aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rhodes <trhodes@FreeBSD.org>2006-10-11 10:26:34 +0000
committerTom Rhodes <trhodes@FreeBSD.org>2006-10-11 10:26:34 +0000
commit43d8847e0be552d63aee7438168290a6d2f82958 (patch)
treee969d63ea1fc1376aefe575c4dc177067db1563c
parentaad0be7a3b47f163041ef843f43b185c725af522 (diff)
Notes
-rw-r--r--bin/cp/cp.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 13757f0b8ef7..fcc2b7668458 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -155,12 +155,9 @@ main(int argc, char *argv[])
usage();
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
- if (rflag) {
- if (Rflag)
- errx(1,
- "the -R and -r options may not be specified together.");
- }
- if (rflag && !Hflag && !Pflag)
+ if (Rflag && rflag)
+ errx(1, "the -R and -r options may not be specified together");
+ if (rflag)
Rflag = 1;
if (Rflag) {
if (Hflag)
@@ -230,7 +227,7 @@ main(int argc, char *argv[])
else
lstat(*argv, &tmp_stat);
- if (S_ISDIR(tmp_stat.st_mode) && (Rflag))
+ if (S_ISDIR(tmp_stat.st_mode) && Rflag)
type = DIR_TO_DNE;
else
type = FILE_TO_FILE;