d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix style(9) bugs in previous commit.

Browse Source 
Lesson from:	bde
This commit is contained in:
Tom Rhodes 2006-10-11 10:26:34 +00:00
parent aad0be7a3b
commit 43d8847e0b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=163233
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/cp/cp.c
View File

@ -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;