Tue Oct 6 19:56:58 2009 UTC ()
Make this slightly more portable; it has to run on arbitary host
platforms at build time.  Previousy, some shells were confused by
some of the "[ ... ]" tests.


(apb)
diff -r1.21 -r1.22 src/bin/sh/mkbuiltins
cvs diff -r1.21 -r1.22 src/bin/sh/mkbuiltins (expand / switch to unified diff)

--- src/bin/sh/mkbuiltins 2004/06/06 07:03:11 1.21
+++ src/bin/sh/mkbuiltins 2009/10/06 19:56:58 1.22
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh - 1#!/bin/sh -
2# $NetBSD: mkbuiltins,v 1.21 2004/06/06 07:03:11 christos Exp $ 2# $NetBSD: mkbuiltins,v 1.22 2009/10/06 19:56:58 apb Exp $
3# 3#
4# Copyright (c) 1991, 1993 4# Copyright (c) 1991, 1993
5# The Regents of the University of California. All rights reserved. 5# The Regents of the University of California. All rights reserved.
6# 6#
7# This code is derived from software contributed to Berkeley by 7# This code is derived from software contributed to Berkeley by
8# Kenneth Almquist. 8# Kenneth Almquist.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 24# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 25# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32# SUCH DAMAGE. 32# SUCH DAMAGE.
33# 33#
34# @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 34# @(#)mkbuiltins 8.2 (Berkeley) 5/4/95
35 35
36havehist=1 36havehist=1
37if [ "X$1" = "X-h" ]; then 37if [ x"$1" = x"-h" ]; then
38 havehist=0 38 havehist=0
39 shift 39 shift
40fi 40fi
41 41
42shell=$1 42shell=$1
43builtins=$2 43builtins=$2
44objdir=$3 44objdir=$3
45 45
46havejobs=0 46havejobs=0
47if grep '^#define JOBS[ ]*1' ${shell} > /dev/null 47if grep '^#define JOBS[ ]*1' ${shell} > /dev/null
48then 48then
49 havejobs=1 49 havejobs=1
50fi 50fi
@@ -79,51 +79,51 @@ extern const struct builtincmd splbltinc @@ -79,51 +79,51 @@ extern const struct builtincmd splbltinc
79 79
80specials= 80specials=
81 81
82while read line 82while read line
83do 83do
84 set -- $line 84 set -- $line
85 [ -z "$1" ] && continue 85 [ -z "$1" ] && continue
86 case "$1" in 86 case "$1" in
87 \#if*|\#def*|\#end*) 87 \#if*|\#def*|\#end*)
88 echo $line >&3 88 echo $line >&3
89 echo $line >&4 89 echo $line >&4
90 continue 90 continue
91 ;; 91 ;;
 92 \#*)
 93 continue
 94 ;;
92 esac 95 esac
93 l1="${line###}" 
94 [ "$l1" != "$line" ] && continue 
95 
96 96
97 func=$1 97 func=$1
98 shift 98 shift
99 [ x"$1" = x'-j' ] && { 99 [ x"$1" = x'-j' ] && {
100 [ $havejobs = 0 ] && continue 100 [ $havejobs = 0 ] && continue
101 shift 101 shift
102 } 102 }
103 [ x"$1" = x'-h' ] && { 103 [ x"$1" = x'-h' ] && {
104 [ $havehist = 0 ] && continue 104 [ $havehist = 0 ] && continue
105 shift 105 shift
106 } 106 }
107 echo 'int '"$func"'(int, char **);' >&4 107 echo 'int '"$func"'(int, char **);' >&4
108 while 108 while
109 [ $# != 0 -a "$1" != '#' ] 109 [ $# != 0 ] && [ x"$1" != x'#' ]
110 do 110 do
111 [ "$1" = '-s' ] && { 111 [ x"$1" = x'-s' ] && {
112 specials="$specials $2 $func" 112 specials="$specials $2 $func"
113 shift 2 113 shift 2
114 continue; 114 continue;
115 } 115 }
116 [ "$1" = '-u' ] && shift 116 [ x"$1" = x'-u' ] && shift
117 echo ' { "'$1'", '"$func"' },' >&3 117 echo ' { "'$1'", '"$func"' },' >&3
118 shift 118 shift
119 done 119 done
120done 120done
121 121
122echo ' { 0, 0 },' >&3 122echo ' { 0, 0 },' >&3
123echo '};' >&3 123echo '};' >&3
124echo >&3 124echo >&3
125echo 'const struct builtincmd splbltincmd[] = {' >&3 125echo 'const struct builtincmd splbltincmd[] = {' >&3
126 126
127set -- $specials 127set -- $specials
128while 128while
129 [ $# != 0 ] 129 [ $# != 0 ]