summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorBenno Schulenberg2015-01-29 21:21:48 +0100
committerKarel Zak2015-02-02 11:27:10 +0100
commitfc14ceba5e545a0e0f61e7a9fe562c79671258ef (patch)
treed89308fcbb2a9b4d23f64c0ab191c61f0d9aa9d6 /disk-utils
parentdocs: mention nice(1) in renice(1) manual page (diff)
downloadkernel-qcow2-util-linux-fc14ceba5e545a0e0f61e7a9fe562c79671258ef.tar.gz
kernel-qcow2-util-linux-fc14ceba5e545a0e0f61e7a9fe562c79671258ef.tar.xz
kernel-qcow2-util-linux-fc14ceba5e545a0e0f61e7a9fe562c79671258ef.zip
textual: grammarize and harmonize the stat error message
The message "stat failed %s" seems to say that stat() failed to do something, or failed to pass a test, but of course it means that the statting of something failed. So say so. Also make two very similar messages equal to this one. Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fdformat.c2
-rw-r--r--disk-utils/fsck.cramfs.c2
-rw-r--r--disk-utils/mkfs.bfs.c2
-rw-r--r--disk-utils/mkfs.cramfs.c6
-rw-r--r--disk-utils/mkfs.minix.c2
-rw-r--r--disk-utils/mkswap.c2
-rw-r--r--disk-utils/partx.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index ad9a86367..e7d43da8f 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
if (argc < 1)
usage(stderr);
if (stat(argv[0], &st) < 0)
- err(EXIT_FAILURE, _("stat failed %s"), argv[0]);
+ err(EXIT_FAILURE, _("stat of %s failed"), argv[0]);
if (!S_ISBLK(st.st_mode))
/* do not test major - perhaps this was an USB floppy */
errx(EXIT_FAILURE, _("%s: not a block device"), argv[0]);
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 419b9acb5..0a375f12c 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -143,7 +143,7 @@ static void test_super(int *start, size_t * length)
/* find the physical size of the file or block device */
if (stat(filename, &st) < 0)
- err(FSCK_EX_ERROR, _("stat failed %s"), filename);
+ err(FSCK_EX_ERROR, _("stat of %s failed"), filename);
fd = open(filename, O_RDONLY);
if (fd < 0)
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index 98e4b050c..2a223646e 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
device = argv[optind++];
if (stat(device, &statbuf) < 0)
- err(EXIT_FAILURE, _("stat failed %s"), device);
+ err(EXIT_FAILURE, _("stat of %s failed"), device);
if (!S_ISBLK(statbuf.st_mode))
errx(EXIT_FAILURE, _("%s is not a block special device"), device);
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 509b50b9d..5b64ad80a 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -328,7 +328,7 @@ static unsigned int parse_directory(struct entry *root_entry, const char *name,
memcpy(endpath, dirent->d_name, namelen + 1);
if (lstat(path, &st) < 0) {
- warn(_("stat failed %s"), endpath);
+ warn(_("stat of %s failed"), endpath);
warn_skip = 1;
continue;
}
@@ -748,7 +748,7 @@ int main(int argc, char **argv)
case 'i':
opt_image = optarg;
if (lstat(opt_image, &st) < 0)
- err(MKFS_EX_USAGE, _("stat failed %s"), opt_image);
+ err(MKFS_EX_USAGE, _("stat of %s failed"), opt_image);
image_length = st.st_size; /* may be padded later */
fslen_ub += (image_length + 3); /* 3 is for padding */
break;
@@ -785,7 +785,7 @@ int main(int argc, char **argv)
blksize = getpagesize();
if (stat(dirname, &st) < 0)
- err(MKFS_EX_USAGE, _("stat failed %s"), dirname);
+ err(MKFS_EX_USAGE, _("stat of %s failed"), dirname);
fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd < 0)
err(MKFS_EX_USAGE, _("cannot open %s"), outfile);
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 81b7ae337..c84aed2b3 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -747,7 +747,7 @@ int main(int argc, char ** argv) {
strcpy(tmp+2, ".badblocks");
}
if (stat(device_name, &statbuf) < 0)
- err(MKFS_EX_ERROR, _("stat failed %s"), device_name);
+ err(MKFS_EX_ERROR, _("stat of %s failed"), device_name);
if (S_ISBLK(statbuf.st_mode))
DEV = open(device_name,O_RDWR | O_EXCL);
else
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index b22c73fff..c7166f731 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -239,7 +239,7 @@ static void open_device(struct mkswap_control *ctl)
assert(ctl->devname);
if (stat(ctl->devname, &ctl->devstat) < 0)
- err(EXIT_FAILURE, _("stat failed %s"), ctl->devname);
+ err(EXIT_FAILURE, _("stat of %s failed"), ctl->devname);
if (S_ISBLK(ctl->devstat.st_mode))
ctl->fd = open(ctl->devname, O_RDWR | O_EXCL);
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 1ba531590..f21c388a7 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -888,7 +888,7 @@ int main(int argc, char **argv)
device = argv[optind];
if (stat(device, &sb))
- err(EXIT_FAILURE, _("stat failed %s"), device);
+ err(EXIT_FAILURE, _("stat of %s failed"), device);
part_devno = sb.st_rdev;