aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-01-20 01:10:07 +0000
committerEric Andersen <andersen@codepoet.org>2001-01-20 01:10:07 +0000
commit6f65a3a7e88a87bdd0f921884cd05ae593659dda (patch)
treeef5ae5dced5aaa9bffe7998fa49ec71bbd476eb1
parent1d269432b16b77e78544cf2b7aae04f0e4b8c06c (diff)
downloadbusybox-6f65a3a7e88a87bdd0f921884cd05ae593659dda.tar.gz
More printf cleanups
-rw-r--r--lash.c18
-rw-r--r--mount.c2
-rw-r--r--sh.c18
-rw-r--r--shell/lash.c18
-rw-r--r--util-linux/mount.c2
5 files changed, 29 insertions, 29 deletions
diff --git a/lash.c b/lash.c
index 98d6b65a6..9e6d09565 100644
--- 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 97b60abbd..88e45fc72 100644
--- 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 98d6b65a6..9e6d09565 100644
--- 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 98d6b65a6..9e6d09565 100644
--- 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 97b60abbd..88e45fc72 100644
--- 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);