From 50f7f446ecaadef6895a4ee601567e0b68330637 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 11 Apr 2007 23:20:53 +0000 Subject: 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 --- miscutils/crond.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'miscutils') 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, ...) if (LogFile == 0) { vsyslog(type, fmt, va); } else { +#if !ENABLE_DEBUG_CROND_OPTION int logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600); +#else + int logfd = open3_or_warn(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600); +#endif if (logfd >= 0) { vdprintf(logfd, fmt, va); close(logfd); -#if ENABLE_DEBUG_CROND_OPTION - } else { - bb_perror_msg("can't open log file"); -#endif } } } @@ -281,10 +281,9 @@ static void startlogger(void) else { /* test logfile */ int logfd; - if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) { + logfd = open3_or_warn(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600); + if (logfd >= 0) { close(logfd); - } else { - bb_perror_msg("failed to open log file '%s': ", LogFile); } } #endif -- cgit v1.2.3