Matt McCutchen's Web Site / rsync / rsync.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Print a warning message in the version if the platform cannot support 32-bit ints
[rsync/rsync.git] / options.c
diff --git a/options.c b/options.c
index ca849d5..be53d5a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1998
+/*  -*- c-file-style: "linux" -*-
+    
+    Copyright (C) 1998-2000 by Andrew Tridgell 
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,9 +63,17 @@ int safe_symlinks=0;
 int copy_unsafe_links=0;
 int block_size=BLOCK_SIZE;
 int size_only=0;
+int bwlimit=0;
 int delete_after=0;
 int only_existing=0;
 int max_delete=0;
+int ignore_errors=0;
+#ifdef _WIN32
+int modify_window=2;
+#else
+int modify_window=0;
+#endif
+int blocking_io=0;
 
 char *backup_suffix = BACKUP_SUFFIX;
 char *tmpdir = NULL;
@@ -82,12 +91,32 @@ int quiet = 0;
 int always_checksum = 0;
 int list_only = 0;
 
+static int modify_window_set;
+
+
 struct in_addr socket_address = {INADDR_ANY};
 
+
+static void print_rsync_version(void)
+{
+        rprintf(FINFO, "rsync version %s  protocol version %d (%d-bit files)\n\n",
+                VERSION, PROTOCOL_VERSION,
+                sizeof(int64) * 8);
+        rprintf(FINFO, "Written by Andrew Tridgell and Paul Mackerras\n");
+        rprintf(FINFO, "http://rsync.samba.org/\n");
+#ifdef NO_INT64
+        rprintf(FINFO, "WARNING: no 64-bit integers on this platform!\n");
+#endif
+}
+
+
 void usage(enum logcode F)
 {
   rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
          VERSION);
+#ifdef NO_INT64
+  rprintf(F, "WARNING: no 64-bit integers on this platform!\n");
+#endif
 
   rprintf(F,"rsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
 
@@ -133,6 +162,7 @@ void usage(enum logcode F)
   rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
   rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
   rprintf(F,"     --delete-after          delete after transferring, not before\n");
+  rprintf(F,"     --ignore-errors         delete even if there are IO errors\n");
   rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
   rprintf(F,"     --partial               keep partially transferred files\n");
   rprintf(F,"     --force                 force deletion of directories even if not empty\n");
@@ -140,6 +170,7 @@ void usage(enum logcode 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,"     --size-only             only use file size when determining if a file should be transferred\n");
+  rprintf(F,"     --modify-window=NUM     Timestamp window (seconds) for file match (default=%d)\n",modify_window);
   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," -P                          equivalent to --partial --progress\n");
@@ -153,10 +184,12 @@ void usage(enum logcode F)
   rprintf(F,"     --address               bind to the specified address\n");  
   rprintf(F,"     --config=FILE           specify alternate rsyncd.conf file\n");  
   rprintf(F,"     --port=PORT             specify alternate rsyncd port number\n");
+  rprintf(F,"     --blocking-io           use blocking IO for the remote shell\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,"     --password-file=FILE    get password from FILE\n");
+  rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
   rprintf(F," -h, --help                  show this help screen\n");
 
   rprintf(F,"\n");
@@ -171,7 +204,9 @@ enum {OPT_VERSION, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS,
       OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST,
       OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
-      OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR};
+      OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, 
+      OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO,
+      OPT_MODIFY_WINDOW};
 
 static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
 
@@ -193,6 +228,7 @@ static struct option long_options[] = {
   {"one-file-system",0,  0,    'x'},
   {"ignore-times",0,     0,    'I'},
   {"size-only",   0,     0,    OPT_SIZE_ONLY},
+  {"modify-window",1,    0,    OPT_MODIFY_WINDOW},
   {"help",        0,     0,    'h'},
   {"dry-run",     0,     0,    'n'},
   {"sparse",      0,     0,    'S'},
@@ -228,9 +264,12 @@ static struct option long_options[] = {
   {"progress",    0,     0,    OPT_PROGRESS},
   {"partial",     0,     0,    OPT_PARTIAL},
   {"delete-after",0,     0,    OPT_DELETE_AFTER},
+  {"ignore-errors",0,     0,   OPT_IGNORE_ERRORS},
+  {"blocking-io" ,0,     0,    OPT_BLOCKING_IO},
   {"config",      1,     0,    OPT_CONFIG},
   {"port",        1,     0,    OPT_PORT},
   {"log-format",  1,     0,    OPT_LOG_FORMAT},
+  {"bwlimit",    1,     0,    OPT_BWLIMIT},
   {"address",     1,     0,    OPT_ADDRESS},
   {"max-delete",  1,     0,    OPT_MAX_DELETE},
   {"backup-dir",  1,     0,    OPT_BACKUP_DIR},
@@ -296,9 +335,7 @@ int parse_arguments(int argc, char *argv[], int frommain)
 
                switch (opt) {
                case OPT_VERSION:
-                       rprintf(FINFO,"rsync version %s  protocol version %d\n\n",
-                               VERSION,PROTOCOL_VERSION);
-                       rprintf(FINFO,"Written by Andrew Tridgell and Paul Mackerras\n");
+                        print_rsync_version();
                        exit_cleanup(0);
                        
                case OPT_SUFFIX:
@@ -321,6 +358,11 @@ int parse_arguments(int argc, char *argv[], int frommain)
                        size_only = 1;
                        break;
 
+               case OPT_MODIFY_WINDOW:
+                       modify_window = atoi(optarg);
+                       modify_window_set = 1;
+                       break;
+                       
                case 'x':
                        one_file_system=1;
                        break;
@@ -528,6 +570,14 @@ int parse_arguments(int argc, char *argv[], int frommain)
                        keep_partial = 1;
                        break;
 
+               case OPT_IGNORE_ERRORS:
+                       ignore_errors = 1;
+                       break;
+
+               case OPT_BLOCKING_IO:
+                       blocking_io = 1;
+                       break;
+
                case 'P':
                        do_progress = 1;
                        keep_partial = 1;
@@ -544,6 +594,10 @@ int parse_arguments(int argc, char *argv[], int frommain)
                case OPT_LOG_FORMAT:
                        log_format = optarg;
                        break;
+       
+               case OPT_BWLIMIT:
+                       bwlimit = atoi(optarg);
+                       break;
 
                case OPT_ADDRESS:
                        {
@@ -576,6 +630,9 @@ void server_options(char **args,int *argc)
        static char bsize[30];
        static char iotime[30];
        static char mdelete[30];
+       static char mwindow[30];
+       static char bw[50];
+
        int i, x;
 
        args[ac++] = "--server";
@@ -587,6 +644,7 @@ void server_options(char **args,int *argc)
        argstr[0] = '-';
        for (i=0;i<verbose;i++)
                argstr[x++] = 'v';
+
        /* the -q option is intentionally left out */
        if (make_backups)
                argstr[x++] = 'b';
@@ -628,6 +686,14 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'S';
        if (do_compression)
                argstr[x++] = 'z';
+
+       /* this is a complete hack - blame Rusty 
+
+          this is a hack to make the list_only (remote file list)
+          more useful */
+       if (list_only && !recurse) 
+               argstr[x++] = 'r';
+
        argstr[x] = 0;
 
        if (x != 1) args[ac++] = argstr;
@@ -647,6 +713,11 @@ void server_options(char **args,int *argc)
                args[ac++] = iotime;
        }    
 
+       if (bwlimit) {
+               slprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
+               args[ac++] = bw;
+       }
+
        if (strcmp(backup_suffix, BACKUP_SUFFIX)) {
                args[ac++] = "--suffix";
                args[ac++] = backup_suffix;
@@ -661,6 +732,12 @@ void server_options(char **args,int *argc)
        if (size_only)
                args[ac++] = "--size-only";
 
+       if (modify_window_set) {
+               slprintf(mwindow,sizeof(mwindow),"--modify-window=%d",
+                        modify_window);
+               args[ac++] = mwindow;
+       }
+
        if (keep_partial)
                args[ac++] = "--partial";
 
@@ -670,6 +747,9 @@ void server_options(char **args,int *argc)
        if (delete_after)
                args[ac++] = "--delete-after";
 
+       if (ignore_errors)
+               args[ac++] = "--ignore-errors";
+
        if (copy_unsafe_links)
                args[ac++] = "--copy-unsafe-links";
 
Matt McCutchen's repository for rsync, the fast and versatile remote file copier