diff options
| author |   bket <bket@openbsd.org> | 2019-04-04 04:19:54 +0000 |
|---|---|---|
| committer | bket <bket@openbsd.org> | 2019-04-04 04:19:54 +0000 |
| commit | 1c3d4160f7ee7a9b7a13be74e11b6b7b03ad1a3c (patch) | |
| tree | 825c84f05a813c429f82885e378947ff16defb34 /usr.bin/rsync/main.c | |
| parent | Remove CONFIGURE_STYLE=autoupdate setting. (diff) | |
| download | wireguard-openbsd-1c3d4160f7ee7a9b7a13be74e11b6b7b03ad1a3c.tar.xz wireguard-openbsd-1c3d4160f7ee7a9b7a13be74e11b6b7b03ad1a3c.zip | |
Add support for not crossing filesystem boundaries (-x) to rsync. Option
and behaviour is the same as GPL rsync.
Initial diff received feedback from benno@, schwarze@, deraadt@ and
florian@. Thanks!
OK deraadt@
Diffstat (limited to 'usr.bin/rsync/main.c')
| -rw-r--r-- | usr.bin/rsync/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/rsync/main.c b/usr.bin/rsync/main.c index dd598d93eb2..4f0b386e0bf 100644 --- a/usr.bin/rsync/main.c +++ b/usr.bin/rsync/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.43 2019/04/01 13:04:51 schwarze Exp $ */ +/* $Id: main.c,v 1.44 2019/04/04 04:19:54 bket Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -315,7 +315,7 @@ main(int argc, char *argv[]) memset(&opts, 0, sizeof(struct opts)); - while ((c = getopt_long(argc, argv, "Dae:ghlnoprtvz", lopts, NULL)) + while ((c = getopt_long(argc, argv, "Dae:ghlnoprtvxz", lopts, NULL)) != -1) { switch (c) { case 'D': @@ -359,6 +359,9 @@ main(int argc, char *argv[]) case 'v': opts.verbose++; break; + case 'x': + opts.one_file_system++; + break; case 'z': fprintf(stderr, "%s: -z not supported yet\n", getprogname()); break; @@ -505,7 +508,7 @@ main(int argc, char *argv[]) exit(rc); usage: fprintf(stderr, "usage: %s" - " [-aDglnoprtv] [-e program] [--del] [--numeric-ids]\n" + " [-aDglnoprtvx] [-e program] [--del] [--numeric-ids]\n" "\t[--port=portnumber] [--rsync-path=program] [--version]\n" "\tsource ... directory\n", getprogname()); |