Commit5da7e53

committed

Don't strip trailing backslashes from a line. Treat them more reasonably.

1 parent4fa3738 commit5da7e53Copy full SHA for 5da7e53

File tree

-13

lines changed

-13

lines changed

Lines changed: 4 additions & 1 deletion

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/command.c,v 1.34 2000/06/26 14:16:34 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.35 2000/07/17 18:24:32 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres.h"`
`9`	`9`	`#include"command.h"`
`@@ -111,6 +111,9 @@ HandleSlashCmds(const char *line,`
`111`	`111`	`{`
`112`	`112`	`continue_parse=&my_line[blank_loc];`
`113`	`113`	`my_line[blank_loc]='\0';`
	`114`	`+/* If it's a double backslash, we skip it. */`
	`115`	`+if (my_line[blank_loc+1]=='\\')`
	`116`	`+continue_parse+=2;`
`114`	`117`	`}`
`115`	`118`	`/* do we have an option string? */`
`116`	`119`	`elseif (my_line[blank_loc]!='\0')`

Lines changed: 1 addition & 12 deletions

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/mainloop.c,v 1.33 2000/07/14 15:43:49 thomas Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.34 2000/07/17 18:24:33 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres.h"`
`9`	`9`	`#include"mainloop.h"`
`@@ -248,17 +248,6 @@ MainLoop(FILE *source)`
`248`	`248`
`249`	`249`	`pset.lineno++;`
`250`	`250`
`251`		`-/* strip trailing backslashes, they don't have a clear meaning */`
`252`		`-while (1)`
`253`		`-{`
`254`		`-char*cp=strrchr(line,'\\');`
`255`		`-`
`256`		`-if (cp&& (*(cp+1)=='\0'))`
`257`		`-*cp='\0';`
`258`		`-else`
`259`		`-break;`
`260`		`-}`
`261`		`-`
`262`	`251`	`/* nothing left on line? then ignore */`
`263`	`252`	`if (line[0]=='\0')`
`264`	`253`	`{`

Comments

(0)