Allow 't', 'T', and even/odd ASCII characters to denote true/false

Thomas G. Lockhart · Thomas G. Lockhart · commit a21c3e353ad5 · 1997-10-09T05:06:12.000Z
rather than just 't' and 'T'.  This allows yes/no and 1/0
 to be interpreted as one might expect.
Clean up function declarations to use bool as the type for arguments
 and return values.
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.6 1997/09/08 02:30:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.7 1997/10/09 05:06:12 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,20 +23,23 @@
 
 /*
  *		boolin			- converts "t" or "f" to 1 or 0
+ *
+ * Check explicitly for "true/TRUE" and allow any odd ASCII value to be "true".
+ * This handles "true/false", "yes/no", "1/0". - thomas 1997-10-05
  */
 bool
 boolin(char *b)
 {
 	if (b == NULL)
 		elog(WARN, "Bad input string for type bool");
-	return ((bool) (*b == 't') || (*b == 'T'));
+	return ((bool) (((*b) == 't') || ((*b) == 'T') || ((*b) & 1)));
 }
 
 /*
  *		boolout			- converts 1 or 0 to "t" or "f"
  */
-char	   *
-boolout(long b)
+char *
+boolout(bool b)
 {
 	char	   *result = (char *) palloc(2);
 
@@ -50,25 +53,25 @@ boolout(long b)
  *****************************************************************************/
 
 bool
-booleq(int8 arg1, int8 arg2)
+booleq(bool arg1, bool arg2)
 {
 	return (arg1 == arg2);
 }
 
 bool
-boolne(int8 arg1, int8 arg2)
+boolne(bool arg1, bool arg2)
 {
 	return (arg1 != arg2);
 }
 
 bool
-boollt(int8 arg1, int8 arg2)
+boollt(bool arg1, bool arg2)
 {
 	return (arg1 < arg2);
 }
 
 bool
-boolgt(int8 arg1, int8 arg2)
+boolgt(bool arg1, bool arg2)
 {
 	return (arg1 > arg2);
 }

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/backend/utils/adt/bool.c,v 1.6 1997/09/08 02:30:26 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.7 1997/10/09 05:06:12 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -23,20 +23,23 @@`
`23`	`23`
`24`	`24`	`/*`
`25`	`25`	`* boolin - converts "t" or "f" to 1 or 0`
	`26`	`+ *`
	`27`	`+ * Check explicitly for "true/TRUE" and allow any odd ASCII value to be "true".`
	`28`	`+ * This handles "true/false", "yes/no", "1/0". - thomas 1997-10-05`
`26`	`29`	`*/`
`27`	`30`	`bool`
`28`	`31`	`boolin(char *b)`
`29`	`32`	`{`
`30`	`33`	`if (b == NULL)`
`31`	`34`	`elog(WARN, "Bad input string for type bool");`
`32`		`- return ((bool) (b == 't') \|\| (b == 'T'));`
	`35`	`+ return ((bool) (((b) == 't') \|\| ((b) == 'T') \|\| ((*b) & 1)));`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`/*`
`36`	`39`	`* boolout - converts 1 or 0 to "t" or "f"`
`37`	`40`	`*/`
`38`		`-char *`
`39`		`-boolout(long b)`
	`41`	`+char *`
	`42`	`+boolout(bool b)`
`40`	`43`	`{`
`41`	`44`	`char result = (char ) palloc(2);`
`42`	`45`
`@@ -50,25 +53,25 @@ boolout(long b)`
`50`	`53`	`*****************************************************************************/`
`51`	`54`
`52`	`55`	`bool`
`53`		`-booleq(int8 arg1, int8 arg2)`
	`56`	`+booleq(bool arg1, bool arg2)`
`54`	`57`	`{`
`55`	`58`	`return (arg1 == arg2);`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`bool`
`59`		`-boolne(int8 arg1, int8 arg2)`
	`62`	`+boolne(bool arg1, bool arg2)`
`60`	`63`	`{`
`61`	`64`	`return (arg1 != arg2);`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`bool`
`65`		`-boollt(int8 arg1, int8 arg2)`
	`68`	`+boollt(bool arg1, bool arg2)`
`66`	`69`	`{`
`67`	`70`	`return (arg1 < arg2);`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`bool`
`71`		`-boolgt(int8 arg1, int8 arg2)`
	`74`	`+boolgt(bool arg1, bool arg2)`
`72`	`75`	`{`
`73`	`76`	`return (arg1 > arg2);`
`74`	`77`	`}`