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 /editors/patch.c | |
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 'editors/patch.c')
-rw-r--r-- | editors/patch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/editors/patch.c b/editors/patch.c index fff06907f..33ff8b569 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -200,8 +200,7 @@ int copy_tempfile(int fdin, char *name, char **tempname) | |||
200 | int fd; | 200 | int fd; |
201 | 201 | ||
202 | *tempname = xasprintf("%sXXXXXX", name); | 202 | *tempname = xasprintf("%sXXXXXX", name); |
203 | fd = mkstemp(*tempname); | 203 | fd = xmkstemp(*tempname); |
204 | if(-1 == fd) bb_perror_msg_and_die("no temp file"); | ||
205 | 204 | ||
206 | // Set permissions of output file | 205 | // Set permissions of output file |
207 | fstat(fdin, &statbuf); | 206 | fstat(fdin, &statbuf); |