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:
parent
58fbb9b2d5
commit
338a6bc55b
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue