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

Make this compile, and honour the spirit of the original design while

Browse Source 
incorporating the intended fix.  Attempt to address some of the
putative style bugs introduced.  Others doubtless remain.

Embarrassed by: bde
This commit is contained in:
msmith 1998-10-20 08:04:15 +00:00
parent 1255619faa
commit ab2f649a67
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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";
#endif
static const char rcsid[] =
"$Id: mkdir.c,v 1.11 1998/05/15 06:23:45 charnier Exp $";
"$Id: mkdir.c,v 1.12 1998/10/20 06:37:01 msmith Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -110,7 +110,7 @@ main(argc, argv)
* nine bits, so if you try to set a mode including the
* sticky, setuid, setgid bits you lose them. So chmod().
*/
if (chmod(*argv, mode) == -1) {
if (chmod(*argv, omode) == -1) {
warn("%s", *argv);
exitval = 1;
}
@ -170,13 +170,15 @@ build(path, omode)
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 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 (chmod(*path, mode) == -1) {
warn("%s", *path);
exitval = 1;
if (last && (chmod(path, omode) == -1)) {
warn("%s", path);
retval = 1;
}
}
else if ((sb.st_mode & S_IFMT) != S_IFDIR) {