Fix style(9) bugs in previous commit.
Lesson from: bde
This commit is contained in:
parent
aad0be7a3b
commit
43d8847e0b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=163233
11
bin/cp/cp.c
11
bin/cp/cp.c
@ -155,12 +155,9 @@ main(int argc, char *argv[])
|
|||||||
usage();
|
usage();
|
||||||
|
|
||||||
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
|
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
|
||||||
if (rflag) {
|
if (Rflag && rflag)
|
||||||
if (Rflag)
|
errx(1, "the -R and -r options may not be specified together");
|
||||||
errx(1,
|
if (rflag)
|
||||||
"the -R and -r options may not be specified together.");
|
|
||||||
}
|
|
||||||
if (rflag && !Hflag && !Pflag)
|
|
||||||
Rflag = 1;
|
Rflag = 1;
|
||||||
if (Rflag) {
|
if (Rflag) {
|
||||||
if (Hflag)
|
if (Hflag)
|
||||||
@ -230,7 +227,7 @@ main(int argc, char *argv[])
|
|||||||
else
|
else
|
||||||
lstat(*argv, &tmp_stat);
|
lstat(*argv, &tmp_stat);
|
||||||
|
|
||||||
if (S_ISDIR(tmp_stat.st_mode) && (Rflag))
|
if (S_ISDIR(tmp_stat.st_mode) && Rflag)
|
||||||
type = DIR_TO_DNE;
|
type = DIR_TO_DNE;
|
||||||
else
|
else
|
||||||
type = FILE_TO_FILE;
|
type = FILE_TO_FILE;
|
||||||
|
Loading…
Reference in New Issue
Block a user