aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-29 21:30:43 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-29 21:30:43 +0000
commita959588b80529ef5e02048ed71f3c7bf9a117217 (patch)
tree331b3963cb98fded02b753ca33bfa37cb48a97c6
parent6c30db8bd37da1466dc71bf3c8c20851d8f46c43 (diff)
downloadbusybox-w32-a959588b80529ef5e02048ed71f3c7bf9a117217.tar.gz
busybox-w32-a959588b80529ef5e02048ed71f3c7bf9a117217.tar.bz2
busybox-w32-a959588b80529ef5e02048ed71f3c7bf9a117217.zip
Yet another silly little byte saving. couldn't -> cannot
Diffstat
-rw-r--r--archival/gunzip.c8
-rw-r--r--archival/uncompress.c2
-rw-r--r--archival/unlzma.c4
-rw-r--r--coreutils/stty.c2
-rw-r--r--e2fsprogs/blkid/devno.c2
-rw-r--r--e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/e2fsck.c6
-rw-r--r--e2fsprogs/ext2fs/finddev.c4
-rw-r--r--e2fsprogs/fsck.c14
-rw-r--r--e2fsprogs/tune2fs.c2
-rw-r--r--libbb/get_console.c2
-rw-r--r--modutils/insmod.c2
-rw-r--r--networking/udhcp/clientpacket.c2
-rw-r--r--networking/udhcp/dhcpc.c2
-rw-r--r--networking/udhcp/dhcpd.c6
-rw-r--r--shell/hush.c4
-rw-r--r--util-linux/mdev.c2
17 files changed, 33 insertions, 33 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c
index a7f5ce481..9a68e62e4 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -119,13 +119,13 @@ int gunzip_main(int argc, char **argv)
119 check_header_gzip(src_fd); 119 check_header_gzip(src_fd);
120 status = inflate_gunzip(src_fd, dst_fd); 120 status = inflate_gunzip(src_fd, dst_fd);
121 if (status != 0) { 121 if (status != 0) {
122 bb_error_msg_and_die("Error inflating"); 122 bb_error_msg_and_die("error inflating");
123 } 123 }
124 } else { 124 } else {
125 bb_error_msg_and_die("Invalid magic"); 125 bb_error_msg_and_die("invalid magic");
126 } 126 }
127 } else { 127 } else {
128 bb_error_msg_and_die("Invalid magic"); 128 bb_error_msg_and_die("invalid magic");
129 } 129 }
130 130
131 if ((status != EXIT_SUCCESS) && (new_path)) { 131 if ((status != EXIT_SUCCESS) && (new_path)) {
@@ -142,7 +142,7 @@ int gunzip_main(int argc, char **argv)
142 142
143 /* delete_path will be NULL if in test mode or from stdin */ 143 /* delete_path will be NULL if in test mode or from stdin */
144 if (delete_path && (unlink(delete_path) == -1)) { 144 if (delete_path && (unlink(delete_path) == -1)) {
145 bb_error_msg_and_die("Couldn't remove %s", delete_path); 145 bb_error_msg_and_die("cannot remove %s", delete_path);
146 } 146 }
147 147
148 free(new_path); 148 free(new_path);
diff --git a/archival/uncompress.c b/archival/uncompress.c
index cbcbcefed..91568e45f 100644
--- a/archival/uncompress.c
+++ b/archival/uncompress.c
@@ -84,7 +84,7 @@ int uncompress_main(int argc, char **argv)
84 84
85 /* delete_path will be NULL if in test mode or from stdin */ 85 /* delete_path will be NULL if in test mode or from stdin */
86 if (delete_path && (unlink(delete_path) == -1)) { 86 if (delete_path && (unlink(delete_path) == -1)) {
87 bb_error_msg_and_die("Couldn't remove %s", delete_path); 87 bb_error_msg_and_die("cannot remove %s", delete_path);
88 } 88 }
89 89
90 free(uncompressed_file); 90 free(uncompressed_file);
diff --git a/archival/unlzma.c b/archival/unlzma.c
index 00acea6e0..fe542b6ac 100644
--- a/archival/unlzma.c
+++ b/archival/unlzma.c
@@ -40,7 +40,7 @@ int unlzma_main(int argc, char **argv)
40 /* bug: char *extension = filename + strlen(filename) - 5; */ 40 /* bug: char *extension = filename + strlen(filename) - 5; */
41 char *extension = strrchr(filename, '.'); 41 char *extension = strrchr(filename, '.');
42 if (!extension || strcmp(extension, ".lzma") != 0) { 42 if (!extension || strcmp(extension, ".lzma") != 0) {
43 bb_error_msg_and_die("Invalid extension"); 43 bb_error_msg_and_die("invalid extension");
44 } 44 }
45 xstat(filename, &stat_buf); 45 xstat(filename, &stat_buf);
46 *extension = '\0'; 46 *extension = '\0';
@@ -53,7 +53,7 @@ int unlzma_main(int argc, char **argv)
53 if (!status) 53 if (!status)
54 filename[strlen(filename)] = '.'; 54 filename[strlen(filename)] = '.';
55 if (unlink(filename) < 0) { 55 if (unlink(filename) < 0) {
56 bb_error_msg_and_die("Couldn't remove %s", filename); 56 bb_error_msg_and_die("cannot remove %s", filename);
57 } 57 }
58 } 58 }
59 59
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 80b94dbad..a41faaf1e 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -792,7 +792,7 @@ end_option:
792 } 792 }
793 fdflags = fcntl(STDIN_FILENO, F_GETFL); 793 fdflags = fcntl(STDIN_FILENO, F_GETFL);
794 if (fdflags == -1 || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0) 794 if (fdflags == -1 || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
795 perror_on_device_and_die("%s: couldn't reset non-blocking mode"); 795 perror_on_device_and_die("%s: cannot reset non-blocking mode");
796 } 796 }
797 797
798 /* Initialize to all zeroes so there is no risk memcmp will report a 798 /* Initialize to all zeroes so there is no risk memcmp will report a
diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c
index f3fa5c0cf..065761fb4 100644
--- a/e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/blkid/devno.c
@@ -189,7 +189,7 @@ int main(int argc, char** argv)
189 char *devname, *tmp; 189 char *devname, *tmp;
190 int major, minor; 190 int major, minor;
191 dev_t devno; 191 dev_t devno;
192 const char *errmsg = "Couldn't parse %s: %s\n"; 192 const char *errmsg = "Cannot parse %s: %s\n";
193 193
194 blkid_debug_mask = DEBUG_ALL; 194 blkid_debug_mask = DEBUG_ALL;
195 if ((argc != 2) && (argc != 3)) { 195 if ((argc != 2) && (argc != 3)) {
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 4c4383001..c6f54a272 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
121 exit(1); 121 exit(1);
122 } 122 }
123 if (blkid_get_cache(&cache, bb_dev_null) < 0) { 123 if (blkid_get_cache(&cache, bb_dev_null) < 0) {
124 fprintf(stderr, "Couldn't get blkid cache\n"); 124 fprintf(stderr, "cannot get blkid cache\n");
125 exit(1); 125 exit(1);
126 } 126 }
127 127
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 7ffc0d230..28139f4ea 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -9132,7 +9132,7 @@ static const struct e2fsck_problem problem_table[] = {
9132 9132
9133 /* Internal error: couldn't find dir_info */ 9133 /* Internal error: couldn't find dir_info */
9134 { PR_2_NO_DIRINFO, 9134 { PR_2_NO_DIRINFO,
9135 N_("Internal error: couldn't find dir_info for %i.\n"), 9135 N_("Internal error: cannot find dir_info for %i.\n"),
9136 PROMPT_NONE, PR_FATAL }, 9136 PROMPT_NONE, PR_FATAL },
9137 9137
9138 /* Final rec_len is wrong */ 9138 /* Final rec_len is wrong */
@@ -9408,7 +9408,7 @@ static const struct e2fsck_problem problem_table[] = {
9408 9408
9409 /* Internal error: couldn't find dir_info */ 9409 /* Internal error: couldn't find dir_info */
9410 { PR_3_NO_DIRINFO, 9410 { PR_3_NO_DIRINFO,
9411 N_("Internal error: couldn't find dir_info for %i.\n"), 9411 N_("Internal error: cannot find dir_info for %i.\n"),
9412 PROMPT_NONE, PR_FATAL }, 9412 PROMPT_NONE, PR_FATAL },
9413 9413
9414 /* Lost+found not a directory */ 9414 /* Lost+found not a directory */
@@ -12915,7 +12915,7 @@ static void reserve_stdio_fds(void)
12915 if (fd > 2) 12915 if (fd > 2)
12916 break; 12916 break;
12917 if (fd < 0) { 12917 if (fd < 0) {
12918 fprintf(stderr, _("ERROR: Couldn't open " 12918 fprintf(stderr, _("ERROR: Cannot open "
12919 "/dev/null (%s)\n"), 12919 "/dev/null (%s)\n"),
12920 strerror(errno)); 12920 strerror(errno));
12921 break; 12921 break;
diff --git a/e2fsprogs/ext2fs/finddev.c b/e2fsprogs/ext2fs/finddev.c
index 1261d1576..4dda916d0 100644
--- a/e2fsprogs/ext2fs/finddev.c
+++ b/e2fsprogs/ext2fs/finddev.c
@@ -158,7 +158,7 @@ int main(int argc, char** argv)
158 char *devname, *tmp; 158 char *devname, *tmp;
159 int major, minor; 159 int major, minor;
160 dev_t device; 160 dev_t device;
161 const char *errmsg = "Couldn't parse %s: %s\n"; 161 const char *errmsg = "Cannot parse %s: %s\n";
162 162
163 if ((argc != 2) && (argc != 3)) { 163 if ((argc != 2) && (argc != 3)) {
164 fprintf(stderr, "Usage: %s device_number\n", argv[0]); 164 fprintf(stderr, "Usage: %s device_number\n", argv[0]);
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
191 printf("Found device! %s\n", devname); 191 printf("Found device! %s\n", devname);
192 free(devname); 192 free(devname);
193 } else { 193 } else {
194 printf("Couldn't find device.\n"); 194 printf("Cannot find device.\n");
195 } 195 }
196 return 0; 196 return 0;
197} 197}
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 99ffed1c5..e2f600329 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -479,7 +479,7 @@ static void load_fs_info(const char *filename)
479 struct fs_info *fs; 479 struct fs_info *fs;
480 480
481 if ((f = fopen(filename, "r")) == NULL) { 481 if ((f = fopen(filename, "r")) == NULL) {
482 bb_perror_msg("WARNING: couldn't open %s", filename); 482 bb_perror_msg("WARNING: cannot open %s", filename);
483 return; 483 return;
484 } 484 }
485 while (!feof(f)) { 485 while (!feof(f)) {
@@ -717,7 +717,7 @@ static struct fsck_instance *wait_one(int flags)
717 if ((errno == EINTR) || (errno == EAGAIN)) 717 if ((errno == EINTR) || (errno == EAGAIN))
718 continue; 718 continue;
719 if (errno == ECHILD) { 719 if (errno == ECHILD) {
720 bb_error_msg("wait: No more child process?!?"); 720 bb_error_msg("wait: no more child process?!?");
721 return NULL; 721 return NULL;
722 } 722 }
723 perror("wait"); 723 perror("wait");
@@ -840,7 +840,7 @@ static void fsck_device(struct fs_info *fs, int interactive)
840 num_running++; 840 num_running++;
841 retval = execute(type, fs->device, fs->mountpt, interactive); 841 retval = execute(type, fs->device, fs->mountpt, interactive);
842 if (retval) { 842 if (retval) {
843 bb_error_msg("Error %d while executing fsck.%s for %s", 843 bb_error_msg("error %d while executing fsck.%s for %s",
844 retval, type, fs->device); 844 retval, type, fs->device);
845 num_running--; 845 num_running--;
846 } 846 }
@@ -1208,8 +1208,8 @@ static void PRS(int argc, char *argv[])
1208 * /proc/partitions isn't found. 1208 * /proc/partitions isn't found.
1209 */ 1209 */
1210 if (access("/proc/partitions", R_OK) < 0) { 1210 if (access("/proc/partitions", R_OK) < 0) {
1211 bb_error_msg_and_die("Couldn't open /proc/partitions: %m\n" 1211 bb_perror_msg_and_die("cannot open /proc/partitions "
1212 "Is /proc mounted?"); 1212 "(is /proc mounted?)");
1213 } 1213 }
1214 /* 1214 /*
1215 * Check to see if this is because 1215 * Check to see if this is because
@@ -1217,10 +1217,10 @@ static void PRS(int argc, char *argv[])
1217 */ 1217 */
1218 if (geteuid()) 1218 if (geteuid())
1219 bb_error_msg_and_die( 1219 bb_error_msg_and_die(
1220 "Must be root to scan for matching filesystems: %s\n", arg); 1220 "must be root to scan for matching filesystems: %s\n", arg);
1221 else 1221 else
1222 bb_error_msg_and_die( 1222 bb_error_msg_and_die(
1223 "Couldn't find matching filesystem: %s", arg); 1223 "cannot find matching filesystem: %s", arg);
1224 } 1224 }
1225 devices[num_devices++] = dev ? dev : string_copy(arg); 1225 devices[num_devices++] = dev ? dev : string_copy(arg);
1226 continue; 1226 continue;
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index fba8b6c1f..d64c12860 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -397,7 +397,7 @@ static time_t parse_time(char *str)
397 ts.tm_mday = 0; 397 ts.tm_mday = 0;
398#endif 398#endif
399 if (ts.tm_mday == 0) { 399 if (ts.tm_mday == 0) {
400 bb_error_msg_and_die("Couldn't parse date/time specifier: %s", str); 400 bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
401 } 401 }
402 return (mktime(&ts)); 402 return (mktime(&ts));
403} 403}
diff --git a/libbb/get_console.c b/libbb/get_console.c
index afe60c268..52ae3d215 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -72,6 +72,6 @@ int get_console_fd(void)
72 } 72 }
73 } 73 }
74 74
75 bb_error_msg("Couldn't get a file descriptor referring to the console"); 75 bb_error_msg("cannot get file descriptor referring to console");
76 return fd; /* total failure */ 76 return fd; /* total failure */
77} 77}
diff --git a/modutils/insmod.c b/modutils/insmod.c
index f8e26dba3..314e87325 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -4111,7 +4111,7 @@ int insmod_main( int argc, char **argv)
4111 if (m_has_modinfo) { 4111 if (m_has_modinfo) {
4112 m_version = new_get_module_version(f, m_strversion); 4112 m_version = new_get_module_version(f, m_strversion);
4113 if (m_version == -1) { 4113 if (m_version == -1) {
4114 bb_error_msg("couldn't find the kernel version the module was " 4114 bb_error_msg("cannot find the kernel version the module was "
4115 "compiled for"); 4115 "compiled for");
4116 goto out; 4116 goto out;
4117 } 4117 }
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c
index f7e7d442c..f9f5a3b8c 100644
--- a/networking/udhcp/clientpacket.c
+++ b/networking/udhcp/clientpacket.c
@@ -172,7 +172,7 @@ int get_raw_packet(struct dhcpMessage *payload, int fd)
172 memset(&packet, 0, sizeof(struct udp_dhcp_packet)); 172 memset(&packet, 0, sizeof(struct udp_dhcp_packet));
173 bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet)); 173 bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet));
174 if (bytes < 0) { 174 if (bytes < 0) {
175 DEBUG("Couldn't read on raw listening socket - ignoring"); 175 DEBUG("Cannot read on raw listening socket - ignoring");
176 usleep(500000); /* possible down interface, looping condition */ 176 usleep(500000); /* possible down interface, looping condition */
177 return -1; 177 return -1;
178 } 178 }
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 499183f18..9ab6aee8c 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -320,7 +320,7 @@ int udhcpc_main(int argc, char *argv[])
320 else 320 else
321 fd = raw_socket(client_config.ifindex); 321 fd = raw_socket(client_config.ifindex);
322 if (fd < 0) { 322 if (fd < 0) {
323 bb_perror_msg("FATAL: couldn't listen on socket"); 323 bb_perror_msg("FATAL: cannot listen on socket");
324 return 0; 324 return 0;
325 } 325 }
326 } 326 }
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index bee4ffdb3..62057bed8 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -90,7 +90,7 @@ int udhcpd_main(int argc, char *argv[])
90 90
91 if (server_socket < 0) 91 if (server_socket < 0)
92 if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) { 92 if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
93 bb_perror_msg("FATAL: couldn't create server socket"); 93 bb_perror_msg("FATAL: cannot create server socket");
94 return 2; 94 return 2;
95 } 95 }
96 96
@@ -137,7 +137,7 @@ int udhcpd_main(int argc, char *argv[])
137 } 137 }
138 138
139 if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) { 139 if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
140 bb_error_msg("Couldn't get option from packet, ignoring"); 140 bb_error_msg("cannot get option from packet, ignoring");
141 continue; 141 continue;
142 } 142 }
143 143
@@ -165,7 +165,7 @@ int udhcpd_main(int argc, char *argv[])
165 DEBUG("Received DISCOVER"); 165 DEBUG("Received DISCOVER");
166 166
167 if (sendOffer(&packet) < 0) { 167 if (sendOffer(&packet) < 0) {
168 bb_error_msg("Send OFFER failed"); 168 bb_error_msg("send OFFER failed");
169 } 169 }
170 break; 170 break;
171 case DHCPREQUEST: 171 case DHCPREQUEST:
diff --git a/shell/hush.c b/shell/hush.c
index cea1d3c60..779c9a373 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -717,7 +717,7 @@ static int builtin_source(struct child_prog *child)
717 /* XXX search through $PATH is missing */ 717 /* XXX search through $PATH is missing */
718 input = fopen(child->argv[1], "r"); 718 input = fopen(child->argv[1], "r");
719 if (!input) { 719 if (!input) {
720 bb_error_msg("Couldn't open file '%s'", child->argv[1]); 720 bb_error_msg("cannot open '%s'", child->argv[1]);
721 return EXIT_FAILURE; 721 return EXIT_FAILURE;
722 } 722 }
723 723
@@ -1120,7 +1120,7 @@ static void pseudo_exec(struct child_prog *child)
1120#endif 1120#endif
1121 debug_printf("exec of %s\n",child->argv[0]); 1121 debug_printf("exec of %s\n",child->argv[0]);
1122 execvp(child->argv[0],child->argv); 1122 execvp(child->argv[0],child->argv);
1123 bb_perror_msg("couldn't exec: %s",child->argv[0]); 1123 bb_perror_msg("cannot exec: %s",child->argv[0]);
1124 _exit(1); 1124 _exit(1);
1125 } else if (child->group) { 1125 } else if (child->group) {
1126 debug_printf("runtime nesting to group\n"); 1126 debug_printf("runtime nesting to group\n");
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index acc5012d4..b292e14b7 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -185,7 +185,7 @@ static void make_device(char *path, int delete)
185 putenv(s); 185 putenv(s);
186 free(s); 186 free(s);
187 free(command); 187 free(command);
188 if (rc == -1) bb_perror_msg_and_die("Couldn't run %s", command); 188 if (rc == -1) bb_perror_msg_and_die("cannot run %s", command);
189 } 189 }
190 if (delete) unlink(device_name); 190 if (delete) unlink(device_name);
191} 191}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 13:30:37 +0000