aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs')
-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
6 files changed, 15 insertions, 15 deletions
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}