diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /libbb/make_directory.c | |
parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
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 1095b49a3..8057f2cec 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c | |||
@@ -44,7 +44,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) | |||
44 | while (1) { | 44 | while (1) { |
45 | c = '\0'; | 45 | c = '\0'; |
46 | 46 | ||
47 | if (flags & FILEUTILS_RECUR) { /* Get the parent */ | 47 | if (flags & FILEUTILS_RECUR) { /* Get the parent */ |
48 | /* skip drive letter and initial slashes */ | 48 | /* skip drive letter and initial slashes */ |
49 | if (ENABLE_PLATFORM_MINGW32 && s == path && *s && s[1] == ':') { | 49 | if (ENABLE_PLATFORM_MINGW32 && s == path && *s && s[1] == ':') { |
50 | s += 2; | 50 | s += 2; |