[pkgsrc/trunk]: pkgsrc/mk/wrapper When $debug_log is set to ":" and at the sa...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00b1110aef42
branches:  trunk
changeset: 518792:00b1110aef42
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Sep 17 22:52:45 2006 +0000

description:
When $debug_log is set to ":" and at the same time $IFS is ":", the
command line

    $debug_log $arguments

tries to execute the empty command. This results in error messages of
the form

    cc[50]: : cannot execute   (IRIX)
    bash: : command not found  (Bash)
    : permission denied        (NetBSD /bin/sh)

Setting IFS to the original value as soon as possible fixes these bugs.

Fixes PR 34135.

diffstat:

 mk/wrapper/arg-source     |  4 +++-
 mk/wrapper/bsd.wrapper.mk |  3 ++-
 mk/wrapper/cmd-sink-ld    |  3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 710df0eac560 -r 00b1110aef42 mk/wrapper/arg-source
--- a/mk/wrapper/arg-source     Sun Sep 17 22:38:37 2006 +0000
+++ b/mk/wrapper/arg-source     Sun Sep 17 22:52:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-source,v 1.7 2005/06/09 17:06:21 jlam Exp $
+# $NetBSD: arg-source,v 1.8 2006/09/17 22:52:45 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -74,6 +74,7 @@
                list="${arg#$R}"
                save_IFS="${IFS}"; IFS=":"
                for dir in $list; do
+                       IFS="${save_IFS}"
                        shquote "$dir"; dir="$shquoted"
                        append_queue argbuf "$R$dir"
                        $debug_log $wrapperlog "    (arg-source) push: $R$dir"
@@ -98,6 +99,7 @@
                *:*)
                        save_IFS="${IFS}"; IFS=":"
                        for dir in $nextarg; do
+                               IFS="${save_IFS}"
                                shquote "$dir"; dir="$shquoted"
                                append_queue argbuf "$R$dir"
                                $debug_log $wrapperlog "    (arg-source) push: $R$dir"
diff -r 710df0eac560 -r 00b1110aef42 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Sun Sep 17 22:38:37 2006 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Sun Sep 17 22:52:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.52 2006/07/31 14:53:45 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.53 2006/09/17 22:52:45 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -402,6 +402,7 @@
        *)      save_IFS="$$IFS";                                       \
                IFS=":";                                                \
                for dir in $${PATH}; do                                 \
+                       IFS="$$save_IFS";                               \
                        case $${dir} in                                 \
                        *${WRAPPER_DIR}*)                               \
                                ;;                                      \
diff -r 710df0eac560 -r 00b1110aef42 mk/wrapper/cmd-sink-ld
--- a/mk/wrapper/cmd-sink-ld    Sun Sep 17 22:38:37 2006 +0000
+++ b/mk/wrapper/cmd-sink-ld    Sun Sep 17 22:52:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-ld,v 1.2 2004/11/12 05:02:41 jlam Exp $
+# $NetBSD: cmd-sink-ld,v 1.3 2006/09/17 22:52:45 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -51,6 +51,7 @@
                save_IFS="${IFS}"; IFS=","
                revlist=
                for opt in $list; do
+                       IFS="${save_IFS}"
                        shquote "$opt"; opt="$shquoted"
                        revlist="$opt $revlist"
                done