mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-26 11:47:31 +00:00
Code Issues Releases Activity

- Don't include both <sys/types.h> and <sys/param.h>

Browse Source 
- Keep variables sorted

- Fix logic error with -f and -v options - don't print
  the usual -v output if there was an error, whether or not
  we were passed -f

- Don't call free(3) just before exit(2)

- Whitespace fixes

Submitted by:	bde
This commit is contained in:
Edward Tomasz Napierala 2009-09-02 05:26:59 +00:00
parent b9a10b5810
commit f0246686c6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=196753
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/chmod/chmod.c
View File

@ -41,7 +41,6 @@ static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
@ -63,7 +62,7 @@ main(int argc, char *argv[])
FTS *ftsp;
FTSENT *p;
mode_t *set;
int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval, error;
int Hflag, Lflag, Rflag, ch, error, fflag, fts_options, hflag, rval;
int vflag;
char *mode;
mode_t newmode;
@ -170,7 +169,6 @@ done: argv += optind;
*/
if (!hflag)
continue;
/* else */
/* FALLTHROUGH */
default:
break;
@ -188,9 +186,11 @@ done: argv += optind;
error = lchmod(p->fts_accpath, newmode);
else
error = chmod(p->fts_accpath, newmode);
if (error && !fflag) {
warn("%s", p->fts_path);
rval = 1;
if (error) {
if (!fflag) {
warn("%s", p->fts_path);
rval = 1;
}
} else {
if (vflag) {
(void)printf("%s", p->fts_path);
@ -201,7 +201,6 @@ done: argv += optind;
strmode(p->fts_statp->st_mode, m1);
strmode((p->fts_statp->st_mode &
S_IFMT) | newmode, m2);
(void)printf(": 0%o [%s] -> 0%o [%s]",
p->fts_statp->st_mode, m1,
(p->fts_statp->st_mode & S_IFMT) |
@ -209,12 +208,10 @@ done: argv += optind;
}
(void)printf("\n");
}
}
}
if (errno)
err(1, "fts_read");
free(set);
exit(rval);
}