diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:54:36 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:54:36 +0700 |
| commit | 47a20f7daf954c90bbc77d2c108cb366171c650f (patch) | |
| tree | 06ed9ed8cb4f7cea8dfa75de197f54b9bc18ca67 /coreutils | |
| parent | 8cef222175855ae08f3768a5586b00650240403d (diff) | |
| parent | 6722737ece4b8db3e30b53aef8f981f53db1621e (diff) | |
| download | busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.tar.gz busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.tar.bz2 busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.zip | |
Merge commit '6722737ece4b8db3e30b53aef8f981f53db1621e'
Conflicts:
coreutils/dos2unix.c
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/dos2unix.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index 8aa1d93b5..35fa11247 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
| @@ -41,14 +41,10 @@ static void convert(char *fn, int conv_type) | |||
| 41 | fstat(fileno(in), &st); | 41 | fstat(fileno(in), &st); |
| 42 | 42 | ||
| 43 | temp_fn = xasprintf("%sXXXXXX", resolved_fn); | 43 | temp_fn = xasprintf("%sXXXXXX", resolved_fn); |
| 44 | i = mkstemp(temp_fn); | 44 | i = xmkstemp(temp_fn); |
| 45 | if (i == -1 | 45 | if (!ENABLE_PLATFORM_MINGW32 && fchmod(i, st.st_mode) == -1) |
| 46 | #if !ENABLE_PLATFORM_MINGW32 | ||
| 47 | || fchmod(i, st.st_mode) == -1 | ||
| 48 | #endif | ||
| 49 | ) { | ||
| 50 | bb_simple_perror_msg_and_die(temp_fn); | 46 | bb_simple_perror_msg_and_die(temp_fn); |
| 51 | } | 47 | |
| 52 | out = xfdopen_for_write(i); | 48 | out = xfdopen_for_write(i); |
| 53 | } | 49 | } |
| 54 | 50 | ||