forgot about avn add... :(

[oweals/busybox.git] / shell / lash.c

diff --git a/shell/lash.c b/shell/lash.c
index 9c862a17f958d8a9f6216ea4f2d943ba1e60b0c4..4067bc6bc853f2bb6622a4658477286bc3101df3 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -426,7 +426,7 @@ static int builtin_source(struct child_prog *child)
        FILE *input;
        int status;
 
-       input = bb_wfopen(child->argv[1], "r");
+       input = fopen_or_warn(child->argv[1], "r");
        if (!input) {
                return EXIT_FAILURE;
        }
@@ -678,7 +678,7 @@ static int get_command(FILE * source, char *command)
 
        if (!fgets(command, BUFSIZ - 2, source)) {
                if (source == stdin)
-                       printf("\n");
+                       puts("");
                return 1;
        }
 
@@ -1145,7 +1145,7 @@ static int pseudo_exec(struct child_prog *child)
        /* Check if the command matches any of the forking builtins. */
        for (x = bltins_forking; x->cmd; x++) {
                if (strcmp(child->argv[0], x->cmd) == 0) {
-                       bb_applet_name=x->cmd;
+                       applet_name=x->cmd;
                        _exit (x->function(child));
                }
        }
@@ -1522,7 +1522,7 @@ int lash_main(int argc_l, char **argv_l)
                        llist_add_to(&close_me_list, (void *)(long)fileno(prof_input));
                        /* Now run the file */
                        busy_loop(prof_input);
-                       bb_fclose_nonstdin(prof_input);
+                       fclose_if_not_stdin(prof_input);
                        llist_pop(&close_me_list);
                }
        }