metaconfig unit changes for #16786.

p4raw-id: //depot/metaconfig@16787

diff --git a/U/modified/Getfile.U b/U/modified/Getfile.U
index b8c8ffa..1b1244a 100644 (file)
--- a/U/modified/Getfile.U
+++ b/U/modified/Getfile.U
@@ -111,7 +111,9 @@ esac
 ?X: Begin by stripping out any (...) grouping.
 case "$fn" in
 *\(*)
-       expr $fn : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
+       : getfile will accept an answer from the comma-separated list
+       : enclosed in parentheses even if it does not meet other criteria.
+       expr "$fn" : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
        fn=`echo $fn | sed 's/(.*)//'`
        ;;
 esac

diff --git a/U/modified/pager.U b/U/modified/pager.U
index 73bcab5..49eed80 100644 (file)
--- a/U/modified/pager.U
+++ b/U/modified/pager.U
@@ -25,6 +25,7 @@
 ?S:    Usual values are (the full pathnames of) more, less, pg, or cat.
 ?S:.
 : locate the preferred pager for this system
+fn=f/
 case "$pager" in
 '')
        dflt=''
@@ -44,10 +45,14 @@ case "$pager" in
        '') dflt=/usr/ucb/more;;
        esac
        ;;
-*) dflt="$pager";;
+*)     dflt="$pager"
+       : Instruct ./getfile to trust the hinted or previous pager value,
+       : even if it does not begin with a slash.  For example, on os2,
+       : pager might be cmd /c more.  See comments in UU/getfile.
+       fn="f/($pager)"
+       ;;
 esac
 echo " "
-fn=f/
 rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"