|
|
@ -43,7 +43,7 @@ |
|
|
|
* Portions Copyright (c) 1994, Regents of the University of California |
|
|
|
* Portions Copyright (c) 1994, Regents of the University of California |
|
|
|
* Portions taken from FreeBSD. |
|
|
|
* Portions taken from FreeBSD. |
|
|
|
* |
|
|
|
* |
|
|
|
* $Header: /cvsroot/pgsql/src/bin/initdb/initdb.c,v 1.13 2003/11/23 22:17:59 petere Exp $ |
|
|
|
* $Header: /cvsroot/pgsql/src/bin/initdb/initdb.c,v 1.14 2003/11/25 19:18:26 petere Exp $ |
|
|
|
* |
|
|
|
* |
|
|
|
*------------------------------------------------------------------------- |
|
|
|
*------------------------------------------------------------------------- |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -485,18 +485,18 @@ pclose_check(FILE *stream) |
|
|
|
} |
|
|
|
} |
|
|
|
else if (WIFEXITED(exitstatus)) |
|
|
|
else if (WIFEXITED(exitstatus)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
fprintf(stderr, _("child process exited with exit code %d\n"), |
|
|
|
fprintf(stderr, _("%s: child process exited with exit code %d\n"), |
|
|
|
WEXITSTATUS(exitstatus)); |
|
|
|
progname, WEXITSTATUS(exitstatus)); |
|
|
|
} |
|
|
|
} |
|
|
|
else if (WIFSIGNALED(exitstatus)) |
|
|
|
else if (WIFSIGNALED(exitstatus)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
fprintf(stderr, _("child process was terminated by signal %d\n"), |
|
|
|
fprintf(stderr, _("%s: child process was terminated by signal %d\n"), |
|
|
|
WTERMSIG(exitstatus)); |
|
|
|
progname, WTERMSIG(exitstatus)); |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
fprintf(stderr, _("child process exited with unexpected status %d\n"), |
|
|
|
fprintf(stderr, _("%s: child process exited with unrecognized status %d\n"), |
|
|
|
exitstatus); |
|
|
|
progname, exitstatus); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
exit_nicely(); |
|
|
|
exit_nicely(); |
|
|
@ -842,7 +842,7 @@ check_input(char *path) |
|
|
|
if (stat(path, &statbuf) != 0 || !S_ISREG(statbuf.st_mode)) |
|
|
|
if (stat(path, &statbuf) != 0 || !S_ISREG(statbuf.st_mode)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
fprintf(stderr, |
|
|
|
fprintf(stderr, |
|
|
|
_("%s: file \"%s\" not found\n" |
|
|
|
_("%s: file \"%s\" does not exist\n" |
|
|
|
"This means you have a corrupted installation or identified\n" |
|
|
|
"This means you have a corrupted installation or identified\n" |
|
|
|
"the wrong directory with the invocation option -L.\n"), |
|
|
|
"the wrong directory with the invocation option -L.\n"), |
|
|
|
progname, path); |
|
|
|
progname, path); |
|
|
@ -1900,7 +1900,7 @@ check_ok() |
|
|
|
} |
|
|
|
} |
|
|
|
else if (output_failed) |
|
|
|
else if (output_failed) |
|
|
|
{ |
|
|
|
{ |
|
|
|
printf(_("failed to write to child process\n")); |
|
|
|
printf(_("could not write to child process\n")); |
|
|
|
exit_nicely(); |
|
|
|
exit_nicely(); |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
@ -2252,7 +2252,7 @@ main(int argc, char *argv[]) |
|
|
|
|
|
|
|
|
|
|
|
if ((short_version = get_short_version()) == NULL) |
|
|
|
if ((short_version = get_short_version()) == NULL) |
|
|
|
{ |
|
|
|
{ |
|
|
|
fprintf(stderr, _("%s: could not get valid short version\n"), progname); |
|
|
|
fprintf(stderr, _("%s: could not determine valid short version string\n"), progname); |
|
|
|
exit(1); |
|
|
|
exit(1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|