bugfix: if NOREADLINE was not defined and input was not from a tty, then

Julian Assange · Julian Assange · commit ed3240d093e0 · 1996-07-28T06:48:42.000Z
the getopt() was not executed.
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.10 1996/07/27 04:38:22 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.11 1996/07/28 06:48:42 julian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1134,8 +1134,8 @@ main(int argc, char** argv)
   settings.opt.pager = 1;
   if (!isatty(0) || !isatty(1))
   	settings.quiet = settings.notty = 1;
-  else
 #ifndef NOREADLINE
+  else
 	settings.useReadline = 1;
 #endif
 

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.10 1996/07/27 04:38:22 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.11 1996/07/28 06:48:42 julian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1134,8 +1134,8 @@ main(int argc, char** argv)`
`1134`	`1134`	`settings.opt.pager = 1;`
`1135`	`1135`	`if (!isatty(0) \|\| !isatty(1))`
`1136`	`1136`	`settings.quiet = settings.notty = 1;`
`1137`		`- else`
`1138`	`1137`	`#ifndef NOREADLINE`
	`1138`	`+ else`
`1139`	`1139`	`settings.useReadline = 1;`
`1140`	`1140`	`#endif`
`1141`	`1141`