|
43 | 43 | * Portions Copyright (c) 1994, Regents of the University of California |
44 | 44 | * Portions taken from FreeBSD. |
45 | 45 | * |
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 $ |
47 | 47 | * |
48 | 48 | *------------------------------------------------------------------------- |
49 | 49 | */ |
@@ -485,18 +485,18 @@ pclose_check(FILE *stream) |
485 | 485 | } |
486 | 486 | elseif (WIFEXITED(exitstatus)) |
487 | 487 | { |
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)); |
490 | 490 | } |
491 | 491 | elseif (WIFSIGNALED(exitstatus)) |
492 | 492 | { |
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)); |
495 | 495 | } |
496 | 496 | else |
497 | 497 | { |
498 | | -fprintf(stderr,_("child process exited withunexpected status %d\n"), |
499 | | -exitstatus); |
| 498 | +fprintf(stderr,_("%s:child process exited withunrecognized status %d\n"), |
| 499 | +progname,exitstatus); |
500 | 500 | } |
501 | 501 |
|
502 | 502 | exit_nicely(); |
@@ -842,9 +842,9 @@ check_input(char *path) |
842 | 842 | if (stat(path,&statbuf)!=0|| !S_ISREG(statbuf.st_mode)) |
843 | 843 | { |
844 | 844 | fprintf(stderr, |
845 | | -_("%s: file \"%s\" notfound\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\"doesnotexist\n" |
| 846 | +"This means you have a corrupted installation or identified\n" |
| 847 | +"the wrong directory with the invocation option -L.\n"), |
848 | 848 | progname,path); |
849 | 849 | exit(1); |
850 | 850 | } |
@@ -1900,7 +1900,7 @@ check_ok() |
1900 | 1900 | } |
1901 | 1901 | elseif (output_failed) |
1902 | 1902 | { |
1903 | | -printf(_("failed to write to child process\n")); |
| 1903 | +printf(_("could not write to child process\n")); |
1904 | 1904 | exit_nicely(); |
1905 | 1905 | } |
1906 | 1906 | else |
@@ -2252,7 +2252,7 @@ main(int argc, char *argv[]) |
2252 | 2252 |
|
2253 | 2253 | if ((short_version=get_short_version())==NULL) |
2254 | 2254 | { |
2255 | | -fprintf(stderr,_("%s: could notget valid short version\n"),progname); |
| 2255 | +fprintf(stderr,_("%s: could notdetermine valid short version string\n"),progname); |
2256 | 2256 | exit(1); |
2257 | 2257 | } |
2258 | 2258 |
|
|