From 57a9a4a340e29ebd90459c5c9bbd40ec46656511 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 2 Oct 2025 18:57:46 +0200 Subject: [PATCH] remove deprecated methods --- src/main.c | 28 +++-------- src/rename.c | 140 --------------------------------------------------- src/rename.h | 6 --- 3 files changed, 8 insertions(+), 166 deletions(-) diff --git a/src/main.c b/src/main.c index ed0ee4f..004b4d7 100644 --- a/src/main.c +++ b/src/main.c @@ -42,35 +42,23 @@ void rename_file(const char* input, const char* output) rename(input, output); } -void rename_files(const char* dir_path, rename_func_ptr renamefunc) +void rename_files(const char* dir_path, rename_ptr renamefunc) { - char* input = malloc(sizeof(char) * STR_MAX_LENGTH); - memset(input, 0, STR_MAX_LENGTH); - char* output = malloc(sizeof(char) * STR_MAX_LENGTH); - memset(output, 0, STR_MAX_LENGTH); - glob_t* files = get_files(dir_path); for (int i = 0; i < files->gl_pathc; i++) { - renamefunc(files->gl_pathv[i], output); + const char* output = renamefunc(files->gl_pathv[i]); rename_file(files->gl_pathv[i], output); if (is_dir(output)) { - escape_str(output, input); - rename_files(input, renamefunc); + const char* dirname = escape(output); + rename_files(dirname, renamefunc); } - - memset(output, 0, STR_MAX_LENGTH); - memset(input, 0, STR_MAX_LENGTH); } globfree(files); free(files); files = NULL; - free(input); - input = NULL; - free(output); - output = NULL; } int main(int argc, char* argv[]) @@ -82,13 +70,13 @@ int main(int argc, char* argv[]) } if (argc == 3 && strcmp(argv[2], "lower") == 0) - rename_files(argv[1], rename_lower_str); + rename_files(argv[1], rename_lower); else if (argc == 3 && strcmp(argv[2], "point") == 0) - rename_files(argv[1], rename_point_str); + rename_files(argv[1], rename_point); else if (argc == 3 && strcmp(argv[2], "revert") == 0) - rename_files(argv[1], rename_revert_str); + rename_files(argv[1], rename_revert); else - rename_files(argv[1], rename_str); + rename_files(argv[1], rename_string); return 0; } \ No newline at end of file diff --git a/src/rename.c b/src/rename.c index 527f07c..7fe12a0 100644 --- a/src/rename.c +++ b/src/rename.c @@ -3,29 +3,6 @@ #include #include "rename.h" -void escape_str(const char* src, char* dst) -{ - int len = strlen(src); - int dstcounter = 0; - for (int i = 0; i < len; i++) { - switch(src[i]) { - case SPACE: - case ROUND_BRACKET_OPEN: - case ROUND_BRACKET_CLOSE: - case BRACKET_OPEN: - case BRACKET_CLOSE: - case BRACE_OPEN: - case BRACE_CLOSE: - dst[dstcounter++] = '\\'; - dst[dstcounter++] = src[i]; - break; - default: - dst[dstcounter++] = src[i]; - break; - } - } -} - char* escape(const char* src) { size_t length = strlen(src); @@ -57,29 +34,6 @@ char* escape(const char* src) return dest; } -void rename_point_str(const char* src, char* dst) -{ - char* tmp_str = NULL; - int len = strlen(src); - int point_count = 0; - for (int i = len - 1; i >= 0; i--) { - if (src[i] == POINT) - point_count++; - - if (src[i] != POINT) - break; - } - - tmp_str = malloc(sizeof(char) * len + 1); - memset(tmp_str, 0, len + 1); - strncpy(tmp_str, src, len - point_count); - - rename_str(tmp_str, dst); - - free(tmp_str); - tmp_str = NULL; -} - char* rename_point(const char* src) { char* dest = rename_string(src); @@ -100,18 +54,6 @@ char* rename_point(const char* src) return dest; } - -void rename_lower_str(const char* src, char* dst) -{ - rename_str(src, dst); - int len = strlen(dst); - for (int i = 0; i < len; i++) { - if (dst[i] >= A && dst[i] <= Z) { - dst[i] = dst[i] + SPACE; - } - } -} - char* rename_lower(const char* src) { char* dest = rename_string(src); @@ -124,47 +66,6 @@ char* rename_lower(const char* src) return dest; } -void rename_str(const char* src, char* dst) -{ - int len = strlen(src); - int dstcounter = 0; - for (int i = 0; i < len; i++) { - if (src[i] == SPACE) { - dst[dstcounter++] = '_'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_a) { - i++; - dst[dstcounter++] = 'a'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_A) { - i++; - dst[dstcounter++] = 'A'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_o) { - i++; - dst[dstcounter++] = 'o'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_O) { - i++; - dst[dstcounter++] = 'O'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_u) { - i++; - dst[dstcounter++] = 'u'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_U) { - i++; - dst[dstcounter++] = 'U'; - dst[dstcounter++] = 'e'; - } else if (src[i] == WIDE_CHAR_PREFIX && src[i + 1] == WIDE_CHAR_SS) { - i++; - dst[dstcounter++] = 's'; - dst[dstcounter++] = 's'; - } else { - dst[dstcounter++] = src[i]; - } - } -} - char* rename_string(const char* src) { size_t length = strlen(src); @@ -214,47 +115,6 @@ char* rename_string(const char* src) return dest; } -void rename_revert_str(const char* src, char* dst) -{ - int len = strlen(src); - int dstcounter = 0; - for (int i = 0; i < len; i++) { - if (src[i] == '_') { - dst[dstcounter++] = SPACE; - } else if (src[i] == 'a' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_a; - } else if (src[i] == 'A' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_A; - } else if (src[i] == 'o' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_o; - } else if (src[i] == 'O' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_O; - } else if (src[i] == 'u' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_u; - } else if (src[i] == 'U' && src[i + 1] == 'e') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_U; - } else if (src[i] == 's' && src[i + 1] == 's') { - i++; - dst[dstcounter++] = WIDE_CHAR_SHORT_PREFIX; - dst[dstcounter++] = WIDE_CHAR_SHORT_SS; - } else { - dst[dstcounter++] = src[i]; - } - } -} - char* rename_revert(const char* src) { size_t length = strlen(src); diff --git a/src/rename.h b/src/rename.h index ac02e59..490324a 100644 --- a/src/rename.h +++ b/src/rename.h @@ -30,18 +30,12 @@ #define WIDE_CHAR_SHORT_U 0x9c #define WIDE_CHAR_SHORT_SS 0x9f -__attribute_deprecated__ typedef void (*rename_func_ptr)(const char* src, char* dst); typedef char* (*rename_ptr)(const char* src); -__attribute_deprecated__ void escape_str(const char* src, char* dst); char* escape(const char* src); -__attribute_deprecated__ void rename_point_str(const char* src, char* dst); char* rename_point(const char* src); -__attribute_deprecated__ void rename_lower_str(const char* src, char* dst); char* rename_lower(const char* src); -__attribute_deprecated__ void rename_str(const char* src, char* dst); char* rename_string(const char* src); -__attribute_deprecated__ void rename_revert_str(const char* src, char* dst); char* rename_revert(const char* src); #endif \ No newline at end of file -- 2.47.3