aboutsummaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-21 23:05:26 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-21 23:05:26 +0000
commit5415c856eaccd1bc5d064022770a288f43b2e94f (patch)
tree5973db4e6f81b5e311e8944700ded5db1083d440 /shell/hush.c
parentb74a2dba571d1c5a6127c683fb50923336d9c59f (diff)
downloadbusybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz
busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2
busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip
libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir) function old new delta config_open2 - 41 +41 config_read 507 542 +35 find_pair 169 187 +18 fopen_for_write - 14 +14 fopen_for_read - 14 +14 find_main 406 418 +12 xfopen_for_write - 10 +10 xfopen_for_read - 10 +10 popstring 134 140 +6 parse_inittab 396 401 +5 next_token 923 928 +5 pack_gzip 1659 1661 +2 bb__parsespent 117 119 +2 fallbackSort 1719 1717 -2 evalvar 1376 1374 -2 qrealloc 36 33 -3 ... ... ... ... singlemount 4579 4569 -10 process_stdin 443 433 -10 patch_main 1111 1101 -10 ifupdown_main 2175 2165 -10 file_action_grep 90 80 -10 uuidcache_init 649 637 -12 hush_main 797 785 -12 read_config 230 217 -13 dpkg_main 3835 3820 -15 read_line_input 3134 3110 -24 sysctl_main 232 203 -29 config_open 40 10 -30 WARN_BAD_LINE 44 - -44 login_main 1714 1575 -139 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 3dc27d9c2..cf6a18f86 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -4012,7 +4012,7 @@ int hush_main(int argc, char **argv)
4012 4012
4013 if (argv[0] && argv[0][0] == '-') { 4013 if (argv[0] && argv[0][0] == '-') {
4014 debug_printf("sourcing /etc/profile\n"); 4014 debug_printf("sourcing /etc/profile\n");
4015 input = fopen("/etc/profile", "r"); 4015 input = fopen_for_read("/etc/profile");
4016 if (input != NULL) { 4016 if (input != NULL) {
4017 close_on_exec_on(fileno(input)); 4017 close_on_exec_on(fileno(input));
4018 parse_and_run_file(input); 4018 parse_and_run_file(input);
@@ -4116,7 +4116,7 @@ int hush_main(int argc, char **argv)
4116 debug_printf("\nrunning script '%s'\n", argv[optind]); 4116 debug_printf("\nrunning script '%s'\n", argv[optind]);
4117 global_argv = argv + optind; 4117 global_argv = argv + optind;
4118 global_argc = argc - optind; 4118 global_argc = argc - optind;
4119 input = xfopen(argv[optind], "r"); 4119 input = xfopen_for_read(argv[optind]);
4120 fcntl(fileno(input), F_SETFD, FD_CLOEXEC); 4120 fcntl(fileno(input), F_SETFD, FD_CLOEXEC);
4121 opt = parse_and_run_file(input); 4121 opt = parse_and_run_file(input);
4122 } 4122 }
@@ -4423,7 +4423,7 @@ static int builtin_source(char **argv)
4423 return EXIT_FAILURE; 4423 return EXIT_FAILURE;
4424 4424
4425 /* XXX search through $PATH is missing */ 4425 /* XXX search through $PATH is missing */
4426 input = fopen(argv[1], "r"); 4426 input = fopen_for_read(argv[1]);
4427 if (!input) { 4427 if (!input) {
4428 bb_error_msg("can't open '%s'", argv[1]); 4428 bb_error_msg("can't open '%s'", argv[1]);
4429 return EXIT_FAILURE; 4429 return EXIT_FAILURE;