aboutsummaryrefslogtreecommitdiff
path: root/shell
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 /shell
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 'shell')
-rw-r--r--shell/hush.c3
-rw-r--r--shell/lash.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 331d591c8..1ad61e54e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1019,11 +1019,10 @@ static int setup_redirects(struct child_prog *prog, int squirrel[])
1019 } 1019 }
1020 if (redir->dup == -1) { 1020 if (redir->dup == -1) {
1021 mode = redir_table[redir->type].mode; 1021 mode = redir_table[redir->type].mode;
1022 openfd = open(redir->word.gl_pathv[0], mode, 0666); 1022 openfd = open3_or_warn(redir->word.gl_pathv[0], mode, 0666);
1023 if (openfd < 0) { 1023 if (openfd < 0) {
1024 /* this could get lost if stderr has been redirected, but 1024 /* this could get lost if stderr has been redirected, but
1025 bash and ash both lose it as well (though zsh doesn't!) */ 1025 bash and ash both lose it as well (though zsh doesn't!) */
1026 bb_perror_msg("error opening %s", redir->word.gl_pathv[0]);
1027 return 1; 1026 return 1;
1028 } 1027 }
1029 } else { 1028 } else {
diff --git a/shell/lash.c b/shell/lash.c
index aba9c0a2e..c72a65639 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -571,11 +571,10 @@ static int setup_redirects(struct child_prog *prog, int squirrel[])
571 break; 571 break;
572 } 572 }
573 573
574 openfd = open(redir->filename, mode, 0666); 574 openfd = open3_or_warn(redir->filename, mode, 0666);
575 if (openfd < 0) { 575 if (openfd < 0) {
576 /* this could get lost if stderr has been redirected, but 576 /* this could get lost if stderr has been redirected, but
577 bash and ash both lose it as well (though zsh doesn't!) */ 577 bash and ash both lose it as well (though zsh doesn't!) */
578 bb_perror_msg("error opening %s", redir->filename);
579 return 1; 578 return 1;
580 } 579 }
581 580