Another "$@" cleanup with new syntax, ${1+"$@"}.

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 0292d3ec32aaf2fe8b08709cc3946af4d5ddefe4..618153387861d9f772c61f4bbfd97f80f2a28824 100755 (executable)
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.26 2002/07/19 13:50:06 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.27 2002/07/19 15:31:42 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -332,12 +332,12 @@ if [ "$op" = "start" -o "$op" = "restart" ];then
     fi
 
     if [ -n "$logfile" ]; then
-        "$po_path" ${1:+"$@"} </dev/null >>$logfile 2>&1 &
+        "$po_path" ${1+"$@"} </dev/null >>$logfile 2>&1 &
     else
         # when starting without log file, redirect stderr to stdout, so
         # pg_ctl can be invoked with >$logfile and still have pg_ctl's
         # stderr on the terminal.
-        "$po_path" ${1:+"$@"} </dev/null 2>&1 &
+        "$po_path" ${1+"$@"} </dev/null 2>&1 &
     fi
 
     # if had an old lockfile, check to see if we were able to start

diff --git a/src/bin/pgaccess/main.tcl b/src/bin/pgaccess/main.tcl
index 37f30d96fa0a0bffef37390cc6a49aa6cc866fb7..3fac71d5b53a164f47c6e65b3da1f17e86a7d4da 100644 (file)
--- a/src/bin/pgaccess/main.tcl
+++ b/src/bin/pgaccess/main.tcl
@@ -1,6 +1,6 @@
 #!/bin/sh
 # the next line restarts using wish \
-exec wish "$0" ${1:+"$@"}
+exec wish "$0" ${1+"$@"}
 
 image create bitmap dnarw -data  {
 #define down_arrow_width 15

diff --git a/src/bin/pgaccess/pgaccess.sh b/src/bin/pgaccess/pgaccess.sh
index aeaf4d097dfc8a7d2ade94c4443494a78e60a0c4..5c6cba39395ddcd1682aaa4408453981d7c2bee8 100755 (executable)
--- a/src/bin/pgaccess/pgaccess.sh
+++ b/src/bin/pgaccess/pgaccess.sh
@@ -10,4 +10,4 @@ export PGACCESS_HOME
 export PGLIB
 export PGPORT
 
-exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" "$@"
+exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" ${1+"$@"}