Restored changes accidentally backed out by Dave Dykstra in previous revision.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 06b442c..af43be7 100644 (file)
--- a/options.c
+++ b/options.c
@@ -81,11 +81,7 @@ int only_existing=0;
 int opt_ignore_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=-1;
 
 
@@ -108,7 +104,7 @@ int suffix_specified = 0;
 char *backup_suffix = BACKUP_SUFFIX;
 char *tmpdir = NULL;
 char *compare_dest = NULL;
-char *config_file = RSYNCD_CONF;
+char *config_file = NULL;
 char *shell_cmd = NULL;
 char *log_format = NULL;
 char *password_file = NULL;
@@ -211,7 +207,7 @@ void usage(enum logcode F)
   rprintf(F," -v, --verbose               increase verbosity\n");
   rprintf(F," -q, --quiet                 decrease verbosity\n");
   rprintf(F," -c, --checksum              always checksum\n");
-  rprintf(F," -a, --archive               archive mode\n");
+  rprintf(F," -a, --archive               archive mode, equivalent to -rlptgoD\n");
   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);
@@ -595,7 +591,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        break;
                case OPT_LINK_DEST:
 #if HAVE_LINK
-                       compare_dest = poptGetOptArg(pc);
+                       compare_dest = (char *)poptGetOptArg(pc);
                        link_dest = 1;
                        break;
 #else