Yet another silly little byte saving. couldn't -> cannot

git-svn-id: svn://busybox.net/trunk/busybox@16263 69ca8d6d-28ef-0310-b511-8ec308f3f277

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)
                                         check_header_gzip(src_fd);
                                         status = inflate_gunzip(src_fd, dst_fd);
                                         if (status != 0) {
-                                                bb_error_msg_and_die("Error inflating");
+                                                bb_error_msg_and_die("error inflating");
                                         }
                                 } else {
-                                        bb_error_msg_and_die("Invalid magic");
+                                        bb_error_msg_and_die("invalid magic");
                                 }
                 } else {
-                        bb_error_msg_and_die("Invalid magic");
+                        bb_error_msg_and_die("invalid magic");
                 }
 
                 if ((status != EXIT_SUCCESS) && (new_path)) {
@@ -142,7 +142,7 @@ int gunzip_main(int argc, char **argv)
 
                 /* delete_path will be NULL if in test mode or from stdin */
                 if (delete_path && (unlink(delete_path) == -1)) {
-                        bb_error_msg_and_die("Couldn't remove %s", delete_path);
+                        bb_error_msg_and_die("cannot remove %s", delete_path);
                 }
 
                 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)
 
                 /* delete_path will be NULL if in test mode or from stdin */
                 if (delete_path && (unlink(delete_path) == -1)) {
-                        bb_error_msg_and_die("Couldn't remove %s", delete_path);
+                        bb_error_msg_and_die("cannot remove %s", delete_path);
                 }
 
                 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)
                 /* bug: char *extension = filename + strlen(filename) - 5; */
                 char *extension = strrchr(filename, '.');
                 if (!extension || strcmp(extension, ".lzma") != 0) {
-                        bb_error_msg_and_die("Invalid extension");
+                        bb_error_msg_and_die("invalid extension");
                 }
                 xstat(filename, &stat_buf);
                 *extension = '\0';
@@ -53,7 +53,7 @@ int unlzma_main(int argc, char **argv)
                 if (!status)
                         filename[strlen(filename)] = '.';
                 if (unlink(filename) < 0) {
-                        bb_error_msg_and_die("Couldn't remove %s", filename);
+                        bb_error_msg_and_die("cannot remove %s", filename);
                 }
         }
 
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:
                 }
                 fdflags = fcntl(STDIN_FILENO, F_GETFL);
                 if (fdflags == -1 || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
-                        perror_on_device_and_die("%s: couldn't reset non-blocking mode");
+                        perror_on_device_and_die("%s: cannot reset non-blocking mode");
         }
 
         /* 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)
         char    *devname, *tmp;
         int     major, minor;
         dev_t   devno;
-        const char *errmsg = "Couldn't parse %s: %s\n";
+        const char *errmsg = "Cannot parse %s: %s\n";
 
         blkid_debug_mask = DEBUG_ALL;
         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)
                 exit(1);
         }
         if (blkid_get_cache(&cache, bb_dev_null) < 0) {
-                fprintf(stderr, "Couldn't get blkid cache\n");
+                fprintf(stderr, "cannot get blkid cache\n");
                 exit(1);
         }
 
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[] = {
 
         /* Internal error: couldn't find dir_info */
         { PR_2_NO_DIRINFO,
-          N_("Internal error: couldn't find dir_info for %i.\n"),
+          N_("Internal error: cannot find dir_info for %i.\n"),
           PROMPT_NONE, PR_FATAL },
 
         /* Final rec_len is wrong */
@@ -9408,7 +9408,7 @@ static const struct e2fsck_problem problem_table[] = {
 
         /* Internal error: couldn't find dir_info */
         { PR_3_NO_DIRINFO,
-          N_("Internal error: couldn't find dir_info for %i.\n"),
+          N_("Internal error: cannot find dir_info for %i.\n"),
           PROMPT_NONE, PR_FATAL },
 
         /* Lost+found not a directory */
@@ -12915,7 +12915,7 @@ static void reserve_stdio_fds(void)
                 if (fd > 2)
                         break;
                 if (fd < 0) {
-                        fprintf(stderr, _("ERROR: Couldn't open "
+                        fprintf(stderr, _("ERROR: Cannot open "
                                 "/dev/null (%s)\n"),
                                 strerror(errno));
                         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)
         char    *devname, *tmp;
         int     major, minor;
         dev_t   device;
-        const char *errmsg = "Couldn't parse %s: %s\n";
+        const char *errmsg = "Cannot parse %s: %s\n";
 
         if ((argc != 2) && (argc != 3)) {
                 fprintf(stderr, "Usage: %s device_number\n", argv[0]);
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
                 printf("Found device!  %s\n", devname);
                 free(devname);
         } else {
-                printf("Couldn't find device.\n");
+                printf("Cannot find device.\n");
         }
         return 0;
 }
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)
         struct fs_info *fs;
 
         if ((f = fopen(filename, "r")) == NULL) {
-                bb_perror_msg("WARNING: couldn't open %s", filename);
+                bb_perror_msg("WARNING: cannot open %s", filename);
                 return;
         }
         while (!feof(f)) {
@@ -717,7 +717,7 @@ static struct fsck_instance *wait_one(int flags)
                         if ((errno == EINTR) || (errno == EAGAIN))
                                 continue;
                         if (errno == ECHILD) {
-                                bb_error_msg("wait: No more child process?!?");
+                                bb_error_msg("wait: no more child process?!?");
                                 return NULL;
                         }
                         perror("wait");
@@ -840,7 +840,7 @@ static void fsck_device(struct fs_info *fs, int interactive)
         num_running++;
         retval = execute(type, fs->device, fs->mountpt, interactive);
         if (retval) {
-                bb_error_msg("Error %d while executing fsck.%s for %s",
+                bb_error_msg("error %d while executing fsck.%s for %s",
                                                 retval, type, fs->device);
                 num_running--;
         }
@@ -1208,8 +1208,8 @@ static void PRS(int argc, char *argv[])
                                  * /proc/partitions isn't found.
                                  */
                                 if (access("/proc/partitions", R_OK) < 0) {
-                                        bb_error_msg_and_die("Couldn't open /proc/partitions: %m\n"
-                                                        "Is /proc mounted?");
+                                        bb_perror_msg_and_die("cannot open /proc/partitions "
+                                                        "(is /proc mounted?)");
                                 }
                                 /*
                                  * Check to see if this is because
@@ -1217,10 +1217,10 @@ static void PRS(int argc, char *argv[])
                                  */
                                 if (geteuid())
                                         bb_error_msg_and_die(
-                "Must be root to scan for matching filesystems: %s\n", arg);
+                "must be root to scan for matching filesystems: %s\n", arg);
                                 else
                                         bb_error_msg_and_die(
-                "Couldn't find matching filesystem: %s", arg);
+                "cannot find matching filesystem: %s", arg);
                         }
                         devices[num_devices++] = dev ? dev : string_copy(arg);
                         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)
                 ts.tm_mday = 0;
 #endif
         if (ts.tm_mday == 0) {
-                bb_error_msg_and_die("Couldn't parse date/time specifier: %s", str);
+                bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
         }
         return (mktime(&ts));
 }
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)
                 }
         }
 
-        bb_error_msg("Couldn't get a file descriptor referring to the console");
+        bb_error_msg("cannot get file descriptor referring to console");
         return fd;                      /* total failure */
 }
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)
                 if (m_has_modinfo) {
                         m_version = new_get_module_version(f, m_strversion);
                         if (m_version == -1) {
-                                bb_error_msg("couldn't find the kernel version the module was "
+                                bb_error_msg("cannot find the kernel version the module was "
                                                 "compiled for");
                                 goto out;
                         }
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)
         memset(&packet, 0, sizeof(struct udp_dhcp_packet));
         bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet));
         if (bytes < 0) {
-                DEBUG("Couldn't read on raw listening socket - ignoring");
+                DEBUG("Cannot read on raw listening socket - ignoring");
                 usleep(500000); /* possible down interface, looping condition */
                 return -1;
         }
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[])
                         else
                                 fd = raw_socket(client_config.ifindex);
                         if (fd < 0) {
-                                bb_perror_msg("FATAL: couldn't listen on socket");
+                                bb_perror_msg("FATAL: cannot listen on socket");
                                 return 0;
                         }
                 }
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[])
 
                 if (server_socket < 0)
                         if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
-                                bb_perror_msg("FATAL: couldn't create server socket");
+                                bb_perror_msg("FATAL: cannot create server socket");
                                 return 2;
                         }
 
@@ -137,7 +137,7 @@ int udhcpd_main(int argc, char *argv[])
                 }
 
                 if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
-                        bb_error_msg("Couldn't get option from packet, ignoring");
+                        bb_error_msg("cannot get option from packet, ignoring");
                         continue;
                 }
 
@@ -165,7 +165,7 @@ int udhcpd_main(int argc, char *argv[])
                         DEBUG("Received DISCOVER");
 
                         if (sendOffer(&packet) < 0) {
-                                bb_error_msg("Send OFFER failed");
+                                bb_error_msg("send OFFER failed");
                         }
                         break;
                 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)
         /* XXX search through $PATH is missing */
         input = fopen(child->argv[1], "r");
         if (!input) {
-                bb_error_msg("Couldn't open file '%s'", child->argv[1]);
+                bb_error_msg("cannot open '%s'", child->argv[1]);
                 return EXIT_FAILURE;
         }
 
@@ -1120,7 +1120,7 @@ static void pseudo_exec(struct child_prog *child)
 #endif
                 debug_printf("exec of %s\n",child->argv[0]);
                 execvp(child->argv[0],child->argv);
-                bb_perror_msg("couldn't exec: %s",child->argv[0]);
+                bb_perror_msg("cannot exec: %s",child->argv[0]);
                 _exit(1);
         } else if (child->group) {
                 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)
                 putenv(s);
                 free(s);
                 free(command);
-                if (rc == -1) bb_perror_msg_and_die("Couldn't run %s", command);
+                if (rc == -1) bb_perror_msg_and_die("cannot run %s", command);
         }
         if (delete) unlink(device_name);
 }