Get rid of perror(), substitute some better phrased error messages.

petere · petere · commit e9c05281b599 · 2004-11-09T15:57:57.000Z
malloc() doesn't set errno, so most uses were buggy anyway.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.65 2004/10/24 15:55:29 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.66 2004/11/09 15:57:52 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2472,7 +2472,8 @@ main(int argc, char *argv[])
 
 			if (chmod(pg_data, 0700) != 0)
 			{
-				perror(pg_data);
+				fprintf(stderr, _("%s: could not change permissions of directory �%s�: %s\n"),
+						progname, pg_data, strerror(errno));
 				exit_nicely();
 			}
 			else
@@ -2493,7 +2494,8 @@ main(int argc, char *argv[])
 
 		default:
 			/* Trouble accessing directory */
-			perror(pg_data);
+			fprintf(stderr, _("%s: could not access directory �%s�: %s\n"),
+					progname, pg_data, strerror(errno));
 			exit_nicely();
 	}
 
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.52 2004/09/27 23:24:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.53 2004/11/09 15:57:53 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -227,14 +227,14 @@ print_aligned_text(const char *title, const char *const * headers,
 		widths = calloc(col_count, sizeof(*widths));
 		if (!widths)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 
 		head_w = calloc(col_count, sizeof(*head_w));
 		if (!head_w)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -253,7 +253,7 @@ print_aligned_text(const char *title, const char *const * headers,
 		cell_w = calloc(cell_count, sizeof(*cell_w));
 		if (!cell_w)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -437,7 +437,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
 		head_w = calloc(col_count, sizeof(*head_w));
 		if (!head_w)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -461,7 +461,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
 		cell_w = calloc(cell_count, sizeof(*cell_w));
 		if (!cell_w)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -485,7 +485,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
 	divider = malloc(hwidth + dwidth + 10);
 	if (!divider)
 	{
-		perror("malloc");
+		fprintf(stderr, gettext("out of memory\n"));
 		exit(EXIT_FAILURE);
 	}
 	divider[0] = '\0';
@@ -514,7 +514,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
 
 				if (!record_str)
 				{
-					perror("malloc");
+					fprintf(stderr, gettext("out of memory\n"));
 					exit(EXIT_FAILURE);
 				}
 
@@ -532,7 +532,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
 
 					if (!div_copy)
 					{
-						perror("malloc");
+						fprintf(stderr, gettext("out of memory\n"));
 						exit(EXIT_FAILURE);
 					}
 
@@ -1153,7 +1153,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
 	headers = calloc(nfields + 1, sizeof(*headers));
 	if (!headers)
 	{
-		perror("calloc");
+		fprintf(stderr, gettext("out of memory\n"));
 		exit(EXIT_FAILURE);
 	}
 
@@ -1165,7 +1165,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
 	cells = calloc(ncells + 1, sizeof(*cells));
 	if (!cells)
 	{
-		perror("calloc");
+		fprintf(stderr, gettext("out of memory\n"));
 		exit(EXIT_FAILURE);
 	}
 
@@ -1186,14 +1186,14 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
 		footers = calloc(2, sizeof(*footers));
 		if (!footers)
 		{
-			perror("calloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 
 		footers[0] = malloc(100);
 		if (!footers[0])
 		{
-			perror("malloc");
+			fprintf(stderr, gettext("out of memory\n"));
 			exit(EXIT_FAILURE);
 		}
 		if (PQntuples(result) == 1)
@@ -1208,7 +1208,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
 	align = calloc(nfields + 1, sizeof(*align));
 	if (!align)
 	{
-		perror("calloc");
+		fprintf(stderr, gettext("out of memory\n"));
 		exit(EXIT_FAILURE);
 	}
 
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.12 2004/10/16 03:10:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.13 2004/11/09 15:57:54 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,8 @@ get_user_name(const char *progname)
 	pw = getpwuid(getuid());
 	if (!pw)
 	{
-		perror(progname);
+		fprintf(stderr, _("%s: could not obtain information about current user: %s"),
+				progname, strerror(errno));
 		exit(1);
 	}
 	return pw->pw_name;
@@ -40,7 +41,8 @@ get_user_name(const char *progname)
 
 	if (!GetUserName(username, &len))
 	{
-		perror(progname);
+		fprintf(stderr, _("%s: could not get current user name: %s"),
+				progname, strerror(errno));
 		exit(1);
 	}
 	return username;
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.90 2004/08/29 05:07:00 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.91 2004/11/09 15:57:55 petere Exp $ */
 
 /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
 /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@@ -154,7 +154,8 @@ main(int argc, char *const argv[])
 					yyout = fopen(optarg, PG_BINARY_W);
 
 				if (yyout == NULL)
-					perror(optarg);
+					fprintf(stderr, "%s: could not open file \"%s\": %s\n",
+							progname, optarg, strerror(errno));
 				else
 					out_option = 1;
 				break;
@@ -304,7 +305,8 @@ main(int argc, char *const argv[])
 					yyout = fopen(output_filename, PG_BINARY_W);
 					if (yyout == NULL)
 					{
-						perror(output_filename);
+						fprintf(stderr, "%s: could not open file \"%s\": %s\n",
+								progname, output_filename, strerror(errno));
 						free(output_filename);
 						free(input_filename);
 						continue;
@@ -313,7 +315,8 @@ main(int argc, char *const argv[])
 			}
 
 			if (yyin == NULL)
-				perror(argv[fnr]);
+				fprintf(stderr, "%s: could not open file \"%s\": %s\n",
+						progname, argv[fnr], strerror(errno));
 			else
 			{
 				struct cursor *ptr;
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.94 2004/10/16 03:10:17 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.95 2004/11/09 15:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -527,7 +527,7 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq)
 				if (!(crypt_pwd = malloc(MD5_PASSWD_LEN + 1)) ||
 					!(crypt_pwd2 = malloc(MD5_PASSWD_LEN + 1)))
 				{
-					perror("malloc");
+					fprintf(stderr, libpq_gettext("out of memory\n"));
 					return STATUS_ERROR;
 				}
 				if (!EncryptMD5(password, conn->pguser,
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
@@ -10,7 +10,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.54 2004/08/29 05:07:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.55 2004/11/09 15:57:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -110,17 +110,17 @@ PQprint(FILE *fout,
 		nTups = PQntuples(res);
 		if (!(fieldNames = (const char **) calloc(nFields, sizeof(char *))))
 		{
-			perror("calloc");
+			fprintf(stderr, libpq_gettext("out of memory\n"));
 			exit(1);
 		}
 		if (!(fieldNotNum = (unsigned char *) calloc(nFields, 1)))
 		{
-			perror("calloc");
+			fprintf(stderr, libpq_gettext("out of memory\n"));
 			exit(1);
 		}
 		if (!(fieldMax = (int *) calloc(nFields, sizeof(int))))
 		{
-			perror("calloc");
+			fprintf(stderr, libpq_gettext("out of memory\n"));
 			exit(1);
 		}
 		for (numFieldName = 0;
@@ -205,7 +205,7 @@ PQprint(FILE *fout,
 		{
 			if (!(fields = (char **) calloc(nFields * (nTups + 1), sizeof(char *))))
 			{
-				perror("calloc");
+				fprintf(stderr, libpq_gettext("out of memory\n"));
 				exit(1);
 			}
 		}
@@ -392,7 +392,7 @@ do_field(const PQprintOpt *po, const PGresult *res,
 				fieldMax[j] = plen;
 			if (!(fields[i * nFields + j] = (char *) malloc(plen + 1)))
 			{
-				perror("malloc");
+				fprintf(stderr, libpq_gettext("out of memory\n"));
 				exit(1);
 			}
 			strcpy(fields[i * nFields + j], pval);
@@ -463,7 +463,7 @@ do_header(FILE *fout, const PQprintOpt *po, const int nFields, int *fieldMax,
 		border = malloc(tot + 1);
 		if (!border)
 		{
-			perror("malloc");
+			fprintf(stderr, libpq_gettext("out of memory\n"));
 			exit(1);
 		}
 		p = border;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* Portions Copyright (c) 1994, Regents of the University of California`
`40`	`40`	`* Portions taken from FreeBSD.`
`41`	`41`	`*`
`42`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.65 2004/10/24 15:55:29 tgl Exp $`
	`42`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.66 2004/11/09 15:57:52 petere Exp $`
`43`	`43`	`*`
`44`	`44`	`*-------------------------------------------------------------------------`
`45`	`45`	`*/`
`@@ -2472,7 +2472,8 @@ main(int argc, char *argv[])`
`2472`	`2472`
`2473`	`2473`	`if (chmod(pg_data, 0700) != 0)`
`2474`	`2474`	`{`
`2475`		`- perror(pg_data);`
	`2475`	`+ fprintf(stderr, _("%s: could not change permissions of directory »%s«: %s\n"),`
	`2476`	`+ progname, pg_data, strerror(errno));`
`2476`	`2477`	`exit_nicely();`
`2477`	`2478`	`}`
`2478`	`2479`	`else`
`@@ -2493,7 +2494,8 @@ main(int argc, char *argv[])`
`2493`	`2494`
`2494`	`2495`	`default:`
`2495`	`2496`	`/* Trouble accessing directory */`
`2496`		`- perror(pg_data);`
	`2497`	`+ fprintf(stderr, _("%s: could not access directory »%s«: %s\n"),`
	`2498`	`+ progname, pg_data, strerror(errno));`
`2497`	`2499`	`exit_nicely();`
`2498`	`2500`	`}`
`2499`	`2501`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.52 2004/09/27 23:24:35 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.53 2004/11/09 15:57:53 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "common.h"`
`@@ -227,14 +227,14 @@ print_aligned_text(const char title, const char const * headers,`
`227`	`227`	`widths = calloc(col_count, sizeof(*widths));`
`228`	`228`	`if (!widths)`
`229`	`229`	`{`
`230`		`- perror("calloc");`
	`230`	`+ fprintf(stderr, gettext("out of memory\n"));`
`231`	`231`	`exit(EXIT_FAILURE);`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`head_w = calloc(col_count, sizeof(*head_w));`
`235`	`235`	`if (!head_w)`
`236`	`236`	`{`
`237`		`- perror("calloc");`
	`237`	`+ fprintf(stderr, gettext("out of memory\n"));`
`238`	`238`	`exit(EXIT_FAILURE);`
`239`	`239`	`}`
`240`	`240`	`}`
`@@ -253,7 +253,7 @@ print_aligned_text(const char title, const char const * headers,`
`253`	`253`	`cell_w = calloc(cell_count, sizeof(*cell_w));`
`254`	`254`	`if (!cell_w)`
`255`	`255`	`{`
`256`		`- perror("calloc");`
	`256`	`+ fprintf(stderr, gettext("out of memory\n"));`
`257`	`257`	`exit(EXIT_FAILURE);`
`258`	`258`	`}`
`259`	`259`	`}`
`@@ -437,7 +437,7 @@ print_aligned_vertical(const char title, const char const * headers,`
`437`	`437`	`head_w = calloc(col_count, sizeof(*head_w));`
`438`	`438`	`if (!head_w)`
`439`	`439`	`{`
`440`		`- perror("calloc");`
	`440`	`+ fprintf(stderr, gettext("out of memory\n"));`
`441`	`441`	`exit(EXIT_FAILURE);`
`442`	`442`	`}`
`443`	`443`	`}`
`@@ -461,7 +461,7 @@ print_aligned_vertical(const char title, const char const * headers,`
`461`	`461`	`cell_w = calloc(cell_count, sizeof(*cell_w));`
`462`	`462`	`if (!cell_w)`
`463`	`463`	`{`
`464`		`- perror("calloc");`
	`464`	`+ fprintf(stderr, gettext("out of memory\n"));`
`465`	`465`	`exit(EXIT_FAILURE);`
`466`	`466`	`}`
`467`	`467`	`}`
`@@ -485,7 +485,7 @@ print_aligned_vertical(const char title, const char const * headers,`
`485`	`485`	`divider = malloc(hwidth + dwidth + 10);`
`486`	`486`	`if (!divider)`
`487`	`487`	`{`
`488`		`- perror("malloc");`
	`488`	`+ fprintf(stderr, gettext("out of memory\n"));`
`489`	`489`	`exit(EXIT_FAILURE);`
`490`	`490`	`}`
`491`	`491`	`divider[0] = '\0';`
`@@ -514,7 +514,7 @@ print_aligned_vertical(const char title, const char const * headers,`
`514`	`514`
`515`	`515`	`if (!record_str)`
`516`	`516`	`{`
`517`		`- perror("malloc");`
	`517`	`+ fprintf(stderr, gettext("out of memory\n"));`
`518`	`518`	`exit(EXIT_FAILURE);`
`519`	`519`	`}`
`520`	`520`
`@@ -532,7 +532,7 @@ print_aligned_vertical(const char title, const char const * headers,`
`532`	`532`
`533`	`533`	`if (!div_copy)`
`534`	`534`	`{`
`535`		`- perror("malloc");`
	`535`	`+ fprintf(stderr, gettext("out of memory\n"));`
`536`	`536`	`exit(EXIT_FAILURE);`
`537`	`537`	`}`
`538`	`538`
`@@ -1153,7 +1153,7 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE *fout)`
`1153`	`1153`	`headers = calloc(nfields + 1, sizeof(*headers));`
`1154`	`1154`	`if (!headers)`
`1155`	`1155`	`{`
`1156`		`- perror("calloc");`
	`1156`	`+ fprintf(stderr, gettext("out of memory\n"));`
`1157`	`1157`	`exit(EXIT_FAILURE);`
`1158`	`1158`	`}`
`1159`	`1159`
`@@ -1165,7 +1165,7 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE *fout)`
`1165`	`1165`	`cells = calloc(ncells + 1, sizeof(*cells));`
`1166`	`1166`	`if (!cells)`
`1167`	`1167`	`{`
`1168`		`- perror("calloc");`
	`1168`	`+ fprintf(stderr, gettext("out of memory\n"));`
`1169`	`1169`	`exit(EXIT_FAILURE);`
`1170`	`1170`	`}`
`1171`	`1171`
`@@ -1186,14 +1186,14 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE *fout)`
`1186`	`1186`	`footers = calloc(2, sizeof(*footers));`
`1187`	`1187`	`if (!footers)`
`1188`	`1188`	`{`
`1189`		`- perror("calloc");`
	`1189`	`+ fprintf(stderr, gettext("out of memory\n"));`
`1190`	`1190`	`exit(EXIT_FAILURE);`
`1191`	`1191`	`}`
`1192`	`1192`
`1193`	`1193`	`footers[0] = malloc(100);`
`1194`	`1194`	`if (!footers[0])`
`1195`	`1195`	`{`
`1196`		`- perror("malloc");`
	`1196`	`+ fprintf(stderr, gettext("out of memory\n"));`
`1197`	`1197`	`exit(EXIT_FAILURE);`
`1198`	`1198`	`}`
`1199`	`1199`	`if (PQntuples(result) == 1)`
`@@ -1208,7 +1208,7 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE *fout)`
`1208`	`1208`	`align = calloc(nfields + 1, sizeof(*align));`
`1209`	`1209`	`if (!align)`
`1210`	`1210`	`{`
`1211`		`- perror("calloc");`
	`1211`	`+ fprintf(stderr, gettext("out of memory\n"));`
`1212`	`1212`	`exit(EXIT_FAILURE);`
`1213`	`1213`	`}`
`1214`	`1214`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.12 2004/10/16 03:10:16 momjian Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.13 2004/11/09 15:57:54 petere Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -30,7 +30,8 @@ get_user_name(const char *progname)`
`30`	`30`	`pw = getpwuid(getuid());`
`31`	`31`	`if (!pw)`
`32`	`32`	`{`
`33`		`- perror(progname);`
	`33`	`+ fprintf(stderr, _("%s: could not obtain information about current user: %s"),`
	`34`	`+ progname, strerror(errno));`
`34`	`35`	`exit(1);`
`35`	`36`	`}`
`36`	`37`	`return pw->pw_name;`
`@@ -40,7 +41,8 @@ get_user_name(const char *progname)`
`40`	`41`
`41`	`42`	`if (!GetUserName(username, &len))`
`42`	`43`	`{`
`43`		`- perror(progname);`
	`44`	`+ fprintf(stderr, _("%s: could not get current user name: %s"),`
	`45`	`+ progname, strerror(errno));`
`44`	`46`	`exit(1);`
`45`	`47`	`}`
`46`	`48`	`return username;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.94 2004/10/16 03:10:17 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.95 2004/11/09 15:57:57 petere Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -527,7 +527,7 @@ pg_password_sendauth(PGconn conn, const char password, AuthRequest areq)`
`527`	`527`	`if (!(crypt_pwd = malloc(MD5_PASSWD_LEN + 1)) \|\|`
`528`	`528`	`!(crypt_pwd2 = malloc(MD5_PASSWD_LEN + 1)))`
`529`	`529`	`{`
`530`		`- perror("malloc");`
	`530`	`+ fprintf(stderr, libpq_gettext("out of memory\n"));`
`531`	`531`	`return STATUS_ERROR;`
`532`	`532`	`}`
`533`	`533`	`if (!EncryptMD5(password, conn->pguser,`