Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/make_directory.c
- Timestamp:
- Feb 25, 2011, 9:26:54 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi-busybox/libbb/make_directory.c
r1765 r2725 5 5 * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> 6 6 * 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.7 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 8 8 */ 9 9 … … 27 27 /* This function is used from NOFORK applets. It must not allocate anything */ 28 28 29 int bb_make_directory(char *path, long mode, int flags)29 int FAST_FUNC bb_make_directory(char *path, long mode, int flags) 30 30 { 31 mode_t mask; 31 mode_t cur_mask; 32 mode_t org_mask; 32 33 const char *fail_msg; 33 char *s = path;34 char *s; 34 35 char c; 35 36 struct stat st; 36 37 37 mask = umask(0); 38 if (mode == -1) { 39 umask(mask); 40 mode = (S_IXUSR | S_IXGRP | S_IXOTH | 41 S_IWUSR | S_IWGRP | S_IWOTH | 42 S_IRUSR | S_IRGRP | S_IROTH) & ~mask; 43 } else { 44 umask(mask & ~0300); 45 } 38 /* Happens on bb_make_directory(dirname("no_slashes"),...) */ 39 if (LONE_CHAR(path, '.')) 40 return 0; 46 41 47 do { 48 c = 0; 42 org_mask = cur_mask = (mode_t)-1L; 43 s = path; 44 while (1) { 45 c = '\0'; 49 46 50 if (flags & FILEUTILS_RECUR) { /* Get the parent.*/51 /* Bypass leading non-'/'s and then subsequent '/'s .*/47 if (flags & FILEUTILS_RECUR) { /* Get the parent */ 48 /* Bypass leading non-'/'s and then subsequent '/'s */ 52 49 while (*s) { 53 50 if (*s == '/') { … … 55 52 ++s; 56 53 } while (*s == '/'); 57 c = *s; 58 *s = 0; /* and replace it with nul.*/54 c = *s; /* Save the current char */ 55 *s = '\0'; /* and replace it with nul */ 59 56 break; 60 57 } … … 63 60 } 64 61 62 if (c != '\0') { 63 /* Intermediate dirs: must have wx for user */ 64 if (cur_mask == (mode_t)-1L) { /* wasn't done yet? */ 65 mode_t new_mask; 66 org_mask = umask(0); 67 cur_mask = 0; 68 /* Clear u=wx in umask - this ensures 69 * they won't be cleared on mkdir */ 70 new_mask = (org_mask & ~(mode_t)0300); 71 //bb_error_msg("org_mask:%o cur_mask:%o", org_mask, new_mask); 72 if (new_mask != cur_mask) { 73 cur_mask = new_mask; 74 umask(new_mask); 75 } 76 } 77 } else { 78 /* Last component: uses original umask */ 79 //bb_error_msg("1 org_mask:%o", org_mask); 80 if (org_mask != cur_mask) { 81 cur_mask = org_mask; 82 umask(org_mask); 83 } 84 } 85 65 86 if (mkdir(path, 0777) < 0) { 66 87 /* If we failed for any other reason than the directory 67 * already exists, output a diagnostic and return -1.*/ 68 if (errno != EEXIST 69 || !(flags & FILEUTILS_RECUR) 70 || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { 88 * already exists, output a diagnostic and return -1 */ 89 if ((errno != EEXIST && errno != EISDIR) 90 || !(flags & FILEUTILS_RECUR) 91 || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode)) 92 ) { 71 93 fail_msg = "create"; 72 umask(mask);73 94 break; 74 95 } 75 96 /* Since the directory exists, don't attempt to change 76 97 * permissions if it was the full target. Note that 77 * this is not an error condit on. */98 * this is not an error condition. */ 78 99 if (!c) { 79 umask(mask); 80 return 0; 100 goto ret0; 81 101 } 82 102 } 83 103 84 104 if (!c) { 85 /* Done. If necessary, update dperms on the newly105 /* Done. If necessary, update perms on the newly 86 106 * created directory. Failure to update here _is_ 87 * an error.*/ 88 umask(mask); 89 if ((mode != -1) && (chmod(path, mode) < 0)){ 107 * an error. */ 108 if ((mode != -1) && (chmod(path, mode) < 0)) { 90 109 fail_msg = "set permissions of"; 91 110 break; 92 111 } 93 return0;112 goto ret0; 94 113 } 95 114 96 /* Remove any inserted nul from the path (recursive mode) .*/115 /* Remove any inserted nul from the path (recursive mode) */ 97 116 *s = c; 117 } /* while (1) */ 98 118 99 } while (1); 100 101 bb_perror_msg("cannot %s directory '%s'", fail_msg, path); 102 return -1; 119 bb_perror_msg("can't %s directory '%s'", fail_msg, path); 120 flags = -1; 121 goto ret; 122 ret0: 123 flags = 0; 124 ret: 125 //bb_error_msg("2 org_mask:%o", org_mask); 126 if (org_mask != cur_mask) 127 umask(org_mask); 128 return flags; 103 129 }
Note:
See TracChangeset
for help on using the changeset viewer.