ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

textual: improve error messages 

Use error printing facilities that add command name in front of the error
message, and add explanation that is part of existing translations.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2014-12-07 10:13:03 +00:00 committed by Karel Zak
parent 58fbb9b2d5
commit 338a6bc55b
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/blockdev.c
View File

@ -365,7 +365,7 @@ static void do_commands(int fd, char **argv, int d)
}
if (res == -1) {
perror(bdcms[j].iocname);
warn(_("ioctl error on %s"), bdcms[j].iocname);
if (verbose)
printf(_("%s failed.\n"), _(bdcms[j].help));
exit(EXIT_FAILURE);

3
disk-utils/mkfs.c
View File

@ -147,6 +147,5 @@ int main(int argc, char **argv)
/* Execute the program */
execvp(progname, argv + optind);
perror(progname);
return EXIT_FAILURE;
err(EXIT_FAILURE, _("failed to execute %s"), progname);
}

2
disk-utils/mkfs.cramfs.c
View File

@ -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) {
perror(endpath);
warn(_("stat failed %s"), endpath);
warn_skip = 1;
continue;
}

10
text-utils/more.c
View File

@ -591,7 +591,7 @@ FILE *checkf(register char *fs, int *clearfirst)
fflush(stdout);
if (clreol)
cleareol();
perror(fs);
warn(_("stat failed %s"), fs);
return ((FILE *)NULL);
}
if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
@ -600,7 +600,7 @@ FILE *checkf(register char *fs, int *clearfirst)
}
if ((f = Fopen(fs, "r")) == NULL) {
fflush(stdout);
perror(fs);
warn(_("cannot open %s"), fs);
return ((FILE *)NULL);
}
if (magic(f, fs)) {
@ -1781,10 +1781,8 @@ void initterm(void)
int tgrp;
/* Wait until we're in the foreground before we
* save the terminal modes. */
if ((tgrp = tcgetpgrp(fileno(stdout))) < 0) {
perror("tcgetpgrp");
exit(EXIT_FAILURE);
}
if ((tgrp = tcgetpgrp(fileno(stdout))) < 0)
err(EXIT_FAILURE, "tcgetpgrp");
if (tgrp != getpgrp(0)) {
kill(0, SIGTTOU);
goto retry;