emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

silly size savings and capitalization fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-26 00:37:00 +00:00
parent e63a0dee9e
commit c6f188def8
24 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/ls.c
View File

@ -485,7 +485,7 @@ static void showdirs(struct dnode **dn, int ndirs, int first)
for (i = 0; i < ndirs; i++) { for (i = 0; i < ndirs; i++) {
if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) { if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
if (!first) if (!first)
printf("\n"); puts("");
first = 0; first = 0;
printf("%s:\n", dn[i]->fullname); printf("%s:\n", dn[i]->fullname);
} }

2
coreutils/sum.c
View File

@ -65,7 +65,7 @@ static int bsd_sum_file(const char *file, int print_name)
if (print_name > 1) if (print_name > 1)
puts(file); puts(file);
else else
printf("\n"); puts("");
out: out:
return ret; return ret;
} }

2
e2fsprogs/blkid/dev.c
View File

@ -82,7 +82,7 @@ void blkid_debug_dump_dev(blkid_dev dev)
else else
printf(" tag: NULL\n"); printf(" tag: NULL\n");
} }
printf("\n"); puts("");
} }
#endif #endif

2
e2fsprogs/blkid/read.c
View File

@ -437,7 +437,7 @@ static void debug_dump_dev(blkid_dev dev)
else else
printf(" tag: NULL\n"); printf(" tag: NULL\n");
} }
printf("\n"); puts("");
} }
int main(int argc, char**argv) int main(int argc, char**argv)

2
e2fsprogs/fsck.c
View File

@ -614,7 +614,7 @@ static int execute(const char *type, const char *device, const char *mntpt,
mntpt ? mntpt : device); mntpt ? mntpt : device);
for (i=0; i < argc; i++) for (i=0; i < argc; i++)
printf("%s ", argv[i]); printf("%s ", argv[i]);
printf("\n"); puts("");
} }
/* Fork and execute the correct program. */ /* Fork and execute the correct program. */

4
e2fsprogs/lsattr.c
View File

@ -57,7 +57,7 @@ static void list_attributes(const char *name)
if (flags & OPT_PF_LONG) { if (flags & OPT_PF_LONG) {
printf("%-28s ", name); printf("%-28s ", name);
print_flags(stdout, fsflags, PFOPT_LONG); print_flags(stdout, fsflags, PFOPT_LONG);
printf("\n"); puts("");
} else { } else {
print_flags(stdout, fsflags, 0); print_flags(stdout, fsflags, 0);
printf(" %s\n", name); printf(" %s\n", name);
@ -102,7 +102,7 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
(de->d_name[1] != '.' && de->d_name[2] != '\0')))) { (de->d_name[1] != '.' && de->d_name[2] != '\0')))) {
printf("\n%s:\n", path); printf("\n%s:\n", path);
iterate_on_dir(path, lsattr_dir_proc, NULL); iterate_on_dir(path, lsattr_dir_proc, NULL);
printf("\n"); puts("");
} }
} }
} }

2
e2fsprogs/uuid/uuid_time.c
View File

@ -147,7 +147,7 @@ main(int argc, char **argv)
printf(" (random)\n"); printf(" (random)\n");
break; break;
default: default:
printf("\n"); puts("");
} }
if (type != 1) { if (type != 1) {
printf("Warning: not a time-based UUID, so UUID time " printf("Warning: not a time-based UUID, so UUID time "

26
miscutils/hdparm.c
View File

@ -547,7 +547,7 @@ static void print_ascii(uint16_t *p, uint8_t length) {
printf("%c%c",(char)0x00ff&((*p)>>8),(char)(*p)&0x00ff); printf("%c%c",(char)0x00ff&((*p)>>8),(char)(*p)&0x00ff);
p++; p++;
} }
printf("\n"); puts("");
} }
// Parse 512 byte disk identification block and print much crap. // Parse 512 byte disk identification block and print much crap.
@ -574,7 +574,7 @@ static void identify(uint16_t *id_supplied)
chksum &= 0xff; chksum &= 0xff;
/* check if we recognise the device type */ /* check if we recognise the device type */
printf("\n"); puts("");
if (!(val[GEN_CONFIG] & NOT_ATA)) if (!(val[GEN_CONFIG] & NOT_ATA))
{ {
dev = ATA_DEV; dev = ATA_DEV;
@ -706,7 +706,7 @@ static void identify(uint16_t *id_supplied)
else if (like_std > std) else if (like_std > std)
printf("& some of %u\n",like_std); printf("& some of %u\n",like_std);
else else
printf("\n"); puts("");
} }
else else
{ {
@ -818,7 +818,7 @@ static void identify(uint16_t *id_supplied)
if (bbbig > 1000) if (bbbig > 1000)
printf("(%"PRIu64" GB)\n", bbbig/1000); printf("(%"PRIu64" GB)\n", bbbig/1000);
else else
printf("\n"); puts("");
} }
/* hw support of commands (capabilities) */ /* hw support of commands (capabilities) */
@ -870,7 +870,7 @@ static void identify(uint16_t *id_supplied)
if ((like_std > 3) && ((val[CAPAB_1] & VALID) == VALID_VAL)) if ((like_std > 3) && ((val[CAPAB_1] & VALID) == VALID_VAL))
printf(", %s device specific minimum\n",(val[CAPAB_1] & MIN_STANDBY_TIMER)?"with":"no"); printf(", %s device specific minimum\n",(val[CAPAB_1] & MIN_STANDBY_TIMER)?"with":"no");
else else
printf("\n"); puts("");
} }
printf("\tR/W multiple sector transfer: "); printf("\tR/W multiple sector transfer: ");
if ((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER)) if ((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER))
@ -913,7 +913,7 @@ static void identify(uint16_t *id_supplied)
printf("\tOverlap support:"); printf("\tOverlap support:");
if (val[PKT_REL]) printf(" %uus to release bus.",val[PKT_REL]); if (val[PKT_REL]) printf(" %uus to release bus.",val[PKT_REL]);
if (val[SVC_NBSY]) printf(" %uus to clear BSY after SERVICE cmd.",val[SVC_NBSY]); if (val[SVC_NBSY]) printf(" %uus to clear BSY after SERVICE cmd.",val[SVC_NBSY]);
printf("\n"); puts("");
} }
} }
@ -944,7 +944,7 @@ static void identify(uint16_t *id_supplied)
err_dma += mode_loop(jj,kk,'u',&have_mode); err_dma += mode_loop(jj,kk,'u',&have_mode);
} }
if (err_dma || !have_mode) printf("(?)"); if (err_dma || !have_mode) printf("(?)");
printf("\n"); puts("");
if ((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)) if ((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP))
printf("\t\tInterleaved DMA support\n"); printf("\t\tInterleaved DMA support\n");
@ -955,7 +955,7 @@ static void identify(uint16_t *id_supplied)
printf("\t\tCycle time:"); printf("\t\tCycle time:");
if (val[DMA_TIME_MIN]) printf(" min=%uns",val[DMA_TIME_MIN]); if (val[DMA_TIME_MIN]) printf(" min=%uns",val[DMA_TIME_MIN]);
if (val[DMA_TIME_NORM]) printf(" recommended=%uns",val[DMA_TIME_NORM]); if (val[DMA_TIME_NORM]) printf(" recommended=%uns",val[DMA_TIME_NORM]);
printf("\n"); puts("");
} }
} }
@ -971,13 +971,13 @@ static void identify(uint16_t *id_supplied)
if (jj & 0x0001) printf("pio%d ",ii); if (jj & 0x0001) printf("pio%d ",ii);
jj >>=1; jj >>=1;
} }
printf("\n"); puts("");
} }
else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) ) else if (((min_std < 5) || (eqpt == CDROM)) && (val[PIO_MODE] & MODE) )
{ {
for (ii = 0; ii <= val[PIO_MODE]>>8; ii++) for (ii = 0; ii <= val[PIO_MODE]>>8; ii++)
printf("pio%d ",ii); printf("pio%d ",ii);
printf("\n"); puts("");
} }
else else
printf("unknown\n"); printf("unknown\n");
@ -989,7 +989,7 @@ static void identify(uint16_t *id_supplied)
printf("\t\tCycle time:"); printf("\t\tCycle time:");
if (val[PIO_NO_FLOW]) printf(" no flow control=%uns", val[PIO_NO_FLOW]); if (val[PIO_NO_FLOW]) printf(" no flow control=%uns", val[PIO_NO_FLOW]);
if (val[PIO_FLOW]) printf(" IORDY flow control=%uns", val[PIO_FLOW]); if (val[PIO_FLOW]) printf(" IORDY flow control=%uns", val[PIO_FLOW]);
printf("\n"); puts("");
} }
} }
@ -1049,7 +1049,7 @@ static void identify(uint16_t *id_supplied)
printf("\t"); printf("\t");
if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, ""); if (jj) printf("%umin for %sSECURITY ERASE UNIT. ", jj==ERASE_BITS ? 508 : jj<<1, "");
if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED "); if (kk) printf("%umin for %sSECURITY ERASE UNIT. ", kk==ERASE_BITS ? 508 : kk<<1, "ENHANCED ");
printf("\n"); puts("");
} }
} }
@ -1194,7 +1194,7 @@ static void dump_identity(const struct hd_driveid *id)
else else
printf("off"); printf("off");
} }
printf("\n"); puts("");
if (!(id->field_valid&1)) if (!(id->field_valid&1))
printf(" (maybe):"); printf(" (maybe):");

4
modutils/lsmod.c
View File

@ -15,7 +15,7 @@
#ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE #ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE
static void check_tainted(void) { printf("\n"); } static void check_tainted(void) { puts(""); }
#else #else
#define TAINT_FILENAME "/proc/sys/kernel/tainted" #define TAINT_FILENAME "/proc/sys/kernel/tainted"
#define TAINT_PROPRIETORY_MODULE (1<<0) #define TAINT_PROPRIETORY_MODULE (1<<0)
@ -127,7 +127,7 @@ int lsmod_main(int argc, char **argv)
} }
if (count) printf("]"); if (count) printf("]");
printf("\n"); puts("");
} }
#ifdef CONFIG_FEATURE_CLEAN_UP #ifdef CONFIG_FEATURE_CLEAN_UP

2
networking/ether-wake.c
View File

@ -92,7 +92,7 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize)
printf("packet dump:\n"); printf("packet dump:\n");
for (i = 0; i < pktsize; ++i) { for (i = 0; i < pktsize; ++i) {
printf("%2.2x ", outpack[i]); printf("%2.2x ", outpack[i]);
if (i % 20 == 19) printf("\n"); if (i % 20 == 19) puts("");
} }
printf("\n\n"); printf("\n\n");
} }

10
networking/interface.c
View File

@ -938,7 +938,7 @@ static void ife_print(struct interface *ptr)
printf("(auto)"); printf("(auto)");
} }
#endif #endif
printf("\n"); puts("");
if (ptr->has_ip) { if (ptr->has_ip) {
printf(" %s addr:%s ", ap->name, printf(" %s addr:%s ", ap->name,
@ -1007,7 +1007,7 @@ static void ife_print(struct interface *ptr)
default: default:
printf("Unknown"); printf("Unknown");
} }
printf("\n"); puts("");
} }
} }
fclose(f); fclose(f);
@ -1034,7 +1034,7 @@ static void ife_print(struct interface *ptr)
if (ptr->outfill || ptr->keepalive) if (ptr->outfill || ptr->keepalive)
printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive); printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive);
#endif #endif
printf("\n"); puts("");
/* If needed, display the interface statistics. */ /* If needed, display the interface statistics. */
@ -1083,9 +1083,9 @@ static void ife_print(struct interface *ptr)
} }
if (ptr->map.dma) if (ptr->map.dma)
printf("DMA chan:%x ", ptr->map.dma); printf("DMA chan:%x ", ptr->map.dma);
printf("\n"); puts("");
} }
printf("\n"); puts("");
} }

16
networking/libiproute/ipaddress.c
View File

@ -435,7 +435,7 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush)
return -1; return -1;
} }
if (filter.family == AF_PACKET) { if (filter.family == AF_PACKET) {
bb_error_msg("Cannot flush link addresses."); bb_error_msg("cannot flush link addresses");
return -1; return -1;
} }
} }
@ -488,17 +488,17 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush)
exit(1); exit(1);
if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETLINK) < 0) { if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETLINK) < 0) {
bb_perror_msg_and_die("Cannot send dump request"); bb_perror_msg_and_die("cannot send dump request");
} }
if (rtnl_dump_filter(&rth, store_nlmsg, &linfo, NULL, NULL) < 0) { if (rtnl_dump_filter(&rth, store_nlmsg, &linfo, NULL, NULL) < 0) {
bb_error_msg_and_die("Dump terminated"); bb_error_msg_and_die("dump terminated");
} }
if (filter_dev) { if (filter_dev) {
filter.ifindex = ll_name_to_index(filter_dev); filter.ifindex = ll_name_to_index(filter_dev);
if (filter.ifindex <= 0) { if (filter.ifindex <= 0) {
bb_error_msg("Device \"%s\" does not exist", filter_dev); bb_error_msg("device \"%s\" does not exist", filter_dev);
return -1; return -1;
} }
} }
@ -532,11 +532,11 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush)
if (filter.family != AF_PACKET) { if (filter.family != AF_PACKET) {
if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) { if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) {
bb_perror_msg_and_die("Cannot send dump request"); bb_perror_msg_and_die("cannot send dump request");
} }
if (rtnl_dump_filter(&rth, store_nlmsg, &ainfo, NULL, NULL) < 0) { if (rtnl_dump_filter(&rth, store_nlmsg, &ainfo, NULL, NULL) < 0) {
bb_error_msg_and_die("Dump terminated"); bb_error_msg_and_die("dump terminated");
} }
} }
@ -763,7 +763,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv)
inet_prefix brd; inet_prefix brd;
int i; int i;
if (req.ifa.ifa_family != AF_INET) { if (req.ifa.ifa_family != AF_INET) {
bb_error_msg("Broadcast can be set only for IPv4 addresses"); bb_error_msg("broadcast can be set only for IPv4 addresses");
return -1; return -1;
} }
brd = peer; brd = peer;
@ -787,7 +787,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv)
ll_init_map(&rth); ll_init_map(&rth);
if ((req.ifa.ifa_index = ll_name_to_index(d)) == 0) { if ((req.ifa.ifa_index = ll_name_to_index(d)) == 0) {
bb_error_msg("Cannot find device \"%s\"", d); bb_error_msg("cannot find device \"%s\"", d);
return -1; return -1;
} }

30
networking/libiproute/iproute.c
View File

@ -398,7 +398,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
if (d) { if (d) {
if ((idx = ll_name_to_index(d)) == 0) { if ((idx = ll_name_to_index(d)) == 0) {
bb_error_msg("Cannot find device \"%s\"", d); bb_error_msg("cannot find device \"%s\"", d);
return -1; return -1;
} }
addattr32(&req.n, sizeof(req), RTA_OIF, idx); addattr32(&req.n, sizeof(req), RTA_OIF, idx);
@ -571,7 +571,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
if (id) { if (id) {
if ((idx = ll_name_to_index(id)) == 0) { if ((idx = ll_name_to_index(id)) == 0) {
bb_error_msg("Cannot find device \"%s\"", id); bb_error_msg("cannot find device \"%s\"", id);
return -1; return -1;
} }
filter.iif = idx; filter.iif = idx;
@ -579,7 +579,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
} }
if (od) { if (od) {
if ((idx = ll_name_to_index(od)) == 0) { if ((idx = ll_name_to_index(od)) == 0) {
bb_error_msg("Cannot find device \"%s\"", od); bb_error_msg("cannot find device \"%s\"", od);
} }
filter.oif = idx; filter.oif = idx;
filter.oifmask = -1; filter.oifmask = -1;
@ -608,7 +608,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
} }
filter.flushed = 0; filter.flushed = 0;
if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
bb_error_msg("Flush terminated"); bb_error_msg("flush terminated");
return -1; return -1;
} }
if (filter.flushed == 0) { if (filter.flushed == 0) {
@ -622,16 +622,16 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
if (filter.tb != -1) { if (filter.tb != -1) {
if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
bb_perror_msg_and_die("Cannot send dump request"); bb_perror_msg_and_die("cannot send dump request");
} }
} else { } else {
if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
bb_perror_msg_and_die("Cannot send dump request"); bb_perror_msg_and_die("cannot send dump request");
} }
} }
if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
bb_error_msg_and_die("Dump terminated"); bb_error_msg_and_die("dump terminated");
} }
exit(0); exit(0);
@ -733,14 +733,14 @@ static int iproute_get(int argc, char **argv)
if (idev) { if (idev) {
if ((idx = ll_name_to_index(idev)) == 0) { if ((idx = ll_name_to_index(idev)) == 0) {
bb_error_msg("Cannot find device \"%s\"", idev); bb_error_msg("cannot find device \"%s\"", idev);
return -1; return -1;
} }
addattr32(&req.n, sizeof(req), RTA_IIF, idx); addattr32(&req.n, sizeof(req), RTA_IIF, idx);
} }
if (odev) { if (odev) {
if ((idx = ll_name_to_index(odev)) == 0) { if ((idx = ll_name_to_index(odev)) == 0) {
bb_error_msg("Cannot find device \"%s\"", odev); bb_error_msg("cannot find device \"%s\"", odev);
return -1; return -1;
} }
addattr32(&req.n, sizeof(req), RTA_OIF, idx); addattr32(&req.n, sizeof(req), RTA_OIF, idx);
@ -761,16 +761,16 @@ static int iproute_get(int argc, char **argv)
struct rtattr * tb[RTA_MAX+1]; struct rtattr * tb[RTA_MAX+1];
if (print_route(NULL, &req.n, (void*)stdout) < 0) { if (print_route(NULL, &req.n, (void*)stdout) < 0) {
bb_error_msg_and_die("An error :-)"); bb_error_msg_and_die("an error :-)");
} }
if (req.n.nlmsg_type != RTM_NEWROUTE) { if (req.n.nlmsg_type != RTM_NEWROUTE) {
bb_error_msg("Not a route?"); bb_error_msg("not a route?");
return -1; return -1;
} }
len -= NLMSG_LENGTH(sizeof(*r)); len -= NLMSG_LENGTH(sizeof(*r));
if (len < 0) { if (len < 0) {
bb_error_msg("Wrong len %d", len); bb_error_msg("wrong len %d", len);
return -1; return -1;
} }
@ -781,7 +781,7 @@ static int iproute_get(int argc, char **argv)
tb[RTA_PREFSRC]->rta_type = RTA_SRC; tb[RTA_PREFSRC]->rta_type = RTA_SRC;
r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]); r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
} else if (!tb[RTA_SRC]) { } else if (!tb[RTA_SRC]) {
bb_error_msg("Failed to connect the route"); bb_error_msg("failed to connect the route");
return -1; return -1;
} }
if (!odev && tb[RTA_OIF]) { if (!odev && tb[RTA_OIF]) {
@ -802,7 +802,7 @@ static int iproute_get(int argc, char **argv)
} }
if (print_route(NULL, &req.n, (void*)stdout) < 0) { if (print_route(NULL, &req.n, (void*)stdout) < 0) {
bb_error_msg_and_die("An error :-)"); bb_error_msg_and_die("an error :-)");
} }
exit(0); exit(0);
@ -849,7 +849,7 @@ int do_iproute(int argc, char **argv)
case 12: /* flush */ case 12: /* flush */
return iproute_list_or_flush(argc-1, argv+1, 1); return iproute_list_or_flush(argc-1, argv+1, 1);
default: default:
bb_error_msg_and_die("Unknown command %s", *argv); bb_error_msg_and_die("unknown command %s", *argv);
} }
return iproute_modify(cmd, flags, argc-1, argv+1); return iproute_modify(cmd, flags, argc-1, argv+1);

22
networking/libiproute/iptunnel.c
View File

@ -164,26 +164,26 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
if (strcmp(*argv, "ipip") == 0 || if (strcmp(*argv, "ipip") == 0 ||
strcmp(*argv, "ip/ip") == 0) { strcmp(*argv, "ip/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) { if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
bb_error_msg("You managed to ask for more than one tunnel mode."); bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1); exit(-1);
} }
p->iph.protocol = IPPROTO_IPIP; p->iph.protocol = IPPROTO_IPIP;
} else if (strcmp(*argv, "gre") == 0 || } else if (strcmp(*argv, "gre") == 0 ||
strcmp(*argv, "gre/ip") == 0) { strcmp(*argv, "gre/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) { if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
bb_error_msg("You managed to ask for more than one tunnel mode."); bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1); exit(-1);
} }
p->iph.protocol = IPPROTO_GRE; p->iph.protocol = IPPROTO_GRE;
} else if (strcmp(*argv, "sit") == 0 || } else if (strcmp(*argv, "sit") == 0 ||
strcmp(*argv, "ipv6/ip") == 0) { strcmp(*argv, "ipv6/ip") == 0) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) { if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
bb_error_msg("You managed to ask for more than one tunnel mode."); bb_error_msg("you managed to ask for more than one tunnel mode");
exit(-1); exit(-1);
} }
p->iph.protocol = IPPROTO_IPV6; p->iph.protocol = IPPROTO_IPV6;
} else { } else {
bb_error_msg("Cannot guess tunnel mode."); bb_error_msg("cannot guess tunnel mode");
exit(-1); exit(-1);
} }
} else if (strcmp(*argv, "key") == 0) { } else if (strcmp(*argv, "key") == 0) {
@ -306,7 +306,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) { if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) { if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
bb_error_msg("Keys are not allowed with ipip and sit."); bb_error_msg("keys are not allowed with ipip and sit");
return -1; return -1;
} }
} }
@ -326,7 +326,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
p->o_flags |= GRE_KEY; p->o_flags |= GRE_KEY;
} }
if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) { if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
bb_error_msg("Broadcast tunnel requires a source address."); bb_error_msg("broadcast tunnel requires a source address");
return -1; return -1;
} }
return 0; return 0;
@ -462,7 +462,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
if ((ptr = strchr(buf, ':')) == NULL || if ((ptr = strchr(buf, ':')) == NULL ||
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)) { (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
bb_error_msg("Wrong format of /proc/net/dev. Sorry."); bb_error_msg("wrong format of /proc/net/dev. Sorry");
return -1; return -1;
} }
if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
@ -475,7 +475,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
continue; continue;
type = do_ioctl_get_iftype(name); type = do_ioctl_get_iftype(name);
if (type == -1) { if (type == -1) {
bb_error_msg("Failed to get type of [%s]", name); bb_error_msg("failed to get type of [%s]", name);
continue; continue;
} }
if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT) if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
@ -490,7 +490,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
(p->i_key && p1.i_key != p->i_key)) (p->i_key && p1.i_key != p->i_key))
continue; continue;
print_tunnel(&p1); print_tunnel(&p1);
printf("\n"); puts("");
} }
return 0; return 0;
} }
@ -521,7 +521,7 @@ static int do_show(int argc, char **argv)
return -1; return -1;
print_tunnel(&p); print_tunnel(&p);
printf("\n"); puts("");
return 0; return 0;
} }
@ -541,6 +541,6 @@ int do_iptunnel(int argc, char **argv)
} else } else
return do_show(0, NULL); return do_show(0, NULL);
bb_error_msg("Command \"%s\" is unknown.", *argv); bb_error_msg("command \"%s\" is unknown", *argv);
exit(-1); exit(-1);
} }

4
networking/nslookup.c
View File

@ -73,7 +73,7 @@ static int addr_list_fprint(char **h_addr_list)
} }
} }
printf("\n"); puts("");
return 0; return 0;
} }
@ -123,7 +123,7 @@ static inline void server_print(void)
char *ip = inet_ntoa(def.sin_addr); char *ip = inet_ntoa(def.sin_addr);
hostent_fprint(gethostbyaddr_wrapper(ip), "Server:"); hostent_fprint(gethostbyaddr_wrapper(ip), "Server:");
printf("\n"); puts("");
} }
/* alter the global _res nameserver structure to use /* alter the global _res nameserver structure to use

2
networking/ping.c
View File

@ -314,7 +314,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
printf(" time=%lu.%lu ms", triptime / 10, triptime % 10); printf(" time=%lu.%lu ms", triptime / 10, triptime % 10);
if (dupflag) if (dupflag)
printf(" (DUP!)"); printf(" (DUP!)");
printf("\n"); puts("");
} else } else
if (icmppkt->icmp_type != ICMP_ECHO) if (icmppkt->icmp_type != ICMP_ECHO)
bb_error_msg("warning: got ICMP %d (%s)", bb_error_msg("warning: got ICMP %d (%s)",

2
networking/ping6.c
View File

@ -305,7 +305,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
triptime / 10, triptime % 10); triptime / 10, triptime % 10);
if (dupflag) if (dupflag)
printf(" (DUP!)"); printf(" (DUP!)");
printf("\n"); puts("");
} else } else
if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
bb_error_msg("warning: got ICMP %d (%s)", bb_error_msg("warning: got ICMP %d (%s)",

2
procps/fuser.c
View File

@ -277,7 +277,7 @@ static int fuser_print_pid_list(pid_list *plist)
if(curr->pid > 0) printf("%d ", curr->pid); if(curr->pid > 0) printf("%d ", curr->pid);
curr = curr->next; curr = curr->next;
} }
printf("\n"); puts("");
return 1; return 1;
} }

2
shell/lash.c
View File

@ -678,7 +678,7 @@ static int get_command(FILE * source, char *command)
if (!fgets(command, BUFSIZ - 2, source)) { if (!fgets(command, BUFSIZ - 2, source)) {
if (source == stdin) if (source == stdin)
printf("\n"); puts("");
return 1; return 1;
} }

4
shell/msh.c
View File

@ -3250,7 +3250,7 @@ static int dohelp(struct op *t)
continue; continue;
col += printf("%s%s", ((col == 0) ? "\t" : " "), x->name); col += printf("%s%s", ((col == 0) ? "\t" : " "), x->name);
if (col > 60) { if (col > 60) {
printf("\n"); puts("");
col = 0; col = 0;
} }
} }
@ -3267,7 +3267,7 @@ static int dohelp(struct op *t)
col += printf("%s%s", ((col == 0) ? "\t" : " "), applet->name); col += printf("%s%s", ((col == 0) ? "\t" : " "), applet->name);
if (col > 60) { if (col > 60) {
printf("\n"); puts("");
col = 0; col = 0;
} }
} }

10
util-linux/fdisk.c
View File

@ -2534,13 +2534,13 @@ print_buffer(char *pbuffer)
printf("0x%03X:", i); printf("0x%03X:", i);
printf(" %02X", (unsigned char) pbuffer[i]); printf(" %02X", (unsigned char) pbuffer[i]);
if (l == MAX_PER_LINE - 1) { if (l == MAX_PER_LINE - 1) {
printf("\n"); puts("");
l = -1; l = -1;
} }
} }
if (l > 0) if (l > 0)
printf("\n"); puts("");
printf("\n"); puts("");
} }
@ -2650,7 +2650,7 @@ xselect(void)
break; break;
case 'q': case 'q':
close(fd); close(fd);
printf("\n"); puts("");
exit(0); exit(0);
case 'r': case 'r':
return; return;
@ -3022,7 +3022,7 @@ int fdisk_main(int argc, char **argv)
break; break;
case 'q': case 'q':
close(fd); close(fd);
printf("\n"); puts("");
return 0; return 0;
case 's': case 's':
#ifdef CONFIG_FEATURE_SUN_LABEL #ifdef CONFIG_FEATURE_SUN_LABEL

4
util-linux/fdisk_osf.c
View File

@ -512,7 +512,7 @@ xbsd_print_disklabel(int show_all)
printf(_(" ecc")); printf(_(" ecc"));
if (lp->d_flags & BSD_D_BADSECT) if (lp->d_flags & BSD_D_BADSECT)
printf(_(" badsect")); printf(_(" badsect"));
printf("\n"); puts("");
/* On various machines the fields of *lp are short/int/long */ /* On various machines the fields of *lp are short/int/long */
/* In order to avoid problems, we cast them all to long. */ /* In order to avoid problems, we cast them all to long. */
printf(_("bytes/sector: %ld\n"), (long) lp->d_secsize); printf(_("bytes/sector: %ld\n"), (long) lp->d_secsize);
@ -579,7 +579,7 @@ xbsd_print_disklabel(int show_all)
printf("%22.22s", ""); printf("%22.22s", "");
break; break;
} }
printf("\n"); puts("");
} }
} }
} }

4
util-linux/fsck_minix.c
View File

@ -322,12 +322,12 @@ static int ask(const char *string, int def)
int c; int c;
if (!repair) { if (!repair) {
printf("\n"); puts("");
errors_uncorrected = 1; errors_uncorrected = 1;
return 0; return 0;
} }
if (automatic) { if (automatic) {
printf("\n"); puts("");
if (!def) if (!def)
errors_uncorrected = 1; errors_uncorrected = 1;
return def; return def;

2
util-linux/getopt.c
View File

@ -172,7 +172,7 @@ int generate_output(char * argv[],int argc,const char *optstr,
printf(" --"); printf(" --");
while (optind < argc) while (optind < argc)
printf(" %s",normalize(argv[optind++])); printf(" %s",normalize(argv[optind++]));
printf("\n"); puts("");
} }
return exit_code; return exit_code;
} }