emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkdir: fix "uname 0222; mkdir foo/bar" case

Browse Source 
(by Doug Graham <dgraham AT nortel.com>)

function                                             old     new   delta
bb_make_directory                                    291     280     -11
This commit is contained in:
Denis Vlasenko 2008-08-15 19:18:35 +00:00
parent cd785fb716
commit 11152e30e3
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libbb/make_directory.c
View File

@ -35,17 +35,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
struct stat st; struct stat st;
mask = umask(0); mask = umask(0);
if (mode == -1) { umask(mask & ~0300); /* Ensure intermediate dirs are wx */
umask(mask);
mode = (S_IXUSR | S_IXGRP | S_IXOTH |
S_IWUSR | S_IWGRP | S_IWOTH |
S_IRUSR | S_IRGRP | S_IROTH) & ~mask;
} else {
umask(mask & ~0300);
}
do { while (1) {
c = 0; c = '\0';
if (flags & FILEUTILS_RECUR) { /* Get the parent. */ if (flags & FILEUTILS_RECUR) { /* Get the parent. */
/* Bypass leading non-'/'s and then subsequent '/'s. */ /* Bypass leading non-'/'s and then subsequent '/'s. */
@ -54,20 +47,24 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
do { do {
++s; ++s;
} while (*s == '/'); } while (*s == '/');
c = *s; /* Save the current char */ c = *s; /* Save the current char */
*s = 0; /* and replace it with nul. */ *s = '\0'; /* and replace it with nul. */
break; break;
} }
++s; ++s;
} }
} }
if (!c) /* Last component uses orig umask */
umask(mask);
if (mkdir(path, 0777) < 0) { if (mkdir(path, 0777) < 0) {
/* If we failed for any other reason than the directory /* If we failed for any other reason than the directory
* already exists, output a diagnostic and return -1.*/ * already exists, output a diagnostic and return -1. */
if (errno != EEXIST if (errno != EEXIST
|| !(flags & FILEUTILS_RECUR) || !(flags & FILEUTILS_RECUR)
|| (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode))
) {
fail_msg = "create"; fail_msg = "create";
umask(mask); umask(mask);
break; break;
@ -82,11 +79,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
} }
if (!c) { if (!c) {
/* Done. If necessary, updated perms on the newly /* Done. If necessary, update perms on the newly
* created directory. Failure to update here _is_ * created directory. Failure to update here _is_
* an error.*/ * an error. */
umask(mask); if ((mode != -1) && (chmod(path, mode) < 0)) {
if ((mode != -1) && (chmod(path, mode) < 0)){
fail_msg = "set permissions of"; fail_msg = "set permissions of";
break; break;
} }
@ -95,8 +91,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
/* Remove any inserted nul from the path (recursive mode). */ /* Remove any inserted nul from the path (recursive mode). */
*s = c; *s = c;
} /* while (1) */
} while (1);
bb_perror_msg("cannot %s directory '%s'", fail_msg, path); bb_perror_msg("cannot %s directory '%s'", fail_msg, path);
return -1; return -1;