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

diff --git a/archival/gunzip.c b/archival/gunzip.c
index a7f5ce4810a7fe3ee6bb2ebd7542b085e36fab47..9a68e62e450d27102d0c9452e4577f19c03daba7 100644 (file)
--- 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 cbcbcefed7cc4a2e5033a6cba2ee3577cb172985..91568e45f3fbad4d3a531932e72e809d5e1d886d 100644 (file)
--- 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 00acea6e0e4f879c38226aabb9b63d5f10ecf25b..fe542b6ac00a676e20e871ce8a827b43f470f24f 100644 (file)
--- 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 80b94dbad908dfdf729df7955ab9cd320a444c93..a41faaf1eb272ffec214894698855b491d6fc5b5 100644 (file)
--- 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 f3fa5c0cfdb480ad783934d75431be4884e5cea1..065761fb43720fc247a7821542c2e311b3039500 100644 (file)
--- 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 4c43830016900787d9b2c06e2524b9e2598bbdd5..c6f54a2723815e7d6c0d152ed415a84919352572 100644 (file)
--- 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 7ffc0d230e2baee3ec2b7ea858c06888c2129b2c..28139f4eab5461442d2edf1bff1a33c410693dd1 100644 (file)
--- 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 1261d15760bc20687509f72929b43637148df405..4dda916d00a90ba36aae5594ae8cc0a80c02f633 100644 (file)
--- 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 99ffed1c557718100b9ff853bc0132e221fd26fc..e2f600329fe06eff196493eb69e7a074108106e2 100644 (file)
--- 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 fba8b6c1ff8836608d8d137c7f104f029578addf..d64c1286066d9d57fa293dc95624d8bd1f3de9ed 100644 (file)
--- 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 afe60c2689dcc6e58c6fcc3f480334c635e7c1d4..52ae3d21516cb426cd57953068bf8f936277c878 100644 (file)
--- 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 f8e26dba34a1edffe89d56d382ed1bde65ff0148..314e87325935b3e1c6ba1dd0bd23313adc10f9c9 100644 (file)
--- 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 f7e7d442c1cd7b31e5cd904fcdfc9c2a9267e03c..f9f5a3b8ce83ce42347634376e98b6a4be941cf1 100644 (file)
--- 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 499183f188ad38f612430ca8849780a20bcc3b56..9ab6aee8c5313d67a795cbdc6526feb10ab1ae44 100644 (file)
--- 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 bee4ffdb3072889a04c6dffe03ca2ef4fe80c7e6..62057bed876850691fe120b9156bd5a44383b17a 100644 (file)
--- 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 cea1d3c60fcaba1967672bc1eaac3242343f18cb..779c9a3738ecbe81cc0523072e851312ecd2258c 100644 (file)
--- 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 acc5012d468d7653bd81a6a0cea0f0d1a0a4385e..b292e14b741b4e264565eab4175d87dcb69c0dd4 100644 (file)
--- 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);
 }