Merge branch 'busybox' into merge

2 files changed, 7 insertions, 6 deletions

diff --git a/archival/tar.c b/archival/tar.c
index 503444796..46e2e4fcc 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -982,9 +982,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         if (getuid() != 0)
                 tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
 
-        /* Prepend '-' to the first argument if required */
-        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
-                argv[1] = xasprintf("-%s", argv[1]);
 #if ENABLE_DESKTOP
         /* Lie to buildroot when it starts asking stupid questions. */
         if (argv[1] && strcmp(argv[1], "--version") == 0) {
@@ -1021,6 +1018,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #endif
+        /* Prepend '-' to the first argument if required */
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
         opt = GETOPT32(argv, "^"
                 "txC:f:Oopvk"
                 IF_FEATURE_TAR_CREATE(   "ch"    )
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index f440e6319..defbd9552 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -189,8 +189,9 @@ static void rcptto(const char *s)
 // send to a list of comma separated addresses
 static void rcptto_list(const char *list)
 {
-        char *str = xstrdup(list);
-        char *s = str;
+        char *free_me = xstrdup(list);
+        char *str = free_me;
+        char *s = free_me;
         char prev = 0;
         int in_quote = 0;
 
@@ -208,7 +209,7 @@ static void rcptto_list(const char *list)
         }
         if (prev != ',')
                 rcptto(angle_address(str));
-        free(str);
+        free(free_me);
 }
 
 int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;