fixed some logcode warnings

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 8a3f7b7..ca849d5 100644 (file)
--- a/options.c
+++ b/options.c
@@ -74,6 +74,7 @@ char *shell_cmd = NULL;
 char *log_format = NULL;
 char *password_file = NULL;
 char *rsync_path = RSYNC_NAME;
+char *backup_dir = NULL;
 int rsync_port = RSYNC_PORT;
 
 int verbose = 0;
@@ -83,7 +84,7 @@ int list_only = 0;
 
 struct in_addr socket_address = {INADDR_ANY};
 
-void usage(int F)
+void usage(enum logcode F)
 {
   rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
          VERSION);
@@ -107,6 +108,7 @@ void usage(int F)
   rprintf(F," -r, --recursive             recurse into directories\n");
   rprintf(F," -R, --relative              use relative path names\n");
   rprintf(F," -b, --backup                make backups (default %s suffix)\n",BACKUP_SUFFIX);
+  rprintf(F,"     --backup-dir            make backups into this directory\n");
   rprintf(F,"     --suffix=SUFFIX         override backup suffix\n");  
   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
   rprintf(F," -l, --links                 preserve soft links\n");
@@ -169,7 +171,7 @@ 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_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR};
 
 static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
 
@@ -231,6 +233,7 @@ static struct option long_options[] = {
   {"log-format",  1,     0,    OPT_LOG_FORMAT},
   {"address",     1,     0,    OPT_ADDRESS},
   {"max-delete",  1,     0,    OPT_MAX_DELETE},
+  {"backup-dir",  1,     0,    OPT_BACKUP_DIR},
   {0,0,0,0}};
 
 
@@ -457,10 +460,8 @@ int parse_arguments(int argc, char *argv[], int frommain)
                        preserve_perms=1;
                        preserve_times=1;
                        preserve_gid=1;
-                       if (am_root) {
-                               preserve_devices=1;
-                               preserve_uid=1;
-                       }
+                       preserve_uid=1;
+                       preserve_devices=1;
                        break;
 
                case OPT_SERVER:
@@ -553,6 +554,10 @@ int parse_arguments(int argc, char *argv[], int frommain)
                        }
                        break;
 
+               case OPT_BACKUP_DIR:
+                       backup_dir = optarg;
+                       break;
+
                default:
                        slprintf(err_buf,sizeof(err_buf),"unrecognised option\n");
                        return 0;
@@ -562,6 +567,8 @@ int parse_arguments(int argc, char *argv[], int frommain)
 }
 
 
+/* need to pass all the valid options from the client to the server */
+
 void server_options(char **args,int *argc)
 {
        int ac = *argc;
@@ -680,6 +687,14 @@ void server_options(char **args,int *argc)
                args[ac++] = tmpdir;
        }
 
+       if (backup_dir && am_sender) {
+               /* only the receiver needs this option, if we are the sender
+                *   then we need to send it to the receiver.
+                */
+               args[ac++] = "--backup-dir";
+               args[ac++] = backup_dir;
+       }
+
        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