a probably-Solaris-/bin/sh-workable improved algorithm
This commit is contained in:
tg
parent
0eb31f6a82
commit
cca3f93e59
73
Build.sh
73
Build.sh
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $MirOS: src/bin/mksh/Build.sh,v 1.43 2006/08/12 19:38:44 tg Exp $
|
||||
# $MirOS: src/bin/mksh/Build.sh,v 1.44 2006/08/12 19:51:08 tg Exp $
|
||||
#-
|
||||
# This script recognises CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS and NROFF.
|
||||
|
||||
@ -9,14 +9,14 @@ srcdir="${srcdir:-`dirname "$0"`}"
|
||||
curdir="`pwd`"
|
||||
|
||||
: ${NROFF:=nroff}
|
||||
echo | $NROFF -v 2>&1 | fgrep GNU >&- 2>&- && NROFF="$NROFF -c"
|
||||
echo | $NROFF -v 2>&1 | grep GNU >&- 2>&- && NROFF="$NROFF -c"
|
||||
|
||||
e=echo
|
||||
q=0
|
||||
r=0
|
||||
x=0
|
||||
|
||||
while [ -n "$1" ]; do
|
||||
while test -n "$1"; do
|
||||
case $1 in
|
||||
-d)
|
||||
LDSTATIC=
|
||||
@ -45,16 +45,20 @@ v()
|
||||
eval "$@"
|
||||
}
|
||||
|
||||
[ $x = 1 ] || LDSTATIC=-static
|
||||
[ $x = 1 ] || SRCS=
|
||||
if test $x = 0; then
|
||||
LDSTATIC=-static
|
||||
SRCS=
|
||||
sigseen=
|
||||
fi
|
||||
SRCS="$SRCS alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c"
|
||||
SRCS="$SRCS jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c"
|
||||
|
||||
[ $x = 1 ] || case "`uname -s 2>/dev/null || uname`" in
|
||||
test $x = 1 || case "`uname -s 2>/dev/null || uname`" in
|
||||
CYGWIN*)
|
||||
LDSTATIC= # they don't want it
|
||||
SRCS="$SRCS compat.c"
|
||||
CPPFLAGS="$CPPFLAGS -DNEED_COMPAT"
|
||||
sigseen=:
|
||||
;;
|
||||
Darwin)
|
||||
LDSTATIC= # never works
|
||||
@ -69,6 +73,7 @@ Linux)
|
||||
CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_GNU_SOURCE"
|
||||
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -DNEED_COMPAT"
|
||||
LDSTATIC= # glibc dlopens the PAM library with getpwnam at runtime
|
||||
sigseen=:
|
||||
;;
|
||||
SunOS)
|
||||
SRCS="$SRCS compat.c"
|
||||
@ -76,37 +81,41 @@ SunOS)
|
||||
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
|
||||
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -DNEED_COMPAT"
|
||||
LDSTATIC= # alternatively you need libdl... same suckage as above
|
||||
sigseen=:
|
||||
;;
|
||||
esac
|
||||
|
||||
sigseen=:; $e Generating list of signal names
|
||||
NSIG=`( echo '#include <signal.h>'; echo "__mksh_test: NSIG" ) \
|
||||
| $CC $CPPFLAGS -E - | grep __mksh_test: | sed 's/^__mksh_test: //'`
|
||||
NSIG=`printf %d "$NSIG"`
|
||||
echo '#include <signal.h>' | $CC $CPPFLAGS -E -dD - \
|
||||
| grep '[ ]SIG[A-Z0-9]*[ ]' \
|
||||
| sed 's/^\(.*[ ]SIG\)\([A-Z0-9]*\)\([ ].*\)$/\2/' \
|
||||
| while read name; do
|
||||
( echo '#include <signal.h>'; echo "__mksh_test: SIG$name" ) \
|
||||
| $CC $CPPFLAGS -E - | grep __mksh_test: | sed \
|
||||
's/^__mksh_test: \([0-9]*\).*$/\1:'$name/
|
||||
done | grep -v '^:' | while IFS=: read number name; do
|
||||
nr=`printf %d "$number"`
|
||||
test $nr -gt 0 -a $nr -lt $NSIG || continue
|
||||
case $sigseen in
|
||||
*:$nr:*) ;;
|
||||
*) echo " { $nr, \"$name\" },"
|
||||
sigseen=$sigseen$nr:
|
||||
;;
|
||||
esac
|
||||
done >signames.inc
|
||||
test -s signames.inc || exit 1
|
||||
if test x"$sigseen" = x:; then
|
||||
$e Generating list of signal names
|
||||
NSIG=`( echo '#include <signal.h>'; echo "mksh_test: NSIG" ) | \
|
||||
$CC $CPPFLAGS -E - | grep mksh_test: | sed 's/^mksh_test: //'`
|
||||
NSIG=`printf %d "$NSIG" 2>&-`
|
||||
test $NSIG -gt 1 || exit 1
|
||||
echo '#include <signal.h>' | $CC $CPPFLAGS -E -dD - | \
|
||||
grep '[ ]SIG[A-Z0-9]*[ ]' | \
|
||||
sed 's/^\(.*[ ]SIG\)\([A-Z0-9]*\)\([ ].*\)$/\2/' | \
|
||||
while read name; do
|
||||
( echo '#include <signal.h>'; echo "mksh_test: SIG$name" ) | \
|
||||
$CC $CPPFLAGS -E - | grep mksh_test: | \
|
||||
sed 's/^mksh_test: \([0-9]*\).*$/\1:'$name/
|
||||
done | grep -v '^:' | while IFS=: read nr name; do
|
||||
nr=`printf %d "$nr" 2>&-`
|
||||
test $nr -gt 0 -a $nr -lt $NSIG || continue
|
||||
case $sigseen in
|
||||
*:$nr:*) ;;
|
||||
*) echo " { $nr, \"$name\" },"
|
||||
sigseen=$sigseen$nr:
|
||||
;;
|
||||
esac
|
||||
done >signames.inc
|
||||
test -s signames.inc || exit 1
|
||||
fi
|
||||
(v "cd '$srcdir' && exec $CC $CFLAGS -I'$curdir' $CPPFLAGS" \
|
||||
"$LDFLAGS $LDSTATIC -o '$curdir/mksh' $SRCS $LIBS") || exit 1
|
||||
test -x mksh || exit 1
|
||||
[ $r = 1 ] || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" \
|
||||
|| rm -f mksh.cat1
|
||||
[ $q = 1 ] || v size mksh
|
||||
test $r = 1 || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \
|
||||
rm -f mksh.cat1
|
||||
test $q = 1 || v size mksh
|
||||
echo "#!$curdir/mksh" >Test.sh
|
||||
echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t'" \
|
||||
"-p '$curdir/mksh' -C pdksh \$*" >>Test.sh
|
||||
@ -116,7 +125,7 @@ $e To test mksh, execute ./Test.sh
|
||||
$e
|
||||
$e Installing the shell:
|
||||
$e "# install -c -s -o root -g bin -m 555 mksh /bin/mksh"
|
||||
$e "# fgrep -qx /bin/mksh /etc/shells || echo /bin/mksh >>/etc/shells"
|
||||
$e "# grep -qx /bin/mksh /etc/shells || echo /bin/mksh >>/etc/shells"
|
||||
$e "# install -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
|
||||
$e
|
||||
$e Installing the manual:
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.19 2006/08/01 14:09:19 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.20 2006/08/12 19:51:09 tg Exp $");
|
||||
|
||||
static int histfd;
|
||||
static int hsize;
|
||||
@ -37,7 +37,7 @@ static Source *hist_source;
|
||||
#define mksh_signame(x) _sys_signame[(x)]
|
||||
#define mksh_siglist(x) _sys_siglist[(x)]
|
||||
#elif defined(__gnu_linux__) || defined(__sun__) || defined(__CYGWIN__)
|
||||
#define NEED_MKSH_SIGNAME
|
||||
#define NEED_MKSH_SIGNAME /* sync the list above with Build.sh */
|
||||
#define mksh_siglist(x) strsignal(x)
|
||||
#else
|
||||
# error "Define sys_sig{name,list} for this platform!"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user