From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 15 May 1998 01:57:33 +0000 (+0000)
Subject: Another \f\  fix for psql.
X-Git-Tag: REL6_4_2~972
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45878915a89bbd338ccb7e4b5b55f4344186df05;p=postgresql

Another \f\  fix for psql.
---

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 0542d3951e..e698f68fb5 100644
--- 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.143 1998/05/13 03:27:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.144 1998/05/15 01:57:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1988,8 +1988,16 @@ HandleSlashCmds(PsqlSettings *pset,
 
 				if (optarg)
 					fs = optarg;
-				if (optarg && !*optarg && strlen(cmd) > 2)
-					fs = cmd + 2;
+				/* handle \f \{space} */
+				if (optarg && !*optarg && strlen(cmd) > 1)
+				{
+					int			i;
+					
+					/* line and cmd match until the first blank space */
+					for (i=2; isspace(line[i]); i++)
+						;
+					fs = cmd + i - 1;
+				}
 				if (pset->opt.fieldSep)
 					free(pset->opt.fieldSep);
 				if (!(pset->opt.fieldSep = strdup(fs)))