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

---
 shell/hush.c | 3 +--
 shell/lash.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'shell')

diff --git a/shell/hush.c b/shell/hush.c
index 331d591..1ad61e5 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1019,11 +1019,10 @@ static int setup_redirects(struct child_prog *prog, int squirrel[])
 		}
 		if (redir->dup == -1) {
 			mode = redir_table[redir->type].mode;
-			openfd = open(redir->word.gl_pathv[0], mode, 0666);
+			openfd = open3_or_warn(redir->word.gl_pathv[0], mode, 0666);
 			if (openfd < 0) {
 			/* this could get lost if stderr has been redirected, but
 			   bash and ash both lose it as well (though zsh doesn't!) */
-				bb_perror_msg("error opening %s", redir->word.gl_pathv[0]);
 				return 1;
 			}
 		} else {
diff --git a/shell/lash.c b/shell/lash.c
index aba9c0a..c72a656 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -571,11 +571,10 @@ static int setup_redirects(struct child_prog *prog, int squirrel[])
 			break;
 		}
 
-		openfd = open(redir->filename, mode, 0666);
+		openfd = open3_or_warn(redir->filename, mode, 0666);
 		if (openfd < 0) {
 			/* this could get lost if stderr has been redirected, but
 			   bash and ash both lose it as well (though zsh doesn't!) */
-			bb_perror_msg("error opening %s", redir->filename);
 			return 1;
 		}
 
-- 
cgit v1.1