diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 | |
parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
download | busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2 busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip |
message string changes, mostly for consistency, also -32 bytes in .rodata
71 files changed, 127 insertions, 130 deletions
diff --git a/applets/applets.c b/applets/applets.c index 00102daa3..10d4c948c 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -135,7 +135,7 @@ static void parse_config_file(void) | |||
135 | || !S_ISREG(st.st_mode) /* Not a regular file? */ | 135 | || !S_ISREG(st.st_mode) /* Not a regular file? */ |
136 | || (st.st_uid != 0) /* Not owned by root? */ | 136 | || (st.st_uid != 0) /* Not owned by root? */ |
137 | || (st.st_mode & (S_IWGRP | S_IWOTH)) /* Writable by non-root? */ | 137 | || (st.st_mode & (S_IWGRP | S_IWOTH)) /* Writable by non-root? */ |
138 | || !(f = fopen(config_file, "r")) /* Can not open? */ | 138 | || !(f = fopen(config_file, "r")) /* Cannot open? */ |
139 | ) { | 139 | ) { |
140 | return; | 140 | return; |
141 | } | 141 | } |
@@ -338,7 +338,7 @@ static void check_suid(struct BB_applet *applet) | |||
338 | m >>= 3; | 338 | m >>= 3; |
339 | 339 | ||
340 | if (!(m & S_IXOTH)) /* is x bit not set ? */ | 340 | if (!(m & S_IXOTH)) /* is x bit not set ? */ |
341 | bb_error_msg_and_die ("You have no permission to run this applet!"); | 341 | bb_error_msg_and_die("you have no permission to run this applet!"); |
342 | 342 | ||
343 | if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { /* *both* have to be set for sgid */ | 343 | if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { /* *both* have to be set for sgid */ |
344 | xsetgid(sct->m_gid); | 344 | xsetgid(sct->m_gid); |
@@ -365,7 +365,7 @@ static void check_suid(struct BB_applet *applet) | |||
365 | #endif | 365 | #endif |
366 | 366 | ||
367 | if (applet->need_suid == _BB_SUID_ALWAYS) { | 367 | if (applet->need_suid == _BB_SUID_ALWAYS) { |
368 | if (geteuid()) bb_error_msg_and_die("Applet requires root privileges!"); | 368 | if (geteuid()) bb_error_msg_and_die("applet requires root privileges!"); |
369 | } else if (applet->need_suid == _BB_SUID_NEVER) { | 369 | } else if (applet->need_suid == _BB_SUID_NEVER) { |
370 | xsetgid(rgid); /* drop all privileges */ | 370 | xsetgid(rgid); /* drop all privileges */ |
371 | xsetuid(ruid); | 371 | xsetuid(ruid); |
diff --git a/archival/ar.c b/archival/ar.c index 06a879b93..521e03799 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
@@ -83,7 +83,7 @@ int ar_main(int argc, char **argv) | |||
83 | 83 | ||
84 | xread(archive_handle->src_fd, magic, 7); | 84 | xread(archive_handle->src_fd, magic, 7); |
85 | if (strncmp(magic, "!<arch>", 7) != 0) { | 85 | if (strncmp(magic, "!<arch>", 7) != 0) { |
86 | bb_error_msg_and_die("Invalid ar magic"); | 86 | bb_error_msg_and_die("invalid ar magic"); |
87 | } | 87 | } |
88 | archive_handle->offset += 7; | 88 | archive_handle->offset += 7; |
89 | 89 | ||
diff --git a/archival/dpkg.c b/archival/dpkg.c index 4d0f3fbf3..2f7372100 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -711,7 +711,7 @@ static unsigned int get_status(const unsigned int status_node, const int num) | |||
711 | /* skip past the separating spaces */ | 711 | /* skip past the separating spaces */ |
712 | status_string += strspn(status_string, " "); | 712 | status_string += strspn(status_string, " "); |
713 | } | 713 | } |
714 | len = strcspn(status_string, " \n\0"); | 714 | len = strcspn(status_string, " \n"); |
715 | state_sub_string = xstrndup(status_string, len); | 715 | state_sub_string = xstrndup(status_string, len); |
716 | state_sub_num = search_name_hashtable(state_sub_string); | 716 | state_sub_num = search_name_hashtable(state_sub_string); |
717 | free(state_sub_string); | 717 | free(state_sub_string); |
@@ -796,7 +796,7 @@ static void index_status_file(const char *filename) | |||
796 | if (status_line != NULL) { | 796 | if (status_line != NULL) { |
797 | status_line += 7; | 797 | status_line += 7; |
798 | status_line += strspn(status_line, " \n\t"); | 798 | status_line += strspn(status_line, " \n\t"); |
799 | status_line = xstrndup(status_line, strcspn(status_line, "\n\0")); | 799 | status_line = xstrndup(status_line, strcspn(status_line, "\n")); |
800 | status_node->status = search_name_hashtable(status_line); | 800 | status_node->status = search_name_hashtable(status_line); |
801 | free(status_line); | 801 | free(status_line); |
802 | } | 802 | } |
@@ -849,7 +849,7 @@ static void write_status_file(deb_file_t **deb_file) | |||
849 | 849 | ||
850 | tmp_string += 8; | 850 | tmp_string += 8; |
851 | tmp_string += strspn(tmp_string, " \n\t"); | 851 | tmp_string += strspn(tmp_string, " \n\t"); |
852 | package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); | 852 | package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n")); |
853 | write_flag = FALSE; | 853 | write_flag = FALSE; |
854 | tmp_string = strstr(control_buffer, "Status:"); | 854 | tmp_string = strstr(control_buffer, "Status:"); |
855 | if (tmp_string != NULL) { | 855 | if (tmp_string != NULL) { |
@@ -1374,8 +1374,8 @@ static void remove_package(const unsigned int package_num, int noisy) | |||
1374 | sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name); | 1374 | sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name); |
1375 | exclude_files = create_list(conffile_name); | 1375 | exclude_files = create_list(conffile_name); |
1376 | 1376 | ||
1377 | /* Some directories cant be removed straight away, so do multiple passes */ | 1377 | /* Some directories can't be removed straight away, so do multiple passes */ |
1378 | while (remove_file_array(remove_files, exclude_files)); | 1378 | while (remove_file_array(remove_files, exclude_files)) /*repeat */; |
1379 | free_array(exclude_files); | 1379 | free_array(exclude_files); |
1380 | free_array(remove_files); | 1380 | free_array(remove_files); |
1381 | 1381 | ||
@@ -1421,7 +1421,7 @@ static void purge_package(const unsigned int package_num) | |||
1421 | exclude_files = xzalloc(sizeof(char*)); | 1421 | exclude_files = xzalloc(sizeof(char*)); |
1422 | 1422 | ||
1423 | /* Some directories cant be removed straight away, so do multiple passes */ | 1423 | /* Some directories cant be removed straight away, so do multiple passes */ |
1424 | while (remove_file_array(remove_files, exclude_files)); | 1424 | while (remove_file_array(remove_files, exclude_files)) /* repeat */; |
1425 | free_array(remove_files); | 1425 | free_array(remove_files); |
1426 | 1426 | ||
1427 | /* Create a list of all /var/lib/dpkg/info/<package> files */ | 1427 | /* Create a list of all /var/lib/dpkg/info/<package> files */ |
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index e03fb0caa..8513ffecb 100644 --- a/archival/libunarchive/archive_xread_all_eof.c +++ b/archival/libunarchive/archive_xread_all_eof.c | |||
@@ -15,7 +15,7 @@ ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *b | |||
15 | 15 | ||
16 | size = full_read(archive_handle->src_fd, buf, count); | 16 | size = full_read(archive_handle->src_fd, buf, count); |
17 | if ((size != 0) && (size != count)) { | 17 | if ((size != 0) && (size != count)) { |
18 | bb_perror_msg_and_die("Short read, read %ld of %ld", (long)size, (long)count); | 18 | bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count); |
19 | } | 19 | } |
20 | return(size); | 20 | return(size); |
21 | } | 21 | } |
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c index 00d1919a7..3e42035b9 100644 --- a/archival/libunarchive/check_header_gzip.c +++ b/archival/libunarchive/check_header_gzip.c | |||
@@ -24,7 +24,7 @@ void check_header_gzip(int src_fd) | |||
24 | 24 | ||
25 | /* Check the compression method */ | 25 | /* Check the compression method */ |
26 | if (header.formatted.method != 8) { | 26 | if (header.formatted.method != 8) { |
27 | bb_error_msg_and_die("Unknown compression method %d", | 27 | bb_error_msg_and_die("unknown compression method %d", |
28 | header.formatted.method); | 28 | header.formatted.method); |
29 | } | 29 | } |
30 | 30 | ||
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 27b4ddbcf..9e3e98dd5 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -745,7 +745,7 @@ static int inflate_block(int *e) | |||
745 | 745 | ||
746 | if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { | 746 | if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { |
747 | if (i == 1) { | 747 | if (i == 1) { |
748 | bb_error_msg_and_die("Incomplete literal tree"); | 748 | bb_error_msg_and_die("incomplete literal tree"); |
749 | huft_free(tl); | 749 | huft_free(tl); |
750 | } | 750 | } |
751 | return i; /* incomplete code set */ | 751 | return i; /* incomplete code set */ |
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index 56862f137..dd48cb09b 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c | |||
@@ -57,7 +57,7 @@ char get_header_cpio(archive_handle_t *archive_handle) | |||
57 | archive_handle->offset += 110; | 57 | archive_handle->offset += 110; |
58 | 58 | ||
59 | if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) { | 59 | if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) { |
60 | bb_error_msg_and_die("Unsupported cpio format, use newc or crc"); | 60 | bb_error_msg_and_die("unsupported cpio format, use newc or crc"); |
61 | } | 61 | } |
62 | 62 | ||
63 | { | 63 | { |
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c index e3cb328fc..e7a80fc41 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libunarchive/get_header_tar_bz2.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | char get_header_tar_bz2(archive_handle_t *archive_handle) | 16 | char get_header_tar_bz2(archive_handle_t *archive_handle) |
17 | { | 17 | { |
18 | /* Cant lseek over pipe's */ | 18 | /* Can't lseek over pipes */ |
19 | archive_handle->seek = seek_by_read; | 19 | archive_handle->seek = seek_by_read; |
20 | 20 | ||
21 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream); | 21 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream); |
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index af059a187..41c02e16a 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c | |||
@@ -12,7 +12,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle) | |||
12 | { | 12 | { |
13 | unsigned char magic[2]; | 13 | unsigned char magic[2]; |
14 | 14 | ||
15 | /* Cant lseek over pipe's */ | 15 | /* Can't lseek over pipes */ |
16 | archive_handle->seek = seek_by_read; | 16 | archive_handle->seek = seek_by_read; |
17 | 17 | ||
18 | xread(archive_handle->src_fd, &magic, 2); | 18 | xread(archive_handle->src_fd, &magic, 2); |
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c index e1917dd2a..d605f61dd 100644 --- a/archival/libunarchive/seek_by_jump.c +++ b/archival/libunarchive/seek_by_jump.c | |||
@@ -19,6 +19,6 @@ void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amo | |||
19 | seek_by_read(archive_handle, amount); | 19 | seek_by_read(archive_handle, amount); |
20 | } else | 20 | } else |
21 | #endif | 21 | #endif |
22 | bb_perror_msg_and_die("Seek failure"); | 22 | bb_perror_msg_and_die("seek failure"); |
23 | } | 23 | } |
24 | } | 24 | } |
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c index 03cbb9ecc..d56f94b21 100644 --- a/archival/libunarchive/seek_by_read.c +++ b/archival/libunarchive/seek_by_read.c | |||
@@ -8,7 +8,7 @@ | |||
8 | #include "unarchive.h" | 8 | #include "unarchive.h" |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | /* If we are reading through a pipe(), or from stdin then we cant lseek, | 11 | /* If we are reading through a pipe(), or from stdin then we can't lseek, |
12 | * we must read and discard the data to skip over it. | 12 | * we must read and discard the data to skip over it. |
13 | */ | 13 | */ |
14 | void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size) | 14 | void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size) |
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c index eed528391..6a84ae811 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libunarchive/unpack_ar_archive.c | |||
@@ -14,7 +14,7 @@ void unpack_ar_archive(archive_handle_t *ar_archive) | |||
14 | 14 | ||
15 | xread(ar_archive->src_fd, magic, 7); | 15 | xread(ar_archive->src_fd, magic, 7); |
16 | if (strncmp(magic, "!<arch>", 7) != 0) { | 16 | if (strncmp(magic, "!<arch>", 7) != 0) { |
17 | bb_error_msg_and_die("Invalid ar magic"); | 17 | bb_error_msg_and_die("invalid ar magic"); |
18 | } | 18 | } |
19 | ar_archive->offset += 7; | 19 | ar_archive->offset += 7; |
20 | 20 | ||
diff --git a/archival/rpm.c b/archival/rpm.c index 448a479a0..2ef7232f4 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -183,7 +183,7 @@ static void extract_cpio_gz(int fd) { | |||
183 | 183 | ||
184 | xread(archive_handle->src_fd, &magic, 2); | 184 | xread(archive_handle->src_fd, &magic, 2); |
185 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { | 185 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { |
186 | bb_error_msg_and_die("Invalid gzip magic"); | 186 | bb_error_msg_and_die("invalid gzip magic"); |
187 | } | 187 | } |
188 | check_header_gzip(archive_handle->src_fd); | 188 | check_header_gzip(archive_handle->src_fd); |
189 | xchdir("/"); // Install RPM's to root | 189 | xchdir("/"); // Install RPM's to root |
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index c00c6be65..3442046c4 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c | |||
@@ -37,10 +37,10 @@ static void skip_header(int rpm_fd) | |||
37 | 37 | ||
38 | xread(rpm_fd, &header, sizeof(struct rpm_header)); | 38 | xread(rpm_fd, &header, sizeof(struct rpm_header)); |
39 | if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) { | 39 | if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) { |
40 | bb_error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */ | 40 | bb_error_msg_and_die("invalid RPM header magic"); /* Invalid magic */ |
41 | } | 41 | } |
42 | if (header.version != 1) { | 42 | if (header.version != 1) { |
43 | bb_error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */ | 43 | bb_error_msg_and_die("unsupported RPM header version"); /* This program only supports v1 headers */ |
44 | } | 44 | } |
45 | header.entries = ntohl(header.entries); | 45 | header.entries = ntohl(header.entries); |
46 | header.size = ntohl(header.size); | 46 | header.size = ntohl(header.size); |
diff --git a/archival/tar.c b/archival/tar.c index 2c4280cc4..d96d20227 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -496,7 +496,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, | |||
496 | freeHardLinkInfo(&tbInfo.hlInfoHead); | 496 | freeHardLinkInfo(&tbInfo.hlInfoHead); |
497 | 497 | ||
498 | if (errorFlag) | 498 | if (errorFlag) |
499 | bb_error_msg("Error exit delayed from previous errors"); | 499 | bb_error_msg("error exit delayed from previous errors"); |
500 | 500 | ||
501 | if (gzipPid && waitpid(gzipPid, NULL, 0)==-1) | 501 | if (gzipPid && waitpid(gzipPid, NULL, 0)==-1) |
502 | bb_error_msg("cannot wait"); | 502 | bb_error_msg("cannot wait"); |
@@ -540,7 +540,7 @@ static llist_t *append_file_list_to_list(llist_t *list) | |||
540 | #ifdef CONFIG_FEATURE_TAR_COMPRESS | 540 | #ifdef CONFIG_FEATURE_TAR_COMPRESS |
541 | static char get_header_tar_Z(archive_handle_t *archive_handle) | 541 | static char get_header_tar_Z(archive_handle_t *archive_handle) |
542 | { | 542 | { |
543 | /* Cant lseek over pipe's */ | 543 | /* Can't lseek over pipes */ |
544 | archive_handle->seek = seek_by_read; | 544 | archive_handle->seek = seek_by_read; |
545 | 545 | ||
546 | /* do the decompression, and cleanup */ | 546 | /* do the decompression, and cleanup */ |
@@ -556,7 +556,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) | |||
556 | /* nothing */; | 556 | /* nothing */; |
557 | 557 | ||
558 | /* Can only do one file at a time */ | 558 | /* Can only do one file at a time */ |
559 | return(EXIT_FAILURE); | 559 | return EXIT_FAILURE; |
560 | } | 560 | } |
561 | #else | 561 | #else |
562 | #define get_header_tar_Z 0 | 562 | #define get_header_tar_Z 0 |
diff --git a/archival/uncompress.c b/archival/uncompress.c index d1b0d2cb3..3c78961d5 100644 --- a/archival/uncompress.c +++ b/archival/uncompress.c | |||
@@ -49,7 +49,7 @@ int uncompress_main(int argc, char **argv) | |||
49 | 49 | ||
50 | extension = strrchr(uncompressed_file, '.'); | 50 | extension = strrchr(uncompressed_file, '.'); |
51 | if (!extension || (strcmp(extension, ".Z") != 0)) { | 51 | if (!extension || (strcmp(extension, ".Z") != 0)) { |
52 | bb_error_msg_and_die("Invalid extension"); | 52 | bb_error_msg_and_die("invalid extension"); |
53 | } | 53 | } |
54 | *extension = '\0'; | 54 | *extension = '\0'; |
55 | 55 | ||
@@ -65,7 +65,7 @@ int uncompress_main(int argc, char **argv) | |||
65 | 65 | ||
66 | /* do the decompression, and cleanup */ | 66 | /* do the decompression, and cleanup */ |
67 | if ((xread_char(src_fd) != 0x1f) || (xread_char(src_fd) != 0x9d)) { | 67 | if ((xread_char(src_fd) != 0x1f) || (xread_char(src_fd) != 0x9d)) { |
68 | bb_error_msg_and_die("Invalid magic"); | 68 | bb_error_msg_and_die("invalid magic"); |
69 | } | 69 | } |
70 | 70 | ||
71 | status = uncompress(src_fd, dst_fd); | 71 | status = uncompress(src_fd, dst_fd); |
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index ec55c3990..ce9b6817c 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
@@ -40,7 +40,7 @@ int loadkmap_main(int argc, char **argv) | |||
40 | 40 | ||
41 | xread(0, buff, 7); | 41 | xread(0, buff, 7); |
42 | if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7)) | 42 | if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7)) |
43 | bb_error_msg_and_die("This is not a valid binary keymap."); | 43 | bb_error_msg_and_die("this is not a valid binary keymap"); |
44 | 44 | ||
45 | xread(0, flags, MAX_NR_KEYMAPS); | 45 | xread(0, flags, MAX_NR_KEYMAPS); |
46 | 46 | ||
diff --git a/coreutils/chown.c b/coreutils/chown.c index b73f66a89..42f973f32 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c | |||
@@ -30,7 +30,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, | |||
30 | (gid == (gid_t)-1) ? statbuf->st_gid : gid)) { | 30 | (gid == (gid_t)-1) ? statbuf->st_gid : gid)) { |
31 | return TRUE; | 31 | return TRUE; |
32 | } | 32 | } |
33 | bb_perror_msg("%s", fileName); /* A filename could have % in it... */ | 33 | bb_perror_msg("%s", fileName); /* A filename can have % in it... */ |
34 | return FALSE; | 34 | return FALSE; |
35 | } | 35 | } |
36 | 36 | ||
diff --git a/coreutils/du.c b/coreutils/du.c index f61d978b7..efc449097 100644 --- a/coreutils/du.c +++ b/coreutils/du.c | |||
@@ -165,7 +165,7 @@ int du_main(int argc, char **argv) | |||
165 | } | 165 | } |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | /* Note: SUSv3 specifies that -a and -s options can not be used together | 168 | /* Note: SUSv3 specifies that -a and -s options cannot be used together |
169 | * in strictly conforming applications. However, it also says that some | 169 | * in strictly conforming applications. However, it also says that some |
170 | * du implementations may produce output when -a and -s are used together. | 170 | * du implementations may produce output when -a and -s are used together. |
171 | * gnu du exits with an error code in this case. We choose to simply | 171 | * gnu du exits with an error code in this case. We choose to simply |
diff --git a/coreutils/expr.c b/coreutils/expr.c index e7fdc5f1e..ea99d8b5b 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c | |||
@@ -250,7 +250,7 @@ of a basic regular expression is not portable; it is being ignored", pv->u.s); | |||
250 | memset(&re_buffer, 0, sizeof(re_buffer)); | 250 | memset(&re_buffer, 0, sizeof(re_buffer)); |
251 | memset(re_regs, 0, sizeof(*re_regs)); | 251 | memset(re_regs, 0, sizeof(*re_regs)); |
252 | if (regcomp(&re_buffer, pv->u.s, 0) != 0) | 252 | if (regcomp(&re_buffer, pv->u.s, 0) != 0) |
253 | bb_error_msg_and_die("Invalid regular expression"); | 253 | bb_error_msg_and_die("invalid regular expression"); |
254 | 254 | ||
255 | /* expr uses an anchored pattern match, so check that there was a | 255 | /* expr uses an anchored pattern match, so check that there was a |
256 | * match and that the match starts at offset 0. */ | 256 | * match and that the match starts at offset 0. */ |
diff --git a/coreutils/install.c b/coreutils/install.c index 2178d435d..54adc2b6e 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
@@ -61,7 +61,7 @@ int install_main(int argc, char **argv) | |||
61 | umask(0); | 61 | umask(0); |
62 | 62 | ||
63 | /* Create directories | 63 | /* Create directories |
64 | * dont use bb_make_directory() as it cant change uid or gid | 64 | * don't use bb_make_directory() as it can't change uid or gid |
65 | * perhaps bb_make_directory() should be improved. | 65 | * perhaps bb_make_directory() should be improved. |
66 | */ | 66 | */ |
67 | if (flags & INSTALL_OPT_DIRECTORY) { | 67 | if (flags & INSTALL_OPT_DIRECTORY) { |
@@ -77,7 +77,7 @@ int install_main(int argc, char **argv) | |||
77 | } | 77 | } |
78 | if (mkdir(*argv, mode) == -1) { | 78 | if (mkdir(*argv, mode) == -1) { |
79 | if (errno != EEXIST) { | 79 | if (errno != EEXIST) { |
80 | bb_perror_msg("coulnt create %s", *argv); | 80 | bb_perror_msg("cannot create %s", *argv); |
81 | ret = EXIT_FAILURE; | 81 | ret = EXIT_FAILURE; |
82 | break; | 82 | break; |
83 | } | 83 | } |
diff --git a/coreutils/nohup.c b/coreutils/nohup.c index 439fbb173..21adfc1c3 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c | |||
@@ -42,12 +42,12 @@ int nohup_main(int argc, char **argv) | |||
42 | * Else redirect to /dev/null. | 42 | * Else redirect to /dev/null. |
43 | */ | 43 | */ |
44 | temp = isatty(STDERR_FILENO); | 44 | temp = isatty(STDERR_FILENO); |
45 | if (temp) bb_error_msg("Appending to %s", nohupout); | 45 | if (temp) bb_error_msg("appending to %s", nohupout); |
46 | dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO); | 46 | dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO); |
47 | close(nullfd); | 47 | close(nullfd); |
48 | signal (SIGHUP, SIG_IGN); | 48 | signal (SIGHUP, SIG_IGN); |
49 | 49 | ||
50 | execvp(argv[1],argv+1); | 50 | execvp(argv[1],argv+1); |
51 | if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout); | 51 | if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout); |
52 | bb_perror_msg_and_die("%s",argv[1]); | 52 | bb_perror_msg_and_die("%s", argv[1]); |
53 | } | 53 | } |
diff --git a/coreutils/realpath.c b/coreutils/realpath.c index 993fa1c9d..0fd2c7625 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c | |||
@@ -5,7 +5,7 @@ | |||
5 | /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) | 5 | /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) |
6 | * | 6 | * |
7 | * Now does proper error checking on output and returns a failure exit code | 7 | * Now does proper error checking on output and returns a failure exit code |
8 | * if one or more paths can not be resolved. | 8 | * if one or more paths cannot be resolved. |
9 | * | 9 | * |
10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
11 | */ | 11 | */ |
diff --git a/e2fsprogs/blkid/cache.c b/e2fsprogs/blkid/cache.c index 57118e1d4..9bae6fb67 100644 --- a/e2fsprogs/blkid/cache.c +++ b/e2fsprogs/blkid/cache.c | |||
@@ -102,7 +102,7 @@ int main(int argc, char** argv) | |||
102 | 102 | ||
103 | blkid_debug_mask = DEBUG_ALL; | 103 | blkid_debug_mask = DEBUG_ALL; |
104 | if ((argc > 2)) { | 104 | if ((argc > 2)) { |
105 | fprintf(stderr, "Usage: %s [filename] \n", argv[0]); | 105 | fprintf(stderr, "Usage: %s [filename]\n", argv[0]); |
106 | exit(1); | 106 | exit(1); |
107 | } | 107 | } |
108 | 108 | ||
diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c index be93666be..4f3dd93cd 100644 --- a/e2fsprogs/blkid/devno.c +++ b/e2fsprogs/blkid/devno.c | |||
@@ -170,7 +170,7 @@ char *blkid_devno_to_devname(dev_t devno) | |||
170 | 170 | ||
171 | if (!devname) { | 171 | if (!devname) { |
172 | DBG(DEBUG_DEVNO, | 172 | DBG(DEBUG_DEVNO, |
173 | printf("blkid: couldn't find devno 0x%04lx\n", | 173 | printf("blkid: cannot find devno 0x%04lx\n", |
174 | (unsigned long) devno)); | 174 | (unsigned long) devno)); |
175 | } else { | 175 | } else { |
176 | DBG(DEBUG_DEVNO, | 176 | DBG(DEBUG_DEVNO, |
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c index 09712bab7..3bbd4c1f4 100644 --- a/e2fsprogs/blkid/tag.c +++ b/e2fsprogs/blkid/tag.c | |||
@@ -408,7 +408,7 @@ int main(int argc, char **argv) | |||
408 | 408 | ||
409 | dev = blkid_get_dev(cache, devname, flags); | 409 | dev = blkid_get_dev(cache, devname, flags); |
410 | if (!dev) { | 410 | if (!dev) { |
411 | fprintf(stderr, "%s: Can not find device in blkid cache\n"); | 411 | fprintf(stderr, "%s: cannot find device in blkid cache\n"); |
412 | exit(1); | 412 | exit(1); |
413 | } | 413 | } |
414 | if (search_type) { | 414 | if (search_type) { |
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index 28139f4ea..77edbd871 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c | |||
@@ -6721,7 +6721,7 @@ static int update_dir_block(ext2_filsys fs FSCK_ATTR((unused)), | |||
6721 | * Then, pass3 interates over all directory inodes; for each directory | 6721 | * Then, pass3 interates over all directory inodes; for each directory |
6722 | * it attempts to trace up the filesystem tree, using dirinfo.parent | 6722 | * it attempts to trace up the filesystem tree, using dirinfo.parent |
6723 | * until it reaches a directory which has been marked "done". If it | 6723 | * until it reaches a directory which has been marked "done". If it |
6724 | * can not do so, then the directory must be disconnected, and e2fsck | 6724 | * cannot do so, then the directory must be disconnected, and e2fsck |
6725 | * will offer to reconnect it to /lost+found. While it is chasing | 6725 | * will offer to reconnect it to /lost+found. While it is chasing |
6726 | * parent pointers up the filesystem tree, if pass3 sees a directory | 6726 | * parent pointers up the filesystem tree, if pass3 sees a directory |
6727 | * twice, then it has detected a filesystem loop, and it will again | 6727 | * twice, then it has detected a filesystem loop, and it will again |
@@ -8587,7 +8587,7 @@ static const struct e2fsck_problem problem_table[] = { | |||
8587 | 8587 | ||
8588 | /* Bad primary block */ | 8588 | /* Bad primary block */ |
8589 | { PR_1_BAD_PRIMARY_BLOCK, | 8589 | { PR_1_BAD_PRIMARY_BLOCK, |
8590 | N_("\nIf the @b is really bad, the @f can not be fixed.\n"), | 8590 | N_("\nIf the @b is really bad, the @f cannot be fixed.\n"), |
8591 | PROMPT_NONE, PR_AFTER_CODE, PR_1_BAD_PRIMARY_BLOCK_PROMPT }, | 8591 | PROMPT_NONE, PR_AFTER_CODE, PR_1_BAD_PRIMARY_BLOCK_PROMPT }, |
8592 | 8592 | ||
8593 | /* Bad primary block prompt */ | 8593 | /* Bad primary block prompt */ |
@@ -8952,7 +8952,7 @@ static const struct e2fsck_problem problem_table[] = { | |||
8952 | 8952 | ||
8953 | /* File has duplicate blocks */ | 8953 | /* File has duplicate blocks */ |
8954 | { PR_1D_DUP_FILE, | 8954 | { PR_1D_DUP_FILE, |
8955 | N_("File %Q (@i #%i, mod time %IM) \n" | 8955 | N_("File %Q (@i #%i, mod time %IM)\n" |
8956 | " has %B @m @b(s), shared with %N file(s):\n"), | 8956 | " has %B @m @b(s), shared with %N file(s):\n"), |
8957 | PROMPT_NONE, 0 }, | 8957 | PROMPT_NONE, 0 }, |
8958 | 8958 | ||
diff --git a/e2fsprogs/ext2fs/test_io.c b/e2fsprogs/ext2fs/test_io.c index fb029e2f1..bd74225c0 100644 --- a/e2fsprogs/ext2fs/test_io.c +++ b/e2fsprogs/ext2fs/test_io.c | |||
@@ -111,7 +111,7 @@ static void test_dump_block(io_channel channel, | |||
111 | for (i=0, cp = buf; i < channel->block_size; i++, cp++) { | 111 | for (i=0, cp = buf; i < channel->block_size; i++, cp++) { |
112 | cksum += *cp; | 112 | cksum += *cp; |
113 | } | 113 | } |
114 | fprintf(f, "Contents of block %lu, checksum %08lu: \n", block, cksum); | 114 | fprintf(f, "Contents of block %lu, checksum %08lu:\n", block, cksum); |
115 | for (i=0, cp = buf; i < channel->block_size; i++, cp++) { | 115 | for (i=0, cp = buf; i < channel->block_size; i++, cp++) { |
116 | if ((i % 16) == 0) | 116 | if ((i % 16) == 0) |
117 | fprintf(f, "%04x: ", i); | 117 | fprintf(f, "%04x: ", i); |
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index e2f600329..06ba4b206 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c | |||
@@ -102,7 +102,7 @@ struct fsck_instance { | |||
102 | * Return the "base device" given a particular device; this is used to | 102 | * Return the "base device" given a particular device; this is used to |
103 | * assure that we only fsck one partition on a particular drive at any | 103 | * assure that we only fsck one partition on a particular drive at any |
104 | * one time. Otherwise, the disk heads will be seeking all over the | 104 | * one time. Otherwise, the disk heads will be seeking all over the |
105 | * place. If the base device can not be determined, return NULL. | 105 | * place. If the base device cannot be determined, return NULL. |
106 | * | 106 | * |
107 | * The base_device() function returns an allocated string which must | 107 | * The base_device() function returns an allocated string which must |
108 | * be freed. | 108 | * be freed. |
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c index f2cce75a3..30110f8b6 100644 --- a/e2fsprogs/mke2fs.c +++ b/e2fsprogs/mke2fs.c | |||
@@ -247,7 +247,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list) | |||
247 | mke2fs_verbose("Running command: %s\n", buf); | 247 | mke2fs_verbose("Running command: %s\n", buf); |
248 | f = popen(buf, "r"); | 248 | f = popen(buf, "r"); |
249 | if (!f) { | 249 | if (!f) { |
250 | bb_perror_msg_and_die("Could not run '%s'", buf); | 250 | bb_perror_msg_and_die("cannot run '%s'", buf); |
251 | } | 251 | } |
252 | retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); | 252 | retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); |
253 | pclose(f); | 253 | pclose(f); |
@@ -1332,7 +1332,7 @@ int mke2fs_main (int argc, char *argv[]) | |||
1332 | retval = zero_blocks(fs, start, blocks - start, | 1332 | retval = zero_blocks(fs, start, blocks - start, |
1333 | NULL, &ret_blk, NULL); | 1333 | NULL, &ret_blk, NULL); |
1334 | 1334 | ||
1335 | mke2fs_warning_msg(retval, "could not zero block %u at end of filesystem", ret_blk); | 1335 | mke2fs_warning_msg(retval, "cannot zero block %u at end of filesystem", ret_blk); |
1336 | write_inode_tables(fs); | 1336 | write_inode_tables(fs); |
1337 | create_root_dir(fs); | 1337 | create_root_dir(fs); |
1338 | create_lost_and_found(fs); | 1338 | create_lost_and_found(fs); |
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c index 01ba31c68..d22deede2 100644 --- a/e2fsprogs/tune2fs.c +++ b/e2fsprogs/tune2fs.c | |||
@@ -615,7 +615,7 @@ int tune2fs_main(int argc, char **argv) | |||
615 | } | 615 | } |
616 | retval = ext2fs_check_if_mounted(device_name, &mount_flags); | 616 | retval = ext2fs_check_if_mounted(device_name, &mount_flags); |
617 | if (retval) | 617 | if (retval) |
618 | bb_error_msg_and_die("Could not determine if %s is mounted", device_name); | 618 | bb_error_msg_and_die("cannot determine if %s is mounted", device_name); |
619 | /* Normally we only need to write out the superblock */ | 619 | /* Normally we only need to write out the superblock */ |
620 | fs->flags |= EXT2_FLAG_SUPER_ONLY; | 620 | fs->flags |= EXT2_FLAG_SUPER_ONLY; |
621 | 621 | ||
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c index e68c457e7..b30c294b8 100644 --- a/e2fsprogs/util.c +++ b/e2fsprogs/util.c | |||
@@ -82,7 +82,7 @@ void check_mount(const char *device, int force, const char *type) | |||
82 | 82 | ||
83 | retval = ext2fs_check_if_mounted(device, &mount_flags); | 83 | retval = ext2fs_check_if_mounted(device, &mount_flags); |
84 | if (retval) { | 84 | if (retval) { |
85 | bb_error_msg("Could not determine if %s is mounted", device); | 85 | bb_error_msg("cannot determine if %s is mounted", device); |
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | if (mount_flags & EXT2_MF_MOUNTED) { | 88 | if (mount_flags & EXT2_MF_MOUNTED) { |
@@ -219,7 +219,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo | |||
219 | EXT2_FLAG_JOURNAL_DEV_OK, 0, | 219 | EXT2_FLAG_JOURNAL_DEV_OK, 0, |
220 | fs->blocksize, io_ptr, &jfs); | 220 | fs->blocksize, io_ptr, &jfs); |
221 | if (retval) | 221 | if (retval) |
222 | bb_error_msg_and_die("Could not journal device %s", journal_device); | 222 | bb_error_msg_and_die("cannot journal device %s", journal_device); |
223 | if(!quiet) | 223 | if(!quiet) |
224 | printf("Adding journal to device %s: ", journal_device); | 224 | printf("Adding journal to device %s: ", journal_device); |
225 | fflush(stdout); | 225 | fflush(stdout); |
@@ -248,7 +248,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in | |||
248 | retval = ext2fs_add_journal_inode(fs, journal_blocks, | 248 | retval = ext2fs_add_journal_inode(fs, journal_blocks, |
249 | journal_flags); | 249 | journal_flags); |
250 | if(retval) | 250 | if(retval) |
251 | bb_error_msg_and_die("Could not create journal"); | 251 | bb_error_msg_and_die("cannot create journal"); |
252 | if(!quiet) | 252 | if(!quiet) |
253 | puts("done"); | 253 | puts("done"); |
254 | } | 254 | } |
diff --git a/editors/awk.c b/editors/awk.c index e74053e75..e91c37678 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -2716,7 +2716,7 @@ keep_going: | |||
2716 | free(s); | 2716 | free(s); |
2717 | } | 2717 | } |
2718 | if (opt & 0x8) // -W | 2718 | if (opt & 0x8) // -W |
2719 | bb_error_msg("Warning: unrecognized option '-W %s' ignored", opt_W); | 2719 | bb_error_msg("warning: unrecognized option '-W %s' ignored", opt_W); |
2720 | 2720 | ||
2721 | if (!from_file) { | 2721 | if (!from_file) { |
2722 | if (argc == optind) | 2722 | if (argc == optind) |
diff --git a/editors/patch.c b/editors/patch.c index 545e70b50..4ddcd004d 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -37,7 +37,7 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign | |||
37 | break; | 37 | break; |
38 | } | 38 | } |
39 | if (fputs(line, dest_stream) == EOF) { | 39 | if (fputs(line, dest_stream) == EOF) { |
40 | bb_perror_msg_and_die("Error writing to new file"); | 40 | bb_perror_msg_and_die("error writing to new file"); |
41 | } | 41 | } |
42 | free(line); | 42 | free(line); |
43 | 43 | ||
@@ -125,7 +125,7 @@ int patch_main(int argc, char **argv) | |||
125 | patch_line = xmalloc_fgets(patch_file); | 125 | patch_line = xmalloc_fgets(patch_file); |
126 | if (strncmp(patch_line, "+++ ", 4) != 0) { | 126 | if (strncmp(patch_line, "+++ ", 4) != 0) { |
127 | ret = 2; | 127 | ret = 2; |
128 | bb_error_msg("Invalid patch"); | 128 | bb_error_msg("invalid patch"); |
129 | continue; | 129 | continue; |
130 | } | 130 | } |
131 | new_filename = extract_filename(patch_line, patch_level); | 131 | new_filename = extract_filename(patch_line, patch_level); |
@@ -189,7 +189,7 @@ int patch_main(int argc, char **argv) | |||
189 | /* src_beg_line will be 0 if its a new file */ | 189 | /* src_beg_line will be 0 if its a new file */ |
190 | count = src_beg_line - src_cur_line; | 190 | count = src_beg_line - src_cur_line; |
191 | if (copy_lines(src_stream, dst_stream, count) != count) { | 191 | if (copy_lines(src_stream, dst_stream, count) != count) { |
192 | bb_error_msg_and_die("Bad src file"); | 192 | bb_error_msg_and_die("bad src file"); |
193 | } | 193 | } |
194 | src_cur_line += count; | 194 | src_cur_line += count; |
195 | dest_cur_line += count; | 195 | dest_cur_line += count; |
@@ -209,7 +209,7 @@ int patch_main(int argc, char **argv) | |||
209 | src_cur_line++; | 209 | src_cur_line++; |
210 | } | 210 | } |
211 | if (strcmp(src_line, patch_line + 1) != 0) { | 211 | if (strcmp(src_line, patch_line + 1) != 0) { |
212 | bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start); | 212 | bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start); |
213 | hunk_error++; | 213 | hunk_error++; |
214 | free(patch_line); | 214 | free(patch_line); |
215 | break; | 215 | break; |
diff --git a/editors/vi.c b/editors/vi.c index a25e96657..82985ced0 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -1802,7 +1802,7 @@ static Byte *yank_delete(Byte * start, Byte * stop, int dist, int yf) | |||
1802 | stop = p; | 1802 | stop = p; |
1803 | } | 1803 | } |
1804 | if (dist <= 0) { | 1804 | if (dist <= 0) { |
1805 | // we can not cross NL boundaries | 1805 | // we cannot cross NL boundaries |
1806 | p = start; | 1806 | p = start; |
1807 | if (*p == '\n') | 1807 | if (*p == '\n') |
1808 | return (p); | 1808 | return (p); |
diff --git a/findutils/xargs.c b/findutils/xargs.c index e7cc7c379..029d4077d 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
@@ -431,7 +431,7 @@ int xargs_main(int argc, char **argv) | |||
431 | n_chars += strlen(*argv) + 1; | 431 | n_chars += strlen(*argv) + 1; |
432 | } | 432 | } |
433 | if (n_max_chars < n_chars) { | 433 | if (n_max_chars < n_chars) { |
434 | bb_error_msg_and_die("can not fit single argument within argument list size limit"); | 434 | bb_error_msg_and_die("cannot fit single argument within argument list size limit"); |
435 | } | 435 | } |
436 | n_max_chars -= n_chars; | 436 | n_max_chars -= n_chars; |
437 | } else { | 437 | } else { |
diff --git a/include/usage.h b/include/usage.h index 287d5a1c8..ffd00cfc8 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -762,8 +762,8 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
762 | "\t( EXPRESSION ) value of EXPRESSION\n\n" \ | 762 | "\t( EXPRESSION ) value of EXPRESSION\n\n" \ |
763 | "Beware that many operators need to be escaped or quoted for shells.\n" \ | 763 | "Beware that many operators need to be escaped or quoted for shells.\n" \ |
764 | "Comparisons are arithmetic if both ARGs are numbers, else\n" \ | 764 | "Comparisons are arithmetic if both ARGs are numbers, else\n" \ |
765 | "lexicographical. Pattern matches return the string matched between \n" \ | 765 | "lexicographical. Pattern matches return the string matched between\n" \ |
766 | "\\( and \\) or null; if \\( and \\) are not used, they return the number \n" \ | 766 | "\\( and \\) or null; if \\( and \\) are not used, they return the number\n" \ |
767 | "of characters matched or 0." | 767 | "of characters matched or 0." |
768 | 768 | ||
769 | #define fakeidentd_trivial_usage \ | 769 | #define fakeidentd_trivial_usage \ |
@@ -1272,10 +1272,10 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
1272 | "This version of init is designed to be run only by the kernel.\n" \ | 1272 | "This version of init is designed to be run only by the kernel.\n" \ |
1273 | "\n" \ | 1273 | "\n" \ |
1274 | "BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \ | 1274 | "BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \ |
1275 | "the /etc/inittab file is completely ignored by BusyBox init. If you want \n" \ | 1275 | "the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \ |
1276 | "runlevels, use sysvinit.\n" \ | 1276 | "runlevels, use sysvinit.\n" \ |
1277 | "\n" \ | 1277 | "\n" \ |
1278 | "BusyBox init works just fine without an inittab. If no inittab is found, \n" \ | 1278 | "BusyBox init works just fine without an inittab. If no inittab is found,\n" \ |
1279 | "it has the following default behavior:\n" \ | 1279 | "it has the following default behavior:\n" \ |
1280 | "\n" \ | 1280 | "\n" \ |
1281 | " ::sysinit:/etc/init.d/rcS\n" \ | 1281 | " ::sysinit:/etc/init.d/rcS\n" \ |
@@ -2898,7 +2898,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \ | |||
2898 | USE_FEATURE_FANCY_TAIL( "\n\t-q\t\tnever output headers giving file names\n" \ | 2898 | USE_FEATURE_FANCY_TAIL( "\n\t-q\t\tnever output headers giving file names\n" \ |
2899 | "\t-s SEC\t\twait SEC seconds between reads with -f\n" \ | 2899 | "\t-s SEC\t\twait SEC seconds between reads with -f\n" \ |
2900 | "\t-v\t\talways output headers giving file names\n\n" \ | 2900 | "\t-v\t\talways output headers giving file names\n\n" \ |
2901 | "If the first character of N (bytes or lines) is a '+', output begins with \n" \ | 2901 | "If the first character of N (bytes or lines) is a '+', output begins with\n" \ |
2902 | "the Nth item from the start of each file, otherwise, print the last N items\n" \ | 2902 | "the Nth item from the start of each file, otherwise, print the last N items\n" \ |
2903 | "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." ) | 2903 | "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." ) |
2904 | #define tail_example_usage \ | 2904 | #define tail_example_usage \ |
@@ -3156,7 +3156,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \ | |||
3156 | "\n\t-f\tForce umount (i.e., unreachable NFS server)" \ | 3156 | "\n\t-f\tForce umount (i.e., unreachable NFS server)" \ |
3157 | USE_FEATURE_MOUNT_LOOP("\n\t-D\tDo not free loop device (if a loop device has been used)") | 3157 | USE_FEATURE_MOUNT_LOOP("\n\t-D\tDo not free loop device (if a loop device has been used)") |
3158 | #define umount_example_usage \ | 3158 | #define umount_example_usage \ |
3159 | "$ umount /dev/hdc1 \n" | 3159 | "$ umount /dev/hdc1\n" |
3160 | 3160 | ||
3161 | #define uname_trivial_usage \ | 3161 | #define uname_trivial_usage \ |
3162 | "[OPTION]..." | 3162 | "[OPTION]..." |
diff --git a/init/halt.c b/init/halt.c index 9e3cbb1cf..3ab41f1f2 100644 --- a/init/halt.c +++ b/init/halt.c | |||
@@ -48,6 +48,6 @@ RB_AUTOBOOT | |||
48 | if (rc) rc = kill(1,signals[which]); | 48 | if (rc) rc = kill(1,signals[which]); |
49 | } else rc = reboot(magic[which]); | 49 | } else rc = reboot(magic[which]); |
50 | 50 | ||
51 | if (rc) bb_error_msg("No."); | 51 | if (rc) bb_error_msg("no"); |
52 | return rc; | 52 | return rc; |
53 | } | 53 | } |
diff --git a/init/init.c b/init/init.c index 99a11e526..beb2b28f0 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -211,7 +211,7 @@ static void message(int device, const char *fmt, ...) | |||
211 | if (log_fd < 0) { | 211 | if (log_fd < 0) { |
212 | if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) { | 212 | if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) { |
213 | log_fd = -2; | 213 | log_fd = -2; |
214 | bb_error_msg("Bummer, can't write to log on %s!", log_console); | 214 | bb_error_msg("bummer, can't write to log on %s!", log_console); |
215 | device = CONSOLE; | 215 | device = CONSOLE; |
216 | } else { | 216 | } else { |
217 | fcntl(log_fd, F_SETFD, FD_CLOEXEC); | 217 | fcntl(log_fd, F_SETFD, FD_CLOEXEC); |
@@ -232,7 +232,7 @@ static void message(int device, const char *fmt, ...) | |||
232 | #if ENABLE_DEBUG_INIT | 232 | #if ENABLE_DEBUG_INIT |
233 | /* all descriptors may be closed */ | 233 | /* all descriptors may be closed */ |
234 | } else { | 234 | } else { |
235 | bb_error_msg("Bummer, can't print: "); | 235 | bb_error_msg("bummer, can't print: "); |
236 | va_start(arguments, fmt); | 236 | va_start(arguments, fmt); |
237 | vfprintf(stderr, fmt, arguments); | 237 | vfprintf(stderr, fmt, arguments); |
238 | va_end(arguments); | 238 | va_end(arguments); |
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c index 3a214ca33..1776fa4f6 100644 --- a/libbb/bb_pwd.c +++ b/libbb/bb_pwd.c | |||
@@ -65,7 +65,7 @@ long bb_xgetpwnam(const char *name) | |||
65 | /* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more | 65 | /* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more |
66 | * flexible : | 66 | * flexible : |
67 | * | 67 | * |
68 | * if bufsize is > 0 char *name can not be set to NULL. | 68 | * if bufsize is > 0 char *name cannot be set to NULL. |
69 | * On success username is written on the static allocated | 69 | * On success username is written on the static allocated |
70 | * buffer name (and a pointer to it is returned). | 70 | * buffer name (and a pointer to it is returned). |
71 | * On failure uid as string is written to the static | 71 | * On failure uid as string is written to the static |
@@ -89,7 +89,7 @@ char * bb_getpwuid(char *name, long uid, int bufsize) | |||
89 | } | 89 | } |
90 | 90 | ||
91 | /* | 91 | /* |
92 | * if bufsize is > 0 char *buffer can not be set to NULL. | 92 | * if bufsize is > 0 char *buffer cannot be set to NULL. |
93 | * If idname is not NULL it is written on the static | 93 | * If idname is not NULL it is written on the static |
94 | * allocated buffer (and a pointer to it is returned). | 94 | * allocated buffer (and a pointer to it is returned). |
95 | * if idname is NULL, id as string is written to the static | 95 | * if idname is NULL, id as string is written to the static |
diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 01a864119..fbec4e20e 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c | |||
@@ -99,6 +99,6 @@ int bb_make_directory (char *path, long mode, int flags) | |||
99 | 99 | ||
100 | } while (1); | 100 | } while (1); |
101 | 101 | ||
102 | bb_perror_msg ("Cannot %s directory `%s'", fail_msg, path); | 102 | bb_perror_msg ("cannot %s directory '%s'", fail_msg, path); |
103 | return -1; | 103 | return -1; |
104 | } | 104 | } |
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 0a5abb878..0a6d90de5 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -265,7 +265,7 @@ void xsetgid(gid_t gid) | |||
265 | if (setgid(gid)) bb_error_msg_and_die("setgid"); | 265 | if (setgid(gid)) bb_error_msg_and_die("setgid"); |
266 | } | 266 | } |
267 | 267 | ||
268 | // Die with an error message if we cant' set uid. (See xsetgid() for why.) | 268 | // Die with an error message if we can't set uid. (See xsetgid() for why.) |
269 | void xsetuid(uid_t uid) | 269 | void xsetuid(uid_t uid) |
270 | { | 270 | { |
271 | if (setuid(uid)) bb_error_msg_and_die("setuid"); | 271 | if (setuid(uid)) bb_error_msg_and_die("setuid"); |
diff --git a/loginutils/adduser.c b/loginutils/adduser.c index a99f47d68..e358f70eb 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c | |||
@@ -81,7 +81,7 @@ static void passwd_wrapper(const char *login) | |||
81 | { | 81 | { |
82 | static const char prog[] = "passwd"; | 82 | static const char prog[] = "passwd"; |
83 | execlp(prog, prog, login, NULL); | 83 | execlp(prog, prog, login, NULL); |
84 | bb_error_msg_and_die("Failed to execute '%s', you must set the password for '%s' manually", prog, login); | 84 | bb_error_msg_and_die("failed to execute '%s', you must set the password for '%s' manually", prog, login); |
85 | } | 85 | } |
86 | 86 | ||
87 | /* putpwent(3) remix */ | 87 | /* putpwent(3) remix */ |
diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 9ab097b77..7a44d9405 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c | |||
@@ -58,7 +58,7 @@ int vlock_main(int argc, char **argv) | |||
58 | o_lock_all = getopt32(argc, argv, "a"); | 58 | o_lock_all = getopt32(argc, argv, "a"); |
59 | 59 | ||
60 | if((pw = getpwuid(getuid())) == NULL) { | 60 | if((pw = getpwuid(getuid())) == NULL) { |
61 | bb_error_msg_and_die("Unknown uid %d", getuid()); | 61 | bb_error_msg_and_die("unknown uid %d", getuid()); |
62 | } | 62 | } |
63 | 63 | ||
64 | vfd = xopen(CURRENT_TTY, O_RDWR); | 64 | vfd = xopen(CURRENT_TTY, O_RDWR); |
diff --git a/miscutils/crond.c b/miscutils/crond.c index eaed1ea69..4fc940b79 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -314,7 +314,7 @@ static void startlogger(void) | |||
314 | if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) { | 314 | if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) { |
315 | close(logfd); | 315 | close(logfd); |
316 | } else { | 316 | } else { |
317 | bb_perror_msg("Failed to open log file '%s' reason", LogFile); | 317 | bb_perror_msg("failed to open log file '%s': ", LogFile); |
318 | } | 318 | } |
319 | } | 319 | } |
320 | #endif | 320 | #endif |
@@ -883,7 +883,7 @@ ForkJob(const char *user, CronLine * line, int mailFd, | |||
883 | exit(0); | 883 | exit(0); |
884 | } else if (pid < 0) { | 884 | } else if (pid < 0) { |
885 | /* FORK FAILED */ | 885 | /* FORK FAILED */ |
886 | crondlog("\024couldn't fork, user %s\n", user); | 886 | crondlog("\024cannot fork, user %s\n", user); |
887 | line->cl_Pid = 0; | 887 | line->cl_Pid = 0; |
888 | if (mailf) { | 888 | if (mailf) { |
889 | remove(mailf); | 889 | remove(mailf); |
@@ -1008,7 +1008,7 @@ static void RunJob(const char *user, CronLine * line) | |||
1008 | exit(0); | 1008 | exit(0); |
1009 | } else if (pid < 0) { | 1009 | } else if (pid < 0) { |
1010 | /* FORK FAILED */ | 1010 | /* FORK FAILED */ |
1011 | crondlog("\024couldn't fork, user %s\n", user); | 1011 | crondlog("\024cannot, user %s\n", user); |
1012 | pid = 0; | 1012 | pid = 0; |
1013 | } | 1013 | } |
1014 | line->cl_Pid = pid; | 1014 | line->cl_Pid = pid; |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 1c9a99e13..a30f4e0d7 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -595,7 +595,7 @@ static void identify(uint16_t *id_supplied) | |||
595 | } | 595 | } |
596 | else | 596 | else |
597 | /*"Unknown device type:\n\tbits 15&14 of general configuration word 0 both set to 1.\n"*/ | 597 | /*"Unknown device type:\n\tbits 15&14 of general configuration word 0 both set to 1.\n"*/ |
598 | bb_error_msg_and_die("Unknown device type"); | 598 | bb_error_msg_and_die("unknown device type"); |
599 | 599 | ||
600 | printf("%sremovable media\n", !(val[GEN_CONFIG] & MEDIA_REMOVABLE) ? "non-" : ""); | 600 | printf("%sremovable media\n", !(val[GEN_CONFIG] & MEDIA_REMOVABLE) ? "non-" : ""); |
601 | /* Info from the specific configuration word says whether or not the | 601 | /* Info from the specific configuration word says whether or not the |
diff --git a/miscutils/less.c b/miscutils/less.c index 63389dcd7..11f1d8baa 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -1113,7 +1113,7 @@ int less_main(int argc, char **argv) { | |||
1113 | if (ttyname(STDIN_FILENO) == NULL) | 1113 | if (ttyname(STDIN_FILENO) == NULL) |
1114 | inp_stdin = 1; | 1114 | inp_stdin = 1; |
1115 | else { | 1115 | else { |
1116 | bb_error_msg("Missing filename"); | 1116 | bb_error_msg("missing filename"); |
1117 | bb_show_usage(); | 1117 | bb_show_usage(); |
1118 | } | 1118 | } |
1119 | } | 1119 | } |
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 6ff5cc223..3bc1559c7 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
@@ -53,7 +53,7 @@ int makedevs_main(int argc, char **argv) | |||
53 | /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */ | 53 | /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */ |
54 | 54 | ||
55 | if (mknod(nodname, mode, makedev(Smajor, Sminor))) | 55 | if (mknod(nodname, mode, makedev(Smajor, Sminor))) |
56 | bb_error_msg("Failed to create: %s", nodname); | 56 | bb_error_msg("failed to create: %s", nodname); |
57 | 57 | ||
58 | if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */ | 58 | if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */ |
59 | nodname = buf; | 59 | nodname = buf; |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 882fcf80f..00e25f5e3 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -4113,7 +4113,7 @@ int insmod_main( int argc, char **argv) | |||
4113 | 4113 | ||
4114 | if (strncmp(uts_info.release, m_strversion, STRVERSIONLEN) != 0) { | 4114 | if (strncmp(uts_info.release, m_strversion, STRVERSIONLEN) != 0) { |
4115 | if (flag_force_load) { | 4115 | if (flag_force_load) { |
4116 | bb_error_msg("Warning: kernel-module version mismatch\n" | 4116 | bb_error_msg("warning: kernel-module version mismatch\n" |
4117 | "\t%s was compiled for kernel version %s\n" | 4117 | "\t%s was compiled for kernel version %s\n" |
4118 | "\twhile this kernel is version %s", | 4118 | "\twhile this kernel is version %s", |
4119 | m_filename, m_strversion, uts_info.release); | 4119 | m_filename, m_strversion, uts_info.release); |
@@ -4134,7 +4134,7 @@ int insmod_main( int argc, char **argv) | |||
4134 | goto out; | 4134 | goto out; |
4135 | k_crcs = new_is_kernel_checksummed(); | 4135 | k_crcs = new_is_kernel_checksummed(); |
4136 | } else { | 4136 | } else { |
4137 | bb_error_msg("Not configured to support old kernels"); | 4137 | bb_error_msg("not configured to support old kernels"); |
4138 | goto out; | 4138 | goto out; |
4139 | } | 4139 | } |
4140 | 4140 | ||
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index ab595c847..ba24791f9 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -758,7 +758,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t * | |||
758 | } | 758 | } |
759 | } | 759 | } |
760 | else { | 760 | else { |
761 | bb_error_msg ("Bad alias %s", dt-> m_name); | 761 | bb_error_msg ("bad alias %s", dt-> m_name); |
762 | return; | 762 | return; |
763 | } | 763 | } |
764 | } | 764 | } |
@@ -897,7 +897,7 @@ int modprobe_main(int argc, char** argv) | |||
897 | } while ( ++optind < argc ); | 897 | } while ( ++optind < argc ); |
898 | } else { | 898 | } else { |
899 | if (optind >= argc) | 899 | if (optind >= argc) |
900 | bb_error_msg_and_die ( "No module or pattern provided" ); | 900 | bb_error_msg_and_die ( "no module or pattern provided" ); |
901 | 901 | ||
902 | if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 )) | 902 | if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 )) |
903 | bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); | 903 | bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); |
diff --git a/networking/arping.c b/networking/arping.c index b9605985c..e4c9b86a9 100644 --- a/networking/arping.c +++ b/networking/arping.c | |||
@@ -392,7 +392,7 @@ int arping_main(int argc, char **argv) | |||
392 | } | 392 | } |
393 | } | 393 | } |
394 | if (me.sll_halen == 0) { | 394 | if (me.sll_halen == 0) { |
395 | bb_error_msg("Interface \"%s\" is not ARPable (no ll address)", device); | 395 | bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device); |
396 | exit(cfg&dad ? 0 : 2); | 396 | exit(cfg&dad ? 0 : 2); |
397 | } | 397 | } |
398 | he = me; | 398 | he = me; |
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 294a9dd3c..9d616d561 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
@@ -270,7 +270,7 @@ static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd) | |||
270 | byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d", | 270 | byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d", |
271 | &passwd[0], &passwd[1], &passwd[2], &passwd[3]); | 271 | &passwd[0], &passwd[1], &passwd[2], &passwd[3]); |
272 | if (byte_cnt < 4) { | 272 | if (byte_cnt < 4) { |
273 | bb_error_msg("Unable to read the Wake-On-LAN pass"); | 273 | bb_error_msg("unable to read the Wake-On-LAN pass"); |
274 | return 0; | 274 | return 0; |
275 | } | 275 | } |
276 | 276 | ||
diff --git a/networking/httpd.c b/networking/httpd.c index bbb2dfe7f..803c45e6e 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1317,7 +1317,7 @@ static int sendFile(const char *url) | |||
1317 | close(f); | 1317 | close(f); |
1318 | } else { | 1318 | } else { |
1319 | #if DEBUG | 1319 | #if DEBUG |
1320 | bb_perror_msg("Unable to open '%s'", url); | 1320 | bb_perror_msg("unable to open '%s'", url); |
1321 | #endif | 1321 | #endif |
1322 | sendHeaders(HTTP_NOT_FOUND); | 1322 | sendHeaders(HTTP_NOT_FOUND); |
1323 | } | 1323 | } |
diff --git a/networking/interface.c b/networking/interface.c index 8e2498d27..4594293e4 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
@@ -325,7 +325,7 @@ static int sockets_open(int family) | |||
325 | sfd = af->fd; | 325 | sfd = af->fd; |
326 | } | 326 | } |
327 | if (sfd < 0) { | 327 | if (sfd < 0) { |
328 | bb_error_msg("No usable address families found."); | 328 | bb_error_msg("no usable address families found"); |
329 | } | 329 | } |
330 | return sfd; | 330 | return sfd; |
331 | } | 331 | } |
@@ -557,7 +557,7 @@ static int if_readlist_proc(char *target) | |||
557 | 557 | ||
558 | fh = fopen(_PATH_PROCNET_DEV, "r"); | 558 | fh = fopen(_PATH_PROCNET_DEV, "r"); |
559 | if (!fh) { | 559 | if (!fh) { |
560 | bb_perror_msg("Warning: cannot open %s. Limited output.", _PATH_PROCNET_DEV); | 560 | bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV); |
561 | return if_readconf(); | 561 | return if_readconf(); |
562 | } | 562 | } |
563 | fgets(buf, sizeof buf, fh); /* eat line */ | 563 | fgets(buf, sizeof buf, fh); /* eat line */ |
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index d9f28374b..f79dab402 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * iplink.c "ip link". | 3 | * iplink.c "ip link". |
4 | * | 4 | * |
5 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> | 5 | * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | */ | 8 | */ |
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | static int on_off(char *msg) | 32 | static int on_off(char *msg) |
33 | { | 33 | { |
34 | bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg); | 34 | bb_error_msg("error: argument of \"%s\" must be \"on\" or \"off\"", msg); |
35 | return -1; | 35 | return -1; |
36 | } | 36 | } |
37 | 37 | ||
@@ -200,7 +200,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr | |||
200 | if (alen < 0) | 200 | if (alen < 0) |
201 | return -1; | 201 | return -1; |
202 | if (alen != halen) { | 202 | if (alen != halen) { |
203 | bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen); | 203 | bb_error_msg("wrong address (%s) length: expected %d bytes", lla, halen); |
204 | return -1; | 204 | return -1; |
205 | } | 205 | } |
206 | return 0; | 206 | return 0; |
@@ -349,6 +349,6 @@ int do_iplink(int argc, char **argv) | |||
349 | } else | 349 | } else |
350 | return ipaddr_list_link(0, NULL); | 350 | return ipaddr_list_link(0, NULL); |
351 | 351 | ||
352 | bb_error_msg("Command \"%s\" is unknown.", *argv); | 352 | bb_error_msg("command \"%s\" is unknown", *argv); |
353 | exit(-1); | 353 | exit(-1); |
354 | } | 354 | } |
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index 094a3b0ac..552f4bf77 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c | |||
@@ -206,10 +206,10 @@ int get_prefix_1(inet_prefix * dst, char *arg, int family) | |||
206 | int get_addr(inet_prefix * dst, char *arg, int family) | 206 | int get_addr(inet_prefix * dst, char *arg, int family) |
207 | { | 207 | { |
208 | if (family == AF_PACKET) { | 208 | if (family == AF_PACKET) { |
209 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg); | 209 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg); |
210 | } | 210 | } |
211 | if (get_addr_1(dst, arg, family)) { | 211 | if (get_addr_1(dst, arg, family)) { |
212 | bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg); | 212 | bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg); |
213 | } | 213 | } |
214 | return 0; | 214 | return 0; |
215 | } | 215 | } |
@@ -217,10 +217,10 @@ int get_addr(inet_prefix * dst, char *arg, int family) | |||
217 | int get_prefix(inet_prefix * dst, char *arg, int family) | 217 | int get_prefix(inet_prefix * dst, char *arg, int family) |
218 | { | 218 | { |
219 | if (family == AF_PACKET) { | 219 | if (family == AF_PACKET) { |
220 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg); | 220 | bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg); |
221 | } | 221 | } |
222 | if (get_prefix_1(dst, arg, family)) { | 222 | if (get_prefix_1(dst, arg, family)) { |
223 | bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg); | 223 | bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg); |
224 | } | 224 | } |
225 | return 0; | 225 | return 0; |
226 | } | 226 | } |
@@ -237,7 +237,7 @@ __u32 get_addr32(char *name) | |||
237 | 237 | ||
238 | void incomplete_command(void) | 238 | void incomplete_command(void) |
239 | { | 239 | { |
240 | bb_error_msg("Command line is not complete. Try option \"help\""); | 240 | bb_error_msg("command line is not complete, try option \"help\""); |
241 | exit(-1); | 241 | exit(-1); |
242 | } | 242 | } |
243 | 243 | ||
@@ -249,13 +249,13 @@ void invarg(const char * const arg, const char * const opt) | |||
249 | 249 | ||
250 | void duparg(char *key, char *arg) | 250 | void duparg(char *key, char *arg) |
251 | { | 251 | { |
252 | bb_error_msg("duplicate \"%s\": \"%s\" is the second value.", key, arg); | 252 | bb_error_msg("duplicate \"%s\": \"%s\" is the second value", key, arg); |
253 | exit(-1); | 253 | exit(-1); |
254 | } | 254 | } |
255 | 255 | ||
256 | void duparg2(char *key, char *arg) | 256 | void duparg2(char *key, char *arg) |
257 | { | 257 | { |
258 | bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage.", key, arg); | 258 | bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage", key, arg); |
259 | exit(-1); | 259 | exit(-1); |
260 | } | 260 | } |
261 | 261 | ||
diff --git a/networking/netstat.c b/networking/netstat.c index 8e481f67b..3dad57a40 100644 --- a/networking/netstat.c +++ b/networking/netstat.c | |||
@@ -575,7 +575,7 @@ int netstat_main(int argc, char **argv) | |||
575 | else | 575 | else |
576 | printf("(w/o servers)"); | 576 | printf("(w/o servers)"); |
577 | } | 577 | } |
578 | printf("\nProto Recv-Q Send-Q Local Address Foreign Address State \n"); | 578 | printf("\nProto Recv-Q Send-Q Local Address Foreign Address State\n"); |
579 | } | 579 | } |
580 | if (inet && flags&NETSTAT_TCP) | 580 | if (inet && flags&NETSTAT_TCP) |
581 | do_info(_PATH_PROCNET_TCP,"AF INET (tcp)",tcp_do_one); | 581 | do_info(_PATH_PROCNET_TCP,"AF INET (tcp)",tcp_do_one); |
diff --git a/networking/ping.c b/networking/ping.c index 8ca8be9b9..ebde007b6 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -317,7 +317,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from) | |||
317 | printf("\n"); | 317 | printf("\n"); |
318 | } else | 318 | } else |
319 | if (icmppkt->icmp_type != ICMP_ECHO) | 319 | if (icmppkt->icmp_type != ICMP_ECHO) |
320 | bb_error_msg("Warning: Got ICMP %d (%s)", | 320 | bb_error_msg("warning: got ICMP %d (%s)", |
321 | icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type)); | 321 | icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type)); |
322 | fflush(stdout); | 322 | fflush(stdout); |
323 | } | 323 | } |
diff --git a/networking/ping6.c b/networking/ping6.c index 0d6a739bf..62dc4cc2d 100644 --- a/networking/ping6.c +++ b/networking/ping6.c | |||
@@ -308,7 +308,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit | |||
308 | printf("\n"); | 308 | printf("\n"); |
309 | } else | 309 | } else |
310 | if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) | 310 | if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) |
311 | bb_error_msg("Warning: Got ICMP %d (%s)", | 311 | bb_error_msg("warning: got ICMP %d (%s)", |
312 | icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type)); | 312 | icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type)); |
313 | } | 313 | } |
314 | 314 | ||
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 086692082..2716a28c6 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c | |||
@@ -81,7 +81,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |||
81 | FD_SET(s, &fdset); | 81 | FD_SET(s, &fdset); |
82 | tm.tv_sec = timeout; | 82 | tm.tv_sec = timeout; |
83 | if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) { | 83 | if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) { |
84 | bb_perror_msg("Error on ARPING request"); | 84 | bb_perror_msg("error on ARPING request"); |
85 | if (errno != EINTR) rv = 0; | 85 | if (errno != EINTR) rv = 0; |
86 | } else if (FD_ISSET(s, &fdset)) { | 86 | } else if (FD_ISSET(s, &fdset)) { |
87 | if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0; | 87 | if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0; |
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 439aa0250..58b26c171 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c | |||
@@ -216,14 +216,14 @@ int get_raw_packet(struct dhcpMessage *payload, int fd) | |||
216 | packet.ip.daddr = dest; | 216 | packet.ip.daddr = dest; |
217 | packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */ | 217 | packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */ |
218 | if (check && check != udhcp_checksum(&packet, bytes)) { | 218 | if (check && check != udhcp_checksum(&packet, bytes)) { |
219 | bb_error_msg("Packet with bad UDP checksum received, ignoring"); | 219 | bb_error_msg("packet with bad UDP checksum received, ignoring"); |
220 | return -2; | 220 | return -2; |
221 | } | 221 | } |
222 | 222 | ||
223 | memcpy(payload, &(packet.data), bytes - (sizeof(packet.ip) + sizeof(packet.udp))); | 223 | memcpy(payload, &(packet.data), bytes - (sizeof(packet.ip) + sizeof(packet.udp))); |
224 | 224 | ||
225 | if (ntohl(payload->cookie) != DHCP_MAGIC) { | 225 | if (ntohl(payload->cookie) != DHCP_MAGIC) { |
226 | bb_error_msg("Received bogus message (bad magic) - ignoring"); | 226 | bb_error_msg("received bogus message (bad magic) - ignoring"); |
227 | return -2; | 227 | return -2; |
228 | } | 228 | } |
229 | DEBUG("oooooh!!! got some!"); | 229 | DEBUG("oooooh!!! got some!"); |
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index ca0c79b95..a0a21fdce 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
@@ -53,7 +53,7 @@ static inline void sanitize_fds(void) | |||
53 | void udhcp_background(const char *pidfile) | 53 | void udhcp_background(const char *pidfile) |
54 | { | 54 | { |
55 | #ifdef __uClinux__ | 55 | #ifdef __uClinux__ |
56 | bb_error_msg("Cannot background in uclinux (yet)"); | 56 | bb_error_msg("cannot background in uclinux (yet)"); |
57 | #else /* __uClinux__ */ | 57 | #else /* __uClinux__ */ |
58 | int pid_fd; | 58 | int pid_fd; |
59 | 59 | ||
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 52d383869..36bcc31d9 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c | |||
@@ -284,7 +284,7 @@ int read_config(const char *file) | |||
284 | keywords[i].handler(keywords[i].def, keywords[i].var); | 284 | keywords[i].handler(keywords[i].def, keywords[i].var); |
285 | 285 | ||
286 | if (!(in = fopen(file, "r"))) { | 286 | if (!(in = fopen(file, "r"))) { |
287 | bb_error_msg("Unable to open config file: %s", file); | 287 | bb_error_msg("unable to open config file: %s", file); |
288 | return 0; | 288 | return 0; |
289 | } | 289 | } |
290 | 290 | ||
@@ -308,7 +308,7 @@ int read_config(const char *file) | |||
308 | for (i = 0; keywords[i].keyword[0]; i++) | 308 | for (i = 0; keywords[i].keyword[0]; i++) |
309 | if (!strcasecmp(token, keywords[i].keyword)) | 309 | if (!strcasecmp(token, keywords[i].keyword)) |
310 | if (!keywords[i].handler(line, keywords[i].var)) { | 310 | if (!keywords[i].handler(line, keywords[i].var)) { |
311 | bb_error_msg("Failure parsing line %d of %s", lm, file); | 311 | bb_error_msg("failure parsing line %d of %s", lm, file); |
312 | if (ENABLE_FEATURE_UDHCP_DEBUG) | 312 | if (ENABLE_FEATURE_UDHCP_DEBUG) |
313 | bb_error_msg("unable to parse '%s'", debug_orig); | 313 | bb_error_msg("unable to parse '%s'", debug_orig); |
314 | /* reset back to the default value */ | 314 | /* reset back to the default value */ |
@@ -329,7 +329,7 @@ void write_leases(void) | |||
329 | unsigned long tmp_time; | 329 | unsigned long tmp_time; |
330 | 330 | ||
331 | if (!(fp = fopen(server_config.lease_file, "w"))) { | 331 | if (!(fp = fopen(server_config.lease_file, "w"))) { |
332 | bb_error_msg("Unable to open %s for writing", server_config.lease_file); | 332 | bb_error_msg("unable to open %s for writing", server_config.lease_file); |
333 | return; | 333 | return; |
334 | } | 334 | } |
335 | 335 | ||
@@ -367,7 +367,7 @@ void read_leases(const char *file) | |||
367 | struct dhcpOfferedAddr lease; | 367 | struct dhcpOfferedAddr lease; |
368 | 368 | ||
369 | if (!(fp = fopen(file, "r"))) { | 369 | if (!(fp = fopen(file, "r"))) { |
370 | bb_error_msg("Unable to open %s for reading", file); | 370 | bb_error_msg("unable to open %s for reading", file); |
371 | return; | 371 | return; |
372 | } | 372 | } |
373 | 373 | ||
@@ -377,7 +377,7 @@ void read_leases(const char *file) | |||
377 | lease.expires = ntohl(lease.expires); | 377 | lease.expires = ntohl(lease.expires); |
378 | if (!server_config.remaining) lease.expires -= time(0); | 378 | if (!server_config.remaining) lease.expires -= time(0); |
379 | if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) { | 379 | if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) { |
380 | bb_error_msg("Too many leases while loading %s", file); | 380 | bb_error_msg("too many leases while loading %s", file); |
381 | break; | 381 | break; |
382 | } | 382 | } |
383 | i++; | 383 | i++; |
diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c index 8dba2ef69..5cc08cca0 100644 --- a/networking/udhcp/options.c +++ b/networking/udhcp/options.c | |||
@@ -76,12 +76,12 @@ uint8_t *get_option(struct dhcpMessage *packet, int code) | |||
76 | length = 308; | 76 | length = 308; |
77 | while (!done) { | 77 | while (!done) { |
78 | if (i >= length) { | 78 | if (i >= length) { |
79 | bb_error_msg("Bogus packet, option fields too long"); | 79 | bb_error_msg("bogus packet, option fields too long"); |
80 | return NULL; | 80 | return NULL; |
81 | } | 81 | } |
82 | if (optionptr[i + OPT_CODE] == code) { | 82 | if (optionptr[i + OPT_CODE] == code) { |
83 | if (i + 1 + optionptr[i + OPT_LEN] >= length) { | 83 | if (i + 1 + optionptr[i + OPT_LEN] >= length) { |
84 | bb_error_msg("Bogus packet, option fields too long"); | 84 | bb_error_msg("bogus packet, option fields too long"); |
85 | return NULL; | 85 | return NULL; |
86 | } | 86 | } |
87 | return optionptr + i + 2; | 87 | return optionptr + i + 2; |
@@ -92,7 +92,7 @@ uint8_t *get_option(struct dhcpMessage *packet, int code) | |||
92 | break; | 92 | break; |
93 | case DHCP_OPTION_OVER: | 93 | case DHCP_OPTION_OVER: |
94 | if (i + 1 + optionptr[i + OPT_LEN] >= length) { | 94 | if (i + 1 + optionptr[i + OPT_LEN] >= length) { |
95 | bb_error_msg("Bogus packet, option fields too long"); | 95 | bb_error_msg("bogus packet, option fields too long"); |
96 | return NULL; | 96 | return NULL; |
97 | } | 97 | } |
98 | over = optionptr[i + 3]; | 98 | over = optionptr[i + 3]; |
@@ -140,7 +140,7 @@ int add_option_string(uint8_t *optionptr, uint8_t *string) | |||
140 | 140 | ||
141 | /* end position + string length + option code/length + end option */ | 141 | /* end position + string length + option code/length + end option */ |
142 | if (end + string[OPT_LEN] + 2 + 1 >= 308) { | 142 | if (end + string[OPT_LEN] + 2 + 1 >= 308) { |
143 | bb_error_msg("Option 0x%02x did not fit into the packet", | 143 | bb_error_msg("option 0x%02x did not fit into the packet", |
144 | string[OPT_CODE]); | 144 | string[OPT_CODE]); |
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 30675eaab..f12ecd6ec 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c | |||
@@ -58,12 +58,12 @@ int udhcp_get_packet(struct dhcpMessage *packet, int fd) | |||
58 | memset(packet, 0, sizeof(struct dhcpMessage)); | 58 | memset(packet, 0, sizeof(struct dhcpMessage)); |
59 | bytes = read(fd, packet, sizeof(struct dhcpMessage)); | 59 | bytes = read(fd, packet, sizeof(struct dhcpMessage)); |
60 | if (bytes < 0) { | 60 | if (bytes < 0) { |
61 | DEBUG("couldn't read on listening socket, ignoring"); | 61 | DEBUG("cannot read on listening socket, ignoring"); |
62 | return -1; | 62 | return -1; |
63 | } | 63 | } |
64 | 64 | ||
65 | if (ntohl(packet->cookie) != DHCP_MAGIC) { | 65 | if (ntohl(packet->cookie) != DHCP_MAGIC) { |
66 | bb_error_msg("Received bogus message, ignoring"); | 66 | bb_error_msg("received bogus message, ignoring"); |
67 | return -2; | 67 | return -2; |
68 | } | 68 | } |
69 | DEBUG("Received a packet"); | 69 | DEBUG("Received a packet"); |
diff --git a/networking/udhcp/pidfile.c b/networking/udhcp/pidfile.c index 148b07b34..6673c9502 100644 --- a/networking/udhcp/pidfile.c +++ b/networking/udhcp/pidfile.c | |||
@@ -45,7 +45,7 @@ int pidfile_acquire(const char *pidfile) | |||
45 | 45 | ||
46 | pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644); | 46 | pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644); |
47 | if (pid_fd < 0) { | 47 | if (pid_fd < 0) { |
48 | bb_perror_msg("Unable to open pidfile %s", pidfile); | 48 | bb_perror_msg("unable to open pidfile %s", pidfile); |
49 | } else { | 49 | } else { |
50 | lockf(pid_fd, F_LOCK, 0); | 50 | lockf(pid_fd, F_LOCK, 0); |
51 | if (!saved_pidfile) | 51 | if (!saved_pidfile) |
@@ -63,14 +63,11 @@ void pidfile_write_release(int pid_fd) | |||
63 | 63 | ||
64 | if (pid_fd < 0) return; | 64 | if (pid_fd < 0) return; |
65 | 65 | ||
66 | if ((out = fdopen(pid_fd, "w")) != NULL) { | 66 | out = fdopen(pid_fd, "w"); |
67 | if (out) { | ||
67 | fprintf(out, "%d\n", getpid()); | 68 | fprintf(out, "%d\n", getpid()); |
68 | fclose(out); | 69 | fclose(out); |
69 | } | 70 | } |
70 | lockf(pid_fd, F_UNLCK, 0); | 71 | lockf(pid_fd, F_UNLCK, 0); |
71 | close(pid_fd); | 72 | close(pid_fd); |
72 | } | 73 | } |
73 | |||
74 | |||
75 | |||
76 | |||
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c index cfead413c..b5cfcf405 100644 --- a/networking/udhcp/serverpacket.c +++ b/networking/udhcp/serverpacket.c | |||
@@ -158,12 +158,12 @@ int sendOffer(struct dhcpMessage *oldpacket) | |||
158 | } | 158 | } |
159 | 159 | ||
160 | if(!packet.yiaddr) { | 160 | if(!packet.yiaddr) { |
161 | bb_error_msg("No IP addresses to give - OFFER abandoned"); | 161 | bb_error_msg("no IP addresses to give - OFFER abandoned"); |
162 | return -1; | 162 | return -1; |
163 | } | 163 | } |
164 | 164 | ||
165 | if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) { | 165 | if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) { |
166 | bb_error_msg("Lease pool is full - OFFER abandoned"); | 166 | bb_error_msg("lease pool is full - OFFER abandoned"); |
167 | return -1; | 167 | return -1; |
168 | } | 168 | } |
169 | 169 | ||
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 665bd5300..94118b059 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -755,7 +755,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
755 | "are interested in, you can still view the help of a grayed-out\n" | 755 | "are interested in, you can still view the help of a grayed-out\n" |
756 | "option.\n" | 756 | "option.\n" |
757 | "\n" | 757 | "\n" |
758 | "Toggling Show Debug Info under the Options menu will show \n" | 758 | "Toggling Show Debug Info under the Options menu will show\n" |
759 | "the dependencies, which you can then match by examining other options."); | 759 | "the dependencies, which you can then match by examining other options."); |
760 | 760 | ||
761 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), | 761 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), |
diff --git a/shell/hush.c b/shell/hush.c index 4d78b47a7..2013a9d2b 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -399,7 +399,7 @@ static int set_local_var(const char *s, int flg_export); | |||
399 | /* Table of built-in functions. They can be forked or not, depending on | 399 | /* Table of built-in functions. They can be forked or not, depending on |
400 | * context: within pipes, they fork. As simple commands, they do not. | 400 | * context: within pipes, they fork. As simple commands, they do not. |
401 | * When used in non-forking context, they can change global variables | 401 | * When used in non-forking context, they can change global variables |
402 | * in the parent shell process. If forked, of course they can not. | 402 | * in the parent shell process. If forked, of course they cannot. |
403 | * For example, 'unset foo | whatever' will parse and run, but foo will | 403 | * For example, 'unset foo | whatever' will parse and run, but foo will |
404 | * still be set at the end. */ | 404 | * still be set at the end. */ |
405 | static const struct built_in_command bltins[] = { | 405 | static const struct built_in_command bltins[] = { |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index d5edaaa00..3061f0d8d 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -1371,7 +1371,7 @@ get_boot(enum action what) | |||
1371 | #endif | 1371 | #endif |
1372 | break; | 1372 | break; |
1373 | default: | 1373 | default: |
1374 | bb_error_msg_and_die(_("Internal error")); | 1374 | bb_error_msg_and_die(_("internal error")); |
1375 | } | 1375 | } |
1376 | #endif /* CONFIG_FEATURE_FDISK_WRITABLE */ | 1376 | #endif /* CONFIG_FEATURE_FDISK_WRITABLE */ |
1377 | } | 1377 | } |
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index f2d9b6e69..45290c942 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c | |||
@@ -111,12 +111,12 @@ int switch_root_main(int argc, char *argv[]) | |||
111 | if (console) { | 111 | if (console) { |
112 | close(0); | 112 | close(0); |
113 | if(open(console, O_RDWR) < 0) | 113 | if(open(console, O_RDWR) < 0) |
114 | bb_error_msg_and_die("Bad console '%s'",console); | 114 | bb_error_msg_and_die("bad console '%s'",console); |
115 | dup2(0, 1); | 115 | dup2(0, 1); |
116 | dup2(0, 2); | 116 | dup2(0, 2); |
117 | } | 117 | } |
118 | 118 | ||
119 | // Exec real init. (This is why we must be pid 1.) | 119 | // Exec real init. (This is why we must be pid 1.) |
120 | execv(argv[optind],argv+optind); | 120 | execv(argv[optind],argv+optind); |
121 | bb_error_msg_and_die("Bad init '%s'",argv[optind]); | 121 | bb_error_msg_and_die("bad init '%s'",argv[optind]); |
122 | } | 122 | } |