X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c3851185f3d4b3ddb72d7c6ea6d931d4423f07c8..78be8e0fc9552189fe0c536a0b88e80ab79ca762:/options.c

diff --git a/options.c b/options.c
index 6488b569..669b15f9 100644
--- a/options.c
+++ b/options.c
@@ -530,7 +530,10 @@ static struct poptOption long_daemon_options[] = {
   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
   {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
+  {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
   {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
+  {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
+  {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
   {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
   {0,0,0,0, 0, 0, 0}
 };
@@ -748,6 +751,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 					goto daemon_error;
 				}
 			}
+
+			if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
+				snprintf(err_buf, sizeof err_buf,
+					 "the --temp-dir path is WAY too long.\n");
+				return 0;
+			}
+
 			if (!daemon_opt) {
 				rprintf(FERROR, "Daemon option(s) used without --daemon.\n");
 			    daemon_error:
@@ -755,6 +765,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				    "(Type \"rsync --daemon --help\" for assistance with daemon mode.)\n");
 				exit_cleanup(RERR_SYNTAX);
 			}
+
 			*argv = poptGetArgs(pc);
 			*argc = count_args(*argv);
 			am_starting_up = 0;