aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-11 23:20:53 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-11 23:20:53 +0000
commit13adb67bb086c45d7191966ca5fa3bff1de2dd74 (patch)
treea10f1d7fd192b8c7ee6cb3d5aa46a0295dd08f2a /miscutils
parentf2f814fb3464329a2d95f9863ead6d0278d0cd4c (diff)
downloadbusybox-w32-13adb67bb086c45d7191966ca5fa3bff1de2dd74.tar.gz
busybox-w32-13adb67bb086c45d7191966ca5fa3bff1de2dd74.tar.bz2
busybox-w32-13adb67bb086c45d7191966ca5fa3bff1de2dd74.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 git-svn-id: svn://busybox.net/trunk/busybox@18408 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/crond.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 24aa3dcc3..c7d1a6c50 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -114,14 +114,14 @@ static void crondlog(const char *ctl, ...)
114 if (LogFile == 0) { 114 if (LogFile == 0) {
115 vsyslog(type, fmt, va); 115 vsyslog(type, fmt, va);
116 } else { 116 } else {
117#if !ENABLE_DEBUG_CROND_OPTION
117 int logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600); 118 int logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600);
119#else
120 int logfd = open3_or_warn(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600);
121#endif
118 if (logfd >= 0) { 122 if (logfd >= 0) {
119 vdprintf(logfd, fmt, va); 123 vdprintf(logfd, fmt, va);
120 close(logfd); 124 close(logfd);
121#if ENABLE_DEBUG_CROND_OPTION
122 } else {
123 bb_perror_msg("can't open log file");
124#endif
125 } 125 }
126 } 126 }
127 } 127 }
@@ -281,10 +281,9 @@ static void startlogger(void)
281 else { /* test logfile */ 281 else { /* test logfile */
282 int logfd; 282 int logfd;
283 283
284 if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) { 284 logfd = open3_or_warn(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600);
285 if (logfd >= 0) {
285 close(logfd); 286 close(logfd);
286 } else {
287 bb_perror_msg("failed to open log file '%s': ", LogFile);
288 } 287 }
289 } 288 }
290#endif 289#endif