X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1db954e9bca018594c9626c92999847d0d1170c5..184dd27a183ab3403eadbd699bc47a1f96cdd331:/options.c diff --git a/options.c b/options.c index a5b862fd..39e61c01 100644 --- a/options.c +++ b/options.c @@ -20,6 +20,7 @@ #include "rsync.h" #include "popt.h" +#include "zlib/zlib.h" extern int module_id; extern int sanitize_paths; @@ -64,6 +65,7 @@ int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; +int def_compress_level = Z_DEFAULT_COMPRESSION; int am_root = 0; int am_server = 0; int am_sender = 0; @@ -142,6 +144,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char *chmod_mode = NULL; char backup_dir_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; @@ -161,11 +164,13 @@ int list_only = 0; #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; +struct chmod_mode_struct *chmod_modes = NULL; + static int daemon_opt; /* sets am_daemon after option error-reporting */ static int F_option_cnt = 0; static int modify_window_set; static int itemize_changes = 0; -static int refused_delete, refused_archive_part; +static int refused_delete, refused_archive_part, refused_compress; static int refused_partial, refused_progress, refused_delete_before; static int refused_inplace; static char *max_size_arg, *min_size_arg; @@ -289,6 +294,7 @@ void usage(enum logcode F) rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); + rprintf(F," --chmod=CHMOD change destination permissions\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n"); @@ -296,8 +302,8 @@ void usage(enum logcode F) rprintf(F," -B, --block-size=SIZE force a fixed checksum block-size\n"); rprintf(F," -e, --rsh=COMMAND specify the remote shell to use\n"); rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\n"); - rprintf(F," --existing only update files that already exist on receiver\n"); rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); + rprintf(F," --ignore-non-existing ignore files that don't exist on receiving side\n"); rprintf(F," --remove-sent-files sent files/symlinks are removed from sending side\n"); rprintf(F," --del an alias for --delete-during\n"); rprintf(F," --delete delete files that don't exist on the sending side\n"); @@ -324,6 +330,7 @@ void usage(enum logcode F) rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); rprintf(F," -z, --compress compress file data during the transfer\n"); + rprintf(F," --compress-level=NUM explicitly set compression level\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); rprintf(F," -F same as --filter='dir-merge /.rsync-filter'\n"); @@ -413,6 +420,7 @@ static struct poptOption long_options[] = { {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, {"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, + {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, @@ -451,7 +459,8 @@ static struct poptOption long_options[] = { {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, - {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, + {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, + {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, {"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 }, {"no-progress", 0, POPT_ARG_VAL, &do_progress, 0, 0, 0 }, @@ -598,6 +607,9 @@ static void set_refuse_options(char *bp) case 't': case 'g': case 'o': case 'D': refused_archive_part = op->val; break; + case 'z': + refused_compress = op->val; + break; case '\0': if (wildmatch("delete", op->longName)) refused_delete = op->val; @@ -901,6 +913,21 @@ int parse_arguments(int *argc, const char ***argv, int frommain) keep_partial = 1; break; + case 'z': + if (def_compress_level < Z_DEFAULT_COMPRESSION + || def_compress_level > Z_BEST_COMPRESSION) { + snprintf(err_buf, sizeof err_buf, + "--compress-level value is invalid: %d\n", + def_compress_level); + return 0; + } + do_compression = def_compress_level != Z_NO_COMPRESSION; + if (do_compression && refused_compress) { + create_refuse_error(refused_compress); + return 0; + } + break; + case OPT_WRITE_BATCH: /* batch_name is already set */ write_batch = 1; @@ -1173,6 +1200,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (make_backups && !backup_dir) omit_dir_times = 1; + if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) { + snprintf(err_buf, sizeof err_buf, + "Invalid argument passed to chmod\n"); + return 0; + } + if (log_format) { if (log_format_has(log_format, 'i')) log_format_has_i = 1; @@ -1431,6 +1464,12 @@ void server_options(char **args,int *argc) if (list_only > 1) args[ac++] = "--list-only"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { + if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) + goto oom; + args[ac++] = arg; + } + /* The server side doesn't use our log-format, but in certain * circumstances they need to know a little about the option. */ if (log_format && am_sender) { @@ -1572,6 +1611,11 @@ void server_options(char **args,int *argc) } } + if (chmod_mode && !am_sender) { + args[ac++] = "--chmod"; + args[ac++] = chmod_mode; + } + if (files_from && (!am_sender || filesfrom_host)) { if (filesfrom_host) { args[ac++] = "--files-from";