psql: Tweak xheader_width and pager_min_lines input parsing

alvherre · alvherre · commit ed7e686a031e · 2023-05-19T20:19:28.000+02:00
Don't throw away the previous value when an invalid value is proposed. Discussion: https://postgr.es/m/20230519110205.updpbjiuqgbox6gp@alvherre.pgsql
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -4521,13 +4521,16 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			popt->topt.expanded_header_width_type = PRINT_XHEADER_PAGE;
 		else
 		{
-			popt->topt.expanded_header_width_type = PRINT_XHEADER_EXACT_WIDTH;
-			popt->topt.expanded_header_exact_width = atoi(value);
-			if (popt->topt.expanded_header_exact_width == 0)
+			int			intval = atoi(value);
+
+			if (intval == 0)
 			{
 				pg_log_error("\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width", "full", "column", "page");
 				return false;
 			}
+
+			popt->topt.expanded_header_width_type = PRINT_XHEADER_EXACT_WIDTH;
+			popt->topt.expanded_header_exact_width = intval;
 		}
 	}
 
@@ -4660,8 +4663,9 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 	/* set minimum lines for pager use */
 	else if (strcmp(param, "pager_min_lines") == 0)
 	{
-		if (value)
-			popt->topt.pager_min_lines = atoi(value);
+		if (value &&
+			!ParseVariableNum(value, "pager_min_lines", &popt->topt.pager_min_lines))
+			return false;
 	}
 
 	/* disable "(x rows)" footer */

Original file line number	Diff line number	Diff line change
`@@ -4521,13 +4521,16 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`4521`	`4521`	`popt->topt.expanded_header_width_type = PRINT_XHEADER_PAGE;`
`4522`	`4522`	`else`
`4523`	`4523`	`{`
`4524`		`- popt->topt.expanded_header_width_type = PRINT_XHEADER_EXACT_WIDTH;`
`4525`		`- popt->topt.expanded_header_exact_width = atoi(value);`
`4526`		`- if (popt->topt.expanded_header_exact_width == 0)`
	`4524`	`+ int intval = atoi(value);`
	`4525`	`+`
	`4526`	`+ if (intval == 0)`
`4527`	`4527`	`{`
`4528`	`4528`	`pg_log_error("\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width", "full", "column", "page");`
`4529`	`4529`	`return false;`
`4530`	`4530`	`}`
	`4531`	`+`
	`4532`	`+ popt->topt.expanded_header_width_type = PRINT_XHEADER_EXACT_WIDTH;`
	`4533`	`+ popt->topt.expanded_header_exact_width = intval;`
`4531`	`4534`	`}`
`4532`	`4535`	`}`
`4533`	`4536`
`@@ -4660,8 +4663,9 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`4660`	`4663`	`/* set minimum lines for pager use */`
`4661`	`4664`	`else if (strcmp(param, "pager_min_lines") == 0)`
`4662`	`4665`	`{`
`4663`		`- if (value)`
`4664`		`- popt->topt.pager_min_lines = atoi(value);`
	`4666`	`+ if (value &&`
	`4667`	`+ !ParseVariableNum(value, "pager_min_lines", &popt->topt.pager_min_lines))`
	`4668`	`+ return false;`
`4665`	`4669`	`}`
`4666`	`4670`
`4667`	`4671`	`/* disable "(x rows)" footer */`