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 /libbb | |
| 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 'libbb')
| -rw-r--r-- | libbb/xfuncs_printf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index 8e60e2165..8a6d7e1d1 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c | |||
| @@ -240,6 +240,14 @@ off_t FAST_FUNC xlseek(int fd, off_t offset, int whence) | |||
| 240 | return off; | 240 | return off; |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | int FAST_FUNC xmkstemp(char *template) | ||
| 244 | { | ||
| 245 | int fd = mkstemp(template); | ||
| 246 | if (fd < 0) | ||
| 247 | bb_perror_msg_and_die("can't create temp file '%s'", template); | ||
| 248 | return fd; | ||
| 249 | } | ||
| 250 | |||
| 243 | // Die with supplied filename if this FILE* has ferror set. | 251 | // Die with supplied filename if this FILE* has ferror set. |
| 244 | void FAST_FUNC die_if_ferror(FILE *fp, const char *fn) | 252 | void FAST_FUNC die_if_ferror(FILE *fp, const char *fn) |
| 245 | { | 253 | { |