Matt McCutchen's Web Site / rsync / rsync.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added 2 new config options: "pre-xfer exec" and "post-xfer exec".
[rsync/rsync.git] / options.c
diff --git a/options.c b/options.c
index 69fe4b3..cb1e89f 100644 (file)
--- a/options.c
+++ b/options.c
@@ -23,7 +23,6 @@
 
 extern int module_id;
 extern int sanitize_paths;
-extern int select_timeout;
 extern struct filter_list_struct filter_list;
 extern struct filter_list_struct server_filter_list;
 
@@ -39,6 +38,7 @@ int make_backups = 0;
  **/
 int whole_file = -1;
 
+int append_mode = 0;
 int archive_mode = 0;
 int keep_dirlinks = 0;
 int copy_links = 0;
@@ -76,6 +76,7 @@ int implied_dirs = 1;
 int numeric_ids = 0;
 int force_delete = 0;
 int io_timeout = 0;
+int allowed_lull = 0;
 char *files_from = NULL;
 int filesfrom_fd = -1;
 char *filesfrom_host = NULL;
@@ -166,6 +167,7 @@ static int modify_window_set;
 static int itemize_changes = 0;
 static int refused_delete, refused_archive_part;
 static int refused_partial, refused_progress, refused_delete_before;
+static int refused_inplace;
 static char *max_size_arg;
 static char partialdir_for_delayupdate[] = ".~tmp~";
 
@@ -251,7 +253,7 @@ void usage(enum logcode F)
   rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
 
   rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
-  rprintf(F,"  or   rsync [OPTION]... [USER@]HOST:SRC DEST\n");
+  rprintf(F,"  or   rsync [OPTION]... [USER@]HOST:SRC [DEST]\n");
   rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... DEST\n");
   rprintf(F,"  or   rsync [OPTION]... [USER@]HOST::SRC [DEST]\n");
   rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
@@ -274,6 +276,7 @@ void usage(enum logcode F)
   rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
   rprintf(F," -u, --update                skip files that are newer on the receiver\n");
   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
+  rprintf(F,"     --append                append data onto shorter files\n");
   rprintf(F," -d, --dirs                  transfer directories without recursing\n");
   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
   rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
@@ -363,8 +366,7 @@ void usage(enum logcode F)
 enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH,
-      OPT_TIMEOUT, OPT_MAX_SIZE,
+      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
       OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
@@ -405,6 +407,7 @@ static struct poptOption long_options[] = {
   {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
   {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
   {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
+  {"append",           0,  POPT_ARG_VAL,    &append_mode, 1, 0, 0 },
   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
   {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
@@ -428,7 +431,7 @@ static struct poptOption long_options[] = {
   {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
   {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
   {"max-size",         0,  POPT_ARG_STRING, &max_size_arg,  OPT_MAX_SIZE, 0, 0 },
-  {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
+  {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
   {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
   {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
@@ -580,6 +583,8 @@ static void set_refuse_options(char *bp)
                                                refused_partial = op->val;
                                        else if (wildmatch("progress", op->longName))
                                                refused_progress = op->val;
+                                       else if (wildmatch("inplace", op->longName))
+                                               refused_inplace = op->val;
                                        break;
                                }
                                if (!is_wild)
@@ -844,11 +849,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        }
                        break;
 
-               case OPT_TIMEOUT:
-                       if (io_timeout && io_timeout < select_timeout)
-                               select_timeout = io_timeout;
-                       break;
-
                case OPT_LINK_DEST:
 #ifdef HAVE_LINK
                        link_dest = 1;
@@ -979,6 +979,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
+       if (!relative_paths)
+               implied_dirs = 0;
 
        if (!!delete_before + delete_during + delete_after > 1) {
                snprintf(err_buf, sizeof err_buf,
@@ -1115,6 +1117,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (dry_run)
                do_xfers = 0;
 
+       set_io_timeout(io_timeout);
+
        if (verbose && !log_format) {
                log_format = "%n%L";
                log_before_transfer = !am_server;
@@ -1130,6 +1134,19 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        bwlimit_writemax = 512;
        }
 
+       if (append_mode) {
+               if (whole_file > 0) {
+                       snprintf(err_buf, sizeof err_buf,
+                                "--append cannot be used with --whole-file\n");
+                       return 0;
+               }
+               if (refused_inplace) {
+                       create_refuse_error(refused_inplace);
+                       return 0;
+               }
+               inplace = 1;
+       }
+
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
 
@@ -1137,7 +1154,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
                        snprintf(err_buf, sizeof err_buf,
-                                "--inplace cannot be used with --%s\n",
+                                "--%s cannot be used with --%s\n",
+                                append_mode ? "append" : "inplace",
                                 delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }
@@ -1150,7 +1168,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                keep_partial = 0;
 #else
                snprintf(err_buf, sizeof err_buf,
-                        "--inplace is not supported on this %s\n",
+                        "--%s is not supported on this %s\n",
+                        append_mode ? "append" : "inplace",
                         am_server ? "server" : "client");
                return 0;
 #endif
@@ -1442,7 +1461,9 @@ void server_options(char **args,int *argc)
        if (opt_ignore_existing && am_sender)
                args[ac++] = "--ignore-existing";
 
-       if (inplace)
+       if (append_mode)
+               args[ac++] = "--append";
+       else if (inplace)
                args[ac++] = "--inplace";
 
        if (tmpdir) {
@@ -1475,7 +1496,7 @@ void server_options(char **args,int *argc)
                if (!relative_paths)
                        args[ac++] = "--no-relative";
        }
-       if (!implied_dirs && !am_sender)
+       if (relative_paths && !implied_dirs && !am_sender)
                args[ac++] = "--no-implied-dirs";
 
        if (fuzzy_basis && am_sender)
Matt McCutchen's repository for rsync, the fast and versatile remote file copier