diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 23:20:53 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 23:20:53 +0000 |
commit | 50f7f446ecaadef6895a4ee601567e0b68330637 (patch) | |
tree | a10f1d7fd192b8c7ee6cb3d5aa46a0295dd08f2a /libbb/xfuncs.c | |
parent | d7c8196c1bba74d1e27ac9cb5e2eb57413daa463 (diff) | |
download | busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.gz busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.bz2 busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.zip |
bb_full_fd_action: remove potential xmalloc from NOFORK path
cat: stop using stdio.h opens
libbb: introduce & use open[3]_or_warn
function old new delta
open3_or_warn - 54 +54
bb_cat 115 144 +29
open_or_warn - 25 +25
unlzma 2404 2412 +8
chattr_main 334 339 +5
xstrtoul_range_sfx 251 255 +4
telnet_main 1514 1510 -4
static.opt 4 - -4
qgravechar 122 118 -4
fuser_add_pid 61 54 -7
fuser_add_inode 154 147 -7
writeFileToTarball 1542 1534 -8
refresh 1156 1148 -8
do_show 856 846 -10
read_leases 212 200 -12
setup_redirects 236 222 -14
iproute_list_or_flush 1582 1568 -14
read_config 427 411 -16
write_leases 284 264 -20
hash_file 338 318 -20
copy_file 1760 1740 -20
do_iproute 2610 2588 -22
bb_full_fd_action 320 269 -51
open_to_or_warn 103 49 -54
fuser_main 1660 1596 -64
.rodata 131160 131096 -64
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 4/19 up/down: 125/-423) Total: -298 bytes
Diffstat (limited to 'libbb/xfuncs.c')
-rw-r--r-- | libbb/xfuncs.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index dde91a2ba..870d736b3 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -106,31 +106,46 @@ FILE *xfopen(const char *path, const char *mode) | |||
106 | { | 106 | { |
107 | FILE *fp = fopen(path, mode); | 107 | FILE *fp = fopen(path, mode); |
108 | if (fp == NULL) | 108 | if (fp == NULL) |
109 | bb_perror_msg_and_die("%s", path); | 109 | bb_perror_msg_and_die("cannot open '%s'", path); |
110 | return fp; | 110 | return fp; |
111 | } | 111 | } |
112 | 112 | ||
113 | // Die if we can't open an existing file and return an fd. | 113 | // Die if we can't open a file and return a fd. |
114 | int xopen(const char *pathname, int flags) | 114 | int xopen3(const char *pathname, int flags, int mode) |
115 | { | 115 | { |
116 | //if (ENABLE_DEBUG && (flags & O_CREAT)) | 116 | int ret; |
117 | // bb_error_msg_and_die("xopen() with O_CREAT"); | 117 | |
118 | ret = open(pathname, flags, mode); | ||
119 | if (ret < 0) { | ||
120 | bb_perror_msg_and_die("cannot open '%s'", pathname); | ||
121 | } | ||
122 | return ret; | ||
123 | } | ||
118 | 124 | ||
125 | // Die if we can't open an existing file and return a fd. | ||
126 | int xopen(const char *pathname, int flags) | ||
127 | { | ||
119 | return xopen3(pathname, flags, 0666); | 128 | return xopen3(pathname, flags, 0666); |
120 | } | 129 | } |
121 | 130 | ||
122 | // Die if we can't open a new file and return an fd. | 131 | // Warn if we can't open a file and return a fd. |
123 | int xopen3(const char *pathname, int flags, int mode) | 132 | int open3_or_warn(const char *pathname, int flags, int mode) |
124 | { | 133 | { |
125 | int ret; | 134 | int ret; |
126 | 135 | ||
127 | ret = open(pathname, flags, mode); | 136 | ret = open(pathname, flags, mode); |
128 | if (ret < 0) { | 137 | if (ret < 0) { |
129 | bb_perror_msg_and_die("%s", pathname); | 138 | bb_perror_msg("cannot open '%s'", pathname); |
130 | } | 139 | } |
131 | return ret; | 140 | return ret; |
132 | } | 141 | } |
133 | 142 | ||
143 | // Warn if we can't open a file and return a fd. | ||
144 | int open_or_warn(const char *pathname, int flags) | ||
145 | { | ||
146 | return open3_or_warn(pathname, flags, 0666); | ||
147 | } | ||
148 | |||
134 | void xunlink(const char *pathname) | 149 | void xunlink(const char *pathname) |
135 | { | 150 | { |
136 | if (unlink(pathname)) | 151 | if (unlink(pathname)) |
@@ -184,6 +199,7 @@ off_t xlseek(int fd, off_t offset, int whence) | |||
184 | void die_if_ferror(FILE *fp, const char *fn) | 199 | void die_if_ferror(FILE *fp, const char *fn) |
185 | { | 200 | { |
186 | if (ferror(fp)) { | 201 | if (ferror(fp)) { |
202 | /* doesn't set useful errno */ | ||
187 | bb_error_msg_and_die("%s: I/O error", fn); | 203 | bb_error_msg_and_die("%s: I/O error", fn); |
188 | } | 204 | } |
189 | } | 205 | } |