projects / oweals / busybox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d26943)
More printf cleanups
authorEric Andersen <andersen@codepoet.org>
Sat, 20 Jan 2001 01:10:07 +0000 (01:10 -0000)
committerEric Andersen <andersen@codepoet.org>
Sat, 20 Jan 2001 01:10:07 +0000 (01:10 -0000)
lash.c patch | blob | history
mount.c patch | blob | history
sh.c patch | blob | history
shell/lash.c patch | blob | history
util-linux/mount.c patch | blob | history

diff --git a/lash.c b/lash.c
index 98d6b65a6132e47278527e59ce954e8ecd66f5f6..9e6d09565fe848d751967020e14e733b52287ec5 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -290,7 +290,7 @@ static int builtin_env(struct child_prog *dummy)
        char **e;
 
        for (e = environ; *e; e++) {
-               fprintf(stdout, "%s\n", *e);
+               printf( "%s\n", *e);
        }
        return (0);
 }
@@ -406,7 +406,7 @@ static int builtin_jobs(struct child_prog *child)
 static int builtin_pwd(struct child_prog *dummy)
 {
        getcwd(cwd, MAX_LINE);
-       fprintf(stdout, "%s\n", cwd);
+       printf( "%s\n", cwd);
        return EXIT_SUCCESS;
 }
 
@@ -566,7 +566,7 @@ static int builtin_source(struct child_prog *child)
 
        input = fopen(child->argv[1], "r");
        if (!input) {
-               fprintf(stdout, "Couldn't open file '%s'\n", child->argv[1]);
+               printf( "Couldn't open file '%s'\n", child->argv[1]);
                return EXIT_FAILURE;
        }
 
@@ -583,7 +583,7 @@ static int builtin_source(struct child_prog *child)
 static int builtin_unset(struct child_prog *child)
 {
        if (child->argv[1] == NULL) {
-               fprintf(stdout, "unset: parameter required.\n");
+               printf( "unset: parameter required.\n");
                return EXIT_FAILURE;
        }
        unsetenv(child->argv[1]);
@@ -1704,7 +1704,7 @@ int shell_main(int argc_l, char **argv_l)
                FILE *prof_input;
                prof_input = fopen("/etc/profile", "r");
                if (!prof_input) {
-                       fprintf(stdout, "Couldn't open file '/etc/profile'\n");
+                       printf( "Couldn't open file '/etc/profile'\n");
                } else {
                        int tmp_fd = fileno(prof_input);
                        mark_open(tmp_fd);      
@@ -1749,12 +1749,12 @@ int shell_main(int argc_l, char **argv_l)
                interactive=TRUE;
        }
        if (interactive==TRUE) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                /* Looks like they want an interactive shell */
-               fprintf(stdout, "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
-               fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
+               printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+               printf( "Enter 'help' for a list of built-in commands.\n\n");
        } else if (local_pending_command==NULL) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                input = xfopen(argv[optind], "r");
                mark_open(fileno(input));  /* be lazy, never mark this closed */
        }
diff --git a/mount.c b/mount.c
index 97b60abbd732542d70c9c4519c0d22ab1f180c02..88e45fc726f5cbb2273ed54dfce9889748817071 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -353,7 +353,7 @@ extern int mount_main(int argc, char **argv)
                        perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
 
                for( i = 0 ; i < numfilesystems ; i++) {
-                       fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
+                       printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                        mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                        mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
                                        mntentlist[i].mnt_passno);
diff --git a/sh.c b/sh.c
index 98d6b65a6132e47278527e59ce954e8ecd66f5f6..9e6d09565fe848d751967020e14e733b52287ec5 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -290,7 +290,7 @@ static int builtin_env(struct child_prog *dummy)
        char **e;
 
        for (e = environ; *e; e++) {
-               fprintf(stdout, "%s\n", *e);
+               printf( "%s\n", *e);
        }
        return (0);
 }
@@ -406,7 +406,7 @@ static int builtin_jobs(struct child_prog *child)
 static int builtin_pwd(struct child_prog *dummy)
 {
        getcwd(cwd, MAX_LINE);
-       fprintf(stdout, "%s\n", cwd);
+       printf( "%s\n", cwd);
        return EXIT_SUCCESS;
 }
 
@@ -566,7 +566,7 @@ static int builtin_source(struct child_prog *child)
 
        input = fopen(child->argv[1], "r");
        if (!input) {
-               fprintf(stdout, "Couldn't open file '%s'\n", child->argv[1]);
+               printf( "Couldn't open file '%s'\n", child->argv[1]);
                return EXIT_FAILURE;
        }
 
@@ -583,7 +583,7 @@ static int builtin_source(struct child_prog *child)
 static int builtin_unset(struct child_prog *child)
 {
        if (child->argv[1] == NULL) {
-               fprintf(stdout, "unset: parameter required.\n");
+               printf( "unset: parameter required.\n");
                return EXIT_FAILURE;
        }
        unsetenv(child->argv[1]);
@@ -1704,7 +1704,7 @@ int shell_main(int argc_l, char **argv_l)
                FILE *prof_input;
                prof_input = fopen("/etc/profile", "r");
                if (!prof_input) {
-                       fprintf(stdout, "Couldn't open file '/etc/profile'\n");
+                       printf( "Couldn't open file '/etc/profile'\n");
                } else {
                        int tmp_fd = fileno(prof_input);
                        mark_open(tmp_fd);      
@@ -1749,12 +1749,12 @@ int shell_main(int argc_l, char **argv_l)
                interactive=TRUE;
        }
        if (interactive==TRUE) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                /* Looks like they want an interactive shell */
-               fprintf(stdout, "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
-               fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
+               printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+               printf( "Enter 'help' for a list of built-in commands.\n\n");
        } else if (local_pending_command==NULL) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                input = xfopen(argv[optind], "r");
                mark_open(fileno(input));  /* be lazy, never mark this closed */
        }
diff --git a/shell/lash.c b/shell/lash.c
index 98d6b65a6132e47278527e59ce954e8ecd66f5f6..9e6d09565fe848d751967020e14e733b52287ec5 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -290,7 +290,7 @@ static int builtin_env(struct child_prog *dummy)
        char **e;
 
        for (e = environ; *e; e++) {
-               fprintf(stdout, "%s\n", *e);
+               printf( "%s\n", *e);
        }
        return (0);
 }
@@ -406,7 +406,7 @@ static int builtin_jobs(struct child_prog *child)
 static int builtin_pwd(struct child_prog *dummy)
 {
        getcwd(cwd, MAX_LINE);
-       fprintf(stdout, "%s\n", cwd);
+       printf( "%s\n", cwd);
        return EXIT_SUCCESS;
 }
 
@@ -566,7 +566,7 @@ static int builtin_source(struct child_prog *child)
 
        input = fopen(child->argv[1], "r");
        if (!input) {
-               fprintf(stdout, "Couldn't open file '%s'\n", child->argv[1]);
+               printf( "Couldn't open file '%s'\n", child->argv[1]);
                return EXIT_FAILURE;
        }
 
@@ -583,7 +583,7 @@ static int builtin_source(struct child_prog *child)
 static int builtin_unset(struct child_prog *child)
 {
        if (child->argv[1] == NULL) {
-               fprintf(stdout, "unset: parameter required.\n");
+               printf( "unset: parameter required.\n");
                return EXIT_FAILURE;
        }
        unsetenv(child->argv[1]);
@@ -1704,7 +1704,7 @@ int shell_main(int argc_l, char **argv_l)
                FILE *prof_input;
                prof_input = fopen("/etc/profile", "r");
                if (!prof_input) {
-                       fprintf(stdout, "Couldn't open file '/etc/profile'\n");
+                       printf( "Couldn't open file '/etc/profile'\n");
                } else {
                        int tmp_fd = fileno(prof_input);
                        mark_open(tmp_fd);      
@@ -1749,12 +1749,12 @@ int shell_main(int argc_l, char **argv_l)
                interactive=TRUE;
        }
        if (interactive==TRUE) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                /* Looks like they want an interactive shell */
-               fprintf(stdout, "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
-               fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
+               printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+               printf( "Enter 'help' for a list of built-in commands.\n\n");
        } else if (local_pending_command==NULL) {
-               //fprintf(stdout, "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
+               //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                input = xfopen(argv[optind], "r");
                mark_open(fileno(input));  /* be lazy, never mark this closed */
        }
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 97b60abbd732542d70c9c4519c0d22ab1f180c02..88e45fc726f5cbb2273ed54dfce9889748817071 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -353,7 +353,7 @@ extern int mount_main(int argc, char **argv)
                        perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
 
                for( i = 0 ; i < numfilesystems ; i++) {
-                       fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
+                       printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                        mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                        mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
                                        mntentlist[i].mnt_passno);
Unnamed repository; edit this file 'description' to name the repository.