summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenis Vlasenko2007-09-27 10:20:47 +0000
committerDenis Vlasenko2007-09-27 10:20:47 +0000
commit4daad9004d8f07991516970a1cbd77756fae7041 (patch)
treef1a17e4b168ef8fdf8af92ac5ce8deba89d38db2 /util-linux
parent1acdc89e992eb3f0548ff48ba586b31c9a0ae232 (diff)
downloadbusybox-4daad9004d8f07991516970a1cbd77756fae7041.zip
busybox-4daad9004d8f07991516970a1cbd77756fae7041.tar.gz
introduce bb_putchar(). saves ~1800 on uclibc (less on glibc).
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c6
-rw-r--r--util-linux/fdisk.c16
-rw-r--r--util-linux/fdisk_osf.c6
-rw-r--r--util-linux/fsck_minix.c4
-rw-r--r--util-linux/getopt.c2
-rw-r--r--util-linux/ipcs.c10
-rw-r--r--util-linux/more.c2
7 files changed, 23 insertions, 23 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 909cbd2..3aa99e5 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -38,12 +38,12 @@ int dmesg_main(int argc, char **argv)
for (in = 0; in<len;) {
if (last == '\n' && buf[in] == '<') in += 3;
- else putchar(last = buf[in++]);
+ else bb_putchar(last = buf[in++]);
}
- if (last != '\n') putchar('\n');
+ if (last != '\n') bb_putchar('\n');
} else {
write(1,buf,len);
- if (len && buf[len-1]!='\n') putchar('\n');
+ if (len && buf[len-1]!='\n') bb_putchar('\n');
}
if (ENABLE_FEATURE_CLEAN_UP) free(buf);
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 7981abc..9f30571 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -892,7 +892,7 @@ list_types(const char *const *sys)
next = ++done;
}
} while (done < last[0]);
- putchar('\n');
+ bb_putchar('\n');
}
#endif /* FEATURE_FDISK_WRITABLE */
@@ -2473,13 +2473,13 @@ print_buffer(char *pbuffer)
printf("0x%03X:", i);
printf(" %02X", (unsigned char) pbuffer[i]);
if (l == MAX_PER_LINE - 1) {
- puts("");
+ bb_putchar('\n');
l = -1;
}
}
if (l > 0)
- puts("");
- puts("");
+ bb_putchar('\n');
+ bb_putchar('\n');
}
static void
@@ -2527,7 +2527,7 @@ xselect(void)
char c;
while (1) {
- putchar('\n');
+ bb_putchar('\n');
c = tolower(read_nonempty("Expert command (m for help): "));
switch (c) {
case 'a':
@@ -2588,7 +2588,7 @@ xselect(void)
break;
case 'q':
close(fd);
- puts("");
+ bb_putchar('\n');
exit(0);
case 'r':
return;
@@ -2867,7 +2867,7 @@ int fdisk_main(int argc, char **argv)
while (1) {
int c;
- putchar('\n');
+ bb_putchar('\n');
c = tolower(read_nonempty("Command (m for help): "));
switch (c) {
case 'a':
@@ -2947,7 +2947,7 @@ int fdisk_main(int argc, char **argv)
break;
case 'q':
close(fd);
- puts("");
+ bb_putchar('\n');
return 0;
case 's':
#if ENABLE_FEATURE_SUN_LABEL
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index f6486d5..7261382 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -394,7 +394,7 @@ bsd_select(void)
#endif
while (1) {
- putchar('\n');
+ bb_putchar('\n');
switch (tolower(read_nonempty("BSD disklabel command (m for help): "))) {
case 'd':
xbsd_delete_part();
@@ -521,7 +521,7 @@ xbsd_print_disklabel(int show_all)
printf(" ecc");
if (lp->d_flags & BSD_D_BADSECT)
printf(" badsect");
- puts("");
+ bb_putchar('\n');
/* On various machines the fields of *lp are short/int/long */
/* In order to avoid problems, we cast them all to long. */
printf("bytes/sector: %ld\n", (long) lp->d_secsize);
@@ -588,7 +588,7 @@ xbsd_print_disklabel(int show_all)
printf("%22.22s", "");
break;
}
- puts("");
+ bb_putchar('\n');
}
}
}
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 531c1ea..5f92f35 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -307,12 +307,12 @@ static int ask(const char *string, int def)
int c;
if (!repair) {
- puts("");
+ bb_putchar('\n');
errors_uncorrected = 1;
return 0;
}
if (automatic) {
- puts("");
+ bb_putchar('\n');
if (!def)
errors_uncorrected = 1;
return def;
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 94fb457..4767d58 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -195,7 +195,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
printf(" --");
while (optind < argc)
printf(" %s", normalize(argv[optind++]));
- puts("");
+ bb_putchar('\n');
}
return exit_code;
}
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 0b4dbf6..d532590 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -555,7 +555,7 @@ static void print_sem(int semid)
}
printf("%-10d %-10d %-10d %-10d %-10d\n", i, val, ncnt, zcnt, pid);
}
- puts("");
+ bb_putchar('\n');
}
int ipcs_main(int argc, char **argv);
@@ -603,19 +603,19 @@ int ipcs_main(int argc, char **argv)
if (!(flags & (flag_shm | flag_msg | flag_sem)))
flags |= flag_msg | flag_shm | flag_sem;
- puts("");
+ bb_putchar('\n');
if (flags & flag_shm) {
do_shm();
- puts("");
+ bb_putchar('\n');
}
if (flags & flag_sem) {
do_sem();
- puts("");
+ bb_putchar('\n');
}
if (flags & flag_msg) {
do_msg();
- puts("");
+ bb_putchar('\n');
}
fflush_stdout_and_exit(0);
}
diff --git a/util-linux/more.c b/util-linux/more.c
index dc5b4c9..0a21a9a 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -40,7 +40,7 @@ struct globals {
static void gotsig(int sig)
{
- putchar('\n');
+ bb_putchar('\n');
setTermSettings(cin_fileno, &initial_settings);
exit(EXIT_FAILURE);
}