diff options
| author | Matthew Martin <phy1729@gmail.com> | 2019-03-20 23:07:53 -0500 |
|---|---|---|
| committer | Matthew Martin <phy1729@gmail.com> | 2019-03-21 22:04:55 -0500 |
| commit | 5267bdc4ef91c1609bf0499861cc46f63e9e5784 (patch) | |
| tree | a80889804fce3fc6717b65d1b8e7aa512bb996ae /Src | |
| parent | 9b267ff1ebd02177613c25ba8e032fdcc4b8d349 (diff) | |
| download | zsh-5267bdc4ef91c1609bf0499861cc46f63e9e5784.tar.gz zsh-5267bdc4ef91c1609bf0499861cc46f63e9e5784.tar.xz zsh-5267bdc4ef91c1609bf0499861cc46f63e9e5784.zip | |
44153: rm: Accept -R as equivalent to -r
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Modules/files.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Src/Modules/files.c b/Src/Modules/files.c index 85764d55e..6d20e38a8 100644 --- a/Src/Modules/files.c +++ b/Src/Modules/files.c @@ -613,7 +613,8 @@ bin_rm(char *nam, char **args, Options ops, UNUSED(int func)) rmm.opt_interact = OPT_ISSET(ops,'i') && !OPT_ISSET(ops,'f'); rmm.opt_unlinkdir = OPT_ISSET(ops,'d'); err = recursivecmd(nam, OPT_ISSET(ops,'f'), - OPT_ISSET(ops,'r') && !OPT_ISSET(ops,'d'), + !OPT_ISSET(ops,'d') && (OPT_ISSET(ops,'R') || + OPT_ISSET(ops,'r')), OPT_ISSET(ops,'s'), args, recurse_donothing, rm_dirpost, rm_leaf, &rmm); return OPT_ISSET(ops,'f') ? 0 : err; @@ -798,7 +799,7 @@ static struct builtin bintab[] = { BUILTIN("ln", 0, bin_ln, 1, -1, BIN_LN, LN_OPTS, NULL), BUILTIN("mkdir", 0, bin_mkdir, 1, -1, 0, "pm:", NULL), BUILTIN("mv", 0, bin_ln, 2, -1, BIN_MV, "fi", NULL), - BUILTIN("rm", 0, bin_rm, 1, -1, 0, "dfirs", NULL), + BUILTIN("rm", 0, bin_rm, 1, -1, 0, "dfiRrs", NULL), BUILTIN("rmdir", 0, bin_rmdir, 1, -1, 0, NULL, NULL), BUILTIN("sync", 0, bin_sync, 0, 0, 0, NULL, NULL), /* The "safe" zsh-only names */ @@ -808,7 +809,7 @@ static struct builtin bintab[] = { BUILTIN("zf_ln", 0, bin_ln, 1, -1, BIN_LN, LN_OPTS, NULL), BUILTIN("zf_mkdir", 0, bin_mkdir, 1, -1, 0, "pm:", NULL), BUILTIN("zf_mv", 0, bin_ln, 2, -1, BIN_MV, "fi", NULL), - BUILTIN("zf_rm", 0, bin_rm, 1, -1, 0, "dfirs", NULL), + BUILTIN("zf_rm", 0, bin_rm, 1, -1, 0, "dfiRrs", NULL), BUILTIN("zf_rmdir", 0, bin_rmdir, 1, -1, 0, NULL, NULL), BUILTIN("zf_sync", 0, bin_sync, 0, 0, 0, NULL, NULL), |