From c2f083c4c5e8ad9df4fb3c1182825b828176150a Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 7 Feb 2024 17:57:01 -0800 Subject: [PATCH] Removed njs_file.c not needed after 8aad26845b18 (0.8.3). --- auto/sources | 1 - src/njs_file.c | 69 ---------------------------- src/njs_file.h | 15 ------ src/njs_main.h | 1 - src/test/njs_unit_test.c | 98 ---------------------------------------- 5 files changed, 184 deletions(-) delete mode 100644 src/njs_file.c delete mode 100644 src/njs_file.h diff --git a/auto/sources b/auto/sources index d2172e37..d675b739 100644 --- a/auto/sources +++ b/auto/sources @@ -17,7 +17,6 @@ NJS_LIB_SRCS=" \ src/njs_sha1.c \ src/njs_sha2.c \ src/njs_time.c \ - src/njs_file.c \ src/njs_malloc.c \ src/njs_mp.c \ src/njs_sprintf.c \ diff --git a/src/njs_file.c b/src/njs_file.c deleted file mode 100644 index 210d85de..00000000 --- a/src/njs_file.c +++ /dev/null @@ -1,69 +0,0 @@ - -/* - * Copyright (C) Igor Sysoev - * Copyright (C) NGINX, Inc. - */ - - -#include - - -void -njs_file_basename(const njs_str_t *path, njs_str_t *name) -{ - const u_char *p, *end; - - end = path->start + path->length; - p = end - 1; - - /* Stripping dir prefix. */ - - while (p >= path->start && *p != '/') { p--; } - - p++; - - name->start = (u_char *) p; - name->length = end - p; -} - - -void -njs_file_dirname(const njs_str_t *path, njs_str_t *name) -{ - const u_char *p, *end; - - if (path->length == 0) { - goto current_dir; - } - - p = path->start + path->length - 1; - - /* Stripping basename. */ - - while (p >= path->start && *p != '/') { p--; } - - end = p + 1; - - if (end == path->start) { - goto current_dir; - } - - /* Stripping trailing slashes. */ - - while (p >= path->start && *p == '/') { p--; } - - p++; - - if (p == path->start) { - p = end; - } - - name->start = path->start; - name->length = p - path->start; - - return; - -current_dir: - - *name = njs_str_value("."); -} diff --git a/src/njs_file.h b/src/njs_file.h deleted file mode 100644 index 86adfb2c..00000000 --- a/src/njs_file.h +++ /dev/null @@ -1,15 +0,0 @@ - -/* - * Copyright (C) Igor Sysoev - * Copyright (C) NGINX, Inc. - */ - -#ifndef _NJS_FILE_H_INCLUDED_ -#define _NJS_FILE_H_INCLUDED_ - - -void njs_file_basename(const njs_str_t *path, njs_str_t *name); -void njs_file_dirname(const njs_str_t *path, njs_str_t *name); - - -#endif /* _NJS_FILE_H_INCLUDED_ */ diff --git a/src/njs_main.h b/src/njs_main.h index 29aba719..afb024e1 100644 --- a/src/njs_main.h +++ b/src/njs_main.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c index 14bb6718..4e54c712 100644 --- a/src/test/njs_unit_test.c +++ b/src/test/njs_unit_test.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -24448,99 +24447,6 @@ njs_vm_object_alloc_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat) } -static njs_int_t -njs_file_basename_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat) -{ - njs_str_t name; - njs_bool_t success; - njs_uint_t i; - - static const struct { - njs_str_t path; - njs_str_t expected; - } tests[] = { - { njs_str(""), njs_str("") }, - { njs_str("/"), njs_str("") }, - { njs_str("/a"), njs_str("a") }, - { njs_str("///"), njs_str("") }, - { njs_str("///a"), njs_str("a") }, - { njs_str("///a/"), njs_str("") }, - { njs_str("a"), njs_str("a") }, - { njs_str("a/"), njs_str("") }, - { njs_str("a//"), njs_str("") }, - { njs_str("path/name"), njs_str("name") }, - { njs_str("/path/name"), njs_str("name") }, - { njs_str("/path/name/"), njs_str("") }, - }; - - for (i = 0; i < njs_nitems(tests); i++) { - njs_file_basename(&tests[i].path, &name); - - success = njs_strstr_eq(&tests[i].expected, &name); - - if (!success) { - njs_printf("njs_file_basename_test(\"%V\"):\n" - "expected: \"%V\"\n got: \"%V\"\n", - &tests[i].path, &tests[i].expected, &name); - - stat->failed++; - - } else { - stat->passed++; - } - } - - return NJS_OK; -} - - -static njs_int_t -njs_file_dirname_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat) -{ - njs_str_t name; - njs_bool_t success; - njs_uint_t i; - - static const struct { - njs_str_t path; - njs_str_t expected; - } tests[] = { - { njs_str(""), njs_str(".") }, - { njs_str("/"), njs_str("/") }, - { njs_str("/a"), njs_str("/") }, - { njs_str("///"), njs_str("///") }, - { njs_str("///a"), njs_str("///") }, - { njs_str("///a/"), njs_str("///a") }, - { njs_str("a"), njs_str(".") }, - { njs_str("a/"), njs_str("a") }, - { njs_str("a//"), njs_str("a") }, - { njs_str("p1/p2/name"), njs_str("p1/p2") }, - { njs_str("/p1/p2/name"), njs_str("/p1/p2") }, - { njs_str("/p1/p2///name"), njs_str("/p1/p2") }, - { njs_str("/p1/p2/name/"), njs_str("/p1/p2/name") }, - }; - - for (i = 0; i < njs_nitems(tests); i++) { - njs_file_dirname(&tests[i].path, &name); - - success = njs_strstr_eq(&tests[i].expected, &name); - - if (!success) { - njs_printf("njs_file_dirname_test(\"%V\"):\n" - "expected: \"%V\"\n got: \"%V\"\n", - &tests[i].path, &tests[i].expected, &name); - - stat->failed++; - } else { - stat->passed++; - } - - } - - return NJS_OK; -} - - static njs_int_t njs_chb_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat) { @@ -24935,10 +24841,6 @@ njs_vm_internal_api_test(njs_unit_test_t unused[], size_t num, njs_str_t *name, } tests[] = { { njs_vm_object_alloc_test, njs_str("njs_vm_object_alloc_test") }, - { njs_file_basename_test, - njs_str("njs_file_basename_test") }, - { njs_file_dirname_test, - njs_str("njs_file_dirname_test") }, { njs_chb_test, njs_str("njs_chb_test") }, { njs_sort_test, -- 2.47.3