pass advertised facility to continued-transport process

[exim.git] / src / src / exinext.src

diff --git a/src/src/exinext.src b/src/src/exinext.src
index 47f9de5178ef6ccf41e2caf60a3aaea0c6d4ece1..182e39574c4a53af024989ffe6b1e33179611d5a 100644 (file)
--- a/src/src/exinext.src
+++ b/src/src/exinext.src
@@ -1,7 +1,6 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exinext.src,v 1.2 2005/12/22 11:47:24 ph10 Exp $
 
-# Copyright (c) 1996-2004 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2007
 # See the file NOTICE for conditions of use and distribution.
 
 # Except when they appear in comments, the following placeholders in this
@@ -26,16 +25,16 @@ config=
 eximmacdef=
 exim_path=
 
-if expr $1 : '\-' >/dev/null ; then
-  while expr $1 : '\-' >/dev/null ; do
+if expr -- $1 : '\-' >/dev/null ; then
+  while expr -- $1 : '\-' >/dev/null ; do
     if [ "$1" = "-C" ]; then
       config=$2
       shift
       shift
-    elif expr $1 : '\-D' >/dev/null ; then
+    elif expr -- $1 : '\-D' >/dev/null ; then
       eximmacdef="$eximmacdef $1"
-      if expr $1 : '\-DEXIM_PATH=' >/dev/null ; then
-        exim_path=`expr $1 : '\-DEXIM_PATH=\(.*\)'`
+      if expr -- $1 : '\-DEXIM_PATH=' >/dev/null ; then
+        exim_path=`expr -- $1 : '\-DEXIM_PATH=\(.*\)'`
       fi
       shift
     else
@@ -65,9 +64,9 @@ if [ "$config" = "" ]; then
   # suffixed file in each case.
 
   set `awk -F: '{ for (i = 1; i <= NF; i++) print $i }' <<End
-  CONFIGURE_FILE
-  End
-  `
+CONFIGURE_FILE
+End
+`
   while [ "$config" = "" -a $# -gt 0 ] ; do
     if [ -f "$1$hostsuffix" ] ; then
       config="$1$hostsuffix"