diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/bbsh.c | 2 | ||||
-rw-r--r-- | shell/hush.c | 6 | ||||
-rw-r--r-- | shell/lash_unused.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c index 3be64ee..897c022 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c @@ -206,7 +206,7 @@ int bbsh_main(int argc, char **argv) getopt32(argv, "c:", &command); - f = argv[optind] ? xfopen(argv[optind],"r") : NULL; + f = argv[optind] ? xfopen_for_read(argv[optind]) : NULL; if (command) handle(command); else { unsigned cmdlen=0; diff --git a/shell/hush.c b/shell/hush.c index 3dc27d9..cf6a18f 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -4012,7 +4012,7 @@ int hush_main(int argc, char **argv) if (argv[0] && argv[0][0] == '-') { debug_printf("sourcing /etc/profile\n"); - input = fopen("/etc/profile", "r"); + input = fopen_for_read("/etc/profile"); if (input != NULL) { close_on_exec_on(fileno(input)); parse_and_run_file(input); @@ -4116,7 +4116,7 @@ int hush_main(int argc, char **argv) debug_printf("\nrunning script '%s'\n", argv[optind]); global_argv = argv + optind; global_argc = argc - optind; - input = xfopen(argv[optind], "r"); + input = xfopen_for_read(argv[optind]); fcntl(fileno(input), F_SETFD, FD_CLOEXEC); opt = parse_and_run_file(input); } @@ -4423,7 +4423,7 @@ static int builtin_source(char **argv) return EXIT_FAILURE; /* XXX search through $PATH is missing */ - input = fopen(argv[1], "r"); + input = fopen_for_read(argv[1]); if (!input) { bb_error_msg("can't open '%s'", argv[1]); return EXIT_FAILURE; diff --git a/shell/lash_unused.c b/shell/lash_unused.c index 7084089..90b1f56 100644 --- a/shell/lash_unused.c +++ b/shell/lash_unused.c @@ -1513,7 +1513,7 @@ int lash_main(int argc, char **argv) if (global_argv[0] && global_argv[0][0] == '-') { FILE *prof_input; - prof_input = fopen("/etc/profile", "r"); + prof_input = fopen_for_read("/etc/profile"); if (prof_input) { llist_add_to(&close_me_list, (void *)(long)fileno(prof_input)); /* Now run the file */ @@ -1553,7 +1553,7 @@ int lash_main(int argc, char **argv) } } else if (!local_pending_command && global_argv[optind]) { //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]); - input = xfopen(global_argv[optind], "r"); + input = xfopen_for_read(global_argv[optind]); /* be lazy, never mark this closed */ llist_add_to(&close_me_list, (void *)(long)fileno(input)); } |