From a7ccdeef396700d1ed78b9f97de0d10c706b169f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 15 Nov 2009 23:28:11 +0100 Subject: libbb: added xfdopen_for_read/write function old new delta xfdopen_helper - 40 +40 logdir_open 1163 1184 +21 process_stdin 433 443 +10 xfdopen_for_write - 9 +9 doCommands 2465 2474 +9 patch_main 1214 1222 +8 bbunpack 457 465 +8 xfdopen_for_read - 7 +7 scan_tree 258 262 +4 xstrtoul_range_sfx 230 231 +1 sendmail_main 957 955 -2 passwd_main 1027 1023 -4 parse 969 964 -5 test_main 253 247 -6 sed_main 655 649 -6 dos2unix_main 437 429 -8 fbsplash_main 950 938 -12 handle_dir_common 371 354 -17 expand_vars_to_list 2197 2169 -28 update_passwd 1275 1246 -29 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 7/10 up/down: 117/-117) Total: 0 bytes Signed-off-by: Denys Vlasenko --- networking/ftpd.c | 4 +--- networking/ifupdown.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'networking') diff --git a/networking/ftpd.c b/networking/ftpd.c index 9937cc3..df8188c 100644 --- a/networking/ftpd.c +++ b/networking/ftpd.c @@ -691,9 +691,7 @@ handle_dir_common(int opts) /* -n prevents user/groupname display, * which can be problematic in chroot */ ls_fd = popen_ls((opts & LONG_LISTING) ? "-l" : "-1"); - ls_fp = fdopen(ls_fd, "r"); - if (!ls_fp) /* never happens. paranoia */ - bb_perror_msg_and_die("fdopen"); + ls_fp = xfdopen_for_read(ls_fd); if (opts & USE_CTRL_CONN) { /* STAT */ diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 88d1944..b16186e 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1056,8 +1056,8 @@ static int popen2(FILE **in, FILE **out, char *command, char *param) /* parent */ close(infd.rd); close(outfd.wr); - *in = fdopen(infd.wr, "w"); - *out = fdopen(outfd.rd, "r"); + *in = xfdopen_for_write(infd.wr); + *out = xfdopen_for_read(outfd.rd); return pid; } -- cgit v1.1