X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/66203a982b3d249bafda9b9272c4c103c19e4a9b..0f3203c312c3e254b611a1687f8ff9a6bdf82376:/options.c

diff --git a/options.c b/options.c
index 642a9f28..ca849d51 100644
--- a/options.c
+++ b/options.c
@@ -84,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);
@@ -108,7 +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");
+  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");
@@ -460,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: