Bug fixes and improvements

- Fixed bugs that could happen when using a custom tag separator and multiple release tags.
- Command [A] can no longer be triggered accidentally.

Author: hippie68

pkgrename.c/pkgrename.c

@@ -687,9 +687,13 @@ static struct scan *pkgrename(struct scan *scan)
                 putchar('\n');
                 return scan;
             }
-        } while (strchr("ynaetmorcslhqbpT", c) == NULL);
+        } while (strchr("ynaAetmorcslhqbpT", c) == NULL);
         printf("%c\n", c);
 
+        static int a_primed;
+        if (c != 'a' && c != 'A')
+            a_primed = 0;
+
         // Evaluate user input,
         switch (c) {
             case 'y': // [Y]es: rename the file.
@@ -698,9 +702,22 @@ static struct scan *pkgrename(struct scan *scan)
             case 'n': // [No]: skip file
                 goto exit;
             case 'a': // [A]ll: rename files automatically.
-                option_yes_to_all = 1;
-                rename_file(filename, new_basename, path);
-                goto exit;
+                a_primed = 1;
+                set_color(BRIGHT_YELLOW, stdout);
+                puts("\nPress Shift-[A] now if you really want to automatically rename all remaining files.\n");
+                set_color(RESET, stdout);
+                break;
+            case 'A':
+                if (a_primed) {
+                    option_yes_to_all = 1;
+                    rename_file(filename, new_basename, path);
+                    goto exit;
+                } else {
+                    set_color(BRIGHT_YELLOW, stdout);
+                    puts("\nPress [A] to unlock this command.\n");
+                    set_color(RESET, stdout);
+                }
+                break;
             case 'e': // [E]dit: let user manually enter a new title.
                 ;
                 char backup[MAX_TITLE_LEN];

pkgrename.c/src/options.c

@@ -76,7 +76,7 @@ static struct option opts[] = {
 
 void print_version(void)
 {
-    printf("Version 1.09 BETA, build date: %s\n", __DATE__);
+    printf("Version 1.09, build date: %s\n", __DATE__);
     printf("Get the latest version at "
         "\"%s\".\n", HOMEPAGE_LINK);
     printf("Report bugs, request features, or add missing tags at "

pkgrename.c/src/releaselists.c

@@ -162,18 +162,12 @@ int get_release(char **release, const char *string)
     } else if (n_found > 1) {
         // Return multiple releases as a comma-separated string.
         qsort(found, n_found, sizeof(char *), compar_func);
-        size_t len = strlen(found[0]);
-        for (int i = 1; i < n_found; i++)
-            len += strlen(found[i]) + strlen(tag_separator);
-        char *new_retval = realloc(retval, len + strlen(tag_separator));
-        if (new_retval == NULL)
-            exit(EXIT_FAILURE);
-        retval = new_retval;
-        retval[0] = '\0';
-        strcpy(retval, found[0]);
+        if (retval == NULL)
+            retval = calloc(MAX_TAG_LEN, 1);
+        strncpy(retval, found[0], MAX_TAG_LEN);
         for (int i = 1; i < n_found; i++) {
-            strcat(retval, tag_separator);
-            strcat(retval, found[i]);
+            strncat(retval, tag_separator, MAX_TAG_LEN - strlen(retval));
+            strncat(retval, found[i], MAX_TAG_LEN - strlen(retval));
         }
         *release = retval;
     }
@@ -245,14 +239,15 @@ void replace_commas_in_tag(char *tag, const char *string)
     size_t taglen = strlen(tag); // Initial length
     size_t stringlen = strlen(string);
 
-    for (size_t i = 0; i < taglen; i++) {
+    for (size_t i = 0; i < strlen(tag); i++) {
         if (tag[i] == ',') {
             // Only do it if there's enough space left in the tag buffer.
-            if (strlen(tag) + stringlen + 1 >= MAX_TAG_LEN)
+            if (strlen(tag) + stringlen - 1 >= MAX_TAG_LEN)
                 return;
 
-            memmove(tag + i + stringlen, tag + i + 1, strlen(tag + i + 1));
+            memmove(tag + i + stringlen, tag + i + 1, strlen(tag + i));
             memcpy(tag + i, string, stringlen);
+            i += stringlen;
         }
     }
 }