[pkgsrc/trunk]: pkgsrc/mk/wrapper Fixed incorrect quoting of arguments. This ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45329e64abcb
branches:  trunk
changeset: 533450:45329e64abcb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Sep 19 13:08:19 2007 +0000

description:
Fixed incorrect quoting of arguments. This behavior had been unnoticed
for several years now, since the directories in the -I... and -L...
options usually don't need quoting. But when the -D... option was
processed using the same code, the bug had become visible.

diffstat:

 mk/wrapper/arg-pp-main |  6 +++---
 mk/wrapper/arg-source  |  7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 2763fddcea4f -r 45329e64abcb mk/wrapper/arg-pp-main
--- a/mk/wrapper/arg-pp-main    Wed Sep 19 13:02:15 2007 +0000
+++ b/mk/wrapper/arg-pp-main    Wed Sep 19 13:08:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-main,v 1.6 2007/04/09 22:33:26 tron Exp $
+# $NetBSD: arg-pp-main,v 1.7 2007/09/19 13:08:19 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -97,7 +97,7 @@
 -Wl,-[LR])
        pop_queue argbuf nextarg
        $debug_log $wrapperlog "    (arg-pp-main) pop:  $nextarg"
-       shquote "${nextarg#-Wl,}"; nextarg="$shquoted"
+       nextarg="${nextarg#-Wl,}"
        $debug_log $wrapperlog "    (arg-pp-main) pre:  $arg$nextarg"
        prepend_queue argbuf "$arg$nextarg"
        argmatch=yes
@@ -105,7 +105,7 @@
 -Wl,-rpath|-Wl,-rpath-link|-Wl,--rpath)
        pop_queue argbuf nextarg
        $debug_log $wrapperlog "    (arg-pp-main) pop:  $nextarg"
-       shquote "${nextarg#-Wl,}"; nextarg="$shquoted"
+       nextarg="${nextarg#-Wl,}"
        $debug_log $wrapperlog "    (arg-pp-main) pre:  $arg,$nextarg"
        prepend_queue argbuf "$arg,$nextarg"
        argmatch=yes
diff -r 2763fddcea4f -r 45329e64abcb mk/wrapper/arg-source
--- a/mk/wrapper/arg-source     Wed Sep 19 13:02:15 2007 +0000
+++ b/mk/wrapper/arg-source     Wed Sep 19 13:08:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-source,v 1.14 2007/09/11 08:33:11 rillig Exp $
+# $NetBSD: arg-source,v 1.15 2007/09/19 13:08:19 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,7 +57,6 @@
                case "$nextarg" in
                -*) msg_log $wrapperlog "WARNING: [arg-source] An $arg option must not be followed by another option, $nextarg." ;;
                esac
-               shquote "$nextarg"; nextarg="$shquoted"
                append_queue argbuf "$arg$nextarg"
                $debug_log $wrapperlog "    (arg-source) push: $arg$nextarg"
                ;;
@@ -103,7 +102,6 @@
                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"
                done
@@ -128,14 +126,12 @@
                        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"
                        done
                        IFS="${save_IFS}"
                        ;;
                *)
-                       shquote "$nextarg"; nextarg="$shquoted"
                        append_queue argbuf "$R$nextarg"
                        $debug_log $wrapperlog "    (arg-source) push: $R$nextarg"
                        ;;
@@ -153,7 +149,6 @@
                        $debug_log $wrapperlog "    (arg-source) push: $nextarg"
                        ;;
                *)
-                       shquote "$nextarg"; nextarg="$shquoted"
                        append_queue argbuf "-Wl,$nextarg"
                        $debug_log $wrapperlog "    (arg-source) push: -Wl,$nextarg"
                        ;;