X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e1add89334f3a48b1df240ee2c95d46299c9ee4b..4c4266d9c9530fc051a0506f915761bcc9f8c3c6:/options.c diff --git a/options.c b/options.c index f5c2cafd..ce51386d 100644 --- a/options.c +++ b/options.c @@ -226,9 +226,9 @@ void usage(enum logcode F) rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); - rprintf(F," -L, --copy-links copy the referent of symlinks\n"); - rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); - rprintf(F," --safe-links ignore links outside the destination tree\n"); + rprintf(F," -L, --copy-links copy the referent of all symlinks\n"); + rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n"); + rprintf(F," --safe-links ignore \"unsafe\" symlinks\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); rprintf(F," -o, --owner preserve owner (root only)\n"); @@ -581,7 +581,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } #if !SUPPORT_LINKS - if (preserve_links) { + if (preserve_links && !am_sender) { snprintf(err_buf, sizeof err_buf, "symlinks are not supported on this %s\n", am_server ? "server" : "client");