getopt32: move support for "always treat first arg as option" to users (tar/ar)

Now getopt() never leaks (and never performs) any xmalloc's.

function                                             old     new   delta
ar_main                                              522     556     +34
tar_main                                             986    1014     +28
getopt32                                            1458    1350    -108
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 62/-108)           Total: -46 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 2886d155b..46c10aad4 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -240,10 +240,12 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
 
         archive_handle = init_handle();
 
-        /* --: prepend '-' to the first argument if required */
+        /* prepend '-' to the first argument if required */
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
         /* -1: at least one param is reqd */
         /* one of p,t,x[,r] is required */
-        opt_complementary = "--:-1:p:t:x"IF_FEATURE_AR_CREATE(":r");
+        opt_complementary = "-1:p:t:x"IF_FEATURE_AR_CREATE(":r");
         opt = getopt32(argv, "voc""ptx"IF_FEATURE_AR_CREATE("r"));
         argv += optind;
 
diff --git a/archival/tar.c b/archival/tar.c
index 280ded4e1..f62b33005 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -966,7 +966,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
 
         /* Prepend '-' to the first argument if required */
-        opt_complementary = "--:" // first arg is options
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
+        opt_complementary =
                 "tt:vv:" // count -t,-v
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                 "\xff::" // --exclude=PATTERN is a list