Fix printf() quote handling and improper exit(), per Tom.

bmomjian · bmomjian · commit 847f8b39d745 · 2002-09-06T02:33:47.000Z
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.20 2002/09/05 22:05:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.21 2002/09/06 02:33:46 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -30,7 +30,7 @@ static void finishInput(void);
 static void finishInput(int, void *);
 #endif
 
-#define PSQLHISTORY	"/.psql_history"
+#define PSQLHISTORY	".psql_history"
 
 
 /*
@@ -144,12 +144,12 @@ initializeInput(int flags)
 		home = getenv("HOME");
 		if (home)
 		{
-			char	   *psql_history = (char *) malloc(strlen(home) +
+			char	   *psql_history = (char *) malloc(strlen(home) + 1 +
 												strlen(PSQLHISTORY) + 1);
 
 			if (psql_history)
 			{
-				sprintf(psql_history, "%s" PSQLHISTORY, home);
+				sprintf(psql_history, "%s/%s", home, PSQLHISTORY);
 				read_history(psql_history);
 				free(psql_history);
 			}
@@ -204,15 +204,15 @@ finishInput(int exitstatus, void *arg)
 		home = getenv("HOME");
 		if (home)
 		{
-			psql_history = (char *) malloc(strlen(home) +
+			psql_history = (char *) malloc(strlen(home) + 1 +
 									strlen(PSQLHISTORY) + 1);
 			if (psql_history)
 			{
 				const char *var = GetVariable(pset.vars, "HISTSIZE");
 
 				if (var)
 					stifle_history(atoi(var));
-				sprintf(psql_history, "%s" PSQLHISTORY, home);
+				sprintf(psql_history, "%s/%s", home, PSQLHISTORY);
 				write_history(psql_history);
 				free(psql_history);
 			}
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.65 2002/09/05 22:05:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.66 2002/09/06 02:33:47 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -42,7 +42,7 @@
  */
 PsqlSettings pset;
 
-#define PSQLRC "/.psqlrc"
+#define PSQLRC ".psqlrc"
 
 /*
  * Structures to pass information between the option parsing routine
@@ -605,20 +605,20 @@ process_psqlrc(void)
 
 	if (home)
 	{
-		psqlrc = malloc(strlen(home) + strlen(PSQLRC) + 1 +
+		psqlrc = malloc(strlen(home) + 1 + strlen(PSQLRC) + 1 +
 				 strlen(PG_VERSION) + 1);
 		if (!psqlrc)
 		{
 			fprintf(stderr, gettext("%s: out of memory\n"), pset.progname);
 			exit(EXIT_FAILURE);
 		}
 
-		sprintf(psqlrc, "%s" PSQLRC "-" PG_VERSION, home);
+		sprintf(psqlrc, "%s/%s-%s", home, PSQLRC, PG_VERSION);
 		if (access(psqlrc, R_OK) == 0)
 			process_file(psqlrc);
 		else
 		{
-			sprintf(psqlrc, "%s" PSQLRC, home);
+			sprintf(psqlrc, "%s/%s", home, PSQLRC);
 			if (access(psqlrc, R_OK) == 0)
 				process_file(psqlrc);
 		}
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.203 2002/09/05 22:24:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.204 2002/09/06 02:33:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,7 @@ inet_aton(const char *cp, struct in_addr * inp)
 #define NOTIFYLIST_INITIAL_SIZE 10
 #define NOTIFYLIST_GROWBY 10
 
-#define PGPASSFILE "/.pgpass"
+#define PGPASSFILE ".pgpass"
 
 /* ----------
  * Definition of the conninfo parameters and their fallback resources.
@@ -2927,18 +2927,17 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
 	home = getenv("HOME");
 	if (home)
 	{
-		pgpassfile = malloc(strlen(home) + strlen(PGPASSFILE) + 1);
+		pgpassfile = malloc(strlen(home) + 1 + strlen(PGPASSFILE) + 1);
 		if (!pgpassfile)
 		{
-						  
 			fprintf(stderr, libpq_gettext("out of memory\n"));
-			exit(EXIT_FAILURE);
+			return NULL;
 		}
 	}
 	else
 		return NULL;
 
-	sprintf(pgpassfile, "%s" PGPASSFILE, home);
+	sprintf(pgpassfile, "%s/%s", home, PGPASSFILE);
 
 	/* If password file cannot be opened, ignore it. */
 	if (stat(pgpassfile, &stat_buf) == -1)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.20 2002/09/05 22:05:50 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.21 2002/09/06 02:33:46 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "input.h"`
`@@ -30,7 +30,7 @@ static void finishInput(void);`
`30`	`30`	`static void finishInput(int, void *);`
`31`	`31`	`#endif`
`32`	`32`
`33`		`-#define PSQLHISTORY "/.psql_history"`
	`33`	`+#define PSQLHISTORY ".psql_history"`
`34`	`34`
`35`	`35`
`36`	`36`	`/*`
`@@ -144,12 +144,12 @@ initializeInput(int flags)`
`144`	`144`	`home = getenv("HOME");`
`145`	`145`	`if (home)`
`146`	`146`	`{`
`147`		`- char psql_history = (char ) malloc(strlen(home) +`
	`147`	`+ char psql_history = (char ) malloc(strlen(home) + 1 +`
`148`	`148`	`strlen(PSQLHISTORY) + 1);`
`149`	`149`
`150`	`150`	`if (psql_history)`
`151`	`151`	`{`
`152`		`- sprintf(psql_history, "%s" PSQLHISTORY, home);`
	`152`	`+ sprintf(psql_history, "%s/%s", home, PSQLHISTORY);`
`153`	`153`	`read_history(psql_history);`
`154`	`154`	`free(psql_history);`
`155`	`155`	`}`
`@@ -204,15 +204,15 @@ finishInput(int exitstatus, void *arg)`
`204`	`204`	`home = getenv("HOME");`
`205`	`205`	`if (home)`
`206`	`206`	`{`
`207`		`- psql_history = (char *) malloc(strlen(home) +`
	`207`	`+ psql_history = (char *) malloc(strlen(home) + 1 +`
`208`	`208`	`strlen(PSQLHISTORY) + 1);`
`209`	`209`	`if (psql_history)`
`210`	`210`	`{`
`211`	`211`	`const char *var = GetVariable(pset.vars, "HISTSIZE");`
`212`	`212`
`213`	`213`	`if (var)`
`214`	`214`	`stifle_history(atoi(var));`
`215`		`- sprintf(psql_history, "%s" PSQLHISTORY, home);`
	`215`	`+ sprintf(psql_history, "%s/%s", home, PSQLHISTORY);`
`216`	`216`	`write_history(psql_history);`
`217`	`217`	`free(psql_history);`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.203 2002/09/05 22:24:23 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.204 2002/09/06 02:33:47 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -66,7 +66,7 @@ inet_aton(const char cp, struct in_addr inp)`
`66`	`66`	`#define NOTIFYLIST_INITIAL_SIZE 10`
`67`	`67`	`#define NOTIFYLIST_GROWBY 10`
`68`	`68`
`69`		`-#define PGPASSFILE "/.pgpass"`
	`69`	`+#define PGPASSFILE ".pgpass"`
`70`	`70`
`71`	`71`	`/* ----------`
`72`	`72`	`* Definition of the conninfo parameters and their fallback resources.`
`@@ -2927,18 +2927,17 @@ PasswordFromFile(char hostname, char port, char dbname, char username)`
`2927`	`2927`	`home = getenv("HOME");`
`2928`	`2928`	`if (home)`
`2929`	`2929`	`{`
`2930`		`- pgpassfile = malloc(strlen(home) + strlen(PGPASSFILE) + 1);`
	`2930`	`+ pgpassfile = malloc(strlen(home) + 1 + strlen(PGPASSFILE) + 1);`
`2931`	`2931`	`if (!pgpassfile)`
`2932`	`2932`	`{`
`2933`		`-`
`2934`	`2933`	`fprintf(stderr, libpq_gettext("out of memory\n"));`
`2935`		`- exit(EXIT_FAILURE);`
	`2934`	`+ return NULL;`
`2936`	`2935`	`}`
`2937`	`2936`	`}`
`2938`	`2937`	`else`
`2939`	`2938`	`return NULL;`
`2940`	`2939`
`2941`		`- sprintf(pgpassfile, "%s" PGPASSFILE, home);`
	`2940`	`+ sprintf(pgpassfile, "%s/%s", home, PGPASSFILE);`
`2942`	`2941`
`2943`	`2942`	`/* If password file cannot be opened, ignore it. */`
`2944`	`2943`	`if (stat(pgpassfile, &stat_buf) == -1)`