=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/fargs.c,v retrieving revision 1.6 retrieving revision 1.7 diff -c -r1.6 -r1.7 *** src/usr.bin/rsync/fargs.c 2019/02/12 14:09:59 1.6 --- src/usr.bin/rsync/fargs.c 2019/02/12 18:06:25 1.7 *************** *** 1,4 **** ! /* $Id: fargs.c,v 1.6 2019/02/12 14:09:59 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * --- 1,4 ---- ! /* $Id: fargs.c,v 1.7 2019/02/12 18:06:25 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * *************** *** 44,50 **** argsz += 1; /* dot separator */ argsz += 1; /* sink file */ argsz += 5; /* per-mode maximum */ ! argsz += 10; /* shared args */ argsz += 1; /* NULL pointer */ argsz += f->sourcesz; --- 44,50 ---- argsz += 1; /* dot separator */ argsz += 1; /* sink file */ argsz += 5; /* per-mode maximum */ ! argsz += 11; /* shared args */ argsz += 1; /* NULL pointer */ argsz += f->sourcesz; *************** *** 70,75 **** --- 70,89 ---- /* Shared arguments. */ + if (sess->opts->del) + args[i++] = "--delete"; + if (sess->opts->preserve_gids) + args[i++] = "-g"; + if (sess->opts->preserve_links) + args[i++] = "-l"; + if (sess->opts->dry_run) + args[i++] = "-n"; + if (sess->opts->preserve_perms) + args[i++] = "-p"; + if (sess->opts->recursive) + args[i++] = "-r"; + if (sess->opts->preserve_times) + args[i++] = "-t"; if (sess->opts->verbose > 3) args[i++] = "-v"; if (sess->opts->verbose > 2) *************** *** 78,95 **** args[i++] = "-v"; if (sess->opts->verbose > 0) args[i++] = "-v"; - if (sess->opts->dry_run) - args[i++] = "-n"; - if (sess->opts->preserve_times) - args[i++] = "-t"; - if (sess->opts->preserve_perms) - args[i++] = "-p"; - if (sess->opts->recursive) - args[i++] = "-r"; - if (sess->opts->preserve_links) - args[i++] = "-l"; - if (sess->opts->del) - args[i++] = "--delete"; /* Terminate with a full-stop for reasons unknown. */ --- 92,97 ----