diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 21:38:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 21:38:30 +0000 |
| commit | 335b63d8d1876ce4e172ebcc9d64544785682244 (patch) | |
| tree | 14183fd728ce51ae10baee70f7d8f72c39d30649 /libbb/copyfd.c | |
| parent | 07c394e69b0cfa7cd30e97ffc6edb0d857905f45 (diff) | |
| download | busybox-w32-335b63d8d1876ce4e172ebcc9d64544785682244.tar.gz busybox-w32-335b63d8d1876ce4e172ebcc9d64544785682244.tar.bz2 busybox-w32-335b63d8d1876ce4e172ebcc9d64544785682244.zip | |
make a few struct bb_applet members conditional
rename sllep_and_die -> xfunc_die
make fflush_stdout_and_exit NOFORK-safe
fix some buglets found by randomconfig
Diffstat (limited to 'libbb/copyfd.c')
| -rw-r--r-- | libbb/copyfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/copyfd.c b/libbb/copyfd.c index e0596d5f6..aa8fbb967 100644 --- a/libbb/copyfd.c +++ b/libbb/copyfd.c | |||
| @@ -74,7 +74,7 @@ void complain_copyfd_and_die(off_t sz) | |||
| 74 | if (sz != -1) | 74 | if (sz != -1) |
| 75 | bb_error_msg_and_die("short read"); | 75 | bb_error_msg_and_die("short read"); |
| 76 | /* if sz == -1, bb_copyfd_XX already complained */ | 76 | /* if sz == -1, bb_copyfd_XX already complained */ |
| 77 | sleep_and_die(); | 77 | xfunc_die(); |
| 78 | } | 78 | } |
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| @@ -94,7 +94,7 @@ void bb_copyfd_exact_size(int fd1, int fd2, off_t size) | |||
| 94 | if (sz != -1) | 94 | if (sz != -1) |
| 95 | bb_error_msg_and_die("short read"); | 95 | bb_error_msg_and_die("short read"); |
| 96 | /* if sz == -1, bb_copyfd_XX already complained */ | 96 | /* if sz == -1, bb_copyfd_XX already complained */ |
| 97 | sleep_and_die(); | 97 | xfunc_die(); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | off_t bb_copyfd_eof(int fd1, int fd2) | 100 | off_t bb_copyfd_eof(int fd1, int fd2) |