aboutsummaryrefslogtreecommitdiff
path: root/libbb/xfuncs.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-25 23:50:28 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-25 23:50:28 +0000
commit2d27e4ccbbc29d6ec1b907849984cec30f24e734 (patch)
tree9e5d35d70aa35b0a06248c5d1189e8eb274083b0 /libbb/xfuncs.c
parent87cd4a87e3f98dd5a1b982cfdfc4dad6800ca010 (diff)
downloadbusybox-w32-2d27e4ccbbc29d6ec1b907849984cec30f24e734.tar.gz
busybox-w32-2d27e4ccbbc29d6ec1b907849984cec30f24e734.tar.bz2
busybox-w32-2d27e4ccbbc29d6ec1b907849984cec30f24e734.zip
tee: fix bug: argv[-1] is a no-no!
bb_full_fd_action: optimize die_if_ferror: "<applet>: filename" isn't a good err msg, add "..I/O error"
Diffstat (limited to 'libbb/xfuncs.c')
-rw-r--r--libbb/xfuncs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 1dbd7521b..773e718b8 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -124,7 +124,7 @@ int ndelay_on(int fd)
124} 124}
125 125
126// Die with an error message if we can't write the entire buffer. 126// Die with an error message if we can't write the entire buffer.
127void xwrite(int fd, void *buf, size_t count) 127void xwrite(int fd, const void *buf, size_t count)
128{ 128{
129 if (count) { 129 if (count) {
130 ssize_t size = full_write(fd, buf, count); 130 ssize_t size = full_write(fd, buf, count);
@@ -146,7 +146,7 @@ off_t xlseek(int fd, off_t offset, int whence)
146void die_if_ferror(FILE *fp, const char *fn) 146void die_if_ferror(FILE *fp, const char *fn)
147{ 147{
148 if (ferror(fp)) { 148 if (ferror(fp)) {
149 bb_error_msg_and_die("%s", fn); 149 bb_error_msg_and_die("%s: I/O error", fn);
150 } 150 }
151} 151}
152 152