diff options
author | Jim Meyering <jim@meyering.net> | 1999-04-26 13:22:23 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-04-26 13:22:23 +0000 |
commit | f2ab7f35a9a3c5edcb3164d39201bc255b8260a4 (patch) | |
tree | 99e61830337c9aefca66fed94c2c49b804c1c85f | |
parent | 050d93b8101576c277d7abff717540d4449f9b13 (diff) | |
download | gnulib-f2ab7f35a9a3c5edcb3164d39201bc255b8260a4.tar.gz |
(S_IRWXU, S_IRWXG, S_IRWXO): Define if not defined.
Use proper mode_t types and macros.
Don't assume the traditional Unix values for mode bits.
-rw-r--r-- | lib/mkdir.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/mkdir.c b/lib/mkdir.c index 5ca5af6964..1829a9e257 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -34,6 +34,16 @@ extern int errno; # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif +#ifndef S_IRWXU +# define S_IRWXU 0700 +#endif +#ifndef S_IRWXG +# define S_IRWXG 0070 +#endif +#ifndef S_IRWXO +# define S_IRWXO 0007 +#endif + /* mkdir adapted from GNU tar. */ /* Make directory DPATH, with permission mode DMODE. @@ -48,9 +58,10 @@ extern int errno; subroutine didn't return EEXIST. It does now. */ int -mkdir (const char *dpath, int dmode) +mkdir (const char *dpath, mode_t dmode) { pid_t cpid; + mode_t mode; int status; struct stat statbuf; @@ -75,8 +86,9 @@ mkdir (const char *dpath, int dmode) process is going away anyway, we zap its umask. This won't suffice to set SUID, SGID, etc. on this directory, so the parent process calls chmod afterward. */ - status = umask (0); /* Get current umask. */ - umask (status | (0777 & ~dmode)); /* Set for mkdir. */ + mode = umask (0); /* Get current umask. */ + /* Set for mkdir. */ + umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode)); execl ("/bin/mkdir", "mkdir", dpath, (char *) 0); _exit (1); |