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

Honour the spirit rather than the implementation of the previous changes;

Browse Source 
if we are invoked with -m, use chmod() on the final directory component
in order to ensure the mode is correctly set.
This commit is contained in:
Mike Smith 1998-10-22 21:42:20 +00:00
parent 8d35fb65a0
commit 16c0b5195c
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/mkdir/mkdir.c
View File

@ -42,7 +42,7 @@ static char const copyright[] =
static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: mkdir.c,v 1.12 1998/10/20 06:37:01 msmith Exp $"; "$Id: mkdir.c,v 1.13 1998/10/20 08:04:15 msmith Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -99,19 +99,20 @@ main(argc, argv)
if (pflag) { if (pflag) {
if (build(*argv, omode)) if (build(*argv, omode))
exitval = 1; exitval = 1;
continue; } else if (mkdir(*argv, omode) < 0) {
}
if (mkdir(*argv, omode) < 0) {
warn("%s", *argv); warn("%s", *argv);
exitval = 1; exitval = 1;
} }
/* /*
* The mkdir() and umask() calls both honor only the low * The mkdir() and umask() calls both honor only the low
* nine bits, so if you try to set a mode including the * nine bits, so if you try to set a mode including the
* sticky, setuid, setgid bits you lose them. So chmod(). * sticky, setuid, setgid bits you lose them. Don't do
* this unless the user has specifically requested a mode,
* as chmod will (obviously) ignore the umask.
*/ */
if (chmod(*argv, omode) == -1) { if ((exitval == 0) &&
warn("%s", *argv); (mode != NULL) && (chmod(*argv, omode) == -1)) {
warn("chmod %s", *argv);
exitval = 1; exitval = 1;
} }
} }
@ -169,17 +170,6 @@ build(path, omode)
retval = 1; retval = 1;
break; break;
} }
/*
* The mkdir() and umask() calls both honor only the
* low nine bits, so if you try to set a mode
* including the sticky, setuid, setgid bits you lose
* them. So chmod() the last path component to try
* to do what the caller has asked for.
*/
if (last && (chmod(path, omode) == -1)) {
warn("%s", path);
retval = 1;
}
} }
else if ((sb.st_mode & S_IFMT) != S_IFDIR) { else if ((sb.st_mode & S_IFMT) != S_IFDIR) {
if (last) if (last)
@ -190,7 +180,8 @@ build(path, omode)
retval = 1; retval = 1;
break; break;
} }
*p = '/'; if (!last)
*p = '/';
} }
if (!first && !last) if (!first && !last)
(void)umask(oumask); (void)umask(oumask);