=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/main.c,v retrieving revision 1.59.2.1 retrieving revision 1.60 diff -c -r1.59.2.1 -r1.60 *** src/usr.bin/rsync/main.c 2021/11/09 13:40:41 1.59.2.1 --- src/usr.bin/rsync/main.c 2021/10/22 11:10:34 1.60 *************** *** 1,4 **** ! /* $OpenBSD: main.c,v 1.59.2.1 2021/11/09 13:40:41 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * --- 1,4 ---- ! /* $OpenBSD: main.c,v 1.60 2021/10/22 11:10:34 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * *************** *** 26,32 **** #include #include #include - #include #include "extern.h" --- 26,31 ---- *************** *** 284,291 **** #define OP_COMP_DEST 1009 #define OP_COPY_DEST 1010 #define OP_LINK_DEST 1011 - #define OP_MAX_SIZE 1012 - #define OP_MIN_SIZE 1013 const struct option lopts[] = { { "address", required_argument, NULL, OP_ADDRESS }, --- 283,288 ---- *************** *** 301,316 **** { "devices", no_argument, &opts.devices, 1 }, { "no-devices", no_argument, &opts.devices, 0 }, { "dry-run", no_argument, &opts.dry_run, 1 }, ! { "exclude", required_argument, NULL, OP_EXCLUDE }, { "exclude-from", required_argument, NULL, OP_EXCLUDE_FROM }, { "group", no_argument, &opts.preserve_gids, 1 }, { "no-group", no_argument, &opts.preserve_gids, 0 }, { "help", no_argument, NULL, 'h' }, ! { "include", required_argument, NULL, OP_INCLUDE }, { "include-from", required_argument, NULL, OP_INCLUDE_FROM }, { "links", no_argument, &opts.preserve_links, 1 }, - { "max-size", required_argument, NULL, OP_MAX_SIZE }, - { "min-size", required_argument, NULL, OP_MIN_SIZE }, { "no-links", no_argument, &opts.preserve_links, 0 }, { "no-motd", no_argument, &opts.no_motd, 1 }, { "numeric-ids", no_argument, &opts.numeric_ids, 1 }, --- 298,311 ---- { "devices", no_argument, &opts.devices, 1 }, { "no-devices", no_argument, &opts.devices, 0 }, { "dry-run", no_argument, &opts.dry_run, 1 }, ! { "exclude", required_argument, NULL, OP_EXCLUDE }, { "exclude-from", required_argument, NULL, OP_EXCLUDE_FROM }, { "group", no_argument, &opts.preserve_gids, 1 }, { "no-group", no_argument, &opts.preserve_gids, 0 }, { "help", no_argument, NULL, 'h' }, ! { "include", required_argument, NULL, OP_INCLUDE }, { "include-from", required_argument, NULL, OP_INCLUDE_FROM }, { "links", no_argument, &opts.preserve_links, 1 }, { "no-links", no_argument, &opts.preserve_links, 0 }, { "no-motd", no_argument, &opts.no_motd, 1 }, { "numeric-ids", no_argument, &opts.numeric_ids, 1 }, *************** *** 342,351 **** pid_t child; int fds[2], sd = -1, rc, c, st, i, lidx; size_t basedir_cnt = 0; ! struct sess sess; struct fargs *fargs; char **args; ! const char *errstr; /* Global pledge. */ --- 337,346 ---- pid_t child; int fds[2], sd = -1, rc, c, st, i, lidx; size_t basedir_cnt = 0; ! struct sess sess; struct fargs *fargs; char **args; ! const char *errstr; /* Global pledge. */ *************** *** 353,360 **** NULL) == -1) err(ERR_IPC, "pledge"); - opts.max_size = opts.min_size = -1; - while ((c = getopt_long(argc, argv, "Dae:ghlnoprtvxz", lopts, &lidx)) != -1) { switch (c) { --- 348,353 ---- *************** *** 473,486 **** errx(1, "too many --%s directories specified", lopts[lidx].name); opts.basedir[basedir_cnt++] = optarg; - break; - case OP_MAX_SIZE: - if (scan_scaled(optarg, &opts.max_size) == -1) - err(1, "bad max-size"); - break; - case OP_MIN_SIZE: - if (scan_scaled(optarg, &opts.min_size) == -1) - err(1, "bad min-size"); break; case OP_VERSION: fprintf(stderr, "openrsync: protocol version %u\n", --- 466,471 ----