Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c95f54c

Browse files
committed
More adjustment of error messages
1 parent 083e10e commit c95f54c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/bin/initdb/initdb.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* Portions Copyright (c) 1994, Regents of the University of California
4444
* Portions taken from FreeBSD.
4545
*
46-
* $Header: /cvsroot/pgsql/src/bin/initdb/initdb.c,v 1.13 2003/11/23 22:17:59 petere Exp $
46+
* $Header: /cvsroot/pgsql/src/bin/initdb/initdb.c,v 1.14 2003/11/25 19:18:26 petere Exp $
4747
*
4848
*-------------------------------------------------------------------------
4949
*/
@@ -485,18 +485,18 @@ pclose_check(FILE *stream)
485485
}
486486
else if (WIFEXITED(exitstatus))
487487
{
488-
fprintf(stderr, _("child process exited with exit code %d\n"),
489-
WEXITSTATUS(exitstatus));
488+
fprintf(stderr, _("%s: child process exited with exit code %d\n"),
489+
progname, WEXITSTATUS(exitstatus));
490490
}
491491
else if (WIFSIGNALED(exitstatus))
492492
{
493-
fprintf(stderr, _("child process was terminated by signal %d\n"),
494-
WTERMSIG(exitstatus));
493+
fprintf(stderr, _("%s: child process was terminated by signal %d\n"),
494+
progname, WTERMSIG(exitstatus));
495495
}
496496
else
497497
{
498-
fprintf(stderr, _("child process exited with unexpected status %d\n"),
499-
exitstatus);
498+
fprintf(stderr, _("%s: child process exited with unrecognized status %d\n"),
499+
progname, exitstatus);
500500
}
501501

502502
exit_nicely();
@@ -842,9 +842,9 @@ check_input(char *path)
842842
if (stat(path, &statbuf) != 0 || !S_ISREG(statbuf.st_mode))
843843
{
844844
fprintf(stderr,
845-
_("%s: file \"%s\" not found\n"
846-
"This means you have a corrupted installation or identified\n"
847-
"the wrong directory with the invocation option -L.\n"),
845+
_("%s: file \"%s\" does not exist\n"
846+
"This means you have a corrupted installation or identified\n"
847+
"the wrong directory with the invocation option -L.\n"),
848848
progname, path);
849849
exit(1);
850850
}
@@ -1900,7 +1900,7 @@ check_ok()
19001900
}
19011901
else if (output_failed)
19021902
{
1903-
printf(_("failed to write to child process\n"));
1903+
printf(_("could not write to child process\n"));
19041904
exit_nicely();
19051905
}
19061906
else
@@ -2252,7 +2252,7 @@ main(int argc, char *argv[])
22522252

22532253
if ((short_version = get_short_version()) == NULL)
22542254
{
2255-
fprintf(stderr, _("%s: could not get valid short version\n"), progname);
2255+
fprintf(stderr, _("%s: could not determine valid short version string\n"), progname);
22562256
exit(1);
22572257
}
22582258

0 commit comments

Comments
 (0)