Multi-byte case fix by Oliver Elphick (olly@lfix.co.uk)

tatsuo-ishii · tatsuo-ishii · commit 267c6c7f0601 · 2000-01-12T13:08:55.000Z
diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.4 1999/12/16 20:10:02 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.5 2000/01/12 13:08:55 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -121,8 +121,10 @@ if [ "$usage" ]; then
 fi
 
 
-if [ "$MB" ]
-then	if [ -z "`pg_encoding '$MB'`" ]
+if [ -n "$MB" ]
+then
+        mbcode=`pg_encoding "$MB"`
+        if [ -z "$mbcode" ]
 	then
 		echo "$CMDNAME: \"$MB\" is not a valid encoding name."
 		exit 1

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`#`
`13`	`13`	`# IDENTIFICATION`
`14`		`-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.4 1999/12/16 20:10:02 momjian Exp $`
	`14`	`+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.5 2000/01/12 13:08:55 ishii Exp $`
`15`	`15`	`#`
`16`	`16`	`#-------------------------------------------------------------------------`
`17`	`17`
`@@ -121,8 +121,10 @@ if [ "$usage" ]; then`
`121`	`121`	`fi`
`122`	`122`
`123`	`123`
`124`		`-if [ "$MB" ]`
`125`		-then if [ -z "`pg_encoding '$MB'`" ]
	`124`	`+if [ -n "$MB" ]`
	`125`	`+then`
	`126`	+ mbcode=`pg_encoding "$MB"`
	`127`	`+ if [ -z "$mbcode" ]`
`126`	`128`	`then`
`127`	`129`	`echo "$CMDNAME: \"$MB\" is not a valid encoding name."`
`128`	`130`	`exit 1`