patch from Alberto Accomazzi <aaccomazzi@cfa.harvard.edu> to add

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 23b3c8c..9d7ad92 100644 (file)
--- a/options.c
+++ b/options.c
@@ -64,15 +64,17 @@ int block_size=BLOCK_SIZE;
 
 char *backup_suffix = BACKUP_SUFFIX;
 char *tmpdir = NULL;
+char *compare_dest = NULL;
 char *config_file = RSYNCD_CONF;
 char *shell_cmd = NULL;
+char *log_format = NULL;
 
 char *rsync_path = RSYNC_NAME;
 int rsync_port = RSYNC_PORT;
 
 int verbose = 0;
 int always_checksum = 0;
-
+int list_only = 0;
 
 void usage(int F)
 {
@@ -118,6 +120,7 @@ void usage(int F)
   rprintf(F,"     --timeout=TIME          set IO timeout in seconds\n");
   rprintf(F," -I, --ignore-times          don't exclude files that match length and time\n");
   rprintf(F," -T  --temp-dir=DIR          create temporary files in directory DIR\n");
+  rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
   rprintf(F," -z, --compress              compress file data\n");
   rprintf(F,"     --exclude=PATTERN       exclude file FILE\n");
   rprintf(F,"     --exclude-from=FILE     exclude patterns listed in FILE\n");
@@ -130,6 +133,7 @@ void usage(int F)
   rprintf(F,"     --port=PORT             specify alternate rsyncd port number\n");
   rprintf(F,"     --stats                 give some file transfer stats\n");  
   rprintf(F,"     --progress              show progress during transfer\n");  
+  rprintf(F,"     --log-format=FORMAT     log file transfers using specified format\n");  
   rprintf(F," -h, --help                  show this help screen\n");
 
   rprintf(F,"\n");
@@ -144,7 +148,7 @@ enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
       OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH,
       OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON,OPT_CONFIG,OPT_PORT,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS,
-      OPT_SAFE_LINKS};
+      OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LOG_FORMAT};
 
 static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T:z";
 
@@ -188,6 +192,7 @@ static struct option long_options[] = {
   {"block-size",  1,     0,    'B'},
   {"timeout",     1,     0,    OPT_TIMEOUT},
   {"temp-dir",    1,     0,    'T'},
+  {"compare-dest", 1,    0,    OPT_COMPARE_DEST},
   {"compress",   0,     0,    'z'},
   {"daemon",      0,     0,    OPT_DAEMON},
   {"stats",       0,     0,    OPT_STATS},
@@ -195,6 +200,7 @@ static struct option long_options[] = {
   {"partial",     0,     0,    OPT_PARTIAL},
   {"config",      1,     0,    OPT_CONFIG},
   {"port",        1,     0,    OPT_PORT},
+  {"log-format",  1,     0,    OPT_LOG_FORMAT},
   {0,0,0,0}};
 
 
@@ -355,7 +361,7 @@ int parse_arguments(int argc, char *argv[])
                case OPT_SENDER:
                        if (!am_server) {
                                usage(FERROR);
-                               exit_cleanup(1);
+                               exit_cleanup(RERR_SYNTAX);
                        }
                        am_sender = 1;
                        break;
@@ -384,6 +390,10 @@ int parse_arguments(int argc, char *argv[])
                        tmpdir = optarg;
                        break;
 
+               case OPT_COMPARE_DEST:
+                       compare_dest = optarg;
+                       break;
+
                case 'z':
                        do_compression = 1;
                        break;
@@ -412,6 +422,10 @@ int parse_arguments(int argc, char *argv[])
                        rsync_port = atoi(optarg);
                        break;
 
+               case OPT_LOG_FORMAT:
+                       log_format = optarg;
+                       break;
+
                default:
                        return 0;
                }
@@ -516,6 +530,16 @@ void server_options(char **args,int *argc)
                args[ac++] = tmpdir;
        }
 
+       if (compare_dest && am_sender) {
+               /* the server only needs this option if it is not the sender,
+                *   and it may be an older version that doesn't know this
+                *   option, so don't send it if client is the sender.
+                */
+               args[ac++] = "--compare-dest";
+               args[ac++] = compare_dest;
+       }
+
+
        *argc = ac;
 }