mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Round number I-lost-count-long-ago of minor cleanups
Somewhat notable changes:
- Remove pointless test commands from Mamfiles.
- Consistent use of NoN macro instead of manual void _STUB_foo(){}
(this is to silence "foo.o has no symbols" warnings from ld).
- Remove src/lib/libast/comp/transition.c; obsolete, does nothing.
- xec.c: Fix off-by-one error in sigreset() used by sh_ntfork():
it tried to (re)set signal 0, which is harmless, but wrong.
(note that sh.st.trapmax is the current max trapped sig + one!)
This commit is contained in:
Martijn Dekker
parent
b72992f684
commit
b8ea3ab76a
17 changed files with 119 additions and 216 deletions
|
|
@ -448,19 +448,19 @@ make install
|
|||
done ${INSTALLROOT}/bin generated
|
||||
make ${INSTALLROOT}/bin/iffe
|
||||
prev iffe
|
||||
exec - test '' = 'iffe' || ${STDCMP} 2>/dev/null -s iffe ${INSTALLROOT}/bin/iffe || { ${STDMV} ${INSTALLROOT}/bin/iffe ${INSTALLROOT}/bin/iffe.old 2>/dev/null || true; ${STDCP} iffe ${INSTALLROOT}/bin/iffe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s iffe ${INSTALLROOT}/bin/iffe || { ${STDMV} ${INSTALLROOT}/bin/iffe ${INSTALLROOT}/bin/iffe.old 2>/dev/null || true; ${STDCP} iffe ${INSTALLROOT}/bin/iffe ;}
|
||||
done ${INSTALLROOT}/bin/iffe generated
|
||||
make ${INSTALLROOT}/bin/mktest
|
||||
prev mktest
|
||||
exec - test '' = 'mktest' || ${STDCMP} 2>/dev/null -s mktest ${INSTALLROOT}/bin/mktest || { ${STDMV} ${INSTALLROOT}/bin/mktest ${INSTALLROOT}/bin/mktest.old 2>/dev/null || true; ${STDCP} mktest ${INSTALLROOT}/bin/mktest ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s mktest ${INSTALLROOT}/bin/mktest || { ${STDMV} ${INSTALLROOT}/bin/mktest ${INSTALLROOT}/bin/mktest.old 2>/dev/null || true; ${STDCP} mktest ${INSTALLROOT}/bin/mktest ;}
|
||||
done ${INSTALLROOT}/bin/mktest generated
|
||||
make ${INSTALLROOT}/bin/package
|
||||
prev package
|
||||
exec - test '' = 'package' || ${STDCMP} 2>/dev/null -s package ${INSTALLROOT}/bin/package || { ${STDMV} ${INSTALLROOT}/bin/package ${INSTALLROOT}/bin/package.old 2>/dev/null || true; ${STDCP} package ${INSTALLROOT}/bin/package ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s package ${INSTALLROOT}/bin/package || { ${STDMV} ${INSTALLROOT}/bin/package ${INSTALLROOT}/bin/package.old 2>/dev/null || true; ${STDCP} package ${INSTALLROOT}/bin/package ;}
|
||||
done ${INSTALLROOT}/bin/package generated
|
||||
make ${INSTALLROOT}/bin/regress
|
||||
prev regress
|
||||
exec - test '' = 'regress' || ${STDCMP} 2>/dev/null -s regress ${INSTALLROOT}/bin/regress || { ${STDMV} ${INSTALLROOT}/bin/regress ${INSTALLROOT}/bin/regress.old 2>/dev/null || true; ${STDCP} regress ${INSTALLROOT}/bin/regress ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s regress ${INSTALLROOT}/bin/regress || { ${STDMV} ${INSTALLROOT}/bin/regress ${INSTALLROOT}/bin/regress.old 2>/dev/null || true; ${STDCP} regress ${INSTALLROOT}/bin/regress ;}
|
||||
done ${INSTALLROOT}/bin/regress generated
|
||||
make ${PACKAGEROOT}/bin
|
||||
exec - if test ! -d ${PACKAGEROOT}/bin
|
||||
|
|
@ -470,11 +470,11 @@ make install
|
|||
make ${PACKAGEROOT}/bin/execrate
|
||||
prev ${PACKAGEROOT}/bin
|
||||
prev execrate
|
||||
exec - test '' = 'execrate' || ${STDCMP} 2>/dev/null -s execrate ${PACKAGEROOT}/bin/execrate || { ${STDMV} ${PACKAGEROOT}/bin/execrate ${PACKAGEROOT}/bin/execrate.old 2>/dev/null || true; ${STDCP} execrate ${PACKAGEROOT}/bin/execrate ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s execrate ${PACKAGEROOT}/bin/execrate || { ${STDMV} ${PACKAGEROOT}/bin/execrate ${PACKAGEROOT}/bin/execrate.old 2>/dev/null || true; ${STDCP} execrate ${PACKAGEROOT}/bin/execrate ;}
|
||||
done ${PACKAGEROOT}/bin/execrate generated
|
||||
make ${PACKAGEROOT}/bin/ignore
|
||||
prev ignore
|
||||
exec - test '' = 'ignore' || ${STDCMP} 2>/dev/null -s ignore ${PACKAGEROOT}/bin/ignore || { ${STDMV} ${PACKAGEROOT}/bin/ignore ${PACKAGEROOT}/bin/ignore.old 2>/dev/null || true; ${STDCP} ignore ${PACKAGEROOT}/bin/ignore ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s ignore ${PACKAGEROOT}/bin/ignore || { ${STDMV} ${PACKAGEROOT}/bin/ignore ${PACKAGEROOT}/bin/ignore.old 2>/dev/null || true; ${STDCP} ignore ${PACKAGEROOT}/bin/ignore ;}
|
||||
done ${PACKAGEROOT}/bin/ignore generated
|
||||
make ${PACKAGEROOT}/bin/mamprobe
|
||||
make mamprobe
|
||||
|
|
@ -515,27 +515,27 @@ make install
|
|||
exec - esac
|
||||
exec - test -w mamprobe -a -x mamprobe || chmod u+w,+x mamprobe
|
||||
done mamprobe generated
|
||||
exec - test '' = 'mamprobe' || ${STDCMP} 2>/dev/null -s mamprobe ${PACKAGEROOT}/bin/mamprobe || { ${STDMV} ${PACKAGEROOT}/bin/mamprobe ${PACKAGEROOT}/bin/mamprobe.old 2>/dev/null || true; ${STDCP} mamprobe ${PACKAGEROOT}/bin/mamprobe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s mamprobe ${PACKAGEROOT}/bin/mamprobe || { ${STDMV} ${PACKAGEROOT}/bin/mamprobe ${PACKAGEROOT}/bin/mamprobe.old 2>/dev/null || true; ${STDCP} mamprobe ${PACKAGEROOT}/bin/mamprobe ;}
|
||||
done ${PACKAGEROOT}/bin/mamprobe generated
|
||||
make ${PACKAGEROOT}/bin/package
|
||||
prev package
|
||||
exec - test '' = 'package' || ${STDCMP} 2>/dev/null -s package ${PACKAGEROOT}/bin/package || { ${STDMV} ${PACKAGEROOT}/bin/package ${PACKAGEROOT}/bin/package.old 2>/dev/null || true; ${STDCP} package ${PACKAGEROOT}/bin/package ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s package ${PACKAGEROOT}/bin/package || { ${STDMV} ${PACKAGEROOT}/bin/package ${PACKAGEROOT}/bin/package.old 2>/dev/null || true; ${STDCP} package ${PACKAGEROOT}/bin/package ;}
|
||||
done ${PACKAGEROOT}/bin/package generated
|
||||
make ${PACKAGEROOT}/bin/silent
|
||||
prev silent
|
||||
exec - test '' = 'silent' || ${STDCMP} 2>/dev/null -s silent ${PACKAGEROOT}/bin/silent || { ${STDMV} ${PACKAGEROOT}/bin/silent ${PACKAGEROOT}/bin/silent.old 2>/dev/null || true; ${STDCP} silent ${PACKAGEROOT}/bin/silent ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s silent ${PACKAGEROOT}/bin/silent || { ${STDMV} ${PACKAGEROOT}/bin/silent ${PACKAGEROOT}/bin/silent.old 2>/dev/null || true; ${STDCP} silent ${PACKAGEROOT}/bin/silent ;}
|
||||
done ${PACKAGEROOT}/bin/silent generated
|
||||
make ${INSTALLROOT}/bin/crossexec
|
||||
prev crossexec
|
||||
exec - test '' = 'crossexec' || ${STDCMP} 2>/dev/null -s crossexec ${INSTALLROOT}/bin/crossexec || { ${STDMV} ${INSTALLROOT}/bin/crossexec ${INSTALLROOT}/bin/crossexec.old 2>/dev/null || true; ${STDCP} crossexec ${INSTALLROOT}/bin/crossexec ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s crossexec ${INSTALLROOT}/bin/crossexec || { ${STDMV} ${INSTALLROOT}/bin/crossexec ${INSTALLROOT}/bin/crossexec.old 2>/dev/null || true; ${STDCP} crossexec ${INSTALLROOT}/bin/crossexec ;}
|
||||
done ${INSTALLROOT}/bin/crossexec generated
|
||||
make ${INSTALLROOT}/bin/filter
|
||||
prev filter
|
||||
exec - test '' = 'filter' || ${STDCMP} 2>/dev/null -s filter ${INSTALLROOT}/bin/filter || { ${STDMV} ${INSTALLROOT}/bin/filter ${INSTALLROOT}/bin/filter.old 2>/dev/null || true; ${STDCP} filter ${INSTALLROOT}/bin/filter ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s filter ${INSTALLROOT}/bin/filter || { ${STDMV} ${INSTALLROOT}/bin/filter ${INSTALLROOT}/bin/filter.old 2>/dev/null || true; ${STDCP} filter ${INSTALLROOT}/bin/filter ;}
|
||||
done ${INSTALLROOT}/bin/filter generated
|
||||
make ${INSTALLROOT}/bin/mamake
|
||||
prev mamake
|
||||
exec - test '' = 'mamake' || ${STDCMP} 2>/dev/null -s mamake ${INSTALLROOT}/bin/mamake || { ${STDMV} ${INSTALLROOT}/bin/mamake ${INSTALLROOT}/bin/mamake.old 2>/dev/null || true; ${STDCP} mamake ${INSTALLROOT}/bin/mamake ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s mamake ${INSTALLROOT}/bin/mamake || { ${STDMV} ${INSTALLROOT}/bin/mamake ${INSTALLROOT}/bin/mamake.old 2>/dev/null || true; ${STDCP} mamake ${INSTALLROOT}/bin/mamake ;}
|
||||
done ${INSTALLROOT}/bin/mamake generated
|
||||
make __proto_stub
|
||||
note *
|
||||
|
|
@ -716,7 +716,7 @@ make install
|
|||
make ${INSTALLROOT}/lib/probe/C/probe
|
||||
prev ${INSTALLROOT}/lib/probe/C
|
||||
prev C+probe
|
||||
exec - test '' = 'C+probe' || ${STDCMP} 2>/dev/null -s C+probe ${INSTALLROOT}/lib/probe/C/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/probe ${INSTALLROOT}/lib/probe/C/probe.old 2>/dev/null || true; ${STDCP} C+probe ${INSTALLROOT}/lib/probe/C/probe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s C+probe ${INSTALLROOT}/lib/probe/C/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/probe ${INSTALLROOT}/lib/probe/C/probe.old 2>/dev/null || true; ${STDCP} C+probe ${INSTALLROOT}/lib/probe/C/probe ;}
|
||||
done ${INSTALLROOT}/lib/probe/C/probe generated
|
||||
make ${INSTALLROOT}/lib/probe/C/make
|
||||
exec - if test ! -d ${INSTALLROOT}/lib/probe/C/make
|
||||
|
|
@ -738,15 +738,15 @@ make install
|
|||
make ${INSTALLROOT}/lib/probe/C/mam/probe
|
||||
prev ${INSTALLROOT}/lib/probe/C/mam
|
||||
prev mprobe
|
||||
exec - test '' = 'mprobe' || ${STDCMP} 2>/dev/null -s mprobe ${INSTALLROOT}/lib/probe/C/mam/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/mam/probe ${INSTALLROOT}/lib/probe/C/mam/probe.old 2>/dev/null || true; ${STDCP} mprobe ${INSTALLROOT}/lib/probe/C/mam/probe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s mprobe ${INSTALLROOT}/lib/probe/C/mam/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/mam/probe ${INSTALLROOT}/lib/probe/C/mam/probe.old 2>/dev/null || true; ${STDCP} mprobe ${INSTALLROOT}/lib/probe/C/mam/probe ;}
|
||||
done ${INSTALLROOT}/lib/probe/C/mam/probe generated
|
||||
make ${INSTALLROOT}/lib/probe/C/mam/mprobe
|
||||
prev mprobe
|
||||
exec - test '' = 'mprobe' || ${STDCMP} 2>/dev/null -s mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/mam/mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe.old 2>/dev/null || true; ${STDCP} mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/mam/mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe.old 2>/dev/null || true; ${STDCP} mprobe ${INSTALLROOT}/lib/probe/C/mam/mprobe ;}
|
||||
done ${INSTALLROOT}/lib/probe/C/mam/mprobe generated
|
||||
make ${INSTALLROOT}/lib/probe/C/make/probe
|
||||
prev probe
|
||||
exec - test '' = 'probe' || ${STDCMP} 2>/dev/null -s probe ${INSTALLROOT}/lib/probe/C/make/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/make/probe ${INSTALLROOT}/lib/probe/C/make/probe.old 2>/dev/null || true; ${STDCP} probe ${INSTALLROOT}/lib/probe/C/make/probe ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s probe ${INSTALLROOT}/lib/probe/C/make/probe || { ${STDMV} ${INSTALLROOT}/lib/probe/C/make/probe ${INSTALLROOT}/lib/probe/C/make/probe.old 2>/dev/null || true; ${STDCP} probe ${INSTALLROOT}/lib/probe/C/make/probe ;}
|
||||
done ${INSTALLROOT}/lib/probe/C/make/probe generated
|
||||
make ${INSTALLROOT}/lib/probe/C/make/probe.ini
|
||||
make probe.ini
|
||||
|
|
@ -774,7 +774,7 @@ make install
|
|||
exec - *) : > probe.ini
|
||||
exec - esac
|
||||
done probe.ini generated
|
||||
exec - test '' = 'probe.ini' || ${STDCMP} 2>/dev/null -s probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini || { ${STDMV} ${INSTALLROOT}/lib/probe/C/make/probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini.old 2>/dev/null || true; ${STDCP} probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini || { ${STDMV} ${INSTALLROOT}/lib/probe/C/make/probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini.old 2>/dev/null || true; ${STDCP} probe.ini ${INSTALLROOT}/lib/probe/C/make/probe.ini ;}
|
||||
done ${INSTALLROOT}/lib/probe/C/make/probe.ini generated
|
||||
make ${INSTALLROOT}/include/ast
|
||||
exec - if test ! -d ${INSTALLROOT}/include/ast
|
||||
|
|
@ -815,7 +815,7 @@ make install
|
|||
exec - echo " $r" > dl.req
|
||||
exec - rm -f dl.exe dl
|
||||
done dl.req generated
|
||||
exec - test '' = 'dl.req' || ${STDCMP} 2>/dev/null -s dl.req ${INSTALLROOT}/lib/lib/dl || { ${STDMV} ${INSTALLROOT}/lib/lib/dl ${INSTALLROOT}/lib/lib/dl.old 2>/dev/null || true; ${STDCP} dl.req ${INSTALLROOT}/lib/lib/dl ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s dl.req ${INSTALLROOT}/lib/lib/dl || { ${STDMV} ${INSTALLROOT}/lib/lib/dl ${INSTALLROOT}/lib/lib/dl.old 2>/dev/null || true; ${STDCP} dl.req ${INSTALLROOT}/lib/lib/dl ;}
|
||||
done ${INSTALLROOT}/lib/lib/dl generated
|
||||
make ${INSTALLROOT}/lib/lib/iconv
|
||||
make iconv.req
|
||||
|
|
@ -845,7 +845,7 @@ make install
|
|||
exec - echo " $r" > iconv.req
|
||||
exec - rm -f iconv.exe iconv
|
||||
done iconv.req generated
|
||||
exec - test '' = 'iconv.req' || ${STDCMP} 2>/dev/null -s iconv.req ${INSTALLROOT}/lib/lib/iconv || { ${STDMV} ${INSTALLROOT}/lib/lib/iconv ${INSTALLROOT}/lib/lib/iconv.old 2>/dev/null || true; ${STDCP} iconv.req ${INSTALLROOT}/lib/lib/iconv ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s iconv.req ${INSTALLROOT}/lib/lib/iconv || { ${STDMV} ${INSTALLROOT}/lib/lib/iconv ${INSTALLROOT}/lib/lib/iconv.old 2>/dev/null || true; ${STDCP} iconv.req ${INSTALLROOT}/lib/lib/iconv ;}
|
||||
done ${INSTALLROOT}/lib/lib/iconv generated
|
||||
make ${INSTALLROOT}/lib/lib/w
|
||||
make w.req
|
||||
|
|
@ -877,7 +877,7 @@ make install
|
|||
exec - echo " $r" > w.req
|
||||
exec - rm -f w.exe w w2
|
||||
done w.req generated
|
||||
exec - test '' = 'w.req' || ${STDCMP} 2>/dev/null -s w.req ${INSTALLROOT}/lib/lib/w || { ${STDMV} ${INSTALLROOT}/lib/lib/w ${INSTALLROOT}/lib/lib/w.old 2>/dev/null || true; ${STDCP} w.req ${INSTALLROOT}/lib/lib/w ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s w.req ${INSTALLROOT}/lib/lib/w || { ${STDMV} ${INSTALLROOT}/lib/lib/w ${INSTALLROOT}/lib/lib/w.old 2>/dev/null || true; ${STDCP} w.req ${INSTALLROOT}/lib/lib/w ;}
|
||||
done ${INSTALLROOT}/lib/lib/w generated
|
||||
make ${INSTALLROOT}/lib/lib/intl
|
||||
make intl.req
|
||||
|
|
@ -907,7 +907,7 @@ make install
|
|||
exec - echo " $r" > intl.req
|
||||
exec - rm -f intl.exe intl
|
||||
done intl.req generated
|
||||
exec - test '' = 'intl.req' || ${STDCMP} 2>/dev/null -s intl.req ${INSTALLROOT}/lib/lib/intl || { ${STDMV} ${INSTALLROOT}/lib/lib/intl ${INSTALLROOT}/lib/lib/intl.old 2>/dev/null || true; ${STDCP} intl.req ${INSTALLROOT}/lib/lib/intl ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s intl.req ${INSTALLROOT}/lib/lib/intl || { ${STDMV} ${INSTALLROOT}/lib/lib/intl ${INSTALLROOT}/lib/lib/intl.old 2>/dev/null || true; ${STDCP} intl.req ${INSTALLROOT}/lib/lib/intl ;}
|
||||
done ${INSTALLROOT}/lib/lib/intl generated
|
||||
make ${INSTALLROOT}/lib/lib/m
|
||||
make m.req
|
||||
|
|
@ -947,7 +947,7 @@ make install
|
|||
exec - echo " $r" > m.req
|
||||
exec - rm -f m.exe m m2 m3 m4 m5 m6
|
||||
done m.req generated
|
||||
exec - test '' = 'm.req' || ${STDCMP} 2>/dev/null -s m.req ${INSTALLROOT}/lib/lib/m || { ${STDMV} ${INSTALLROOT}/lib/lib/m ${INSTALLROOT}/lib/lib/m.old 2>/dev/null || true; ${STDCP} m.req ${INSTALLROOT}/lib/lib/m ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s m.req ${INSTALLROOT}/lib/lib/m || { ${STDMV} ${INSTALLROOT}/lib/lib/m ${INSTALLROOT}/lib/lib/m.old 2>/dev/null || true; ${STDCP} m.req ${INSTALLROOT}/lib/lib/m ;}
|
||||
done ${INSTALLROOT}/lib/lib/m generated
|
||||
make ${INSTALLROOT}/lib/lib/nsl
|
||||
make nsl.req
|
||||
|
|
@ -977,7 +977,7 @@ make install
|
|||
exec - echo " $r" > nsl.req
|
||||
exec - rm -f nsl.exe nsl
|
||||
done nsl.req generated
|
||||
exec - test '' = 'nsl.req' || ${STDCMP} 2>/dev/null -s nsl.req ${INSTALLROOT}/lib/lib/nsl || { ${STDMV} ${INSTALLROOT}/lib/lib/nsl ${INSTALLROOT}/lib/lib/nsl.old 2>/dev/null || true; ${STDCP} nsl.req ${INSTALLROOT}/lib/lib/nsl ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s nsl.req ${INSTALLROOT}/lib/lib/nsl || { ${STDMV} ${INSTALLROOT}/lib/lib/nsl ${INSTALLROOT}/lib/lib/nsl.old 2>/dev/null || true; ${STDCP} nsl.req ${INSTALLROOT}/lib/lib/nsl ;}
|
||||
done ${INSTALLROOT}/lib/lib/nsl generated
|
||||
make ${INSTALLROOT}/lib/lib/socket
|
||||
make socket.req
|
||||
|
|
@ -1008,7 +1008,7 @@ make install
|
|||
exec - echo " $r" > socket.req
|
||||
exec - rm -f socket.exe socket nsl
|
||||
done socket.req generated
|
||||
exec - test '' = 'socket.req' || ${STDCMP} 2>/dev/null -s socket.req ${INSTALLROOT}/lib/lib/socket || { ${STDMV} ${INSTALLROOT}/lib/lib/socket ${INSTALLROOT}/lib/lib/socket.old 2>/dev/null || true; ${STDCP} socket.req ${INSTALLROOT}/lib/lib/socket ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s socket.req ${INSTALLROOT}/lib/lib/socket || { ${STDMV} ${INSTALLROOT}/lib/lib/socket ${INSTALLROOT}/lib/lib/socket.old 2>/dev/null || true; ${STDCP} socket.req ${INSTALLROOT}/lib/lib/socket ;}
|
||||
done ${INSTALLROOT}/lib/lib/socket generated
|
||||
make ${INSTALLROOT}/lib/lib/dbm
|
||||
make dbm.req
|
||||
|
|
@ -1048,7 +1048,7 @@ make install
|
|||
exec - echo " $r" > dbm.req
|
||||
exec - rm -f dbm.exe db gdbm gdbm1 gdbm2
|
||||
done dbm.req generated
|
||||
exec - test '' = 'dbm.req' || ${STDCMP} 2>/dev/null -s dbm.req ${INSTALLROOT}/lib/lib/dbm || { ${STDMV} ${INSTALLROOT}/lib/lib/dbm ${INSTALLROOT}/lib/lib/dbm.old 2>/dev/null || true; ${STDCP} dbm.req ${INSTALLROOT}/lib/lib/dbm ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s dbm.req ${INSTALLROOT}/lib/lib/dbm || { ${STDMV} ${INSTALLROOT}/lib/lib/dbm ${INSTALLROOT}/lib/lib/dbm.old 2>/dev/null || true; ${STDCP} dbm.req ${INSTALLROOT}/lib/lib/dbm ;}
|
||||
done ${INSTALLROOT}/lib/lib/dbm generated
|
||||
done install virtual
|
||||
make test
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ make install
|
|||
done ${INSTALLROOT}/bin generated
|
||||
make ${INSTALLROOT}/bin/pty
|
||||
prev pty
|
||||
exec - test '' = 'pty' || ${STDCMP} 2>/dev/null -s pty ${INSTALLROOT}/bin/pty || { ${STDMV} ${INSTALLROOT}/bin/pty ${INSTALLROOT}/bin/pty.old 2>/dev/null || true; ${STDCP} pty ${INSTALLROOT}/bin/pty ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s pty ${INSTALLROOT}/bin/pty || { ${STDMV} ${INSTALLROOT}/bin/pty ${INSTALLROOT}/bin/pty.old 2>/dev/null || true; ${STDCP} pty ${INSTALLROOT}/bin/pty ;}
|
||||
done ${INSTALLROOT}/bin/pty generated
|
||||
make ${INSTALLROOT}/bin
|
||||
exec - if silent test ! -d ${INSTALLROOT}/bin
|
||||
|
|
|
|||
|
|
@ -1354,7 +1354,7 @@ make install
|
|||
make ${INSTALLROOT}/bin/ksh
|
||||
prev ${INSTALLROOT}/bin
|
||||
prev ksh
|
||||
exec - test '' = 'ksh' || ${STDCMP} 2>/dev/null -s ksh ${INSTALLROOT}/bin/ksh || { ${STDMV} ${INSTALLROOT}/bin/ksh ${INSTALLROOT}/bin/ksh.old 2>/dev/null || true; ${STDCP} ksh ${INSTALLROOT}/bin/ksh ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s ksh ${INSTALLROOT}/bin/ksh || { ${STDMV} ${INSTALLROOT}/bin/ksh ${INSTALLROOT}/bin/ksh.old 2>/dev/null || true; ${STDCP} ksh ${INSTALLROOT}/bin/ksh ;}
|
||||
done ${INSTALLROOT}/bin/ksh generated
|
||||
make ${INSTALLROOT}/man/man1
|
||||
exec - if silent test ! -d ${INSTALLROOT}/man/man1
|
||||
|
|
@ -1365,7 +1365,7 @@ make install
|
|||
prev ${INSTALLROOT}/man/man1
|
||||
make sh.1
|
||||
done sh.1
|
||||
exec - test '' = 'sh.1' || ${STDCMP} 2>/dev/null -s sh.1 ${INSTALLROOT}/man/man1/sh.1 || { ${STDMV} ${INSTALLROOT}/man/man1/sh.1 ${INSTALLROOT}/man/man1/sh.1.old 2>/dev/null || true; ${STDCP} sh.1 ${INSTALLROOT}/man/man1/sh.1 ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s sh.1 ${INSTALLROOT}/man/man1/sh.1 || { ${STDMV} ${INSTALLROOT}/man/man1/sh.1 ${INSTALLROOT}/man/man1/sh.1.old 2>/dev/null || true; ${STDCP} sh.1 ${INSTALLROOT}/man/man1/sh.1 ;}
|
||||
done ${INSTALLROOT}/man/man1/sh.1 generated
|
||||
make ${INSTALLROOT}/lib
|
||||
exec - if silent test ! -d ${INSTALLROOT}/lib
|
||||
|
|
@ -1375,7 +1375,7 @@ make install
|
|||
make ${INSTALLROOT}/lib/libshell.a archive
|
||||
prev ${INSTALLROOT}/lib
|
||||
prev libshell.a archive
|
||||
exec - test '' = 'libshell.a' || ${STDCMP} 2>/dev/null -s libshell.a ${INSTALLROOT}/lib/libshell.a || { ${STDMV} ${INSTALLROOT}/lib/libshell.a ${INSTALLROOT}/lib/libshell.a.old 2>/dev/null || true; ${STDCP} libshell.a ${INSTALLROOT}/lib/libshell.a ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s libshell.a ${INSTALLROOT}/lib/libshell.a || { ${STDMV} ${INSTALLROOT}/lib/libshell.a ${INSTALLROOT}/lib/libshell.a.old 2>/dev/null || true; ${STDCP} libshell.a ${INSTALLROOT}/lib/libshell.a ;}
|
||||
exec - (ranlib ${INSTALLROOT}/lib/libshell.a) >/dev/null 2>&1 || true
|
||||
done ${INSTALLROOT}/lib/libshell.a generated
|
||||
make ${INSTALLROOT}/man/man3
|
||||
|
|
@ -1387,12 +1387,12 @@ make install
|
|||
prev ${INSTALLROOT}/man/man3
|
||||
make shell.3
|
||||
done shell.3
|
||||
exec - test '' = 'shell.3' || ${STDCMP} 2>/dev/null -s shell.3 ${INSTALLROOT}/man/man3/shell.3 || { ${STDMV} ${INSTALLROOT}/man/man3/shell.3 ${INSTALLROOT}/man/man3/shell.3.old 2>/dev/null || true; ${STDCP} shell.3 ${INSTALLROOT}/man/man3/shell.3 ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s shell.3 ${INSTALLROOT}/man/man3/shell.3 || { ${STDMV} ${INSTALLROOT}/man/man3/shell.3 ${INSTALLROOT}/man/man3/shell.3.old 2>/dev/null || true; ${STDCP} shell.3 ${INSTALLROOT}/man/man3/shell.3 ;}
|
||||
done ${INSTALLROOT}/man/man3/shell.3 generated
|
||||
make ${INSTALLROOT}/man/man3/nval.3
|
||||
make nval.3
|
||||
done nval.3
|
||||
exec - test '' = 'nval.3' || ${STDCMP} 2>/dev/null -s nval.3 ${INSTALLROOT}/man/man3/nval.3 || { ${STDMV} ${INSTALLROOT}/man/man3/nval.3 ${INSTALLROOT}/man/man3/nval.3.old 2>/dev/null || true; ${STDCP} nval.3 ${INSTALLROOT}/man/man3/nval.3 ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s nval.3 ${INSTALLROOT}/man/man3/nval.3 || { ${STDMV} ${INSTALLROOT}/man/man3/nval.3 ${INSTALLROOT}/man/man3/nval.3.old 2>/dev/null || true; ${STDCP} nval.3 ${INSTALLROOT}/man/man3/nval.3 ;}
|
||||
done ${INSTALLROOT}/man/man3/nval.3 generated
|
||||
make ${INSTALLROOT}/lib/lib
|
||||
exec - if silent test ! -d ${INSTALLROOT}/lib/lib
|
||||
|
|
@ -1402,7 +1402,7 @@ make install
|
|||
make ${INSTALLROOT}/lib/lib/shell
|
||||
prev ${INSTALLROOT}/lib/lib
|
||||
prev shell.req
|
||||
exec - test '' = 'shell.req' || ${STDCMP} 2>/dev/null -s shell.req ${INSTALLROOT}/lib/lib/shell || { ${STDMV} ${INSTALLROOT}/lib/lib/shell ${INSTALLROOT}/lib/lib/shell.old 2>/dev/null || true; ${STDCP} shell.req ${INSTALLROOT}/lib/lib/shell ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s shell.req ${INSTALLROOT}/lib/lib/shell || { ${STDMV} ${INSTALLROOT}/lib/lib/shell ${INSTALLROOT}/lib/lib/shell.old 2>/dev/null || true; ${STDCP} shell.req ${INSTALLROOT}/lib/lib/shell ;}
|
||||
done ${INSTALLROOT}/lib/lib/shell generated
|
||||
make ${PACKAGE_ast_INCLUDE}
|
||||
exec - if silent test ! -d ${PACKAGE_ast_INCLUDE}
|
||||
|
|
@ -1430,11 +1430,11 @@ make install
|
|||
done ${PACKAGE_ast_INCLUDE}/history.h generated
|
||||
make ${INSTALLROOT}/bin/suid_exec
|
||||
prev suid_exec
|
||||
exec - test '' = 'suid_exec' || ${STDCMP} 2>/dev/null -s suid_exec ${INSTALLROOT}/bin/suid_exec || { ${STDMV} ${INSTALLROOT}/bin/suid_exec ${INSTALLROOT}/bin/suid_exec.old 2>/dev/null || true; ${STDCP} suid_exec ${INSTALLROOT}/bin/suid_exec ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s suid_exec ${INSTALLROOT}/bin/suid_exec || { ${STDMV} ${INSTALLROOT}/bin/suid_exec ${INSTALLROOT}/bin/suid_exec.old 2>/dev/null || true; ${STDCP} suid_exec ${INSTALLROOT}/bin/suid_exec ;}
|
||||
done ${INSTALLROOT}/bin/suid_exec generated
|
||||
make ${INSTALLROOT}/bin/shcomp
|
||||
prev shcomp
|
||||
exec - test '' = 'shcomp' || ${STDCMP} 2>/dev/null -s shcomp ${INSTALLROOT}/bin/shcomp || { ${STDMV} ${INSTALLROOT}/bin/shcomp ${INSTALLROOT}/bin/shcomp.old 2>/dev/null || true; ${STDCP} shcomp ${INSTALLROOT}/bin/shcomp ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s shcomp ${INSTALLROOT}/bin/shcomp || { ${STDMV} ${INSTALLROOT}/bin/shcomp ${INSTALLROOT}/bin/shcomp.old 2>/dev/null || true; ${STDCP} shcomp ${INSTALLROOT}/bin/shcomp ;}
|
||||
done ${INSTALLROOT}/bin/shcomp generated
|
||||
make ${INSTALLROOT}/fun
|
||||
exec - if silent test ! -d ${INSTALLROOT}/fun
|
||||
|
|
@ -1451,7 +1451,7 @@ make install
|
|||
prev ${INSTALLROOT}/fun
|
||||
make fun/dirs
|
||||
done fun/dirs
|
||||
exec - test '' = 'fun/dirs' || ${STDCMP} 2>/dev/null -s fun/dirs ${INSTALLROOT}/fun/dirs || { ${STDMV} ${INSTALLROOT}/fun/dirs ${INSTALLROOT}/fun/dirs.old 2>/dev/null || true; ${STDCP} fun/dirs ${INSTALLROOT}/fun/dirs && chmod ugo+x ${INSTALLROOT}/fun/dirs ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s fun/dirs ${INSTALLROOT}/fun/dirs || { ${STDMV} ${INSTALLROOT}/fun/dirs ${INSTALLROOT}/fun/dirs.old 2>/dev/null || true; ${STDCP} fun/dirs ${INSTALLROOT}/fun/dirs && chmod ugo+x ${INSTALLROOT}/fun/dirs ;}
|
||||
done ${INSTALLROOT}/fun/dirs generated
|
||||
make ${INSTALLROOT}/fun/man
|
||||
prev ${INSTALLROOT}/fun
|
||||
|
|
@ -1462,12 +1462,12 @@ make install
|
|||
make ${INSTALLROOT}/fun/popd
|
||||
make fun/popd
|
||||
done fun/popd
|
||||
exec - test '' = 'fun/popd' || ${STDCMP} 2>/dev/null -s fun/popd ${INSTALLROOT}/fun/popd || { ${STDMV} ${INSTALLROOT}/fun/popd ${INSTALLROOT}/fun/popd.old 2>/dev/null || true; ${STDCP} fun/popd ${INSTALLROOT}/fun/popd && chmod ugo+x ${INSTALLROOT}/fun/popd ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s fun/popd ${INSTALLROOT}/fun/popd || { ${STDMV} ${INSTALLROOT}/fun/popd ${INSTALLROOT}/fun/popd.old 2>/dev/null || true; ${STDCP} fun/popd ${INSTALLROOT}/fun/popd && chmod ugo+x ${INSTALLROOT}/fun/popd ;}
|
||||
done ${INSTALLROOT}/fun/popd generated
|
||||
make ${INSTALLROOT}/fun/pushd
|
||||
make fun/pushd
|
||||
done fun/pushd
|
||||
exec - test '' = 'fun/pushd' || ${STDCMP} 2>/dev/null -s fun/pushd ${INSTALLROOT}/fun/pushd || { ${STDMV} ${INSTALLROOT}/fun/pushd ${INSTALLROOT}/fun/pushd.old 2>/dev/null || true; ${STDCP} fun/pushd ${INSTALLROOT}/fun/pushd && chmod ugo+x ${INSTALLROOT}/fun/pushd ;}
|
||||
exec - ${STDCMP} 2>/dev/null -s fun/pushd ${INSTALLROOT}/fun/pushd || { ${STDMV} ${INSTALLROOT}/fun/pushd ${INSTALLROOT}/fun/pushd.old 2>/dev/null || true; ${STDCP} fun/pushd ${INSTALLROOT}/fun/pushd && chmod ugo+x ${INSTALLROOT}/fun/pushd ;}
|
||||
done ${INSTALLROOT}/fun/pushd generated
|
||||
done install virtual
|
||||
make test
|
||||
|
|
|
|||
|
|
@ -26,8 +26,10 @@
|
|||
*/
|
||||
|
||||
#include "shopt.h"
|
||||
#include "defs.h"
|
||||
|
||||
#if !SHOPT_MKSERVICE
|
||||
void _STUB_b_mkservice(){}
|
||||
NoN(mkservice)
|
||||
#else
|
||||
|
||||
static const char mkservice_usage[] =
|
||||
|
|
@ -91,8 +93,6 @@ static const char eloop_usage[] =
|
|||
;
|
||||
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
#include <cmd.h>
|
||||
#include <error.h>
|
||||
#include <nval.h>
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ struct sh_scoped
|
|||
short optchar;
|
||||
short opterror;
|
||||
int ioset;
|
||||
unsigned short trapmax;
|
||||
unsigned short trapmax; /* highest currently trapped signal number, plus one (!) */
|
||||
char trapdontexec; /* stop exec optimization if any non-DEBUG/SIGKILL/SIGSTOP trap is set and non-empty */
|
||||
char *trap[SH_DEBUGTRAP+1]; /* pseudosignals (except EXIT) */
|
||||
char **otrap; /* save parent pseudosignals for v=$(trap) */
|
||||
|
|
|
|||
|
|
@ -3329,8 +3329,8 @@ static void coproc_init(int pipes[])
|
|||
static void sigreset(int mode)
|
||||
{
|
||||
register char *trap;
|
||||
register int sig=sh.st.trapmax;
|
||||
while(sig-- > 0)
|
||||
register int sig;
|
||||
for (sig = 1; sig < sh.st.trapmax; sig++)
|
||||
{
|
||||
if(sig==SIGCHLD)
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue