Fix for \d on long table names.

bmomjian · bmomjian · commit c2dd3c4fef12 · 1998-02-06T17:46:31.000Z
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.131 1998/01/28 20:44:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.132 1998/02/06 17:46:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -308,7 +308,7 @@ int
 tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
 	bool system_tables)
 {
-	char		listbuf[256];
+	char		listbuf[512];
 	int			nColumns;
 	int			i;
 	char	   *rk;
@@ -436,7 +436,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
 			pclose(fout);
 			pqsignal(SIGPIPE, SIG_DFL);
 		}
-		return (0);
+		return 0;
 
 	}
 	else
@@ -458,7 +458,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
 				fprintf(stderr, "Couldn't find any tables, sequences or indices!\n");
 				break;
 		}
-		return (-1);
+		return -1;
 	}
 }
 
@@ -469,7 +469,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
 int
 rightsList(PsqlSettings *pset)
 {
-	char		listbuf[256];
+	char		listbuf[512];
 	int			nColumns;
 	int			i;
 	int			usePipe = 0;
@@ -537,12 +537,12 @@ rightsList(PsqlSettings *pset)
 			pclose(fout);
 			pqsignal(SIGPIPE, SIG_DFL);
 		}
-		return (0);
+		return 0;
 	}
 	else
 	{
 		fprintf(stderr, "Couldn't find any tables!\n");
-		return (-1);
+		return -1;
 	}
 }
 
@@ -556,7 +556,7 @@ rightsList(PsqlSettings *pset)
 int
 tableDesc(PsqlSettings *pset, char *table, FILE *fout)
 {
-	char		descbuf[256];
+	char		descbuf[512];
 	int			nColumns;
 	char	   *rtype;
 	char	   *rnotnull;
@@ -700,20 +700,18 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout)
 			fprintf(fout,"\n");
 		}
 		fprintf(fout,"+----------------------------------+----------------------------------+-------+\n");
-
 		PQclear(res);
 		if (usePipe)
 		{
 			pclose(fout);
 			pqsignal(SIGPIPE, SIG_DFL);
 		}
-		return (0);
-
+		return 0;
 	}
 	else
 	{
 		fprintf(stderr, "Couldn't find table %s!\n", table);
-		return (-1);
+		return -1;
 	}
 }
 
@@ -727,7 +725,7 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout)
 int
 objectDescription(PsqlSettings *pset, char *object, FILE *fout)
 {
-	char		descbuf[256];
+	char		descbuf[512];
 	int			nDescriptions;
 	int			i;
 	PGresult   *res;
@@ -886,13 +884,13 @@ objectDescription(PsqlSettings *pset, char *object, FILE *fout)
 			pclose(fout);
 			pqsignal(SIGPIPE, SIG_DFL);
 		}
-		return (0);
+		return 0;
 
 	}
 	else
 	{
 		fprintf(stderr, "Couldn't find comments for object %s!\n", object);
-		return (-1);
+		return -1;
 	}
 }
 
@@ -907,7 +905,7 @@ gets_noreadline(char *prompt, FILE *source)
 {
 	fputs(prompt, stdout);
 	fflush(stdout);
-	return (gets_fromFile(prompt, stdin));
+	return gets_fromFile(prompt, stdin);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.131 1998/01/28 20:44:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.132 1998/02/06 17:46:31 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -308,7 +308,7 @@ int`
`308`	`308`	`tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,`
`309`	`309`	`bool system_tables)`
`310`	`310`	`{`
`311`		`- char listbuf[256];`
	`311`	`+ char listbuf[512];`
`312`	`312`	`int nColumns;`
`313`	`313`	`int i;`
`314`	`314`	`char *rk;`
`@@ -436,7 +436,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,`
`436`	`436`	`pclose(fout);`
`437`	`437`	`pqsignal(SIGPIPE, SIG_DFL);`
`438`	`438`	`}`
`439`		`- return (0);`
	`439`	`+ return 0;`
`440`	`440`
`441`	`441`	`}`
`442`	`442`	`else`
`@@ -458,7 +458,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,`
`458`	`458`	`fprintf(stderr, "Couldn't find any tables, sequences or indices!\n");`
`459`	`459`	`break;`
`460`	`460`	`}`
`461`		`- return (-1);`
	`461`	`+ return -1;`
`462`	`462`	`}`
`463`	`463`	`}`
`464`	`464`
`@@ -469,7 +469,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,`
`469`	`469`	`int`
`470`	`470`	`rightsList(PsqlSettings *pset)`
`471`	`471`	`{`
`472`		`- char listbuf[256];`
	`472`	`+ char listbuf[512];`
`473`	`473`	`int nColumns;`
`474`	`474`	`int i;`
`475`	`475`	`int usePipe = 0;`
`@@ -537,12 +537,12 @@ rightsList(PsqlSettings *pset)`
`537`	`537`	`pclose(fout);`
`538`	`538`	`pqsignal(SIGPIPE, SIG_DFL);`
`539`	`539`	`}`
`540`		`- return (0);`
	`540`	`+ return 0;`
`541`	`541`	`}`
`542`	`542`	`else`
`543`	`543`	`{`
`544`	`544`	`fprintf(stderr, "Couldn't find any tables!\n");`
`545`		`- return (-1);`
	`545`	`+ return -1;`
`546`	`546`	`}`
`547`	`547`	`}`
`548`	`548`
`@@ -556,7 +556,7 @@ rightsList(PsqlSettings *pset)`
`556`	`556`	`int`
`557`	`557`	`tableDesc(PsqlSettings pset, char table, FILE *fout)`
`558`	`558`	`{`
`559`		`- char descbuf[256];`
	`559`	`+ char descbuf[512];`
`560`	`560`	`int nColumns;`
`561`	`561`	`char *rtype;`
`562`	`562`	`char *rnotnull;`
`@@ -700,20 +700,18 @@ tableDesc(PsqlSettings pset, char table, FILE *fout)`
`700`	`700`	`fprintf(fout,"\n");`
`701`	`701`	`}`
`702`	`702`	`fprintf(fout,"+----------------------------------+----------------------------------+-------+\n");`
`703`		`-`
`704`	`703`	`PQclear(res);`
`705`	`704`	`if (usePipe)`
`706`	`705`	`{`
`707`	`706`	`pclose(fout);`
`708`	`707`	`pqsignal(SIGPIPE, SIG_DFL);`
`709`	`708`	`}`
`710`		`- return (0);`
`711`		`-`
	`709`	`+ return 0;`
`712`	`710`	`}`
`713`	`711`	`else`
`714`	`712`	`{`
`715`	`713`	`fprintf(stderr, "Couldn't find table %s!\n", table);`
`716`		`- return (-1);`
	`714`	`+ return -1;`
`717`	`715`	`}`
`718`	`716`	`}`
`719`	`717`
`@@ -727,7 +725,7 @@ tableDesc(PsqlSettings pset, char table, FILE *fout)`
`727`	`725`	`int`
`728`	`726`	`objectDescription(PsqlSettings pset, char object, FILE *fout)`
`729`	`727`	`{`
`730`		`- char descbuf[256];`
	`728`	`+ char descbuf[512];`
`731`	`729`	`int nDescriptions;`
`732`	`730`	`int i;`
`733`	`731`	`PGresult *res;`
`@@ -886,13 +884,13 @@ objectDescription(PsqlSettings pset, char object, FILE *fout)`
`886`	`884`	`pclose(fout);`
`887`	`885`	`pqsignal(SIGPIPE, SIG_DFL);`
`888`	`886`	`}`
`889`		`- return (0);`
	`887`	`+ return 0;`
`890`	`888`
`891`	`889`	`}`
`892`	`890`	`else`
`893`	`891`	`{`
`894`	`892`	`fprintf(stderr, "Couldn't find comments for object %s!\n", object);`
`895`		`- return (-1);`
	`893`	`+ return -1;`
`896`	`894`	`}`
`897`	`895`	`}`
`898`	`896`
`@@ -907,7 +905,7 @@ gets_noreadline(char prompt, FILE source)`
`907`	`905`	`{`
`908`	`906`	`fputs(prompt, stdout);`
`909`	`907`	`fflush(stdout);`
`910`		`- return (gets_fromFile(prompt, stdin));`
	`908`	`+ return gets_fromFile(prompt, stdin);`
`911`	`909`	`}`
`912`	`910`
`913`	`911`	`/*`