From: Wayne Davison <wayne@opencoder.net>
Date: Sat, 13 Jun 2020 06:10:44 +0000 (-0700)
Subject: Make use of poptDupArgv().
X-Git-Tag: v3.2.0pre1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab0189c81365c0b00e8235a29be67e60cf89a1ab;p=thirdparty%2Frsync.git

Make use of poptDupArgv().
---

diff --git a/main.c b/main.c
index 155b178c..90ab43db 100644
--- a/main.c
+++ b/main.c
@@ -26,6 +26,7 @@
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#include <popt.h>
 
 extern int dry_run;
 extern int list_only;
@@ -1706,13 +1707,9 @@ int main(int argc,char *argv[])
 		option_error();
 		exit_cleanup(RERR_SYNTAX);
 	}
-	if (write_batch) {
-		int j;
-		cooked_argc = argc;
-		cooked_argv = new_array(char*, argc+1);
-		for (j = 0; j <= argc; j++)
-			cooked_argv[j] = argv[j];
-	}
+	if (write_batch
+	 && poptDupArgv(argc, (const char **)argv, &cooked_argc, (const char ***)&cooked_argv) != 0)
+		out_of_memory("main");
 
 	SIGACTMASK(SIGINT, sig_int);
 	SIGACTMASK(SIGHUP, sig_int);