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/diff.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/diff.c')
| -rw-r--r-- | editors/diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editors/diff.c b/editors/diff.c index 83de52753..d9d709db6 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -685,9 +685,8 @@ static int diffreg(char *file[2]) | |||
| 685 | */ | 685 | */ |
| 686 | if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) { | 686 | if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) { |
| 687 | char name[] = "/tmp/difXXXXXX"; | 687 | char name[] = "/tmp/difXXXXXX"; |
| 688 | int fd_tmp = mkstemp(name); | 688 | int fd_tmp = xmkstemp(name); |
| 689 | if (fd_tmp < 0) | 689 | |
| 690 | bb_perror_msg_and_die("mkstemp"); | ||
| 691 | unlink(name); | 690 | unlink(name); |
| 692 | if (bb_copyfd_eof(fd, fd_tmp) < 0) | 691 | if (bb_copyfd_eof(fd, fd_tmp) < 0) |
| 693 | xfunc_die(); | 692 | xfunc_die(); |