X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2206abf88410dc19632faf6743eae525ad94199a..5dd14f0c3388f69932d521915e039e32b9e6d970:/options.c diff --git a/options.c b/options.c index 4fd2565b..2d049744 100644 --- a/options.c +++ b/options.c @@ -20,7 +20,7 @@ */ #include "rsync.h" -#include "ifuncs.h" +#include "itypes.h" #include #include "zlib/zlib.h" @@ -93,7 +93,7 @@ int filesfrom_fd = -1; char *filesfrom_host = NULL; int eol_nulls = 0; int protect_args = 0; -int human_readable = 0; +int human_readable = 1; int recurse = 0; int allow_inc_recurse = 1; int xfer_dirs = -1; @@ -102,6 +102,7 @@ int connect_timeout = 0; int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; +int munge_symlinks = 0; int size_only = 0; int daemon_bwlimit = 0; int bwlimit = 0; @@ -120,6 +121,7 @@ int checksum_seed = 0; int inplace = 0; int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ +char number_separator; char *skip_compress = NULL; item_list dparam_list = EMPTY_ITEM_LIST; @@ -199,9 +201,9 @@ struct chmod_mode_struct *chmod_modes = NULL; static const char *debug_verbosity[] = { /*0*/ NULL, /*1*/ NULL, - /*2*/ "bind,cmd,deltasum,connect,del,dup,filter,flist", + /*2*/ "bind,cmd,connect,del,deltasum,dup,filter,flist,iconv", /*3*/ "acl,backup,deltasum2,del2,exit,filter2,flist2,fuzzy,genr,own,recv,send,time", - /*4*/ "cmd2,deltasum3,del3,exit2,flist3,iconv,own2,proto,time2", + /*4*/ "cmd2,deltasum3,del3,exit2,flist3,iconv2,own2,proto,time2", /*5*/ "chdir,deltasum4,flist4,fuzzy2,hlink", }; @@ -210,7 +212,7 @@ static const char *debug_verbosity[] = { static const char *info_verbosity[1+MAX_VERBOSITY] = { /*0*/ NULL, /*1*/ "copy,del,flist,misc,name,stats,symsafe", - /*2*/ "backup,misc2,mount,name2,remove,skip", + /*2*/ "backup,mount,name2,remove,skip", }; #define MAX_OUT_LEVEL 4 /* The largest N allowed for any flagN word. */ @@ -243,7 +245,7 @@ static struct output_struct info_words[COUNT_INFO+1] = { INFO_WORD(COPY, W_REC, "Mention files copied locally on the receiving side"), INFO_WORD(DEL, W_REC, "Mention deletions on the receiving side"), INFO_WORD(FLIST, W_CLI, "Mention file-list receiving/sending (levels 1-2)"), - INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information (levels 1-2)"), + INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information"), INFO_WORD(MOUNT, W_SND|W_REC, "Mention mounts that were found or skipped"), INFO_WORD(NAME, W_SND|W_REC, "Mention 1) updated file/dir names, 2) unchanged names"), INFO_WORD(PROGRESS, W_CLI, "Mention 1) per-file progress or 2) total transfer progress"), @@ -272,7 +274,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = { DEBUG_WORD(FUZZY, W_REC, "Debug fuzzy scoring (levels 1-2)"), DEBUG_WORD(GENR, W_REC, "Debug generator functions"), DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions"), - DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv (character conversion)"), + DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"), DEBUG_WORD(OWN, W_REC, "Debug ownership changes in users & groups (levels 1-2)"), DEBUG_WORD(PROTO, W_CLI|W_SRV, "Debug protocol information"), DEBUG_WORD(RECV, W_REC, "Debug receiver functions"), @@ -670,6 +672,7 @@ void usage(enum logcode F) rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n"); rprintf(F," --safe-links ignore symlinks that point outside the source tree\n"); + rprintf(F," --munge-links munge symlinks to make them safer (but unusable)\n"); rprintf(F," -k, --copy-dirlinks transform symlink to a dir into referent dir\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -H, --hard-links preserve hard links\n"); @@ -855,6 +858,8 @@ static struct poptOption long_options[] = { {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 }, {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 }, {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, + {"munge-links", 0, POPT_ARG_VAL, &munge_symlinks, 1, 0, 0 }, + {"no-munge-links", 0, POPT_ARG_VAL, &munge_symlinks, 0, 0, 0 }, {"copy-dirlinks", 'k', POPT_ARG_NONE, ©_dirlinks, 0, 0, 0 }, {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, {"hard-links", 'H', POPT_ARG_NONE, 0, 'H', 0, 0 }, @@ -1665,7 +1670,7 @@ int parse_arguments(int *argc_p, const char ***argv_p) } } - if (human_readable && argc == 2 && !am_server) { + if (human_readable > 1 && argc == 2 && !am_server) { /* Allow the old meaning of 'h' (--help) on its own. */ usage(FINFO); exit_cleanup(0); @@ -1678,6 +1683,15 @@ int parse_arguments(int *argc_p, const char ***argv_p) verbose > 1 ? "stats3" : "stats2", DEFAULT_PRIORITY); } + if (human_readable) { + char buf[32]; + snprintf(buf, sizeof buf, "%f", 3.14); + if (strchr(buf, '.') != NULL) + number_separator = ','; + else + number_separator = '.'; + } + #ifdef ICONV_OPTION if (iconv_opt && protect_args != 2) { if (!am_server && strcmp(iconv_opt, "-") == 0) @@ -1842,6 +1856,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) need_messages_from_generator = 1; } + if (munge_symlinks && !am_daemon) { + STRUCT_STAT st; + char prefix[SYMLINK_PREFIX_LEN]; /* NOT +1 ! */ + strlcpy(prefix, SYMLINK_PREFIX, sizeof prefix); /* trim the trailing slash */ + if (do_stat(prefix, &st) == 0 && S_ISDIR(st.st_mode)) { + rprintf(FERROR, "Symlink munging is unsafe when a %s directory exists.\n", + prefix); + exit_cleanup(RERR_UNSUPPORTED); + } + } + if (sanitize_paths) { int i; for (i = argc; i-- > 0; ) @@ -2229,6 +2254,9 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'i'; #if defined HAVE_LUTIMES && defined HAVE_UTIMES argstr[x++] = 'L'; +#endif +#ifdef ICONV_OPTION + argstr[x++] = 's'; #endif }