summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorSami Kerola2012-07-15 10:39:57 +0200
committerKarel Zak2012-07-16 18:18:22 +0200
commit289dcc90234680063a336925a99d1ef04e97cbda (patch)
treecb8656c16143daa406ea9d706406ca12d94d89d3 /disk-utils
parenttranslation: unify stat error messages (diff)
downloadkernel-qcow2-util-linux-289dcc90234680063a336925a99d1ef04e97cbda.tar.gz
kernel-qcow2-util-linux-289dcc90234680063a336925a99d1ef04e97cbda.tar.xz
kernel-qcow2-util-linux-289dcc90234680063a336925a99d1ef04e97cbda.zip
translation: unify file open error messages
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/addpart.c2
-rw-r--r--disk-utils/delpart.c2
-rw-r--r--disk-utils/fdformat.c4
-rw-r--r--disk-utils/fsck.c2
-rw-r--r--disk-utils/fsck.cramfs.c4
-rw-r--r--disk-utils/fsck.minix.c2
-rw-r--r--disk-utils/isosize.c2
-rw-r--r--disk-utils/mkfs.cramfs.c2
-rw-r--r--disk-utils/mkfs.minix.c2
-rw-r--r--disk-utils/partx.c2
-rw-r--r--disk-utils/swaplabel.c2
11 files changed, 13 insertions, 13 deletions
diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index 0d814bf3e..c0f25a539 100644
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
usage(stderr);
if ((fd = open(argv[1], O_RDONLY)) < 0)
- err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
+ err(EXIT_FAILURE, _("cannot open %s"), argv[1]);
if (partx_add_partition(fd,
strtou32_or_err(argv[2], _("invalid partition number argument")),
diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index 79925db89..e940e3bed 100644
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
if ((fd = open(argv[1], O_RDONLY)) < 0)
- err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
+ err(EXIT_FAILURE, _("cannot open %s"), argv[1]);
if (partx_del_partition(fd,
strtou32_or_err(argv[2], _("invalid partition number argument"))))
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 97fd4e8d6..e937a8ed5 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -59,7 +59,7 @@ static void verify_disk(char *name)
printf(_("Verifying ... "));
fflush(stdout);
if ((fd = open(name, O_RDONLY)) < 0)
- err(EXIT_FAILURE, _("cannot open file %s"), name);
+ err(EXIT_FAILURE, _("cannot open %s"), name);
for (cyl = 0; cyl < param.track; cyl++) {
int read_bytes;
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
ctrl = open(argv[0], O_WRONLY);
if (ctrl < 0)
- err(EXIT_FAILURE, _("cannot open file %s"), argv[0]);
+ err(EXIT_FAILURE, _("cannot open %s"), argv[0]);
if (ioctl(ctrl, FDGETPRM, (long)&param) < 0)
err(EXIT_FAILURE, _("Could not determine current format type"));
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 46646a99b..71263a273 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1344,7 +1344,7 @@ static void parse_argv(int argc, char *argv[])
* /proc/partitions isn't found.
*/
if (access(_PATH_PROC_PARTITIONS, R_OK) < 0) {
- warn(_("couldn't open %s"),
+ warn(_("cannot open %s"),
_PATH_PROC_PARTITIONS);
errx(FSCK_EX_ERROR, _("Is /proc mounted?"));
}
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index ac378307e..d64e2bed9 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)
fd = open(filename, O_RDONLY);
if (fd < 0)
- err(FSCK_EX_ERROR, _("open failed: %s"), filename);
+ err(FSCK_EX_ERROR, _("cannot open %s"), filename);
if (S_ISBLK(st.st_mode)) {
unsigned long long bytes;
@@ -495,7 +495,7 @@ static void do_file(char *path, struct cramfs_inode *i)
if (opt_extract) {
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, i->mode);
if (fd < 0)
- err(FSCK_EX_ERROR, _("open failed: %s"), path);
+ err(FSCK_EX_ERROR, _("cannot open %s"), path);
}
if (i->size)
do_uncompress(path, fd, offset, i->size);
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 5e56e832d..f24a9f215 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1302,7 +1302,7 @@ main(int argc, char **argv) {
}
IN = open(device_name, repair ? O_RDWR : O_RDONLY);
if (IN < 0)
- die(_("unable to open '%s': %s"), device_name, strerror(errno));
+ die(_("cannot open %s: %s"), device_name, strerror(errno));
for (count = 0; count < 3; count++)
sync();
read_superblock();
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 4ba34d550..e5defae29 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -123,7 +123,7 @@ static void isosize(char *filenamep, int xflag, long divisor)
struct iso_primary_descriptor ipd;
if ((fd = open(filenamep, O_RDONLY)) < 0)
- err(EXIT_FAILURE, _("failed to open %s"), filenamep);
+ err(EXIT_FAILURE, _("cannot open %s"), filenamep);
if (lseek(fd, 16 << 11, 0) == (off_t) - 1)
err(EXIT_FAILURE, _("seek error on %s"), filenamep);
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 44d774083..f504a3236 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -657,7 +657,7 @@ static unsigned int write_file(char *file, char *base, unsigned int offset)
fd = open(file, O_RDONLY);
if (fd < 0)
- err(MKFS_EX_ERROR, _("cannot open file %s"), file);
+ err(MKFS_EX_ERROR, _("cannot open %s"), file);
buf = mmap(NULL, image_length, PROT_READ, MAP_PRIVATE, fd, 0);
memcpy(base + offset, buf, image_length);
munmap(buf, image_length);
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index a1b5162fa..49626bf2a 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -759,7 +759,7 @@ int main(int argc, char ** argv) {
DEV = open(device_name,O_RDWR);
if (DEV<0)
- err(MKFS_EX_ERROR, _("%s: open failed"), device_name);
+ err(MKFS_EX_ERROR, _("cannot open %s"), device_name);
if (S_ISBLK(statbuf.st_mode)) {
int sectorsize;
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index a971a7ea8..69c559dea 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -827,7 +827,7 @@ int main(int argc, char **argv)
errx(EXIT_FAILURE, _("%s: not a block device"), wholedisk);
}
if ((fd = open(wholedisk, O_RDONLY)) == -1)
- err(EXIT_FAILURE, _("%s: open failed"), wholedisk);
+ err(EXIT_FAILURE, _("cannot open %s"), wholedisk);
if (what == ACT_DELETE)
rc = del_parts(fd, wholedisk, disk_devno, lower, upper);
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 44b1cb368..3e3e78b16 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -102,7 +102,7 @@ static int change_info(const char *devname, const char *label, const char *uuid)
fd = open(devname, O_RDWR);
if (fd < 0) {
- warn(_("%s: failed to open"), devname);
+ warn(_("cannot open %s"), devname);
goto err;
}
#ifdef HAVE_LIBUUID