diff options
| author | Mike Smith <msmith@FreeBSD.org> | 1998-10-20 08:04:15 +0000 |
|---|---|---|
| committer | Mike Smith <msmith@FreeBSD.org> | 1998-10-20 08:04:15 +0000 |
| commit | 37a182e2b27683ffbbdb2fa04122ea710d1b953d (patch) | |
| tree | 1633a7e43024214a43c89cd02f646784aef6722b | |
| parent | e9b30c621de2ae3edfc9e1d4ea3db23eb311936f (diff) | |
Notes
| -rw-r--r-- | bin/mkdir/mkdir.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index e11cfb0db5dc..69217016cc80 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -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) { |