system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove the code for parsing octal modes, since setmode(3) already

Browse source 
handles them.

Reviewed by:	audit
MFC after:	2 weeks
This commit is contained in:
Anton Berezin 2003-10-31 13:20:09 +00:00
parent 875ec8bdcf
commit ad6a34de1d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121794
1 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bin/chmod/chmod.c
View file

@ -65,16 +65,13 @@ main(int argc, char *argv[])
FTS *ftsp;
FTSENT *p;
mode_t *set;
long val;
int oct;
int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval;
int vflag;
char *ep, *mode;
mode_t newmode, omode;
char *mode;
mode_t newmode;
int (*change_mode)(const char *, mode_t);
set = NULL;
omode = 0;
Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
while ((ch = getopt(argc, argv, "HLPRXfghorstuvwx")) != -1)
switch (ch) {
@ -152,22 +149,8 @@ done: argv += optind;
change_mode = chmod;
mode = *argv;
if (*mode >= '0' && *mode <= '7') {
errno = 0;
val = strtol(mode, &ep, 8);
if (val > USHRT_MAX || val < 0)
errno = ERANGE;
if (errno)
err(1, "invalid file mode: %s", mode);
if (*ep)
errx(1, "invalid file mode: %s", mode);
omode = (mode_t)val;
oct = 1;
} else {
if ((set = setmode(mode)) == NULL)
errx(1, "invalid file mode: %s", mode);
oct = 0;
}
if ((set = setmode(mode)) == NULL)
errx(1, "invalid file mode: %s", mode);
if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
err(1, "fts_open");
@ -200,7 +183,7 @@ done: argv += optind;
default:
break;
}
newmode = oct ? omode : getmode(set, p->fts_statp->st_mode);
newmode = getmode(set, p->fts_statp->st_mode);
if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS))
continue;
if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {