diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
| commit | ec71cb6575290eb6ad716e4f620db445d8e1bcd3 (patch) | |
| tree | 219a5dba000e0ad98ff563bc6f7d45d274d3a178 /libbb/make_directory.c | |
| parent | b5139d7cd8982d9b683cb1babf0bd759076aaab0 (diff) | |
| parent | 6814cbc9288601840aedb372e2bd84dab76ffa43 (diff) | |
| download | busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.gz busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.bz2 busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'libbb/make_directory.c')
| -rw-r--r-- | libbb/make_directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 1eb8a8a49..4bb79bdf6 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c | |||
| @@ -93,7 +93,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) | |||
| 93 | if (mkdir(path, 0777) < 0) { | 93 | if (mkdir(path, 0777) < 0) { |
| 94 | /* If we failed for any other reason than the directory | 94 | /* If we failed for any other reason than the directory |
| 95 | * already exists, output a diagnostic and return -1 */ | 95 | * already exists, output a diagnostic and return -1 */ |
| 96 | if (errno != EEXIST | 96 | if ((errno != EEXIST && errno != EISDIR) |
| 97 | || !(flags & FILEUTILS_RECUR) | 97 | || !(flags & FILEUTILS_RECUR) |
| 98 | || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode)) | 98 | || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode)) |
| 99 | ) { | 99 | ) { |