diff options
Diffstat (limited to 'mcon/U')
455 files changed, 5284 insertions, 2713 deletions
diff --git a/mcon/U/AAAAA.U b/mcon/U/AAAAA.U index bdcb211..b2f6211 100644 --- a/mcon/U/AAAAA.U +++ b/mcon/U/AAAAA.U @@ -1,12 +1,12 @@ -?RCS: $Id: AAAAA.U,v 3.0.1.4 1994/06/20 06:50:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: AAAAA.U,v $ ?RCS: Revision 3.0.1.4 1994/06/20 06:50:26 ram diff --git a/mcon/U/Begin.U b/mcon/U/Begin.U index 99d968d..c05d239 100644 --- a/mcon/U/Begin.U +++ b/mcon/U/Begin.U @@ -1,12 +1,12 @@ -?RCS: $Id: Begin.U,v 3.0.1.3 1997/02/28 14:56:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Begin.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 14:56:35 ram diff --git a/mcon/U/Checkcc.U b/mcon/U/Checkcc.U new file mode 100644 index 0000000..ac1b513 --- /dev/null +++ b/mcon/U/Checkcc.U @@ -0,0 +1,135 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 2000, Jarkko Hietaniemi +?RCS: +?X: +?X: This unit produces a bit of shell code that must be dotted in order +?X: to make quick check on whether the current C compiler is working. +?X: +?MAKE:Checkcc ccname ccversion: Myread Warn startsh cat contains test +?MAKE: -pick add $@ %< +?S:ccname: +?S: This can set either by hints files or by Configure. If using +?S: gcc, this is gcc, and if not, usually equal to cc, unimpressive, no? +?S: Some platforms, however, make good use of this by storing the +?S: flavor of the C compiler being used here. For example if using +?S: the Sun WorkShop suite, ccname will be 'workshop'. +?S:. +?S:ccversion: +?S: This can set either by hints files or by Configure. If using +?S: a (non-gcc) vendor cc, this variable may contain a version for +?S: the compiler. +?S:. +?F:./checkcc ./trygcc !checktmp +?V:despair +?T:trygcc +?LINT:extern cc rm ccflags ldflags +?LINT:change cc ccflags +?LINT:usefile checktmp +?INIT:ccname='' +?INIT:ccversion='' +: generate the trygcc script for later perusal +cat <<EOS >trygcc +$startsh +EOS +cat <<'EOSC' >>trygcc +case "$cc" in +'') ;; +*) $rm -f try try.* + $cat >try.c <<EOM +int main(int argc, char *argv[]) { + (void) argc; + (void) argv; + return 0; +} +EOM + if $cc -o try $ccflags $ldflags try.c; then + : + else + echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4 + despair=yes + trygcc=yes + case "$cc" in + *gcc*) trygcc=no ;; + esac + case "`$cc -v -c try.c 2>&1`" in + *gcc*) trygcc=no ;; + esac + if $test X"$trygcc" = Xyes; then + if gcc -o try -c try.c; then + echo " " + echo "You seem to have a working gcc, though." >&4 + rp="Would you like to use it?" + dflt=y + if $test -f myread; then + . ./myread + else + if $test -f UU/myread; then + . ./UU/myread + else + echo "Cannot find myread, sorry. Aborting." >&2 + exit 1 + fi + fi + case "$ans" in + [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; +?X: Look whether we have 'call-back units' generated by hints that would +?X: seemingly affect the compiling environment. + $cat *.cbu >checktmp 2>/dev/null + if $contains ccflags checktmp >/dev/null; then + ./warn <<EOM +Any previous setting of the C compiler flags has been lost. +It may be necessary to pass -Dcc=gcc to Configure right away. +EOM + fi;; + esac + fi + fi + fi + $rm -f try try.* + ;; +esac +EOSC + +: generate the checkcc script for later perusal +cat <<EOS >checkcc +$startsh +EOS +cat <<'EOSC' >>checkcc +case "$cc" in +'') ;; +*) $rm -f try try.* + $cat >try.c <<EOM +int main(int argc, char *argv[]) { + (void) argc; + (void) argv; + return 0; +} +EOM + if $cc -o try $ccflags $ldflags try.c; then + : + else + if $test X"$despair" = Xyes; then + echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4 + fi + $cat >&4 <<EOM +You need to find a working C compiler. +Either (purchase and) install the C compiler supplied by your OS vendor, +or for a free C compiler try http://gcc.gnu.org/ +I cannot continue any further, aborting. +EOM + exit 1 + fi + $rm -f try try.* + ;; +esac +EOSC + diff --git a/mcon/U/Chk_MANI.U b/mcon/U/Chk_MANI.U index 5d4adc8..121ce9d 100644 --- a/mcon/U/Chk_MANI.U +++ b/mcon/U/Chk_MANI.U @@ -1,12 +1,12 @@ -?RCS: $Id: Chk_MANI.U,v 3.0.1.2 1997/02/28 14:57:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Chk_MANI.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 14:57:25 ram @@ -32,18 +32,22 @@ @if {test -f ../MANIFEST} : Now test for existence of everything in MANIFEST echo " " -if test -f $rsrc/MANIFEST; then +if test -f "$rsrc/MANIFEST"; then echo "First let's make sure your kit is complete. Checking..." >&4 ?X: ?X: Files spelled uppercased and beginning with PACK are produced by the ?X: shell archive builder and may be removed by the user. Usually, they are ?X: not listed in the MANIFEST file, but you never know... ?X: - awk '$1 !~ /PACK[A-Z]+/ {print $1}' $rsrc/MANIFEST | split -l 50 +?X: "split -l" is the new way of running a split, but we also try the older way +?X: + awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | \ + (split -l 50 2>/dev/null || split -50) rm -f missing tmppwd=`pwd` for filelist in x??; do - (cd $rsrc; ls `cat $tmppwd/$filelist` >/dev/null 2>>$tmppwd/missing) + (cd "$rsrc"; ls `cat "$tmppwd/$filelist"` \ + >/dev/null 2>>"$tmppwd/missing") done if test -s missing; then cat missing >&4 diff --git a/mcon/U/Chk_whoami.U b/mcon/U/Chk_whoami.U index 272e16b..a18ae1d 100644 --- a/mcon/U/Chk_whoami.U +++ b/mcon/U/Chk_whoami.U @@ -1,12 +1,12 @@ -?RCS: $Id: Chk_whoami.U,v 3.0 1993/08/18 12:04:46 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Chk_whoami.U,v $ ?RCS: Revision 3.0 1993/08/18 12:04:46 ram diff --git a/mcon/U/Compile.U b/mcon/U/Compile.U new file mode 100644 index 0000000..a8af2e0 --- /dev/null +++ b/mcon/U/Compile.U @@ -0,0 +1,63 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 1998 Andy Dougherty +?RCS: +?RCS: You may distribute under the terms of either the GNU General Public +?RCS: License or the Artistic License, as specified in the README file. +?RCS: +?RCS: +?X: +?X: This unit is just a quick shorthand for the compile command +?X: to be used in all the other metaconfig units. +?X: +?MAKE:Compile: +cc +optimize +ccflags +ldflags +libs +?MAKE: -pick add $@ %< +?LINT:define compile compile_ok +?V:compile compile_ok mc_file +?S:compile: +?S: This shell variable is used internally by Configure to provide +?S: a convenient shorthand for the typical compile command, namely +?S: $cc $optimize $ccflags $ldflags -o $1 $1.c $libs > /dev/null 2>&1 +?S: Note that the output filename does _not_ include the _exe +?S: extension. Instead we assume that the linker will be +?S: "helpful" and automatically appending the correct suffix. +?S: OS/2 users will apparently need to supply the -Zexe flag to +?S: get this behavior. +?S: +?S: To use this variable, say something like: +?S: echo 'int main() { exit(0); }' > try.c +?S: set try +?S: if eval $compile; then +?S: echo "success" # and do whatever . . . +?S: else +?S: echo "failure" # and do whatever . . . +?S: fi +?S: To add extra flags cc flags (e.g. -DWHATEVER) just put them +?S: in $*, e.g. +?S: set try -DTRY_THIS_FLAG +?S:. +?S:compile_ok: +?S: This shell variable is used internally by Configure to provide +?S: a convenient shorthand for the typical compile command that you +?S: expect to work ok. It is the same as $compile, except we +?S: deliberately let the user see any error messages. +?S:. +: define a shorthand compile call +compile=' +mc_file=$1; +shift; +$cc -o ${mc_file} $optimize $ccflags $ldflags $* ${mc_file}.c $libs > /dev/null 2>&1;' +: define a shorthand compile call for compilations that should be ok. +compile_ok=' +mc_file=$1; +shift; +$cc -o ${mc_file} $optimize $ccflags $ldflags $* ${mc_file}.c $libs;' + diff --git a/mcon/U/Config_h.U b/mcon/U/Config_h.U index 9793f61..04336c2 100644 --- a/mcon/U/Config_h.U +++ b/mcon/U/Config_h.U @@ -1,12 +1,12 @@ -?RCS: $Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Config_h.U,v $ ?RCS: Revision 3.0.1.5 1997/02/28 14:57:43 ram @@ -44,24 +44,34 @@ ?MAKE: -pick c_h_weed $@ ./Config_h ?MAKE: -pick c_h_weed $@ ./Obsol_h ?T:CONFIG TOP +?LINT:unclosed !GROK!THIS! +?LINT:extern CONFIG_H CONFIG_SH +?LINT:change CONFIG_H CONFIG_SH +?LINT:nocomment +case "$CONFIG_SH" in +'') CONFIG_SH=config.sh;; +esac +case "$CONFIG_H" in +'') CONFIG_H=config.h;; +esac case $CONFIG in '') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; + if test -f $CONFIG_SH; then TOP=.; + elif test -f ../$CONFIG_SH; then TOP=..; + elif test -f ../../$CONFIG_SH; then TOP=../..; + elif test -f ../../../$CONFIG_SH; then TOP=../../..; + elif test -f ../../../../$CONFIG_SH; then TOP=../../../..; else - echo "Can't find config.sh."; exit 1 + echo "Can't find $CONFIG_SH."; exit 1 fi - . $TOP/config.sh + . $TOP/$CONFIG_SH ;; esac ?X: Make sure we are in the directory where the .SH file is located. case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac -echo "Extracting config.h (with variable substitutions)" +echo "Extracting $CONFIG_H (with variable substitutions)" ?X: ?X: Since we unconditionally translate leading #undef into /*#define, we're ?X: stuck when we really want to have a #undef in config.h. That's why there @@ -78,17 +88,17 @@ echo "Extracting config.h (with variable substitutions)" ?X: This sed command from Hallvard B Furuseth <h.b.furuseth@usit.uio.no> ?X: changes it to ?X: /*#define FOO / **/ -sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-def!#undef!' +sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-def!#undef!' /* * This file was produced by running the config_h.SH script, which - * gets its values from config.sh, which is generally produced by + * gets its values from $CONFIG_SH, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config_h.SH again will wipe out any changes you've made. - * For a more permanent change edit config.sh and rerun config_h.SH. + * For a more permanent change edit $CONFIG_SH and rerun config_h.SH. * - * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ + * \$Id$ */ /* diff --git a/mcon/U/Config_sh.U b/mcon/U/Config_sh.U index 3f9316c..3d71a2e 100644 --- a/mcon/U/Config_sh.U +++ b/mcon/U/Config_sh.U @@ -1,12 +1,12 @@ -?RCS: $Id: Config_sh.U,v 3.0.1.3 1997/02/28 14:57:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Config_sh.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 14:57:53 ram @@ -28,17 +28,24 @@ ?X: here document redirection with variable substitution). ?X: ?MAKE:Config_sh: cf_time cf_by test spitshell startsh myuname Myread \ - End Obsol_sh Loc +d_portable package src + End Obsol_sh Loc +d_portable package src cat sed ?MAKE: -pick add.Config_sh $@ %< ?MAKE: -pick add $@ ./Obsol_sh ?MAKE: -pick close.Config_sh $@ %< -?F:!config.over -?T:file +?F:!config.over !config.arch +?T:file sfile xsed +?LINT:unclosed EOT : back to where it started if test -d ../UU; then cd .. fi +: configuration may be unconditionally patched via a 'config.arch' file +if $test -f config.arch; then + echo "I see a config.arch file, loading it." >&4 + . ./config.arch +fi + : configuration may be patched via a 'config.over' file if $test -f config.over; then echo " " @@ -59,13 +66,19 @@ fi ?X: Strip down paths in located executables. For each file, e.g. vi, there ?X: is a $vi variable whose value is for instance '/usr/bin/vi'. By resetting ?X: $vi to 'vi', we rely on the PATH variable to locate the executable... +?X: In order to allow vi='/usr/bin/nvi' which will strip down to vi='nvi', +?X: we can't just say 'eval $file="\$file"', we have to recourse to sed. +?X: We don't use basename since it is less portable than sed. ?X: case "$d_portable" in "$define") echo " " echo "Stripping down executable paths..." >&4 + xsed=$sed for file in $loclist $trylist; do - eval $file="\$file" + eval sfile="\$$file" + sfile=`echo $sfile | $xsed -e 's,.*/\(.*\),\1,'` + eval $file="$sfile" done ;; esac @@ -89,3 +102,9 @@ $startsh # Configured by : $cf_by # Target system : $myuname +EOT +?X: Command line options are saved by the Options.U unit in the +?X: temporary file UU/cmdline.opt +$test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh +$spitshell <<EOT >>config.sh + diff --git a/mcon/U/Configdir.U b/mcon/U/Configdir.U index ceed327..1dfcf70 100644 --- a/mcon/U/Configdir.U +++ b/mcon/U/Configdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: Configdir.U,v 3.0.1.1 1997/02/28 14:58:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Configdir.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 14:58:36 ram diff --git a/mcon/U/Cppsym.U b/mcon/U/Cppsym.U index fc8200a..ab6bf7c 100644 --- a/mcon/U/Cppsym.U +++ b/mcon/U/Cppsym.U @@ -1,13 +1,13 @@ -?RCS: $Id: Cppsym.U,v 3.0.1.5 1995/05/12 11:59:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: Cppsym.U,v $ ?RCS: Revision 3.0.1.5 1995/05/12 11:59:11 ram ?RCS: patch54: split awk command onto two lines for older awks (ADO) @@ -38,192 +38,249 @@ ?X: are more easily determined. If you want to add to $al you can do ?X: it in Myinit.U. ?X: -?MAKE:Cppsym: eunicefix Guess cppstdin awk cat tr sed sort grep rm startsh \ - contains cppminus +cc +gccversion test comm uniq echo n c Options +?MAKE:Cppsym ccsymbols cppsymbols cppccsymbols: run \ + eunicefix Guess awk cat tr sed sort rm startsh osname \ + +cc gccversion test comm uniq echo Options trnl \ + optimize ccflags ldflags libs ?MAKE: -pick add $@ %< +?S:ccsymbols: +?S: The variable contains the symbols defined by the C compiler alone. +?S: The symbols defined by cpp or by cc when it calls cpp are not in +?S: this list, see cppsymbols and cppccsymbols. +?S: The list is a space-separated list of symbol=value tokens. +?S:. +?S:cppsymbols: +?S: The variable contains the symbols defined by the C preprocessor +?S: alone. The symbols defined by cc or by cc when it calls cpp are +?S: not in this list, see ccsymbols and cppccsymbols. +?S: The list is a space-separated list of symbol=value tokens. +?S:. +?S:cppccsymbols: +?S: The variable contains the symbols defined by the C compiler +?S: when it calls cpp. The symbols defined by the cc alone or cpp +?S: alone are not in this list, see ccsymbols and cppsymbols. +?S: The list is a space-separated list of symbol=value tokens. +?S:. +?T:also symbols i postprocess_cc_v flags ?F:./Cppsym -?T:sym list unknown status also symbols i -?V:al +?F:!Cppsym.true !Cppsym.know !ccsym.com !ccsym.cpp !ccsym.own +: determine known pre-processor and compiler symbols +echo " " +$echo "Guessing which symbols your C compiler and preprocessor define..." >&4 ?X: ?X: The symbol list is in alpha order for ease of maintenance... ?X: ?X: Lots of new symbols (mostly rummaged from gcc), courtesy of ?X: Jarkko Hietaniemi <jhi@snakemail.hut.fi> -- RAM, 06/06/94 ?X: -?INIT:: list of known cpp symbols, sorted alphabetically -?INIT:al="AMIX BIT_MSF BSD BSD4_3 BSD_NET2 CMU CRAY DGUX DOLPHIN DPX2" -?INIT:al="$al GO32 GOULD_PN HP700 I386 I80960 I960 Lynx M68000 M68K MACH" -?INIT:al="$al MIPSEB MIPSEL MSDOS MTXINU MULTIMAX MVS" -?INIT:al="$al M_COFF M_I186 M_I286 M_I386 M_I8086 M_I86 M_I86SM" -?INIT:al="$al M_SYS3 M_SYS5 M_SYSIII M_SYSV M_UNIX M_XENIX" -?INIT:al="$al NeXT OCS88 OSF1 PARISC PC532 PORTAR POSIX" -?INIT:al="$al PWB R3000 RES RISC6000 RT Sun386i SVR3 SVR4" -?INIT:al="$al SYSTYPE_BSD SYSTYPE_SVR4 SYSTYPE_SYSV Tek4132 Tek4300" -?INIT:al="$al UMAXV USGr4 USGr4_2 UTEK UTS UTek UnicomPBB UnicomPBD Utek" -?INIT:al="$al VMS Xenix286" -?INIT:al="$al _AIX _AIX32 _AIX370 _AM29000 _COFF _CRAY _CX_UX _EPI" -?INIT:al="$al _IBMESA _IBMR2 _M88K _M88KBCS_TARGET" -?INIT:al="$al _MIPSEB _MIPSEL _M_COFF _M_I86 _M_I86SM _M_SYS3" -?INIT:al="$al _M_SYS5 _M_SYSIII _M_SYSV _M_UNIX _M_XENIX _NLS _PGC_ _R3000" -?INIT:al="$al _SYSTYPE_BSD _SYSTYPE_BSD43 _SYSTYPE_SVR4" -?INIT:al="$al _SYSTYPE_SYSV _SYSV3 _U370 _UNICOS" -?INIT:al="$al __386BSD__ __BIG_ENDIAN __BIG_ENDIAN__ __BSD_4_4__" -?INIT:al="$al __DGUX__ __DPX2__ __H3050R __H3050RX" -?INIT:al="$al __LITTLE_ENDIAN __LITTLE_ENDIAN__ __MACH__" -?INIT:al="$al __MIPSEB __MIPSEB__ __MIPSEL __MIPSEL__" -?INIT:al="$al __Next__ __OSF1__ __PARAGON__ __PGC__ __PWB __STDC__" -?INIT:al="$al __SVR4_2__ __UMAXV__" -?INIT:al="$al ____386BSD____ __alpha __alpha__ __amiga" -?INIT:al="$al __bsd4_2 __bsd4_2__ __bsdi__ __convex__" -?INIT:al="$al __host_mips__" -?INIT:al="$al __hp9000s200 __hp9000s300 __hp9000s400 __hp9000s500" -?INIT:al="$al __hp9000s500 __hp9000s700 __hp9000s800" -?INIT:al="$al __hppa __hpux __hp_osf __i286 __i286__ __i386 __i386__" -?INIT:al="$al __i486 __i486__ __i860 __i860__ __ibmesa __ksr1__ __linux__" -?INIT:al="$al __m68k __m68k__ __m88100__ __m88k __m88k__" -?INIT:al="$al __mc68000 __mc68000__ __mc68020 __mc68020__" -?INIT:al="$al __mc68030 __mc68030__ __mc68040 __mc68040__" -?INIT:al="$al __mc88100 __mc88100__ __mips __mips__" -?INIT:al="$al __motorola__ __osf__ __pa_risc __sparc__ __stdc__" -?INIT:al="$al __sun __sun__ __svr3__ __svr4__ __ultrix __ultrix__" -?INIT:al="$al __unix __unix__ __uxpm__ __uxps__ __vax __vax__" -?INIT:al="$al _host_mips _mips _unix" -?INIT:al="$al a29k aegis aix aixpc alliant alpha am29000 amiga ansi ardent" -?INIT:al="$al apollo ardent att386 att3b" -?INIT:al="$al bsd bsd43 bsd4_2 bsd4_3 bsd4_4 bsdi bull" -?INIT:al="$al cadmus clipper concurrent convex cray ctix" -?INIT:al="$al dmert encore gcos gcx gimpel gould" -?INIT:al="$al hbullx20 hcx host_mips hp200 hp300 hp700 hp800" -?INIT:al="$al hp9000 hp9000s300 hp9000s400 hp9000s500" -?INIT:al="$al hp9000s700 hp9000s800 hp9k8 hppa hpux" -?INIT:al="$al i186 i286 i386 i486 i8086" -?INIT:al="$al i80960 i860 iAPX286 ibm ibm032 ibmrt interdata is68k" -?INIT:al="$al ksr1 linux luna luna88k m68k m88100 m88k" -?INIT:al="$al mc300 mc500 mc68000 mc68010 mc68020 mc68030" -?INIT:al="$al mc68040 mc68060 mc68k mc68k32 mc700" -?INIT:al="$al mc88000 mc88100 merlin mert mips mvs n16" -?INIT:al="$al ncl_el ncl_mr" -?INIT:al="$al news1500 news1700 news1800 news1900 news3700" -?INIT:al="$al news700 news800 news900 ns16000 ns32000" -?INIT:al="$al ns32016 ns32332 ns32k nsc32000 os osf" -?INIT:al="$al parisc pc532 pdp11 plexus posix pyr" -?INIT:al="$al riscix riscos scs sequent sgi sinix sony sony_news" -?INIT:al="$al sonyrisc sparc sparclite spectrum stardent stratos" -?INIT:al="$al sun sun3 sun386 svr4 sysV68 sysV88" -?INIT:al="$al titan tower tower32 tower32_200 tower32_600 tower32_700" -?INIT:al="$al tower32_800 tower32_850 tss u370 u3b u3b2 u3b20 u3b200" -?INIT:al="$al u3b20d u3b5 ultrix unix unixpc unos vax venix vms" -?INIT:al="$al xenix z8000" -?INIT: -: get C preprocessor symbols handy -echo " " -$echo $n "Hmm... $c" -?X: The following used to be tr '[ - ]' ... but this was rejected by AIX 3.2 -?X: since the endpoints where the same (from patch 12u8 to patch). -echo $al | $tr ' ' '\012' >Cppsym.know -$cat <<EOSS >Cppsym +?X: If your symbol is mixed case, just add it as-is. +?X: All symbols will be transformed to both all-lower and all-upper. +?X: Also drop any leading/trailing underscores, the scan will try all those. +?X: +$cat <<'EOSH' > Cppsym.know +a29k ABI64 aegis AES_SOURCE AIX AIX32 AIX370 +AIX41 AIX42 AIX43 AIX_SOURCE aixpc ALL_SOURCE +alliant alpha am29000 AM29000 AMD64 amiga AMIGAOS AMIX +ansi ANSI_C_SOURCE apollo ardent ARM32 atarist att386 att3b +BeOS BIG_ENDIAN BIT_MSF bsd BSD bsd43 bsd4_2 bsd4_3 BSD4_3 bsd4_4 +BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES BSDCOMPAT bsdi +bull c cadmus clipper CMU COFF COMPILER_VERSION +concurrent convex cpu cray CRAY CRAYMPP ctix CX_UX +CYGWIN DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO +Dynix DynixPTX ELF encore EPI EXTENSIONS FAVOR_BSD +FILE_OFFSET_BITS FreeBSD GCC_NEW_VARARGS gcos gcx gimpel +GLIBC GLIBC_MINOR +GNU_SOURCE GNUC GNUC_MINOR GNU_LIBRARY GO32 gould GOULD_PN +H3050R H3050RX hbullx20 hcx host_mips +hp200 hp300 hp700 HP700 hp800 hp9000 +hp9000s200 hp9000s300 hp9000s400 hp9000s500 +hp9000s700 hp9000s800 hp9k8 hp_osf hppa hpux HPUX_SOURCE +i186 i286 i386 i486 i586 i686 i8086 i80960 i860 I960 +IA64 iAPX286 ibm ibm032 ibmesa IBMR2 ibmrt ILP32 ILP64 +INLINE_INTRINSICS INTRINSICS INT64 interdata is68k ksr1 +LANGUAGE_C LARGE_FILE_API LARGEFILE64_SOURCE +LARGEFILE_SOURCE LFS64_LARGEFILE LFS_LARGEFILE +Linux LITTLE_ENDIAN LONG64 LONG_DOUBLE LONG_LONG +LONGDOUBLE LONGLONG LP64 luna luna88k Lynx +M68000 m68k m88100 m88k M88KBCS_TARGET M_COFF +M_I186 M_I286 M_I386 M_I8086 M_I86 M_I86SM M_SYS3 +M_SYS5 M_SYSIII M_SYSV M_UNIX M_XENIX MACH machine MachTen +MATH_HAS_NO_SIDE_EFFECTS +mc300 mc500 mc68000 mc68010 mc68020 mc68030 mc68040 +mc68060 mc68k mc68k32 mc700 mc88000 mc88100 merlin +mert MiNT mips MIPS_FPSET MIPS_ISA MIPS_SIM MIPS_SZINT +MIPS_SZLONG MIPS_SZPTR MIPSEB MIPSEL MODERN_C motorola +mpeix MSDOS MTXINU MULTIMAX mvs MVS n16 ncl_el ncl_mr +NetBSD news1500 news1700 news1800 news1900 news3700 +news700 news800 news900 NeXT NLS nonstopux ns16000 ns32000 +ns32016 ns32332 ns32k nsc32000 +OCS88 OEMVS OpenBSD os OS2 OS390 osf OSF1 OSF_SOURCE +pa_risc PA_RISC1_1 PA_RISC2_0 PARAGON parisc +pc532 pdp11 PGC PIC plexus PORTAR posix +POSIX1B_SOURCE POSIX2_SOURCE POSIX4_SOURCE +POSIX_C_SOURCE POSIX_SOURCE POWER +PROTOTYPES PWB pyr QNX R3000 REENTRANT RES Rhapsody RISC6000 +riscix riscos RT S390 SA110 scs SCO sequent sgi SGI_SOURCE SH3 sinix +SIZE_INT SIZE_LONG SIZE_PTR SOCKET_SOURCE SOCKETS_SOURCE +sony sony_news sonyrisc sparc sparclite spectrum +stardent stdc STDC_EXT stratos sun sun3 sun386 +Sun386i svr3 svr4 SVR4_2 SVR4_SOURCE svr5 +SX system SYSTYPE_BSD SYSTYPE_BSD43 SYSTYPE_BSD44 +SYSTYPE_SVR4 SYSTYPE_SVR5 SYSTYPE_SYSV SYSV SYSV3 SYSV4 SYSV5 +sysV68 sysV88 Tek4132 Tek4300 titan +TM3200 TM5400 TM5600 +tower tower32 tower32_200 tower32_600 tower32_700 +tower32_800 tower32_850 tss +u370 u3b u3b2 u3b20 u3b200 u3b20d u3b5 +ultrix UMAXV UnicomPBB UnicomPBD UNICOS UNICOSMK +unix UNIX95 UNIX99 unixpc unos +USE_BSD USE_FILE_OFFSET64 USE_GNU USE_ISOC9X USE_LARGEFILE USE_LARGEFILE64 +USE_MISC USE_POSIX USE_POSIX199309 USE_POSIX199506 USE_POSIX2 +USE_REENTRANT USE_SVID USE_UNIX98 USE_XOPEN USE_XOPEN_EXTENDED +USGr4 USGr4_2 +Utek UTek UTS UWIN uxpm uxps vax venix VMESA vms xenix Xenix286 +XOPEN_SOURCE XOPEN_SOURCE_EXTENDED XPG2 XPG2_EXTENDED +XPG3 XPG3_EXTENDED XPG4 XPG4_EXTENDED +z8000 +EOSH +?X: Maybe put other stuff here too. +cat <<EOSH >>Cppsym.know +$osname +EOSH +./tr '[a-z]' '[A-Z]' < Cppsym.know > Cppsym.a +./tr '[A-Z]' '[a-z]' < Cppsym.know > Cppsym.b +$cat Cppsym.know > Cppsym.c +$cat Cppsym.a Cppsym.b Cppsym.c | $tr ' ' $trnl | $sort | $uniq > Cppsym.know +$rm -f Cppsym.a Cppsym.b Cppsym.c +cat <<EOSH > Cppsym $startsh -case "\$1" in --l) list=true - shift - ;; -esac -unknown='' -case "\$list\$#" in -1|2) - for sym do - if $contains "^\$1$" Cppsym.true >/dev/null 2>&1; then - exit 0 - elif $contains "^\$1$" Cppsym.know >/dev/null 2>&1; then - : - else - unknown="\$unknown \$sym" - fi - done - set X \$unknown - shift - ;; -esac -case \$# in -0) exit 1;; -esac -echo \$* | $tr ' ' '\012' | $sed -e 's/\(.*\)/\\ -#ifdef \1\\ -exit 0; _ _ _ _\1\\ \1\\ -#endif\\ -/' >Cppsym\$\$ -echo "exit 1; _ _ _" >>Cppsym\$\$ -$cppstdin $cppminus <Cppsym\$\$ | $grep '^exit [01]; _ _' >Cppsym2\$\$ -case "\$list" in -true) $awk 'NF > 5 {print substr(\$6,2,100)}' <Cppsym2\$\$ ;; -*) - sh Cppsym2\$\$ - status=\$? - ;; -esac -$rm -f Cppsym\$\$ Cppsym2\$\$ -exit \$status -EOSS +if $test \$# -gt 0; then + echo \$* | $tr " " "$trnl" | ./Cppsym.try > Cppsym.got + if $test -s Cppsym.got; then + $rm -f Cppsym.got + exit 0 + fi + $rm -f Cppsym.got + exit 1 +else + $tr " " "$trnl" | ./Cppsym.try + exit 0 +fi +EOSH chmod +x Cppsym $eunicefix Cppsym -./Cppsym -l $al | $sort | $grep -v '^$' >Cppsym.true - +?X: The below awk script will die a horrible death if +?X: some of the tested symbols are not long ints. +?X: Also, we do not make difference between just defined and defined zero. +cat <<EOSH > Cppsym.try +$startsh +cat <<'EOCP' > try.c +#include <stdio.h> +int main() { +EOCP +?X: The length($1) command guards against possible empty entries. +?X: The awk snippet is know to give heartburn to UNICOS/mk awk. +$awk \\ +EOSH +cat <<'EOSH' >> Cppsym.try +'length($1) > 0 { + printf "#ifdef %s\n#if %s+0\nprintf(\"%s=%%ld\\n\", (long)%s);\n#else\nprintf(\"%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 + printf "#ifdef _%s\n#if _%s+0\nprintf(\"_%s=%%ld\\n\", (long)_%s);\n#else\nprintf(\"_%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 + printf "#ifdef __%s\n#if __%s+0\nprintf(\"__%s=%%ld\\n\", (long)__%s);\n#else\nprintf(\"__%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 + printf "#ifdef __%s__\n#if __%s__+0\nprintf(\"__%s__=%%ld\\n\", (long)__%s__);\n#else\nprintf(\"__%s__\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 +}' >> try.c +echo 'return 0;}' >> try.c +EOSH +cat <<EOSH >> Cppsym.try +flags="$ccflags" +case "$osname-$gccversion" in +irix-) flags="\$flags -woff 1178" ;; +os2-*) flags="\$flags -Zlinker /PM:VIO" ;; +esac +$cc -o try $optimize \$flags $ldflags try.c $libs && $run ./try +EOSH +chmod +x Cppsym.try +$eunicefix Cppsym.try +./Cppsym < Cppsym.know > Cppsym.true : now check the C compiler for additional symbols ?X: suggested by Jarkko Hietaniemi <jhi@snakemail.hut.fi>, thanks! +postprocess_cc_v='' +case "$osname" in +aix) postprocess_cc_v="|$tr , ' '" ;; +esac $cat >ccsym <<EOS $startsh $cat >tmp.c <<EOF extern int foo; EOF -for i in \`$cc -v -c tmp.c 2>&1\` +for i in \`$cc -v -c tmp.c 2>&1 $postprocess_cc_v\` do case "\$i" in -D*) echo "\$i" | $sed 's/^-D//';; - -A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';; + -A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';; esac done $rm -f try.c EOS +postprocess_cc_v='' chmod +x ccsym $eunicefix ccsym -./ccsym | $sort | $uniq >ccsym.raw +./ccsym > ccsym1.raw +?X: AIX complains if $uniq is passed an empty file. ($sort apparently +?X: doesn't care.) --AD 14 July 1998 +if $test -s ccsym1.raw; then + $sort ccsym1.raw | $uniq >ccsym.raw +else + mv ccsym1.raw ccsym.raw +fi + ?X: canonicalize symbols for easier sort/uniq/comm usage: append =1 if no = sign ?X: the awk script must be on two lines for older awk programs, sigh! -- ADO $awk '/\=/ { print $0; next } { print $0"=1" }' ccsym.raw >ccsym.list -$awk '{ print $0"=1" }' Cppsym.true >ccsym.true +$awk '/\=/ { print $0; next } + { print $0"=1" }' Cppsym.true >ccsym.true $comm -13 ccsym.true ccsym.list >ccsym.own $comm -12 ccsym.true ccsym.list >ccsym.com $comm -23 ccsym.true ccsym.list >ccsym.cpp also='' -symbols='symbols' if $test -z ccsym.raw; then - echo "Your C compiler doesn't seem to define any symbol!" >&4 + echo "Your C compiler doesn't seem to define any symbols!" >&4 echo " " - echo "However, your C preprocessor defines the following ones:" + echo "However, your C preprocessor defines the following symbols:" $cat Cppsym.true + ccsymbols='' + cppsymbols=`$cat Cppsym.true` + cppsymbols=`echo $cppsymbols` + cppccsymbols="$cppsymbols" else if $test -s ccsym.com; then echo "Your C compiler and pre-processor define these symbols:" - $sed -e 's/\(.*\)=.*/\1/' ccsym.com + $sed -e 's/\(..*\)=.*/\1/' ccsym.com also='also ' symbols='ones' + cppccsymbols=`$cat ccsym.com` + cppccsymbols=`echo $cppccsymbols` $test "$silent" || sleep 1 fi if $test -s ccsym.cpp; then $test "$also" && echo " " - echo "Your C pre-processor ${also}defines the following $symbols:" - $sed -e 's/\(.*\)=.*/\1/' ccsym.cpp + echo "Your C pre-processor ${also}defines the following symbols:" + $sed -e 's/\(..*\)=.*/\1/' ccsym.cpp also='further ' + cppsymbols=`$cat ccsym.cpp` + cppsymbols=`echo $cppsymbols` $test "$silent" || sleep 1 fi if $test -s ccsym.own; then $test "$also" && echo " " - echo "Your C compiler ${also}defines the following cpp variables:" - $sed -e 's/\(.*\)=1/\1/' ccsym.own - $sed -e 's/\(.*\)=.*/\1/' ccsym.own | $uniq >>Cppsym.true + echo "Your C compiler ${also}defines the following cpp symbols:" + $sed -e 's/\(..*\)=1/\1/' ccsym.own + $sed -e 's/\(..*\)=.*/\1/' ccsym.own | $uniq >>Cppsym.true + ccsymbols=`$cat ccsym.own` + ccsymbols=`echo $ccsymbols` $test "$silent" || sleep 1 fi fi -$rm -f ccsym* +$rm -f Cppsym.know Cppsym.true diff --git a/mcon/U/Cross.U b/mcon/U/Cross.U new file mode 100644 index 0000000..feaef31 --- /dev/null +++ b/mcon/U/Cross.U @@ -0,0 +1,349 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 2001 Jarkko Hietaniemi +?RCS: +?MAKE:run to from targetarch usecrosscompile: src awk cat grep test rm \ + echo sed mkdir cp touch chmod +?MAKE: -pick add $@ %< +?Y:TOP +?S:usecrosscompile: +?S: This variable conditionally defines the USE_CROSS_COMPILE symbol, +?S: and indicates that our package has been cross-compiled. +?S:. +?S:run: +?S: This variable contains the command used by Configure +?S: to copy and execute a cross-compiled executable in the +?S: target host. Useful and available only during the build. +?S: Empty string '' if not cross-compiling. +?S:. +?S:from: +?S: This variable contains the command used by Configure +?S: to copy files from the target host. Useful and available +?S: only during the build. +?S: The string ':' if not cross-compiling. +?S:. +?S:to: +?S: This variable contains the command used by Configure +?S: to copy to from the target host. Useful and available +?S: only during the build. +?S: The string ':' if not cross-compiling. +?S:. +?S:targetarch: +?S: If cross-compiling, this variable contains the target architecture. +?S: If not, this will be empty. +?S:. +?C:USE_CROSS_COMPILE: +?C: This symbol, if defined, indicates that the package is being +?C: cross-compiled. +?C:. +?C:CROSS_TARGET_ARCH: +?C: This symbol, if defined, indicates the target architecture +?C: the package has been cross-compiled to. +?C: Undefined if not a cross-compile. +?C:. +?H:?usecrosscompile:#ifndef USE_CROSS_COMPILE +?H:?usecrosscompile:#$usecrosscompile USE_CROSS_COMPILE /**/ +?H:?usecrosscompile:#define CROSS_TARGET_ARCH "$targetarch" /**/ +?H:?usecrosscompile:#endif +?H:. +?T:croak pwd exe f q i j cwd +?LINT:extern usecrosscompile +?LINT:extern cc +?LINT:extern usrinc +?LINT:change usrinc +?LINT:change ar +?LINT:change nm +?LINT:change ranlib +?LINT:extern targethost +?LINT:extern targetdir +?LINT:change targetdir +?LINT:extern targetuser +?LINT:change targetuser +?LINT:extern targetrun +?LINT:extern targetfrom +?LINT:extern targetto +?LINT:extern targetmkdir +?LINT:change targetrun +?LINT:change targetfrom +?LINT:change targetto +?LINT:change targetmkdir +?LINT:extern incpth +?LINT:extern libpth +?LINT:change incpth +?LINT:change libpth +?LINT:extern locincpth +?LINT:extern loclibpth +?LINT:change locincpth +?LINT:change loclibpth +: setup for possible cross-compilation +run='' +to=: +from=: +usecrosscompile='undef' +targetarch='' +case "$usecrosscompile" in +$define|true|[yY]*) +@if { test -d ../Cross } +?X: +?X: Cross-compilation is enabled when there is a 'Cross' directory found +?X: at the root of the package. This directory must contain the following +?X: entries for defining the cross-compilation process: +?X: +?X: FIXME FIXME +?X: WE MUST DISTINGUISH BETWEEN LOCAL cross-compiling AND REMOTE ONE +?X: ACTUALLY, REMOTE COMPILATION SHOULD BE CONFIGURED INTERACTIVELY +?X: IT WILL COPY ALL THE FILES FROM THE MANIFEST DOWN TO THE REMOTE DIR... +?X: (and copy things like 'mkdep', etc...) +?X: + $echo "Cross-compiling..." + croak='' + case "$cc" in + *-*-gcc) +?X: A cross-compiling gcc, probably. + targetarch=`$echo $cc|$sed 's/-gcc$//'` + ar=$targetarch-ar +?X: leave out ld, choosing it is more complex + nm=$targetarch-nm + ranlib=$targetarch-ranlib + $echo 'extern int foo;' > try.c + set X `$cc -v -E try.c 2>&1 | \ + $awk '/^#include </,/^End of search /'|$grep '/include'` + shift + if $test $# -gt 0; then + incpth="$incpth $*" + incpth="`$echo $incpth|$sed 's/^ //'`" + echo "Guessing incpth '$incpth'." >&4 + for i in $*; do + j="`$echo $i|$sed 's,/include$,/lib,'`" + if $test -d $j; then + libpth="$libpth $j" + fi + done + libpth="`$echo $libpth|$sed 's/^ //'`" + echo "Guessing libpth '$libpth'." >&4 + fi + $rm -f try.c + ;; + esac + case "$targetarch" in + '') echo "Targetarch not defined." >&4; croak=y ;; + *) echo "Using targetarch $targetarch." >&4 ;; + esac + case "$incpth" in + '') echo "Incpth not defined." >&4; croak=y ;; + *) echo "Using incpth '$incpth'." >&4 ;; + esac + case "$libpth" in + '') echo "Libpth not defined." >&4; croak=y ;; + *) echo "Using libpth '$libpth'." >&4 ;; + esac + case "$usrinc" in + '') + for i in $incpth; do + if $test -f $i/errno.h -a -f $i/stdio.h -a -f $i/time.h; then + usrinc=$i + echo "Guessing usrinc $usrinc." >&4 + break + fi + done + case "$usrinc" in + '') echo "Usrinc not defined." >&4; croak=y ;; + esac + ;; + *) echo "Using usrinc $usrinc." >&4 ;; + esac + case "$targethost" in + '') echo "Targethost not defined." >&4; croak=y ;; + *) echo "Using targethost $targethost." >&4 + esac + locincpth=' ' + loclibpth=' ' + case "$croak" in + y) echo "Cannot continue, aborting." >&4; exit 1 ;; + esac + case "$src" in + /*) run=$src/Cross/run + targetmkdir=$src/Cross/mkdir + to=$src/Cross/to + from=$src/Cross/from + ;; + *) pwd=`$test -f ../Configure & cd ..; pwd` + run=$pwd/Cross/run + targetmkdir=$pwd/Cross/mkdir + to=$pwd/Cross/to + from=$pwd/Cross/from + ;; + esac + case "$targetrun" in + '') targetrun=ssh ;; + esac + case "$targetto" in + '') targetto=scp ;; + esac + case "$targetfrom" in + '') targetfrom=scp ;; + esac + run=$run-$targetrun + to=$to-$targetto + from=$from-$targetfrom + case "$targetdir" in + '') + targetdir=/tmp + echo "Guessing targetdir $targetdir." >&4 + ;; + esac + case "$targetuser" in + '') + targetuser=root + echo "Guessing targetuser $targetuser." >&4 + ;; + esac + case "$targetfrom" in + scp) q=-q ;; + *) q='' ;; + esac + case "$targetrun" in + ssh|rsh) + $cat >$run <<EOF +#!/bin/sh +case "\$1" in +-cwd) + shift + cwd=\$1 + shift + ;; +esac +case "\$cwd" in +'') cwd=$targetdir ;; +esac +exe=\$1 +shift +if $test ! -f \$exe.xok; then + $to \$exe + $touch \$exe.xok +fi +$targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@" +EOF + ;; + *) echo "Unknown targetrun '$targetrun'" >&4 + exit 1 + ;; + esac + case "$targetmkdir" in + */Cross/mkdir) + $cat >$targetmkdir <<EOF +#!/bin/sh +$targetrun -l $targetuser $targethost "mkdir -p \$@" +EOF + $chmod a+rx $targetmkdir + ;; + *) echo "Unknown targetmkdir '$targetmkdir'" >&4 + exit 1 + ;; + esac + case "$targetto" in + scp|rcp) + $cat >$to <<EOF +#!/bin/sh +for f in \$@ +do + case "\$f" in + /*) + $targetmkdir \`dirname \$f\` + $targetto $q \$f $targetuser@$targethost:\$f || exit 1 + ;; + *) + $targetmkdir $targetdir/\`dirname \$f\` + $targetto $q \$f $targetuser@$targethost:$targetdir/\$f || exit 1 + ;; + esac +done +exit 0 +EOF + ;; + cp) $cat >$to <<EOF +#!/bin/sh +for f in \$@ +do + case "\$f" in + /*) + $mkdir -p $targetdir/\`dirname \$f\` + $cp \$f $targetdir/\$f || exit 1 + ;; + *) + $targetmkdir $targetdir/\`dirname \$f\` + $cp \$f $targetdir/\$f || exit 1 + ;; + esac +done +exit 0 +EOF + ;; + *) echo "Unknown targetto '$targetto'" >&4 + exit 1 + ;; + esac + case "$targetfrom" in + scp|rcp) + $cat >$from <<EOF +#!/bin/sh +for f in \$@ +do + $rm -f \$f + $targetfrom $q $targetuser@$targethost:$targetdir/\$f . || exit 1 +done +exit 0 +EOF + ;; + cp) $cat >$from <<EOF +#!/bin/sh +for f in \$@ +do + $rm -f \$f + cp $targetdir/\$f . || exit 1 +done +exit 0 +EOF + ;; + *) echo "Unknown targetfrom '$targetfrom'" >&4 + exit 1 + ;; + esac + if $test ! -f $run; then + echo "Target 'run' script '$run' not found." >&4 + else + $chmod a+rx $run + fi + if $test ! -f $to; then + echo "Target 'to' script '$to' not found." >&4 + else + $chmod a+rx $to + fi + if $test ! -f $from; then + echo "Target 'from' script '$from' not found." >&4 + else + $chmod a+rx $from + fi + if $test ! -f $run -o ! -f $to -o ! -f $from; then + exit 1 + fi + $cat >&4 <<EOF +Using '$run' for remote execution, +and '$from' and '$to' +for remote file transfer. +EOF +@else + echo "Cross-compilation is not supported for this package." >&4 + exit 1 +@end + ;; +esac + diff --git a/mcon/U/Csym.U b/mcon/U/Csym.U index 0b0bd2c..e7c7c4b 100644 --- a/mcon/U/Csym.U +++ b/mcon/U/Csym.U @@ -1,12 +1,12 @@ -?RCS: $Id: Csym.U,v 3.0.1.4 1995/07/25 13:36:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Csym.U,v $ ?RCS: Revision 3.0.1.4 1995/07/25 13:36:29 ram @@ -47,7 +47,7 @@ csym='tlook=$1; case "$3" in -v) tf=libc.tmp; tc=""; tdc="";; -a) tf=libc.tmp; tc="[0]"; tdc="[]";; -*) tlook="^$1\$"; tf=libc.list; tc="()"; tdc="()";; +*) tlook="^$1\$"; tf=libc.list; tc=""; tdc="()";; esac; tx=yes; case "$reuseval-$4" in @@ -64,22 +64,23 @@ yes) fi;; *) ?X: -?X: Put symbol inside a printf to fool optimizing compilers... -?X: -?X: We use 'short' instead of 'int' to try to circumvent overzealous +?X: We use 'char' instead of 'int' to try to circumvent overzealous ?X: optimizing compilers using built-in prototypes for commonly used ?X: routines to complain when seeing a different external declaration. For ?X: instance, gcc 2.6.3 fails if we use 'int' and we attempt a test against ?X: memcpy() on machines where sizeof(int) == sizeof(char *) (the usual return ?X: type), the compiler assuming it's a built-in declaration given that the -?X: returned size matches. At least with 'short' we are safe! -- RAM, for ADO +?X: returned size matches. At least with 'char' we are safe! -- RAM, for ADO ?X: ?X: Let's thank GNU cc for making our lifes so easy! :-) ?X: (An alternative for the future would be to use our knowledge about gcc -?X: to force a -fno-builtin option in the compile test, in case the 'short' +?X: to force a -fno-builtin option in the compile test, in case the 'char' ?X: trick is obsoleted by future gcc releases). -- RAM ?X: - echo "main() { extern short $1$tdc; printf(\"%hd\", $1$tc); }" > t.c; +?X: Lastly, gcc 3.4 otimizes &missing == 0 away, so we use + 2 instead now. +?X: The GNU folks like to do weird things, don't they? -- RAM, 2004-06-05 +?X: + echo "extern char $1$tdc; int main() { return &$1$tc + 2; }" > t.c; if $cc $ccflags $ldflags -o t t.c $libs >/dev/null 2>&1; then tval=true; else tval=false; diff --git a/mcon/U/End.U b/mcon/U/End.U index 2de82eb..165b5af 100644 --- a/mcon/U/End.U +++ b/mcon/U/End.U @@ -1,12 +1,12 @@ -?RCS: $Id: End.U,v 3.0 1993/08/18 12:04:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: End.U,v $ ?RCS: Revision 3.0 1993/08/18 12:04:51 ram @@ -24,5 +24,4 @@ : end of configuration questions echo " " echo "End of configuration questions." -echo " " diff --git a/mcon/U/Extract.U b/mcon/U/Extract.U index d4a8f55..d01d324 100644 --- a/mcon/U/Extract.U +++ b/mcon/U/Extract.U @@ -1,12 +1,12 @@ -?RCS: $Id: Extract.U,v 3.0.1.2 1997/02/28 14:58:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Extract.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 14:58:52 ram @@ -25,46 +25,32 @@ ?X: When running Configure from a remote directory ($src is not '.'), ?X: then the files will be created in that directory, so beware! ?X: -?MAKE:Extract: src +?MAKE:Extract: Mkdirp src ?MAKE: -pick add $@ %< ?F:./extract -?T:CONFIG dir file name create mkdir_p +?T:CONFIG SRC dir file : script used to extract .SH files with variable substitutions -cat >extract <<'EOS' +cat >extract <<EOS CONFIG=true +SRC="$src" +EOS +cat >>extract <<'EOS' echo "Doing variable substitutions on .SH files..." -if test -f $src/MANIFEST; then - set x `awk '{print $1}' <$src/MANIFEST | grep '\.SH'` +if test -f "$SRC/MANIFEST"; then + set x `awk '{print $1}' <$SRC/MANIFEST | grep '\.SH'` else echo "(Looking for .SH files under the source directory.)" - set x `(cd $src; find . -name "*.SH" -print)` + set x `(cd "$SRC"; find . -name "*.SH" -print)` fi shift case $# in -0) set x `(cd $src; echo *.SH)`; shift;; +0) set x `(cd "$SRC"; echo *.SH)`; shift;; esac -if test ! -f $src/$1; then +if test ! -f "$SRC/$1"; then shift fi -?X: script to emulate mkdir -p -mkdir_p=' -name=$1; -create=""; -while test $name; do - if test ! -d "$name"; then - create="$name $create"; - name=`echo $name | sed -e "s|^[^/]*$||"`; - name=`echo $name | sed -e "s|\(.*\)/.*|\1|"`; - else - name=""; - fi; -done; -for file in $create; do - mkdir $file; -done -' for file in $*; do - case "$src" in + case "$SRC" in ".") case "$file" in */*) @@ -99,20 +85,20 @@ for file in $*; do */*) dir=`expr X$file : 'X\(.*\)/'` file=`expr X$file : 'X.*/\(.*\)'` - (set x $dir; shift; eval $mkdir_p) - sh <$src/$dir/$file + ./mkdirp $dir + sh <"$SRC/$dir/$file" ;; *) - sh <$src/$file + sh <"$SRC/$file" ;; esac ;; esac done -if test -f $src/config_h.SH; then +if test -f "$SRC/config_h.SH"; then if test ! -f config.h; then - : oops, they left it out of MANIFEST, probably, so do it anyway. - . $src/config_h.SH +?X: oops, they left it out of MANIFEST, probably, so do it anyway. + sh <"$SRC/config_h.SH" fi fi EOS diff --git a/mcon/U/Extractall.U b/mcon/U/Extractall.U index eb69b75..e764c20 100644 --- a/mcon/U/Extractall.U +++ b/mcon/U/Extractall.U @@ -1,12 +1,12 @@ -?RCS: $Id: Extractall.U,v 3.0.1.1 1997/02/28 15:00:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Extractall.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:00:43 ram @@ -21,9 +21,8 @@ ?X: The Begin.U unit now requires us before beginning to do anything ?X: interesting, to ensure proper semantics. -- RAM, 15/03/96 ?X: -?MAKE:Extractall: Extract Options rsrc +?MAKE:Extractall: Extract Options ?MAKE: -pick wipe $@ %< -?T:config : extract files and exit if asked to do so case "$extractsh" in true) @@ -34,20 +33,18 @@ true) *) exec 1>&4;; esac case "$config_sh" in - '') config_sh='config.sh'; config="$rsrc/config.sh";; - /*) config="$config_sh";; - *) config="$rsrc/$config_sh";; + '') config_sh='config.sh';; esac echo " " echo "Fetching answers from $config_sh..." - . $config + cd .. + . $config_sh test "$override" && . ./optdef.sh echo " " ?X: extract has to be run from the top directory, not within UU. - cd .. . UU/extract rm -rf UU - echo "Done." + echo "Extraction done." exit 0 ;; esac diff --git a/mcon/U/Filexp.U b/mcon/U/Filexp.U index 9713a87..7602808 100644 --- a/mcon/U/Filexp.U +++ b/mcon/U/Filexp.U @@ -1,12 +1,12 @@ -?RCS: $Id: Filexp.U,v 3.0.1.2 1994/10/29 15:52:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Filexp.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 15:52:53 ram diff --git a/mcon/U/Findhdr.U b/mcon/U/Findhdr.U index 48d4d75..50f7ba7 100644 --- a/mcon/U/Findhdr.U +++ b/mcon/U/Findhdr.U @@ -1,12 +1,12 @@ -?RCS: $Id: Findhdr.U,v 3.0.1.2 1994/10/29 15:53:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Thomas Neumann <tom@smart.bo.open.de> ?RCS: @@ -28,7 +28,7 @@ ?X: empty string with an error status if the file could not be located. ?X: ?MAKE:Findhdr: grep test tr rm +usrinc awk cat startsh \ - cppstdin cppminus +cppflags + cppstdin cppminus +cppflags eunicefix osname ?MAKE: -pick add $@ %< ?LINT:define fieldn ?S:fieldn: @@ -40,11 +40,22 @@ ?S:. ?V:fieldn ?F:./findhdr !fieldn -?T:cline pos wanted name awkprg +?T:cline pos wanted name awkprg cppfilter testaccess status usrincdir : determine filename position in cpp output echo " " echo "Computing filename position in cpp output for #include directives..." >&4 echo '#include <stdio.h>' > foo.c +case "$osname" in +vos) + testaccess=-e +?X: VOS: path component separator is > + cppfilter="tr '\\\\>' '/' |" + ;; +*) + testaccess=-r + cppfilter='' + ;; +esac $cat >fieldn <<EOF $startsh $cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \ @@ -53,7 +64,7 @@ while read cline; do pos=1 set \$cline while $test \$# -gt 0; do - if $test -r \`echo \$1 | $tr -d '"'\`; then + if $test $testaccess \`echo \$1 | $tr -d '"'\`; then echo "\$pos" exit 0 fi @@ -82,25 +93,34 @@ $cat >findhdr <<EOF $startsh wanted=\$1 name='' -if test -f $usrinc/\$wanted; then - echo "$usrinc/\$wanted" - exit 0 -fi +for usrincdir in $usrinc; do + if test -f \$usrincdir/\$wanted; then + echo "\$usrincdir/\$wanted" + exit 0 + fi +done awkprg='{ print \$$fieldn }' echo "#include <\$wanted>" > foo\$\$.c $cppstdin $cppminus $cppflags < foo\$\$.c 2>/dev/null | \ -$grep "^[ ]*#.*\$wanted" | \ +$cppfilter $grep "^[ ]*#.*\$wanted" | \ while read cline; do name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\` case "\$name" in - */\$wanted) echo "\$name"; exit 0;; - *) name='';; - esac; -done; -$rm -f foo\$\$.c; -case "\$name" in -'') exit 1;; -esac + *[/\\\\]\$wanted) echo "\$name"; exit 1;; + *[\\\\/]\$wanted) echo "\$name"; exit 1;; + *) exit 2;; + esac +done +?X: status = 0: grep returned 0 lines, case statement not executed +?X: status = 1: headerfile found +?X: status = 2: while loop executed, no headerfile found +status=\$? +$rm -f foo\$\$.c +if test \$status -eq 1; then + exit 0 +fi +exit 1 EOF chmod +x findhdr +$eunicefix findhdr diff --git a/mcon/U/Finish.U b/mcon/U/Finish.U index 9aedfdc..2ed7bd9 100644 --- a/mcon/U/Finish.U +++ b/mcon/U/Finish.U @@ -1,13 +1,13 @@ -?RCS: $Id: Finish.U,v 3.0.1.6 1995/02/15 14:09:30 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: Finish.U,v $ ?RCS: Revision 3.0.1.6 1995/02/15 14:09:30 ram ?RCS: patch51: now clearer about how to edit config.sh at the prompt (WED) @@ -35,14 +35,16 @@ ?X: SH files, which among other things produce config.h and (usually) Makefile. ?X: It offers to do a make depend if the Makefile contains that target. ?X: -?MAKE:Finish: Chk_MANI Extract Myread Oldsym Magic_h cat rm contains +?MAKE:Finish: Chk_MANI Extract Myread Oldsym Magic_h cat rm contains \ + test package make ?MAKE: -pick add $@ %< ?F:!config.sh +?T:pwd : Finish up by extracting the .SH files case "$alldone" in exit) $rm -rf UU - echo "Done." + echo "Extraction done." exit 0 ;; cont) @@ -77,7 +79,9 @@ esac ?X: echo " " exec 1>&4 +pwd=`pwd` . ./UU/extract +cd "$pwd" if $contains '^depend:' [Mm]akefile >/dev/null 2>&1; then dflt=y @@ -86,30 +90,45 @@ if $contains '^depend:' [Mm]akefile >/dev/null 2>&1; then *) $cat <<EOM -Now you need to generate make dependencies by running "make depend". -You might prefer to run it in background: "make depend > makedepend.out &" +Now you need to generate make dependencies by running "$make depend". +You might prefer to run it in background: "$make depend > makedepend.out &" It can take a while, so you might not want to run it right now. EOM ;; esac - rp="Run make depend now?" + rp="Run $make depend now?" . UU/myread case "$ans" in y*) - make depend && echo "Now you must run a make." + $make depend && echo "Now you must run '$make'." ;; *) - echo "You must run 'make depend' then 'make'." + echo "You must run '$make depend' then '$make'." ;; esac elif test -f [Mm]akefile; then echo " " - echo "Now you must run a make." + echo "Now you must run a $make." else - echo "Done." + echo "Configure done." fi +if $test -f Policy.sh; then + $cat <<EOM + +If you compile $package on a different machine or from a different object +directory, copy the Policy.sh file from this object directory to the +new one before you run Configure -- this will help you with most of +the policy defaults. + +EOM +fi +if $test -f UU/config.msg; then + echo "Hmm. I also noted the following information while running:" + echo " " + $cat UU/config.msg >&4 +fi ?X: ?X: kit*isdone files are left over by shell archives built using the makedist ?X: script which comes from dist, while ark*isdone files are left over by diff --git a/mcon/U/Getfile.U b/mcon/U/Getfile.U index 787a62c..fe917ad 100644 --- a/mcon/U/Getfile.U +++ b/mcon/U/Getfile.U @@ -1,13 +1,13 @@ -?RCS: $Id: Getfile.U,v 3.0.1.7 1997/02/28 15:01:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: Getfile.U,v $ ?RCS: Revision 3.0.1.7 1997/02/28 15:01:06 ram ?RCS: patch61: getfile script now begins with "startsh" @@ -44,6 +44,9 @@ ?X: To use this unit, $rp and $dflt must hold the question and the ?X: default answer, which will be passed as-is to the myread script. ?X: The $fn variable must hold the file type (f or d, for file/directory). +?X: If $gfpth is set to a list of space-separated list of directories, +?X: those are prefixes for the filename. Unless $gfpthkeep is set to 'y', +?X: gfpth is cleared on return from Getfile. ?X: ?X: If is is followed by a ~, then ~name substitution will occur. Upon return, ?X: $ans is set with the filename value. If a / is specified, then only a full @@ -79,13 +82,14 @@ ?X: If the answer to the question is 'none', then the existence checks are ?X: skipped and the empty string is returned. ?X: -?MAKE:Getfile: d_portable contains startsh Myread Filexp +?MAKE:Getfile: d_portable contains startsh Myread Filexp tr trnl ?MAKE: -pick add $@ %< -?V:ansexp:fn +?V:ansexp:fn gfpth gfpthkeep ?F:./getfile ?T:tilde type what orig_rp orig_dflt fullpath already redo skip none_ok \ - value exp_file nopath_ok loc_file + value exp_file nopath_ok loc_file fp pf dir direxp ?LINT:change ans +?LINT:change gfpth : now set up to get a file name cat <<EOS >getfile $startsh @@ -100,11 +104,16 @@ exp_file='' nopath_ok='' orig_rp="$rp" orig_dflt="$dflt" +case "$gfpth" in +'') gfpth='.' ;; +esac ?X: Begin by stripping out any (...) grouping. case "$fn" in *\(*) - expr $fn : '.*(\(.*\)).*' | tr ',' '\012' >getfile.ok + : getfile will accept an answer from the comma-separated list + : enclosed in parentheses even if it does not meet other criteria. + expr "$fn" : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok fn=`echo $fn | sed 's/(.*)//'` ;; esac @@ -212,6 +221,8 @@ while test "$type"; do ?X: Always expand ~user if '/' was requested case "$ansexp" in /*) value="$ansexp" ;; +?X: Allow for c:/some/path + [a-zA-Z]:/*) value="$ansexp" ;; *) redo=true case "$already" in @@ -236,18 +247,40 @@ while test "$type"; do '') case "$type" in File) - if test -f "$ansexp"; then - type='' - elif test -r "$ansexp" || (test -h "$ansexp") >/dev/null 2>&1 - then - echo "($value is not a plain file, but that's ok.)" - type='' - fi + for fp in $gfpth; do + if test "X$fp" = X.; then + pf="$ansexp" + else + pf="$fp/$ansexp" + fi + if test -f "$pf"; then + type='' + elif test -r "$pf" || (test -h "$pf") >/dev/null 2>&1 + then + echo "($value is not a plain file, but that's ok.)" + type='' + fi + if test X"$type" = X; then + value="$pf" + break + fi + done ;; Directory) - if test -d "$ansexp"; then - type='' - fi + for fp in $gfpth; do + if test "X$fp" = X.; then + dir="$ans" + direxp="$ansexp" + else + dir="$fp/$ansexp" + direxp="$fp/$ansexp" + fi + if test -d "$direxp"; then + type='' + value="$dir" + break + fi + done ;; Locate) if test -d "$ansexp"; then @@ -301,5 +334,6 @@ ans="$value" rp="$orig_rp" dflt="$orig_dflt" rm -f getfile.ok +test "X$gfpthkeep" != Xy && gfpth="" EOSC diff --git a/mcon/U/Guess.U b/mcon/U/Guess.U index faa4ea2..3459325 100644 --- a/mcon/U/Guess.U +++ b/mcon/U/Guess.U @@ -1,12 +1,12 @@ -?RCS: $Id: Guess.U,v 3.0.1.5 1995/07/25 13:37:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Guess.U,v $ ?RCS: Revision 3.0.1.5 1995/07/25 13:37:14 ram @@ -34,46 +34,74 @@ ?X: is. The information it collects here is used primarily to establish default ?X: answers to other questions. ?X: -?MAKE:Guess d_eunice d_xenix d_bsd: cat test echo n c contains rm Loc eunicefix +?MAKE:Guess d_eunice d_xenix d_bsd d_linux d_dos d_os2: cat test echo n c \ + contains rm tr Loc eunicefix ?MAKE: -pick add $@ %< ?S:d_eunice: -?S: This variable conditionally defines the symbols EUNICE and VAX, which +?S: This variable conditionally defines the symbols EUNICE_SYSTEM, which ?S: alerts the C program that it must deal with ideosyncracies of VMS. ?S:. ?S:d_xenix: -?S: This variable conditionally defines the symbol XENIX, which alerts +?S: This variable conditionally defines the symbol XENIX_SYSTEM, which alerts ?S: the C program that it runs under Xenix. ?S:. +?S:d_dos: +?S: This symbol conditionally defines the symbol DOS_SYSTEM when running on +?S: DOS with DJGPP or Cygwin. +?S:. +?S:d_os2: +?S: This symbol conditionally defines the symbol OS2_SYSTEM when running on +?S: an OS/2 system. +?S:. ?S:d_bsd: -?S: This symbol conditionally defines the symbol BSD when running on a +?S: This symbol conditionally defines the symbol BSD_SYSTEM when running on a ?S: BSD system. ?S:. -?C:EUNICE: +?S:d_linux: +?S: This symbol conditionally defines the symbol LINUX_SYSTEM when running +?S: on a Linux system. +?S:. +?C:EUNICE_SYSTEM (EUNICE): ?C: This symbol, if defined, indicates that the program is being compiled ?C: under the EUNICE package under VMS. The program will need to handle ?C: things like files that don't go away the first time you unlink them, ?C: due to version numbering. It will also need to compensate for lack ?C: of a respectable link() command. ?C:. -?C:VMS: +?C:VMS_SYSTEM (VMS): ?C: This symbol, if defined, indicates that the program is running under ?C: VMS. It is currently only set in conjunction with the EUNICE symbol. ?C:. -?C:XENIX: -?C: This symbol, if defined, indicates thet the program is running under +?C:XENIX_SYSTEM (XENIX): +?C: This symbol, if defined, indicates that the program is running under ?C: Xenix (at least 3.0 ?). ?C:. -?C:BSD: +?C:DOS_SYSTEM: +?C: This symbol, if defined, indicates that the program is running under +?C: DOS with DJGPP. +?C:. +?C:OS2_SYSTEM: +?C: This symbol, if defined, indicates that the program is running under +?C: an OS/2 system. +?C:. +?C:BSD_SYSTEM: ?C: This symbol, if defined, indicates that the program is running under ?C: a BSD system. ?C:. -?H:#$d_eunice EUNICE /**/ -?H:#$d_eunice VMS /**/ -?H:#$d_xenix XENIX /**/ -?H:#$d_bsd BSD /**/ +?C:LINUX_SYSTEM: +?C: This symbol, if defined, indicates that the program is running under +?C: a Linux system. +?C:. +?H:#$d_eunice EUNICE_SYSTEM /**/ +?H:#$d_eunice VMS_SYSTEM /**/ +?H:#$d_xenix XENIX_SYSTEM /**/ +?H:#$d_dos DOS_SYSTEM /**/ +?H:#$d_os2 OS2_SYSTEM /**/ +?H:#$d_bsd BSD_SYSTEM /**/ +?H:#$d_linux LINUX_SYSTEM /**/ ?H:. -?F:./bsd ./usg ./v7 ./osf1 ./eunice ./xenix ./venix ./os2 -?T:xxx +?F:./bsd ./usg ./v7 ./osf1 ./eunice ./xenix ./venix ./dos ./os2 ./gnu ./linux +?T:xxx DJGPP MACHTYPE : make some quick guesses about what we are up against echo " " $echo $n "Hmm... $c" @@ -85,7 +113,13 @@ echo exit 1 >eunice echo exit 1 >xenix echo exit 1 >venix echo exit 1 >os2 +echo exit 1 >gnu +echo exit 1 >linux +echo exit 1 >dos d_bsd="$undef" +d_linux="$undef" +d_dos="$undef" +d_os2="$undef" ?X: ?X: Do not use 'usrinc', or we get a circular dependency. because ?X: usrinc is defined in usrinc.U, which relies on us... @@ -95,7 +129,7 @@ if test -f /osf_boot || $contains 'OSF/1' /usr/include/ctype.h >/dev/null 2>&1 then echo "Looks kind of like an OSF/1 system, but we'll see..." echo exit 0 >osf1 -elif test `echo abc | tr a-z A-Z` = Abc ; then +elif test `echo abc | $tr a-z A-Z` = Abc ; then xxx=`./loc addbib blurfl $pth` if $test -f $xxx; then echo "Looks kind of like a USG system with BSD features, but we'll see..." @@ -113,6 +147,17 @@ elif $contains SIGTSTP foo >/dev/null 2>&1 ; then echo "Looks kind of like a BSD system, but we'll see..." d_bsd="$define" echo exit 0 >bsd +elif + $rm --version 2>/dev/null >foo; + $contains "Free Software Foundation" foo >/dev/null +then + xxx=`uname` + echo exit 0 >gnu + echo "Looks kind of like a GNU/$xxx system, but we'll see..." + if $test X$xxx = XLinux; then + d_linux="$define" + echo exit 0 >linux + fi else echo "Looks kind of like a Version 7 system, but we'll see..." echo exit 0 >v7 @@ -138,9 +183,21 @@ case "$p_" in *) $cat <<'EOI' I have the feeling something is not exactly right, however...don't tell me... +EOI + if test -n "$DJGPP"; then + case "X${MACHTYPE:-nonesuchmach}" in + cygwin) echo "hah!... you're running under Cygwin!";; + *) echo "got it... you're running DOS with DJGPP!";; + esac + echo exit 0 >dos + d_dos="$define" + else + $cat <<'EOI' lemme think...does HAL ring a bell?...no, of course, you're only running OS/2! EOI - echo exit 0 >os2 + echo exit 0 >os2 + d_os2="$define" + fi ;; esac if test -f /xenix; then @@ -165,7 +222,7 @@ else echo "Nor is it Venix..." fi fi -chmod +x bsd usg v7 osf1 eunice xenix venix os2 -$eunicefix bsd usg v7 osf1 eunice xenix venix os2 +chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux +$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux $rm -f foo diff --git a/mcon/U/Head.U b/mcon/U/Head.U index cdffded..7667c8a 100644 --- a/mcon/U/Head.U +++ b/mcon/U/Head.U @@ -1,12 +1,12 @@ -?RCS: $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Head.U,v $ ?RCS: Revision 3.0.1.9 1997/02/28 15:02:09 ram @@ -48,9 +48,13 @@ ?X: ?MAKE:Head: ?MAKE: -pick wipe $@ %< -?V:PATH p_ me -?T:argv Id p paths OS2_SHELL +?V:PATH p_ _exe me newsh +?T:argv Id p paths OS2_SHELL DJGPP ?T:inksh needksh avoidksh newsh changesh reason +?F:!* +?LINT:extern ENV CDPATH SHELL MACHTYPE +?LINT:change ENV CDPATH +?LINT:nocomment #! /bin/sh # # If these # comments don't work, trim them. Don't worry about any other @@ -71,12 +75,10 @@ ?X: ?X: WE ASK YOU NOT TO REMOVE OR ALTER THE FOLLOWING PARAGRAPH, PLEASE: ?X: -# (Note: this Configure script was generated automatically. Rather than +# Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. -# The dist-3.0 package (which contains metaconfig) was posted in -# comp.sources.misc and is available on CPAN under authors/id/RAM so -# you may fetch it yourself from your nearest archive site.) -# +# The dist package (which contains metaconfig) is available via SVN: +# svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist ?X: ?X: NOTA BENE: ?X: If you develop you own version of metaconfig based on this work, @@ -84,11 +86,11 @@ ?X: by your version, not mine: It credits your work. ?X: -# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ +# $Id$ # -# Generated on <DATE> [metaconfig <VERSION> PL<PATCHLEVEL>] +# Generated on <DATE> [metaconfig <VERSION>-<REVISION>] -cat >/tmp/c1$$ <<EOF +cat >c1$$ <<EOF ARGGGHHHH!!!!! SCO csh still thinks true is false. Write to SCO today and tell them that next @@ -99,18 +101,18 @@ we'd have to do is go in and swap the && and || tokens, wherever they are.) [End of diatribe. We now return you to your regularly scheduled programming...] EOF -cat >/tmp/c2$$ <<EOF +cat >c2$$ <<EOF OOPS! You naughty creature! You didn't run Configure with sh! I will attempt to remedy the situation by running sh for you... EOF -true || cat /tmp/c1$$ /tmp/c2$$ +true || cat c1$$ c2$$ true || exec sh $0 $argv:q -(exit $?0) || cat /tmp/c2$$ +(exit $?0) || cat c2$$ (exit $?0) || exec sh $0 $argv:q -rm -f /tmp/c1$$ /tmp/c2$$ +rm -f c1$$ c2$$ : compute my invocation name me=$0 @@ -123,16 +125,24 @@ esac ?X: ?X: To be able to run under OS/2, we must detect that early enough to use -?X: the proper path separator, stored in $p_. It is : on UNIX and \ on OS/2. +?X: the proper path separator, stored in $p_. It is : on UNIX and ; on +?X: DOSish systems such as OS/2. ?X: -: Proper PATH separator +: Proper separator for the PATH environment variable p_=: -: On OS/2 this directory should exist if this is not floppy only system :-] -if test -d c:/.; then - p_=\; - PATH=`cmd /c "echo %PATH%" | tr '\\\\' / ` +: On OS/2 this directory should exist if this is not floppy only system ":-]" +if test -d c:/. ; then + if test -n "$OS2_SHELL"; then + p_=\; + PATH=`cmd /c "echo %PATH%" | tr '\\\\' / ` ?X: That's a bug in ksh5.22 - OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'` + OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'` + elif test -n "$DJGPP"; then + case "X${MACHTYPE:-nonesuchmach}" in + *cygwin) ;; + *) p_=\; ;; + esac + fi fi ?X: @@ -149,7 +159,7 @@ fi ?X: various permutations on /opt as opposed to /usr or /usr/local.-- ADO ?X: ?X: We only add directories that are not already in the PATH of the -?X: user and the directories must exist also. +?X: user and the directories must exist also. ?X: : Proper PATH setting paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' @@ -160,6 +170,7 @@ paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin" paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" paths="$paths /sbin /usr/sbin /usr/libexec" +paths="$paths /system/gnu_library/bin" for p in $paths do @@ -196,11 +207,21 @@ if test -d /usr/lpp -a -f /usr/bin/bsh -a -f /usr/bin/uname; then newsh=/usr/bin/bsh fi fi +?X: On Digital UNIX, /bin/sh may start up buggy /bin/ksh, use sh +if test -f /osf_boot -a -f /usr/sbin/setld; then + if test X`/usr/bin/uname -s` = XOSF1; then + avoidksh="to avoid Digital UNIX' ksh" + newsh=/bin/sh +?X: if BIN_SH is set to 'xpg4', sh will start up ksh + unset BIN_SH + fi +fi ?X: If we are not in ksh and need it, then feed us back to it case "$inksh/$needksh" in /[a-z]*) -?X: Unset ENV to avoid any ~/.kshrc that could alias cd or whatever... - unset ENV +?X: Clear ENV to avoid any ~/.kshrc that could alias cd or whatever... +?X: Don't use "unset ENV", that is not portable enough + ENV='' changesh=true reason="$needksh" ;; @@ -224,6 +245,7 @@ EOM esac case "$changesh" in true) + export newsh echo "(Feeding myself to $newsh $reason.)" ?X: Make sure they didn't say sh <Configure by checking whether $0 ends ?X: with Configure or not. If they did say sh <../../Configure, then too @@ -237,10 +259,24 @@ true) ;; esac +?X: Unset CDPATH to avoid surprises when using cd under some shells +?X: Can't unset it because that's not portable to very old shells. +?X: Can't set it to '' because then bash 2.02 won't do "cd UU" --AD 6/98. +?X: Don't want to set it to '.' because then ksh prints out the +?X: name of the directory every time you cd to it. --AD 6/98 +?X: In order to inflict the least harm, change it only if it's set. +: if needed, set CDPATH to a harmless value that is not chatty +case "$CDPATH" in +'') ;; +*) case "$SHELL" in + *bash*) CDPATH='.' ;; + *) CDPATH='' ;; + esac + ;; +esac + : Configure runs within the UU subdirectory test -d UU || mkdir UU ?X: Use ./* to avoid any confirmation prompts from enhanced shells -- WED -?X: Unset CDPATH to avoid surprised when using cd under some shells -unset CDPATH cd UU && rm -f ./* diff --git a/mcon/U/Inhdr.U b/mcon/U/Inhdr.U index c55db84..e06282f 100644 --- a/mcon/U/Inhdr.U +++ b/mcon/U/Inhdr.U @@ -1,12 +1,12 @@ -?RCS: $Id: Inhdr.U,v 3.0.1.2 1995/05/12 12:01:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Inhdr.U,v $ ?RCS: Revision 3.0.1.2 1995/05/12 12:01:31 ram @@ -31,7 +31,6 @@ ?MAKE:Inhdr: test Findhdr Whoa ?MAKE: -pick add $@ %< ?LINT:define inhdr -?LINT:use ccflags ?V:inhdr ?S:inhdr: ?S: This shell variable is used internally by Configure to check diff --git a/mcon/U/Init.U b/mcon/U/Init.U index 9ccb68d..892579d 100644 --- a/mcon/U/Init.U +++ b/mcon/U/Init.U @@ -1,12 +1,12 @@ -?RCS: $Id: Init.U,v 3.0.1.1 1994/10/31 09:45:59 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Init.U,v $ ?RCS: Revision 3.0.1.1 1994/10/31 09:45:59 ram @@ -22,7 +22,7 @@ ?X: This file initializes certain default variables used by Configure. They ?X: may be overridden or added to by definitions in Myinit.U. ?X: -?MAKE:Init eunicefix: Null +?MAKE:Init eunicefix _exe: Null ?MAKE: -pick add $@ %< ?MAKE: -pick weed $@ ./Init ?S:eunicefix: @@ -30,6 +30,13 @@ ?S: convert a shell script to the proper form of text file for it to be ?S: executable by the shell. On other systems it is a no-op. ?S:. +?S:_exe (exe_ext): +?S: This variable defines the extension used for executable files. +?S: For unix it is empty. Other possible values include '.exe'. +?S: DJGPP, Cygwin and OS/2 use '.exe'. Stratus VOS uses '.pm'. +?S: On operating systems which do not require a specific extension +?S: for executable files, this variable is empty. +?S:. ?V:define undef smallmach:rmlist ?X: ?X: Throughout the units, one may make use of $define and $undef to reference @@ -38,6 +45,8 @@ ?X: everyone inherits from those symbols since by convention Init.U is the ?X: root dependency. ?X: +?T: DJGPP +: Initialize wide constants define='define' undef='undef' smallmach='pdp11 i8086 z8000 i80286 iAPX286' @@ -52,3 +61,21 @@ if test -f /etc/unixtovms.exe; then eunicefix=/etc/unixtovms.exe fi +: Set executable suffix now -- needed before hints available +if test -f "/libs/version.library"; then + : Amiga OS + _exe="" +elif test -f "/system/gnu_library/bin/ar.pm"; then + : Stratus VOS + _exe=".pm" +elif test -n "$DJGPP"; then + : DOS DJGPP + _exe=".exe" +elif test -d c:/. ; then + : OS/2 or cygwin + _exe=".exe" +else + : All other UNIX systems + _exe="" +fi + diff --git a/mcon/U/Inlibc.U b/mcon/U/Inlibc.U index a34d4e2..64fd37a 100644 --- a/mcon/U/Inlibc.U +++ b/mcon/U/Inlibc.U @@ -1,12 +1,12 @@ -?RCS: $Id: Inlibc.U,v 3.0.1.1 1994/10/29 15:55:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Inlibc.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 15:55:08 ram @@ -25,7 +25,6 @@ ?MAKE:Inlibc: Csym Whoa Oldconfig ?MAKE: -pick add $@ %< ?LINT:define inlibc -?LINT:use libc ?V:inlibc ?S:inlibc: ?S: This shell variable is used internally by Configure to check diff --git a/mcon/U/Instruct.U b/mcon/U/Instruct.U index 5c6ff21..deccaf8 100644 --- a/mcon/U/Instruct.U +++ b/mcon/U/Instruct.U @@ -1,12 +1,12 @@ -?RCS: $Id: Instruct.U,v 3.0.1.3 1997/02/28 15:02:55 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Instruct.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:02:55 ram @@ -82,7 +82,7 @@ If you are in a hurry, you may run 'Configure -d'. This will bypass nearly all the questions and use the computed defaults (or the previous answers if there was already a config.sh file). Type 'Configure -h' for a list of options. You may also start interactively and then answer '& -d' at any prompt to turn -on the non-interactive behaviour for the remaining of the execution. +on the non-interactive behaviour for the remainder of the execution. EOH . ./myread diff --git a/mcon/U/Loc.U b/mcon/U/Loc.U index e54b817..6afc8f0 100644 --- a/mcon/U/Loc.U +++ b/mcon/U/Loc.U @@ -1,12 +1,12 @@ -?RCS: $Id: Loc.U,v 3.0.1.10 1997/02/28 15:04:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Loc.U,v $ ?RCS: Revision 3.0.1.10 1997/02/28 15:04:16 ram @@ -61,24 +61,24 @@ ?X: I put startsh at the end of the dependency list, in order to avoid the ?X: loading of the spitshell unit before the instructions. ?X: -?MAKE:Loc Mcc awk ar bash bison byacc cat chgrp chmod chown \ +?MAKE:Loc awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ - gcc gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ - make mkdir more mv nroff perl pg pmake pr rm rmail sed sendmail \ - shar sleep smail sort submit tail tar tbl test touch tr troff \ - uname uniq uuname vi zcat zip: eunicefix n c Instruct Myread \ - startsh + gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ + make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + shar sleep smail sort submit tail tar tbl tee test touch tr troff \ + uname uniq uuname vi zcat zip: eunicefix n c startsh Instruct Warn ?MAKE: -pick weed $@ %< -?LINT:describe Loc Mcc awk ar bash bison byacc cat chgrp chmod chown \ +?LINT: describe awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ - gcc gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ - make mkdir more mv nroff perl pg pmake pr rm rmail sed sendmail \ - shar sleep smail sort submit tail tar tbl test touch tr troff \ + gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ + make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + shar sleep smail sort submit tail tar tbl tee test touch tr troff \ uname uniq uuname vi zcat zip ?V::pth loclist trylist ?F:./loc -?T:thisthing thing xxx dir file say _test -?LINT:change PATH +?T:thisthing thing xxx dir file say DJGPP +?T:_test _grep _cp _gmake _egrep _ln _make dflt +?LINT: change PATH : find out where common programs are echo " " echo "Locating common programs..." >&4 @@ -114,9 +114,16 @@ for dir in \$*; do if test -f \$thisthing; then echo \$thisthing exit 0 + elif test -f \$thisthing$_exe; then + echo \$thisthing + exit 0 elif test -f \$dir/\$thing.exe; then - : on Eunice apparently - echo \$dir/\$thing + if test -n "$DJGPP"; then + echo \$dir/\$thing.exe + else + : on Eunice apparently + echo \$dir/\$thing + fi exit 0 fi ;; @@ -140,7 +147,6 @@ loclist=" ?find:find ?grep:grep ?ls:ls -?make:make ?mkdir:mkdir ?mv:mv ?rm:rm @@ -166,7 +172,7 @@ trylist=" ?egrep:egrep ?emacs:emacs ?flex:flex -?gcc:gcc +?gmake:gmake ?gzip:gzip ?inews:inews ?ksh:ksh @@ -178,7 +184,9 @@ trylist=" ?lpr:lpr ?mail:mail ?mailx:mailx +?make:make ?more:more +?nm:nm ?nroff:nroff ?perl:perl ?pg:pg @@ -191,6 +199,7 @@ trylist=" ?submit:submit ?tar:tar ?tbl:tbl +?tee:tee ?test:test ?troff:troff ?uname:uname @@ -199,11 +208,11 @@ trylist=" ?zcat:zcat ?zip:zip " -?LINT:set Loc Mcc awk ar bash bison byacc cat chgrp chmod chown \ - comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ - gcc gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ - make mkdir more mv nroff perl pg pmake pr rm rmail sed sendmail \ - shar sleep smail sort submit tail tar tbl test touch tr troff \ +?LINT: set awk ar bash bison byacc cat chgrp chmod chown \ + comm compress cp cpio cpp csh date echo emacs expr find flex \ + gmake gzip grep inews ksh less line lint lp lpr ls mail mailx \ + mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ + shar sleep smail sort submit tail tar tbl tee touch tr troff \ uname uniq uuname vi zcat zip pth=`echo $PATH | sed -e "s/$p_/ /g"` pth="$pth /lib /usr/lib" @@ -221,14 +230,14 @@ for file in $loclist; do if test -f "$xxx"; then : ok else - echo "WARNING: no $xxx -- ignoring your setting for $file." >&4 + ./warn "no $xxx -- ignoring your setting for $file." xxx=`./loc $file $file $pth` fi ;; '') xxx=`./loc $file $file $pth`;; *) xxx=`./loc $xxx $xxx $pth`;; esac - eval $file=$xxx + eval $file=$xxx$_exe eval _$file=$xxx case "$xxx" in /*) @@ -256,14 +265,14 @@ for file in $trylist; do if test -f "$xxx"; then : ok else - echo "WARNING: no $xxx -- ignoring your setting for $file." >&4 + ./warn "no $xxx -- ignoring your setting for $file." xxx=`./loc $file $file $pth` fi ;; '') xxx=`./loc $file $file $pth`;; *) xxx=`./loc $xxx $xxx $pth`;; esac - eval $file=$xxx + eval $file=$xxx$_exe eval _$file=$xxx case "$xxx" in /*) @@ -283,6 +292,7 @@ case "$egrep" in egrep) echo "Substituting grep for egrep." egrep=$grep + _egrep=$_grep ;; esac @if ln @@ -290,6 +300,32 @@ case "$ln" in ln) echo "Substituting cp for ln." ln=$cp + _ln=$_cp + ;; +esac +@end +@if make || gmake +case "$make" in +make) + case "$gmake" in + gmake) + echo "I can't find make or gmake, and my life depends on it." >&4 + echo "Go find a public domain implementation or fix your PATH setting!" >&4 + exit 1 + ;; + esac + ;; +esac +case "$gmake" in +gmake) ;; +*) # We can't have osname yet. + if test -f "/system/gnu_library/bin/ar.pm"; then # Stratus VOS + # Assume that gmake, if found, is definitely GNU make + # and prefer it over the system make. + echo "Substituting gmake for make." + make=$gmake + _make=$_gmake + fi ;; esac @end diff --git a/mcon/U/Loc_sed.U b/mcon/U/Loc_sed.U index e587af6..f61a876 100644 --- a/mcon/U/Loc_sed.U +++ b/mcon/U/Loc_sed.U @@ -1,13 +1,13 @@ -?RCS: $Id: Loc_sed.U,v 3.0.1.1 1997/02/28 15:04:22 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?X: This is used in perl.c. ?MAKE:full_sed: sed @@ -28,7 +28,6 @@ ?C:. ?H:#define LOC_SED "$full_sed" /**/ ?H:. -?LINT:use sed : Store the full pathname to the sed program for use in the C program full_sed=$sed diff --git a/mcon/U/Magic_h.U b/mcon/U/Magic_h.U index 27f1e19..8e2556c 100644 --- a/mcon/U/Magic_h.U +++ b/mcon/U/Magic_h.U @@ -1,12 +1,12 @@ -?RCS: $Id: Magic_h.U,v 3.0.1.2 1993/11/10 17:32:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Magic_h.U,v $ ?RCS: Revision 3.0.1.2 1993/11/10 17:32:58 ram @@ -26,6 +26,7 @@ ?MAKE:Magic_h: Id Config_h ?MAKE: -pick cm_h_weed $@ %< ?MAKE: -pick cm_h_weed $@ ./Magic_h +?LINT:nocomment /* * This file was produced by running metaconfig and is intended to be included * after config.h and after all the other needed includes have been dealt with. @@ -34,7 +35,7 @@ * If you wish to get rid of this magic, remove this file and rerun metaconfig * without the -M option. * - * $Id: Magic_h.U,v 3.0.1.2 1993/11/10 17:32:58 ram Exp $ + * $Id$ */ #ifndef _confmagic_h_ diff --git a/mcon/U/MailAuthor.U b/mcon/U/MailAuthor.U index 741a978..61c226a 100644 --- a/mcon/U/MailAuthor.U +++ b/mcon/U/MailAuthor.U @@ -1,12 +1,12 @@ -?RCS: $Id: MailAuthor.U,v 3.0.1.5 1997/02/28 15:04:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: diff --git a/mcon/U/MailList.U b/mcon/U/MailList.U index 80233fb..e9fb039 100644 --- a/mcon/U/MailList.U +++ b/mcon/U/MailList.U @@ -1,12 +1,12 @@ -?RCS: $Id: MailList.U,v 3.0.1.1 1994/01/24 14:01:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: diff --git a/mcon/U/Mkdirp.U b/mcon/U/Mkdirp.U new file mode 100644 index 0000000..bad6081 --- /dev/null +++ b/mcon/U/Mkdirp.U @@ -0,0 +1,51 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: Extract.U,v $ +?RCS: Revision 3.0.1.2 1997/02/28 14:58:52 ram +?RCS: patch61: added support for src.U +?RCS: +?RCS: Revision 3.0.1.1 1994/10/29 15:51:46 ram +?RCS: patch36: added ?F: line for metalint file checking +?RCS: +?RCS: Revision 3.0 1993/08/18 12:04:52 ram +?RCS: Baseline for dist 3.0 netwide release. +?RCS: +?X: +?X: This unit produces a shell script which can launched to create a +?X: directory path like "mkdir -p" would do. +?X: +?MAKE:Mkdirp: eunicefix startsh +?MAKE: -pick add $@ %< +?F:./mkdirp +?T:name create file +: script used to emulate mkdir -p +cat >mkdirp <<EOS +$startsh +EOS +cat >>mkdirp <<'EOS' +name=$1; +create=""; +while test $name; do + if test ! -d "$name"; then + create="$name $create" + name=`echo $name | sed -e "s|^[^/]*$||"` + name=`echo $name | sed -e "s|\(.*\)/.*|\1|"` + else + name="" + fi +done +for file in $create; do + mkdir $file +done +EOS +chmod +x mkdirp +$eunicefix mkdirp + diff --git a/mcon/U/Mksymlinks.U b/mcon/U/Mksymlinks.U new file mode 100644 index 0000000..92318a8 --- /dev/null +++ b/mcon/U/Mksymlinks.U @@ -0,0 +1,90 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 2000, Jarkko Hietaniemi +?RCS: +?X: +?X: This unit allows the duplication of the source tree to the current +?X: directory via symbolic links. This must be requested explicitly +?X: by them issuing a -Dmksymlinks on the command line. +?X: +?MAKE:Mksymlinks: Mkdirp lns issymlink src rsrc pkgsrc +?MAKE: -pick add $@ %< +?F:!UU +?T: dir filename tmppwd filelist +?LINT:extern mksymlinks +@if {test -f ../MANIFEST} +: Duplicate the tree with symbolic links if -Dmksymlinks was supplied +case "$mksymlinks" in +$define|true|[yY]*) + echo " " + case "$src" in + ''|'.') echo "Cannot create symlinks in the original directory." >&4 + exit 1 + ;; + *) case "$lns:$issymlink" in + *"ln"*" -s:"*"test -"?) + echo "Creating the symbolic links..." >&4 + echo "(First creating the subdirectories...)" >&4 + cd .. + awk '{print $1}' $src/MANIFEST | grep / | sed 's:/[^/]*$::' | \ + sort -u | while true + do + read dir + test -z "$dir" && break + ./UU/mkdirp $dir 2>/dev/null + if test -d $dir; then + : ok + else + echo "Failed to create '$dir'. Aborting." >&4 + exit 1 + fi + done + echo "(Now creating the symlinks...)" >&4 + awk '{print $1}' $src/MANIFEST | while true; do + read filename + test -z "$filename" && break + if test -f $filename; then + if $issymlink $filename; then + rm -f $filename + fi + fi + if test -f $filename; then + echo "$filename already exists, not symlinking." + else +?X: Note that the following works because "$pkgsrc" is absolute + ln -s $pkgsrc/$filename $filename + fi + done +?X: Check that everything was correctly copied + echo "(Checking current directory...)" >&4 + cd UU + awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | \ + (split -l 50 2>/dev/null || split -50) + rm -f missing + tmppwd=`pwd` + for filelist in x??; do + (cd ..; ls `cat "$tmppwd/$filelist"` \ + >/dev/null 2>>"$tmppwd/missing") + done + if test -s missing; then + echo "Failed duplication of source tree. Aborting." >&4 + exit 1 + fi + ;; + *) echo "(I cannot figure out how to do symbolic links, ignoring!)" >&4 + ;; + esac + ;; + esac + ;; +esac + +@end diff --git a/mcon/U/Myinit.U b/mcon/U/Myinit.U index b4dab64..0ab97f4 100644 --- a/mcon/U/Myinit.U +++ b/mcon/U/Myinit.U @@ -1,12 +1,12 @@ -?RCS: $Id: Myinit.U,v 3.0.1.1 1994/10/31 09:47:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Myinit.U,v $ ?RCS: Revision 3.0.1.1 1994/10/31 09:47:29 ram @@ -23,4 +23,4 @@ ?X: ?MAKE:Myinit: Init ?MAKE: -pick add $@ %< - +?LINT: nocomment diff --git a/mcon/U/Myread.U b/mcon/U/Myread.U index 6a2fdb2..330f503 100644 --- a/mcon/U/Myread.U +++ b/mcon/U/Myread.U @@ -1,12 +1,12 @@ -?RCS: $Id: Myread.U,v 3.0.1.6 1997/02/28 15:05:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Myread.U,v $ ?RCS: Revision 3.0.1.6 1997/02/28 15:05:39 ram @@ -45,7 +45,7 @@ ?X: end of Configure, there is an exception to this rule (Finish.U) where we ?X: set nostick to a non-empty value to allow the Return key to play its role! ?X: -?MAKE:Myread: Options startsh n c +?MAKE:Myread: Options startsh n c trnl ?MAKE: -pick add $@ %< ?V:ans:dflt rp nostick ?F:./myread @@ -172,7 +172,7 @@ while expr "X\$ans" : "X!" >/dev/null; do y) echo "*** Substitution done -- please confirm." xxxm="\$ans" - ans=\`echo $n "\$ans$c" | tr '\012' ' '\` + ans=\`echo $n "\$ans$c" | tr '$trnl' ' '\` xxxm="\$ans" ans=! ;; diff --git a/mcon/U/Nothing.U b/mcon/U/Nothing.U index 59c9e32..fe40801 100644 --- a/mcon/U/Nothing.U +++ b/mcon/U/Nothing.U @@ -1,12 +1,12 @@ -?RCS: $Id: Nothing.U,v 3.0 1993/08/18 12:05:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Nothing.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:09 ram diff --git a/mcon/U/Null.U b/mcon/U/Null.U index d3b7f51..bb218b0 100644 --- a/mcon/U/Null.U +++ b/mcon/U/Null.U @@ -1,12 +1,12 @@ -?RCS: $Id: Null.U,v 3.0 1993/08/18 12:05:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Null.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:10 ram diff --git a/mcon/U/Obsol_h.U b/mcon/U/Obsol_h.U index e11626d..1061aa9 100644 --- a/mcon/U/Obsol_h.U +++ b/mcon/U/Obsol_h.U @@ -1,12 +1,12 @@ -?RCS: $Id: Obsol_h.U,v 3.0 1993/08/18 12:05:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Obsol_h.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:11 ram @@ -18,6 +18,7 @@ ?X: ?MAKE:Obsol_h: ?MAKE: -pick prepend $@ ./Obsol_h +?LINT:nocomment /* * The following symbols are obsolete. They are mapped to the the new * symbols only to ease the transition process. The sources should be diff --git a/mcon/U/Obsol_sh.U b/mcon/U/Obsol_sh.U index ecabb9a..0a976bf 100644 --- a/mcon/U/Obsol_sh.U +++ b/mcon/U/Obsol_sh.U @@ -1,12 +1,12 @@ -?RCS: $Id: Obsol_sh.U,v 3.0 1993/08/18 12:05:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Obsol_sh.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:11 ram @@ -18,6 +18,7 @@ ?X: ?MAKE:Obsol_sh: ?MAKE: -pick prepend $@ ./Obsol_sh +?LINT:nocomment # # The following symbols are obsolete. They are mapped to the the new # symbols only to ease the transition process. The sources should be diff --git a/mcon/U/Oldconfig.U b/mcon/U/Oldconfig.U index 1e18b0f..9e079dd 100644 --- a/mcon/U/Oldconfig.U +++ b/mcon/U/Oldconfig.U @@ -1,12 +1,12 @@ -?RCS: $Id: Oldconfig.U,v 3.0.1.10 1997/02/28 15:06:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Oldconfig.U,v $ ?RCS: Revision 3.0.1.10 1997/02/28 15:06:39 ram @@ -57,8 +57,9 @@ ?X: This unit tries to remember what we did last time we ran Configure, mostly ?X: for the sake of setting defaults. ?X: -?MAKE:Oldconfig hint myuname osname osvers: Instruct Myread uname \ - sh awk sed test cat rm lns n c contains Loc Options Tr src +?MAKE:Oldconfig hint myuname osname osvers: Instruct Myread Checkcc \ + Mksymlinks Loc Options Tr src trnl ln uname sh awk sed test cat grep \ + rm lns tr n c contains targetarch ?MAKE: -pick wipe $@ %< ?S:myuname: ?S: The output of 'uname -a' if available, otherwise the hostname. On Xenix, @@ -90,21 +91,25 @@ ?C: by Configure. You shouldn't rely on it too much; the specific ?C: feature tests from Configure are generally more reliable. ?C:. +?C:OSVERS: +?C: This symbol contains the version of the operating system, as determined +?C: by Configure. You shouldn't rely on it too much; the specific +?C: feature tests from Configure are generally more reliable. +?C:. ?H:#define OSNAME "$osname" /**/ +?H:#define OSVERS "$osvers" /**/ ?H:. ?F:!config.sh -?T:tmp tmp_n tmp_c tmp_sh file +?T:tmp tmp_n tmp_c tmp_sh file ?T:xxxxfile xxxfile xxfile xfile hintfile newmyuname -?T:tans _ isesix INITPROG +?T:tans _ isesix INITPROG DJGPP has_uname +?D:osname='' ?LINT:change n c sh -: Try to determine whether config.sh was made on this system -case "$config_sh" in -'') -?X: indentation wrong on purpose--RAM -?X: Leave a white space between first two '(' for ksh. The sub-shell is needed -?X: on some machines to avoid the error message when uname is not found; e.g. -?X: old SUN-OS 3.2 would not execute hostname in (uname -a || hostname). Sigh! -myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1` +?LINT:extern hostarch +?LINT:change hostarch +: Determine the name of the machine +myuname=`$uname -a 2>/dev/null` +$test -z "$myuname" && myuname=`hostname 2>/dev/null` ?X: Special mention for Xenix, whose 'uname -a' gives us output like this: ?X: sysname=XENIX ?X: nodename=whatever @@ -112,15 +117,322 @@ myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1` ?X: Therefore, we strip all this variable assignment junk and remove all the ?X: new lines to keep the myuname variable sane... --RAM myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \ - ./tr '[A-Z]' '[a-z]' | tr '\012' ' '` + ./tr '[A-Z]' '[a-z]' | $tr $trnl ' '` ?X: Save the value we just computed to reset myuname after we get done here. newmyuname="$myuname" +$test -f "$uname$_exe" && has_uname=y + +: Guessing of the OS name -- half the following guesses are probably wrong... +: If you have better tests or hints, please send them to the metaconfig +: authors and to <MAINTLOC> +$test -f /irix && osname=irix +$test -f /xenix && osname=sco_xenix +$test -f /dynix && osname=dynix +$test -f /dnix && osname=dnix +$test -f /lynx.os && osname=lynxos +$test -f /unicos && osname=unicos && osvers=`$uname -r` +$test -f /unicosmk && osname=unicosmk && osvers=`$uname -r` +$test -f /unicosmk.ar && osname=unicosmk && osvers=`$uname -r` +$test -f /bin/mips && /bin/mips && osname=mips +$test -d /NextApps && set X `hostinfo | $grep 'NeXT Mach.*:' | \ + $sed -e 's/://' -e 's/\./_/'` && osname=next && osvers=$4 +$test -d /usr/apollo/bin && osname=apollo +$test -f /etc/saf/_sactab && osname=svr4 +$test -d /usr/include/minix && osname=minix +$test -f /system/gnu_library/bin/ar.pm && osname=vos +if $test -d /MachTen -o -d /MachTen_Folder; then +?X: MachTen uname -a output looks like +?X: xxx 4 0.0 Macintosh +?X: MachTen /sbin/version output looks like +?X: MachTen 4.0 Mon Aug 28 10:18:00 1995 +?X: MachTen 3.x had the 'version' command in /usr/etc/version. + osname=machten + if $test -x /sbin/version; then + osvers=`/sbin/version | $awk '{print $2}' | + $sed -e 's/[A-Za-z]$//'` + elif $test -x /usr/etc/version; then + osvers=`/usr/etc/version | $awk '{print $2}' | + $sed -e 's/[A-Za-z]$//'` + else + osvers="$2.$3" + fi +fi +$test -f /sys/posix.dll && + $test -f /usr/bin/what && + set X `/usr/bin/what /sys/posix.dll` && + $test "$3" = UWIN && + osname=uwin && + osvers="$5" +?X: If we have uname, we already computed a suitable uname -a output, correctly +?X: formatted for Xenix, and it lies in $myuname. +if $test "X$has_uname" != X; then + set X $myuname + shift + case "$5" in + fps*) osname=fps ;; + mips*) + case "$4" in + umips) osname=umips ;; + *) osname=mips ;; + esac;; + [23]100) osname=mips ;; + next*) osname=next ;; +?X: Interactive Unix. + i386*) + tmp=`/bin/uname -X 2>/dev/null|awk '/3\.2v[45]/{ print $(NF) }'` + if $test "$tmp" != "" -a "$3" = "3.2" -a -f '/etc/systemid'; then + osname='sco' + osvers=$tmp + elif $test -f /etc/kconfig; then + osname=isc + if $test "$lns" = "$ln -s"; then + osvers=4 + elif $contains _SYSV3 /usr/include/stdio.h > /dev/null 2>&1 ; then + osvers=3 + elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1 ; then + osvers=2 + fi + fi + tmp='' + ;; +?X: MS-DOS djgpp uname -a output looks like: +?X: ms-dos xxx 6 22 pc +?X: $1 is the "dos flavor" (need not be "ms-dos"). +?X: $2 is the node name +?X: $3 and $4 are version/subversion +?X: $5 is always "pc", but that might not be unique to DJGPP. +?X: (e.g. Solaris_x86 has $5 = i86pc, which doesn't actually conflict, +?X: but it's close enought that I can easily imagine other vendors also +?X: using variants of pc* in $5.) +?X: The "DJGPP" environment variable is always set when djgpp is active. + pc*) + if $test -n "$DJGPP"; then + osname=dos + osvers=djgpp + fi + ;; + esac + case "$1" in + aix) osname=aix +?X: aix 4.1 uname -a output looks like +?X: AIX foo 1 4 000123456789 +?X: where $4 is the major release number and $3 is the (minor) version. +?X: More detail on the version is available with the oslevel command. +?X: in 3.2.x, it output a string (see case statements below). In 4.1, +?X: it puts out something like 4.1.1.0 + tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1` + case "$tmp" in + 'not found') osvers="$4"."$3" ;; + '<3240'|'<>3240') osvers=3.2.0 ;; + '=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;; + '=3250'|'>3250') osvers=3.2.5 ;; + *) osvers=$tmp;; + esac + ;; + bsd386) osname=bsd386 + osvers=`$uname -r` + ;; + cygwin*) osname=cygwin + osvers="$3" + ;; + *dc.osx) osname=dcosx + osvers="$3" + ;; + dnix) osname=dnix + osvers="$3" + ;; + domainos) osname=apollo + osvers="$3" + ;; + dgux) osname=dgux + osvers="$3" + ;; +?X: uname -a returns +?X: DYNIX/ptx xxx 4.0 V4.1.2 i386 + dynixptx*) osname=dynixptx + osvers=`echo "$4"|sed 's/^v//'` + ;; + freebsd) osname=freebsd + osvers="$3" ;; + genix) osname=genix ;; +?X: HP-UX uname -a gives something like +?X: HP-UX foobar B.10.20 A 9000/735 2016483812 two-user license +?X: Preserve the full 10.20 string instead of the previous plain '10'. +?X: Thanks to Graham Barr. --AD 6/30/1998 + hp*) osname=hpux + osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'` + ;; + irix*) osname=irix + case "$3" in + 4*) osvers=4 ;; + 5*) osvers=5 ;; + *) osvers="$3" ;; + esac + ;; + linux) osname=linux + case "$3" in + *) osvers="$3" ;; + esac + ;; + MiNT) osname=mint + ;; + netbsd*) osname=netbsd + osvers="$3" + ;; + news-os) osvers="$3" + case "$3" in + 4*) osname=newsos4 ;; + *) osname=newsos ;; + esac + ;; + next*) osname=next ;; + nonstop-ux) osname=nonstopux ;; + openbsd) osname=openbsd + osvers="$3" + ;; + POSIX-BC | posix-bc ) osname=posix-bc + osvers="$3" + ;; + powerux | power_ux | powermax_os | powermaxos | \ + powerunix | power_unix) osname=powerux + osvers="$3" + ;; + qnx) osname=qnx + osvers="$4" + ;; + solaris) osname=solaris + case "$3" in + 5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;; + *) osvers="$3" ;; + esac + ;; + sunos) osname=sunos + case "$3" in + 5*) osname=solaris + osvers=`echo $3 | $sed 's/^5/2/g'` ;; + *) osvers="$3" ;; + esac + ;; + titanos) osname=titanos + case "$3" in + 1*) osvers=1 ;; + 2*) osvers=2 ;; + 3*) osvers=3 ;; + 4*) osvers=4 ;; + *) osvers="$3" ;; + esac + ;; + ultrix) osname=ultrix + osvers="$3" + ;; + osf1|mls+) case "$5" in + alpha) +?X: DEC OSF/1 myuname -a output looks like: osf1 xxxx t3.2 123.4 alpha +?X: where the version number can be something like [xvt]n.n + osname=dec_osf +?X: sizer knows the minor minor version: the letter + osvers=`sizer -v | awk '{print $3}' | \ + ./tr '[A-Z]' '[a-z]' | sed 's/^[xvt]//'` + case "$osvers" in + [1-9].[0-9]*) ;; + *) osvers=`echo "$3" | sed 's/^[xvt]//'` ;; + esac + ;; + hp*) osname=hp_osf1 ;; + mips) osname=mips_osf1 ;; +?X: hp and mips were unsupported Technology Releases -- ADO, 24/10/94 + esac + ;; + unixware) osname=svr5 + osvers="$4" + ;; + uts) osname=uts + osvers="$3" + ;; + vos) osvers="$3" + ;; + $2) case "$osname" in + *isc*) ;; + *freebsd*) ;; + svr*) + : svr4.x or possibly later + case "svr$3" in + ${osname}*) + osname=svr$3 + osvers=$4 + ;; + esac + case "$osname" in + svr4.0) + : Check for ESIX + if $test -f /stand/boot ; then + eval `$grep '^INITPROG=[a-z/0-9]*$' /stand/boot` + if $test -n "$INITPROG" -a -f "$INITPROG"; then + isesix=`strings -a $INITPROG | \ + $grep 'ESIX SYSTEM V/386 Release 4.0'` + if $test -n "$isesix"; then + osname=esix4 + fi + fi + fi + ;; + esac + ;; + *) if $test -f /etc/systemid; then + osname=sco + set `echo $3 | $sed 's/\./ /g'` $4 + if $test -f $src/hints/sco_$1_$2_$3.sh; then + osvers=$1.$2.$3 + elif $test -f $src/hints/sco_$1_$2.sh; then + osvers=$1.$2 + elif $test -f $src/hints/sco_$1.sh; then + osvers=$1 + fi + else + case "$osname" in + '') : Still unknown. Probably a generic Sys V. + osname="sysv" + osvers="$3" + ;; + esac + fi + ;; + esac + ;; + *) case "$osname" in + '') : Still unknown. Probably a generic BSD. + osname="$1" + osvers="$3" + ;; + esac + ;; + esac +else +?X: Try to identify sony's NEWS-OS (BSD unix) + if $test -f /vmunix -a -f $src/hints/news_os.sh; then + (what /vmunix | UU/tr '[A-Z]' '[a-z]') > UU/kernel.what 2>&1 + if $contains news-os UU/kernel.what >/dev/null 2>&1; then + osname=news_os + fi + $rm -f UU/kernel.what +?X: Maybe it's OS/2 or DOS or something similar + elif $test -d c:/.; then + set X $myuname + osname=os2 + osvers="$5" + fi +fi + +: Try to determine whether config.sh was made on this system +case "$config_sh" in +'') +?X: indentation wrong on purpose--RAM dflt=n case "$knowitall" in '') if test -f ../config.sh; then if $contains myuname= ../config.sh >/dev/null 2>&1; then - eval "`grep myuname= ../config.sh`" + eval "`$grep myuname= ../config.sh`" fi if test "X$myuname" = "X$newmyuname"; then dflt=y @@ -130,297 +442,95 @@ case "$knowitall" in *) dflt=y;; esac -@if {test -d ../hints} -: Get old answers from old config file if Configure was run on the -: same system, otherwise use the hints. +: Get old answers from config file if it was generated on the same system hint=default -cd .. -?X: Since we are now at the root of the source tree, we must use $src -?X: to access the sources and not $rsrc. See src.U for details... -if test -f config.sh; then +if $test -f ../config.sh; then echo " " rp="I see a config.sh file. Shall I use it to set the defaults?" - . UU/myread + . ./myread case "$ans" in - n*|N*) echo "OK, I'll ignore it."; mv config.sh config.sh.old;; + n*|N*) echo "OK, I'll ignore it." + mv ../config.sh ../config.sh.old + myuname="$newmyuname" + ;; *) echo "Fetching default answers from your old config.sh file..." >&4 tmp_n="$n" tmp_c="$c" tmp_sh="$sh" - . ./config.sh - cp config.sh UU + . ../config.sh + cp ../config.sh . n="$tmp_n" c="$tmp_c" - : Older versions did not always set $sh. Catch re-use of such - : an old config.sh. - case "$sh" in - '') sh="$tmp_sh" ;; - esac hint=previous ;; esac fi -if test ! -f config.sh; then +?X: remember, case indentation is wrong--RAM +;; +*) + echo " " + echo "Fetching default answers from $config_sh..." >&4 + tmp_n="$n" + tmp_c="$c" + tmp_sh="$sh" + cd .. +?X: preserve symbolic links, if any + cp $config_sh config.sh 2>/dev/null + chmod +w config.sh + . ./config.sh + cd UU + cp ../config.sh . + n="$tmp_n" + c="$tmp_c" + hint=previous + ;; +esac +?X: Older versions did not always set $sh. +case "$sh" in +'') sh="$tmp_sh" ;; +esac +$test "$override" && . ./optdef.sh + +: Restore computed paths +for file in $loclist $trylist; do + eval $file="\$_$file" +done + +. ./checkcc +?X: Cross-compiling support +case "$targetarch" in +'') ;; +*) hostarch=$osname + osname=`echo $targetarch|sed 's,^[^-]*-,,'` + osvers='' + ;; +esac + +@if {test -d ../hints} +: Offer them some hints based on their OS +cd .. +?X: Since we are now at the root of the source tree, we must use $src +?X: to access the sources and not $rsrc. See src.U for details... +if $test ! -f config.sh; then $cat <<EOM -First time through, eh? I have some defaults handy for the following systems: +First time through, eh? I have some defaults handy for some systems +that need some extra help getting the Configure answers right: EOM (cd $src/hints; ls -C *.sh) | $sed 's/\.sh/ /g' >&4 dflt='' - : Half the following guesses are probably wrong... If you have better - : tests or hints, please send them to <MAINTLOC> - : The metaconfig authors would also appreciate a copy... - $test -f /irix && osname=irix - $test -f /xenix && osname=sco_xenix - $test -f /dynix && osname=dynix - $test -f /dnix && osname=dnix - $test -f /lynx.os && osname=lynxos - $test -f /unicos && osname=unicos && osvers=`$uname -r` - $test -f /unicosmk.ar && osname=unicosmk && osvers=`$uname -r` - $test -f /bin/mips && /bin/mips && osname=mips - $test -d /NextApps && set X `hostinfo | grep 'NeXT Mach.*:' | \ - $sed -e 's/://' -e 's/\./_/'` && osname=next && osvers=$4 - $test -d /usr/apollo/bin && osname=apollo - $test -f /etc/saf/_sactab && osname=svr4 - $test -d /usr/include/minix && osname=minix - if $test -d /MachTen; then -?X: MachTen uname -a output looks like -?X: xxx 4 0.0 Macintosh -?X: MachTen /sbin/version output looks like -?X: MachTen 4.0 Mon Aug 28 10:18:00 1995 -?X: MachTen 3.x had the 'version' command in /usr/etc/version. - osname=machten - if $test -x /sbin/version; then - osvers=`/sbin/version | $awk '{print $2}' | - $sed -e 's/[A-Za-z]$//'` - elif $test -x /usr/etc/version; then - osvers=`/usr/etc/version | $awk '{print $2}' | - $sed -e 's/[A-Za-z]$//'` - else - osvers="$2.$3" - fi - fi -?X: If we have uname, we already computed a suitable uname -a output, correctly -?X: formatted for Xenix, and it lies in $myuname. - if $test -f $uname; then - set X $myuname - shift - case "$5" in - fps*) osname=fps ;; - mips*) - case "$4" in - umips) osname=umips ;; - *) osname=mips ;; - esac;; - [23]100) osname=mips ;; - next*) osname=next ;; - news*) osname=news ;; -?X: Interactive Unix. - i386*) - if $test -f /etc/kconfig; then - osname=isc - if test "$lns" = "ln -s"; then - osvers=4 - elif $contains _SYSV3 /usr/include/stdio.h > /dev/null 2>&1 ; then - osvers=3 - elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1 ; then - osvers=2 - fi - fi - ;; - esac - - case "$1" in - aix) osname=aix -?X: aix 4.1 uname -a output looks like -?X: AIX foo 1 4 000123456789 -?X: where $4 is the major release number and $3 is the (minor) version. -?X: More detail on the version is available with the oslevel command. -?X: in 3.2.x, it output a string (see case statements below). In 4.1, -?X: it puts out something like 4.1.1.0 - tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1` - case "$tmp" in - 'not found') osvers="$4"."$3" ;; - '<3240'|'<>3240') osvers=3.2.0 ;; - '=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;; - '=3250'|'>3250') osvers=3.2.5 ;; - *) osvers=$tmp;; - esac - ;; - *dc.osx) osname=dcosx - osvers="$3" - ;; - dnix) osname=dnix - osvers="$3" - ;; - domainos) osname=apollo - osvers="$3" - ;; - dgux) osname=dgux - osvers="$3" - ;; -?X: uname -a returns -?X: DYNIX/ptx xxx 4.0 V4.1.2 i386 - dynixptx*) osname=dynixptx - osvers="$3" - ;; - freebsd) osname=freebsd - osvers="$3" ;; - genix) osname=genix ;; - hp*) osname=hpux - case "$3" in - *.08.*) osvers=9 ;; - *.09.*) osvers=9 ;; - *.10.*) osvers=10 ;; - *) osvers="$3" ;; - esac - ;; - irix*) osname=irix - case "$3" in - 4*) osvers=4 ;; - 5*) osvers=5 ;; - *) osvers="$3" ;; - esac - ;; - linux) osname=linux - case "$3" in - 1*) osvers=1 ;; - *) osvers="$3" ;; - esac - ;; - netbsd*) osname=netbsd - osvers="$3" - ;; - bsd386) osname=bsd386 - osvers=`$uname -r` - ;; - next*) osname=next ;; - solaris) osname=solaris - case "$3" in - 5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;; - *) osvers="$3" ;; - esac - ;; - sunos) osname=sunos - case "$3" in - 5*) osname=solaris - osvers=`echo $3 | $sed 's/^5/2/g'` ;; - *) osvers="$3" ;; - esac - ;; - titanos) osname=titanos - case "$3" in - 1*) osvers=1 ;; - 2*) osvers=2 ;; - 3*) osvers=3 ;; - 4*) osvers=4 ;; - *) osvers="$3" ;; - esac - ;; - ultrix) osname=ultrix - osvers="$3" - ;; - osf1|mls+) case "$5" in - alpha) -?X: DEC OSF/1 myuname -a output looks like: osf1 xxxx t3.2 123.4 alpha -?X: where the version number can be either vn.n or tn.n. - osname=dec_osf - osvers=`echo "$3" | sed 's/^[vt]//'` - ;; - hp*) osname=hp_osf1 ;; - mips) osname=mips_osf1 ;; -?X: hp and mips were unsupported Technology Releases -- ADO, 24/10/94 - esac - ;; - uts) osname=uts - osvers="$3" - ;; - qnx) osname=qnx - osvers="$4" - ;; - $2) case "$osname" in - *isc*) ;; - *freebsd*) ;; - svr*) - : svr4.x or possibly later - case "svr$3" in - ${osname}*) - osname=svr$3 - osvers=$4 - ;; - esac - case "$osname" in - svr4.0) - : Check for ESIX - if test -f /stand/boot ; then - eval `grep '^INITPROG=[a-z/0-9]*$' /stand/boot` - if test -n "$INITPROG" -a -f "$INITPROG"; then - isesix=`strings -a $INITPROG|grep 'ESIX SYSTEM V/386 Release 4.0'` - if test -n "$isesix"; then - osname=esix4 - fi - fi - fi - ;; - esac - ;; - *) if test -f /etc/systemid; then - osname=sco - set `echo $3 | $sed 's/\./ /g'` $4 - if $test -f sco_$1_$2_$3.sh; then - osvers=$1.$2.$3 - elif $test -f sco_$1_$2.sh; then - osvers=$1.$2 - elif $test -f sco_$1.sh; then - osvers=$1 - fi - else - case "$osname" in - '') : Still unknown. Probably a generic Sys V. - osname="sysv" - osvers="$3" - ;; - esac - fi - ;; - esac - ;; - *) case "$osname" in - '') : Still unknown. Probably a generic BSD. - osname="$1" - osvers="$3" - ;; - esac - ;; - esac - else -?X: Try to identify sony's NEWS-OS (BSD unix) - if test -f /vmunix -a -f $src/hints/news_os.sh; then - (what /vmunix | UU/tr '[A-Z]' '[a-z]') > UU/kernel.what 2>&1 - if $contains news-os UU/kernel.what >/dev/null 2>&1; then - osname=news_os - fi - $rm -f UU/kernel.what -?X: Maybe it's an OS/2 - elif test -d c:/.; then - set X $myuname - osname=os2 - osvers="$5" - fi - fi - : Now look for a hint file osname_osvers, unless one has been : specified already. case "$hintfile" in ''|' ') - file=`echo "${osname}_${osvers}" | $sed -e 's@\.@_@g' -e 's@_$@@'` + file=`echo "${osname}_${osvers}" | $sed -e 's%\.%_%g' -e 's%_$%%'` : Also try without trailing minor version numbers. - xfile=`echo $file | $sed -e 's@_[^_]*$@@'` - xxfile=`echo $xfile | $sed -e 's@_[^_]*$@@'` - xxxfile=`echo $xxfile | $sed -e 's@_[^_]*$@@'` - xxxxfile=`echo $xxxfile | $sed -e 's@_[^_]*$@@'` + xfile=`echo $file | $sed -e 's%_[^_]*$%%'` + xxfile=`echo $xfile | $sed -e 's%_[^_]*$%%'` + xxxfile=`echo $xxfile | $sed -e 's%_[^_]*$%%'` + xxxxfile=`echo $xxxfile | $sed -e 's%_[^_]*$%%'` case "$file" in '') dflt=none ;; *) case "$osvers" in @@ -445,26 +555,47 @@ EOM esac ;; esac + if $test -f Policy.sh ; then + case "$dflt" in + *Policy*) ;; + none) dflt="Policy" ;; + *) dflt="Policy $dflt" ;; + esac + fi ;; *) dflt=`echo $hintfile | $sed 's/\.sh$//'` ;; esac + if $test -f Policy.sh ; then + $cat <<EOM + +There's also a Policy hint file available, which should make the +site-specific (policy) questions easier to answer. +EOM + + fi + $cat <<EOM You may give one or more space-separated answers, or "none" if appropriate. -If your OS version has no hints, DO NOT give a wrong version -- say "none". +A well-behaved OS will have no hints, so answering "none" or just "Policy" +is a good thing. DO NOT give a wrong version or a wrong OS. EOM + rp="Which of these apply, if any?" . UU/myread tans=$ans for file in $tans; do - if $test -f $src/hints/$file.sh; then + if $test X$file = XPolicy -a -f Policy.sh; then + . Policy.sh + $cat Policy.sh >> UU/config.sh + elif $test -f $src/hints/$file.sh; then . $src/hints/$file.sh $cat $src/hints/$file.sh >> UU/config.sh - elif $test X$tans = X -o X$tans = Xnone ; then + elif $test X"$tans" = X -o X"$tans" = Xnone ; then : nothing else : Give one chance to correct a possible typo. @@ -495,56 +626,13 @@ EOM fi cd UU ?X: From here on, we must use $rsrc instead of $src -@else -: Get old answers, if there is a config file out there -hint=default -hintfile='' -if test -f ../config.sh; then - echo " " - rp="I see a config.sh file. Shall I use it to set the defaults?" - . ./myread - case "$ans" in - n*|N*) echo "OK, I'll ignore it.";; - *) echo "Fetching default answers from your old config.sh file..." >&4 - tmp_n="$n" - tmp_c="$c" - . ../config.sh - cp ../config.sh . - n="$tmp_n" - c="$tmp_c" - hint=previous - ;; - esac -fi -@end -?X: remember, indentation is wrong--RAM -;; -*) - echo " " - echo "Fetching default answers from $config_sh..." >&4 - tmp_n="$n" - tmp_c="$c" - cd .. -?X: preserve symbolic links, if any - cp $config_sh config.sh 2>/dev/null - chmod +w config.sh - . ./config.sh - cd UU - cp ../config.sh . - n="$tmp_n" - c="$tmp_c" - hint=previous - ;; -esac -test "$override" && . ./optdef.sh -myuname="$newmyuname" -: Restore computed paths -for file in $loclist $trylist; do - eval $file="\$_$file" -done +@end +: Process their -A options +. ./posthint.sh @if osname || osvers +: Ask them to confirm the OS name cat << EOM Configure uses the operating system name and version to set some defaults. diff --git a/mcon/U/Oldsym.U b/mcon/U/Oldsym.U index c49cb64..816a6f9 100644 --- a/mcon/U/Oldsym.U +++ b/mcon/U/Oldsym.U @@ -1,12 +1,12 @@ -?RCS: $Id: Oldsym.U,v 3.0.1.1 1997/02/28 15:06:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Oldsym.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:06:58 ram @@ -21,26 +21,32 @@ ?X: which is set to true. Then, we try to keep all the new symbols that ?X: may come from a hint file or a previous config.sh file. ?X: -?MAKE:Oldsym: Config_sh test hint src +?MAKE:Oldsym: Config_sh Options test hint src sed sort uniq ?MAKE: -pick add $@ %< -?T:CONFIG sym tmp s +?T:CONFIG sym tmp +?F:!UU : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +$test -f $src/revision.h && \ +awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/revision.h >>config.sh echo "CONFIG=true" >>config.sh : propagate old symbols if $test -f UU/config.sh; then ?X: Make sure each symbol is unique in oldconfig.sh - <UU/config.sh sort | uniq >UU/oldconfig.sh + <UU/config.sh $sort | $uniq >UU/oldconfig.sh ?X: ?X: All the symbols that appear twice come only from config.sh (hence the ?X: two config.sh in the command line). These symbols will be removed by ?X: the uniq -u command. The oldsyms file thus contains all the symbols ?X: that did not appear in the produced config.sh (Larry Wall). ?X: - sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' config.sh config.sh UU/oldconfig.sh |\ - sort | uniq -u >UU/oldsyms +?X: Do not touch the -u flag of uniq. This means you too, Jarkko. +?X: + $sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' \ + config.sh config.sh UU/oldconfig.sh |\ + $sort | $uniq -u >UU/oldsyms set X `cat UU/oldsyms` shift case $# in @@ -49,7 +55,7 @@ if $test -f UU/config.sh; then cat <<EOM Hmm...You had some extra variables I don't know about...I'll try to keep 'em... EOM - echo "# Variables propagated from previous config.sh file." >>config.sh + echo ": Variables propagated from previous config.sh file." >>config.sh for sym in `cat UU/oldsyms`; do echo " Propagating $hint variable "'$'"$sym..." eval 'tmp="$'"${sym}"'"' diff --git a/mcon/U/Options.U b/mcon/U/Options.U index 0985d3e..0508d27 100644 --- a/mcon/U/Options.U +++ b/mcon/U/Options.U @@ -1,12 +1,12 @@ -?RCS: $Id: Options.U,v 3.0.1.7 1997/02/28 15:08:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Options.U,v $ ?RCS: Revision 3.0.1.7 1997/02/28 15:08:15 ram @@ -47,12 +47,52 @@ ?MAKE: -pick wipe $@ %< ?V:reuseval alldone error realsilent silent extractsh fastread \ override knowitall: config_sh -?T:arg symbol -?F:./optdef.sh +?T:arg argn symbol config_arg0 config_args config_argc xxx yyy zzz uuu +?T:args_exp args_sep arg_exp +?F:!Configure +?F:./optdef.sh ./cmdline.opt ./posthint.sh ./cmdl.opt +: Save command line options in file UU/cmdline.opt for later use in +: generating config.sh. +?X: This temporary file will be read by Oldsym.U. I used a temporary +?X: file to preserve all sorts of potential command line quotes and +?X: also because we don't know in advance how many variables we'll +?X: need, so I can't actually declare them on the MAKE line. +?X: The config_args variable won't be quite correct if Configure is +?X: fed something like ./Configure -Dcc="gcc -B/usr/ccs/bin/" +?X: since the quotes are gone by the time we see them. You'd have to +?X: reconstruct the command line from the config_arg? lines, but since +?X: I don't imagine anyone actually having to do that, I'm not going +?X: to worry too much. +cat > cmdline.opt <<EOSH +: Configure command line arguments. +config_arg0='$0' +config_args='$*' +config_argc=$# +EOSH +argn=1 +args_exp='' +args_sep='' +for arg in "$@"; do + cat >>cmdline.opt <<EOSH +config_arg$argn='$arg' +EOSH +?X: Extreme backslashitis: replace each ' by '"'"' + cat <<EOC | sed -e "s/'/'"'"'"'"'"'"'/g" > cmdl.opt +$arg +EOC + arg_exp=`cat cmdl.opt` + args_exp="$args_exp$args_sep'$arg_exp'" + argn=`expr $argn + 1` + args_sep=' ' +done +?X: args_exp is good for restarting self: eval "set X $args_exp"; shift; $0 "$@" +?X: used by hints/os2.sh in Perl, for instance +rm -f cmdl.opt + : produce awk script to parse command line options cat >options.awk <<'EOF' BEGIN { - optstr = "dD:eEf:hKOrsSU:V"; # getopt-style specification + optstr = "A:dD:eEf:hKOrsSU:V"; # getopt-style specification len = length(optstr); for (i = 1; i <= len; i++) { @@ -118,7 +158,7 @@ silent='' extractsh='' override='' knowitall='' -rm -f optdef.sh +rm -f optdef.sh posthint.sh cat >optdef.sh <<EOS $startsh EOS @@ -185,8 +225,58 @@ while test $# -gt 0; do esac shift ;; - -V) echo "$me generated by metaconfig <VERSION> PL<PATCHLEVEL>." >&2 - exit 0;; + -A) + shift + xxx='' + yyy="$1" + zzz='' + uuu=undef + case "$yyy" in + *=*) zzz=`echo "$yyy"|sed 's!=.*!!'` + case "$zzz" in + *:*) zzz='' ;; + *) xxx=append + zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'` + yyy=`echo "$yyy"|sed 's!=.*!!'` ;; + esac + ;; + esac + case "$xxx" in + '') case "$yyy" in + *:*) xxx=`echo "$yyy"|sed 's!:.*!!'` + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` + zzz=`echo "$yyy"|sed 's!^[^=]*=!!'` + yyy=`echo "$yyy"|sed 's!=.*!!'` ;; + *) xxx=`echo "$yyy"|sed 's!:.*!!'` + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;; + esac + ;; + esac + case "$xxx" in + append) + echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;; + clear) + echo "$yyy=''" >> posthint.sh ;; + define) + case "$zzz" in + '') zzz=define ;; + esac + echo "$yyy='$zzz'" >> posthint.sh ;; + eval) + echo "eval \"$yyy=$zzz\"" >> posthint.sh ;; + prepend) + echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;; + undef) + case "$zzz" in + '') zzz="$uuu" ;; + esac + echo "$yyy=$zzz" >> posthint.sh ;; + *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;; + esac + shift + ;; + -V) echo "$me generated by metaconfig <VERSION>-<REVISION>." >&2 + exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; *) break;; @@ -197,7 +287,7 @@ case "$error" in true) cat >&2 <<EOM Usage: $me [-dehrsEKOSV] [-f config.sh] [-D symbol] [-D symbol=value] - [-U symbol] [-U symbol=] + [-U symbol] [-U symbol=] [-A command:symbol...] -d : use defaults for all answers. -e : go on without questioning past the production of config.sh. -f : specify an alternate default configuration file. @@ -214,6 +304,16 @@ Usage: $me [-dehrsEKOSV] [-f config.sh] [-D symbol] [-D symbol=value] -U : undefine symbol: -U symbol symbol gets the value 'undef' -U symbol= symbol gets completely empty + -A : manipulate symbol after the platform specific hints have been applied: + -A symbol=value append " "value to symbol + -A append:symbol=value append value to symbol + -A define:symbol=value define symbol to have value + -A clear:symbol define symbol to be '' + -A define:symbol define symbol to be 'define' + -A eval:symbol=value define symbol to be eval of value + -A prepend:symbol=value prepend value to symbol + -A undef:symbol define symbol to be 'undef' + -A undef:symbol= define symbol to be '' -V : print version number and exit (with a zero status). EOM exit 1 @@ -221,9 +321,9 @@ EOM esac ?X: -?X: Unless they specified both -d and -e/E, make sure we're running -?X: interactively, i.e. attached to a terminal. Moved from Head.U to be able -?X: to handle batch configurations... +?X: Unless they specified either -S or both -d and -e/E, make sure we're +?X: running interactively, i.e. attached to a terminal. Moved from Head.U to +?X: be able to handle batch configurations... ?X: ?X: We have to hardwire the Configure name and cannot use $me, since if they ?X: said 'sh <Configure', then $me is 'sh'... @@ -232,10 +332,15 @@ esac case "$fastread$alldone" in yescont|yesexit) ;; *) - if test ! -t 0; then - echo "Say 'sh Configure', not 'sh <Configure'" - exit 1 - fi + case "$extractsh" in + true) ;; + *) + if test ! -t 0; then + echo "Say 'sh Configure', not 'sh <Configure'" + exit 1 + fi + ;; + esac ;; esac @@ -252,4 +357,7 @@ esac : run the defines and the undefines, if any, but leave the file out there... touch optdef.sh . ./optdef.sh +: create the posthint manipulation script and leave the file out there... +?X: this file will be perused by Oldconfig.U +touch posthint.sh diff --git a/mcon/U/Prefixit.U b/mcon/U/Prefixit.U index 91f11aa..dae8dba 100644 --- a/mcon/U/Prefixit.U +++ b/mcon/U/Prefixit.U @@ -1,12 +1,12 @@ -?RCS: $Id: Prefixit.U,v 3.0.1.1 1995/01/30 14:29:22 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Prefixit.U,v $ ?RCS: Revision 3.0.1.1 1995/01/30 14:29:22 ram diff --git a/mcon/U/Prefixup.U b/mcon/U/Prefixup.U index 11b633a..46b0b15 100644 --- a/mcon/U/Prefixup.U +++ b/mcon/U/Prefixup.U @@ -1,12 +1,12 @@ -?RCS: $Id: Prefixup.U,v 3.0.1.1 1995/01/30 14:30:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Prefixup.U,v $ ?RCS: Revision 3.0.1.1 1995/01/30 14:30:40 ram diff --git a/mcon/U/Rcs.U b/mcon/U/Rcs.U index e7f4bd7..255fcb6 100644 --- a/mcon/U/Rcs.U +++ b/mcon/U/Rcs.U @@ -1,12 +1,12 @@ -?RCS: $Id: Rcs.U,v 3.0 1993/08/18 12:05:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Rcs.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:15 ram diff --git a/mcon/U/Setvar.U b/mcon/U/Setvar.U index 645d271..75b640c 100644 --- a/mcon/U/Setvar.U +++ b/mcon/U/Setvar.U @@ -1,12 +1,12 @@ -?RCS: $Id: Setvar.U,v 3.0.1.1 1994/10/29 15:58:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Setvar.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 15:58:28 ram @@ -40,7 +40,7 @@ ?S:. ?V:setvar:val ?T:var was td tu -: function used to set $1 to $val +: function used to set '$1' to '$val' setvar='var=$1; eval "was=\$$1"; td=$define; tu=$undef; case "$val$was" in $define$undef) . ./whoa; eval "$var=\$td";; diff --git a/mcon/U/Signal.U b/mcon/U/Signal.U index 2eb4ea9..6ac5eb8 100644 --- a/mcon/U/Signal.U +++ b/mcon/U/Signal.U @@ -1,12 +1,12 @@ -?RCS: $Id: Signal.U,v 3.0.1.1 1997/02/28 15:20:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Signal.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:20:01 ram @@ -14,7 +14,8 @@ ?RCS: ?X: ?X: This unit produces three files: -?X: 1- A signal.c file, which, when compiled and ran, produces an output like: +?X: +?X: 1- A signal.c file, which, when compiled and run, produces an output like: ?X: ?X: HUP 1 ?X: INT 2 @@ -23,54 +24,75 @@ ?X: ?X: 2- A signal.awk script to parse the output of signal.c, fill ?X: in gaps (up to NSIG) and move duplicates to the end. +?X: ?X: 3- A signal_cmd script to compile signal.c and run it -?X: through sort -n +1 | uniq | awk -f signal.awk. +?X: through sort -n -k 2 | uniq | awk -f signal.awk. +?X: (we try also sort -n +1 since some old hosts don't grok sort -k) ?X: (This is called signal_cmd to avoid OS/2 confusion with ?X: signal.cmd vs. signal. +?X: The signal_cmd script also falls back on checking signals one at a +?X: time in case the signal.c program fails. On at least one version of +?X: Linux 2.1.x, the header file #define'd SIGRTMAX to a symbol that +?X: is not defined by the compiler/linker. :-(. Further, on that same +?X: version of Linux, the user had a defective C-shell that gave an +?X: incorrect list for kill -l, so the fall-back didn't work. ?X: ?X: This unit is then used by sig_name.U. ?X: ?MAKE:Signal: test tr rm awk cat grep startsh eunicefix sed sort uniq \ - Findhdr cppstdin +cppflags cppminus +cc +ccflags +ldflags _o + Findhdr cppstdin +cppflags cppminus Compile trnl run ?MAKE: -pick add $@ %< ?X:all files declared as "public" since they're used from other units ?F:signal.c signal_cmd signal.lst signal signal.awk ?T: xx xxx xxxfiles +?LINT:use rm run : Trace out the files included by signal.h, then look for SIGxxx names. -: Remove SIGARRAYSIZE used by HPUX. -: Remove SIGTYP void lines used by OS2. -xxx=`echo '#include <signal.h>' | +?X: Remove SIGARRAYSIZE used by HPUX. +?X: Remove SIGSTKSIZE used by Linux. +?X: Remove SIGSTKSZ used by Posix. +?X: Remove SIGTYP void lines used by OS2. +?X: Some cpps, like os390, dont give the file name anywhere +if [ "X$fieldn" = X ]; then + : Just make some guesses. We check them later. + xxx='/usr/include/signal.h /usr/include/sys/signal.h' +else + xxx=`echo '#include <signal.h>' | $cppstdin $cppminus $cppflags 2>/dev/null | $grep '^[ ]*#.*include' | - $awk "{print \\$$fieldn}" | $sed 's!"!!g' | $sort | $uniq` -: Check this list of files to be sure we have parsed the cpp output ok. -: This will also avoid potentially non-existent files, such -: as ../foo/bar.h + $awk "{print \\$$fieldn}" | $sed 's!"!!g' | \ + $sed 's!\\\\\\\\!/!g' | $sort | $uniq` +fi +?X: Check this list of files to be sure we have parsed the cpp output ok. +?X: This will also avoid potentially non-existent files, such +?X: as ../foo/bar.h xxxfiles='' ?X: Add /dev/null in case the $xxx list is empty. for xx in $xxx /dev/null ; do $test -f "$xx" && xxxfiles="$xxxfiles $xx" done -: If we have found no files, at least try signal.h +?X: If we have found no files, at least try signal.h case "$xxxfiles" in '') xxxfiles=`./findhdr signal.h` ;; esac xxx=`awk ' -$1 ~ /^#define$/ && $2 ~ /^SIG[A-Z0-9]*$/ && $2 !~ /SIGARRAYSIZE/ && $3 !~ /void/ { +$1 ~ /^#define$/ && $2 ~ /^SIG[A-Z0-9]*$/ && $2 !~ /SIGARRAYSIZE/ && $2 !~ /SIGSTKSIZE/ && $2 !~ /SIGSTKSZ/ && $3 !~ /void/ { print substr($2, 4, 20) } $1 == "#" && $2 ~ /^define$/ && $3 ~ /^SIG[A-Z0-9]*$/ && $3 !~ /SIGARRAYSIZE/ && $4 !~ /void/ { print substr($3, 4, 20) }' $xxxfiles` : Append some common names just in case the awk scan failed. -xxx="$xxx ABRT ALRM BUS CHLD CLD CONT DIL EMT FPE HUP ILL INT IO IOT KILL" -xxx="$xxx LOST PHONE PIPE POLL PROF PWR QUIT SEGV STKFLT STOP SYS TERM TRAP" -xxx="$xxx TSTP TTIN TTOU URG USR1 USR2 USR3 USR4 VTALRM" -xxx="$xxx WINCH WIND WINDOW XCPU XFSZ" +xxx="$xxx ABRT ALRM BUS CANCEL CHLD CLD CONT DIL EMT FPE" +xxx="$xxx FREEZE HUP ILL INT IO IOT KILL LOST LWP PHONE" +xxx="$xxx PIPE POLL PROF PWR QUIT RTMAX RTMIN SEGV STKFLT STOP" +xxx="$xxx SYS TERM THAW TRAP TSTP TTIN TTOU URG USR1 USR2" +xxx="$xxx USR3 USR4 VTALRM WAITING WINCH WIND WINDOW XCPU XFSZ" + : generate a few handy files for later -$cat > signal.c <<'EOP' +$cat > signal.c <<'EOCP' #include <sys/types.h> #include <signal.h> +#include <stdio.h> int main() { /* Strange style to avoid deeply-nested #if/#else/#endif */ @@ -125,8 +147,11 @@ int main() { printf("NSIG %d\n", NSIG); -EOP -echo $xxx | $tr ' ' '\012' | $sort | $uniq | $awk ' +#ifndef JUST_NSIG + +EOCP + +echo $xxx | $tr ' ' $trnl | $sort | $uniq | $awk ' { printf "#ifdef SIG"; printf $1; printf "\n" printf "printf(\""; printf $1; printf " %%d\\n\",SIG"; @@ -134,7 +159,8 @@ echo $xxx | $tr ' ' '\012' | $sort | $uniq | $awk ' printf "#endif\n" } END { - printf "}\n"; + printf "#endif /* JUST_NSIG */\n"; + printf "exit(0);\n}\n"; } ' >>signal.c $cat >signal.awk <<'EOP' @@ -151,41 +177,94 @@ $1 ~ /^NSIG$/ { nsig = $2 } sig_name[$2] = $1 sig_num[$2] = $2 } - } END { - if (nsig == 0) { nsig = maxsig + 1 } - for (n = 1; n < nsig; n++) { - if (sig_name[n]) { - printf("%s %d\n", sig_name[n], sig_num[n]) - } - else { - printf("NUM%d %d\n", n, n) - } + if (nsig == 0) { + nsig = maxsig + 1 + } + printf("NSIG %d\n", nsig); + for (n = 1; n < nsig; n++) { + if (sig_name[n]) { + printf("%s %d\n", sig_name[n], sig_num[n]) } + else { + printf("NUM%d %d\n", n, n) + } + } for (n = 0; n < ndups; n++) { - printf("%s %d\n", dup_name[n], dup_num[n]) + printf("%s %d\n", dup_name[n], dup_num[n]) } } EOP $cat >signal_cmd <<EOS $startsh -$test -s signal.lst && exit 0 -if $cc $ccflags signal.c -o signal $ldflags >/dev/null 2>&1; then - ./signal | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst +if $test -s signal.lst; then + echo "Using your existing signal.lst file" + exit 0 +fi +xxx="$xxx" +EOS +?X: Avoid variable interpolation problems, especially with +?X: xxx, which contains newlines. +$cat >>signal_cmd <<'EOS' + +set signal +if eval $compile_ok; then + $run ./signal$_exe | ($sort -n -k 2 2>/dev/null || $sort -n +1) | \ + $uniq | $awk -f signal.awk >signal.lst +else + echo "(I can't seem be able to compile the whole test program)" >&4 + echo "(I'll try it in little pieces.)" >&4 + set signal -DJUST_NSIG + if eval $compile_ok; then + $run ./signal$_exe > signal.nsg + $cat signal.nsg + else + echo "I can't seem to figure out how many signals you have." >&4 + echo "Guessing 50." >&4 + echo 'NSIG 50' > signal.nsg + fi + : Now look at all the signal names, one at a time. + for xx in `echo $xxx | $tr ' ' $trnl | $sort | $uniq`; do + $cat > signal.c <<EOCP +#include <sys/types.h> +#include <signal.h> +#include <stdio.h> +int main() { +printf("$xx %d\n", SIG${xx}); +return 0; +} +EOCP + set signal + if eval $compile; then + echo "SIG${xx} found." + $run ./signal$_exe >> signal.ls1 + else + echo "SIG${xx} NOT found." + fi + done + if $test -s signal.ls1; then + $cat signal.nsg signal.ls1 | + $sort -n | $uniq | $awk -f signal.awk >signal.lst + fi + +fi +if $test -s signal.lst; then + : else - echo "(I can't seem be able to compile the test program -- Guessing)" + echo "(AAK! I can't compile the test programs -- Guessing)" >&4 echo 'kill -l' >signal - set X \`csh -f <signal\` + set X `csh -f <signal` $rm -f signal shift - case \$# in + case $# in 0) set HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM;; esac - echo \$@ | $tr ' ' '\012' | \ - $awk '{ printf $1; printf " %d\n", ++s; }' >signal.lst + echo $@ | $tr ' ' $trnl | \ + $awk '{ printf "%s %d\n", $1, ++s; } + END { printf "NSIG %d\n", ++s }' >signal.lst fi -$rm -f signal.c signal signal$_o +$rm -f signal.c signal$_exe signal$_o signal.nsg signal.ls1 EOS chmod a+x signal_cmd $eunicefix signal_cmd diff --git a/mcon/U/Tr.U b/mcon/U/Tr.U index 883d13c..a7320fe 100644 --- a/mcon/U/Tr.U +++ b/mcon/U/Tr.U @@ -1,12 +1,12 @@ -?RCS: $Id: Tr.U,v 3.0.1.2 1994/10/29 18:00:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Tr.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 18:00:54 ram @@ -31,29 +31,72 @@ ?MAKE:Tr: startsh tr eunicefix ?MAKE: -pick add $@ %< ?F:./tr -?T:up low +?T:up low LC_ALL : see whether [:lower:] and [:upper:] are supported character classes echo " " -up='[A-Z]' -low='[a-z]' -case "`echo AbyZ | $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in +case "`echo AbyZ | LC_ALL=C $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in ABYZ) echo "Good, your tr supports [:lower:] and [:upper:] to convert case." >&4 up='[:upper:]' low='[:lower:]' ;; +*) # There is a discontinuity in EBCDIC between 'I' and 'J' + # (0xc9 and 0xd1), therefore that is a nice testing point. + if test "X$up" = X -o "X$low" = X; then + case "`echo IJ | LC_ALL=C $tr '[I-J]' '[i-j]' 2>/dev/null`" in + ij) up='[A-Z]' + low='[a-z]' + ;; + esac + fi + if test "X$up" = X -o "X$low" = X; then + case "`echo IJ | LC_ALL=C $tr I-J i-j 2>/dev/null`" in + ij) up='A-Z' + low='a-z' + ;; + esac + fi + if test "X$up" = X -o "X$low" = X; then + case "`echo IJ | od -x 2>/dev/null`" in + *C9D1*|*c9d1*) + echo "Hey, this might be EBCDIC." >&4 + if test "X$up" = X -o "X$low" = X; then + case "`echo IJ | \ + LC_ALL=C $tr '[A-IJ-RS-Z]' '[a-ij-rs-z]' 2>/dev/null`" in + ij) up='[A-IJ-RS-Z]' + low='[a-ij-rs-z]' + ;; + esac + fi + if test "X$up" = X -o "X$low" = X; then + case "`echo IJ | LC_ALL=C $tr A-IJ-RS-Z a-ij-rs-z 2>/dev/null`" in + ij) up='A-IJ-RS-Z' + low='a-ij-rs-z' + ;; + esac + fi + ;; + esac + fi +esac +case "`echo IJ | LC_ALL=C $tr \"$up\" \"$low\" 2>/dev/null`" in +ij) + echo "Using $up and $low to convert case." >&4 + ;; *) - echo "Your tr only supports [a-z] and [A-Z] to convert case." >&4 - ;; + echo "I don't know how to translate letters from upper to lower case." >&4 + echo "Your tr is not acting any way I know of." >&4 + exit 1 + ;; esac : set up the translation script tr, must be called with ./tr of course cat >tr <<EOSC $startsh case "\$1\$2" in -'[A-Z][a-z]') exec $tr '$up' '$low';; -'[a-z][A-Z]') exec $tr '$low' '$up';; +'[A-Z][a-z]') LC_ALL=C exec $tr '$up' '$low';; +'[a-z][A-Z]') LC_ALL=C exec $tr '$low' '$up';; esac -exec $tr "\$@" +LC_ALL=C exec $tr "\$@" EOSC chmod +x tr $eunicefix tr diff --git a/mcon/U/Typedef.U b/mcon/U/Typedef.U index 2018d4a..fd16777 100644 --- a/mcon/U/Typedef.U +++ b/mcon/U/Typedef.U @@ -1,12 +1,12 @@ -?RCS: $Id: Typedef.U,v 3.0.1.3 1995/07/25 13:42:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Typedef.U,v $ ?RCS: Revision 3.0.1.3 1995/07/25 13:42:07 ram @@ -27,6 +27,7 @@ ?X: ?MAKE:Typedef: cppstdin cppminus cppflags rm contains Oldconfig ?MAKE: -pick add $@ %< +?F:!temp.c ?LINT:define typedef ?V:typedef ?S:typedef: diff --git a/mcon/U/Unix.U b/mcon/U/Unix.U index 4c40623..4c05c7b 100644 --- a/mcon/U/Unix.U +++ b/mcon/U/Unix.U @@ -1,13 +1,13 @@ -?RCS: $Id: Unix.U,v 3.0.1.1 1997/02/28 15:20:06 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Unix.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:20:06 ram @@ -19,18 +19,14 @@ ?X: environment, then some of the following variables can be redefined in hint ?X: files. ?X: -?MAKE:Unix _exe _a _o firstmakefile archobjs: Oldconfig +?MAKE:Unix _a _o firstmakefile archobjs: Oldconfig ?MAKE: -pick add $@ %< -?S:_exe: -?S: This variable defines the extension used for executable files. -?S: For unix it is empty. Other possible values include '.exe'. -?S:. -?S:_a: +?S:_a (lib_ext): ?S: This variable defines the extension used for ordinary libraries. ?S: For unix, it is '.a'. The '.' is included. Other possible ?S: values include '.lib'. ?S:. -?S:_o: +?S:_o (obj_ext): ?S: This variable defines the extension used for object files. ?S: For unix, it is '.o'. The '.' is included. Other possible ?S: values include '.obj'. @@ -48,8 +44,6 @@ ?S: or other facilities. For perl on OS/2, for example, this would ?S: include os2/os2.obj. ?S:. -?INIT:: No trailing extension on UNIX executables -?INIT:_exe='' ?INIT:: Extra object files, if any, needed on this platform. ?INIT:archobjs='' : Define several unixisms. diff --git a/mcon/U/Warn.U b/mcon/U/Warn.U new file mode 100644 index 0000000..ffab53e --- /dev/null +++ b/mcon/U/Warn.U @@ -0,0 +1,57 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: Extract.U,v $ +?X: +?X: This unit produces a shell script which can be run in order to emit +?X: an important warning to the user, which will be remembered and shown +?X: at the end of the Configure run as well. +?X: +?X: A typical use would be: +?X: +?X: ./warn <<EOM +?X: Problem with your C compiler: can't turn debugging on. +?X: EOM +?X: +?X: or: +?X: +?X: ./warn "Problem with your C compiler: can't turn debugging on." +?X: +?X: Which will both display to the user: +?X: +?X: *** WARNING: +?X: *** Problem with your C compiler: can't turn debugging on. +?X: *** +?X: +?MAKE:Warn: startsh eunicefix +?MAKE: -pick add $@ %< +?F:./warn +: script used to emit important warnings +cat >warn <<EOS +$startsh +?X: Read the whole warning message from stdin into a temporary file +?X: when no argument was supplied. +if test \$# -gt 0; then + echo "\$@" >msg +else + cat >msg +fi +?X: Emit the warning, prefixing all lines with '*** ' +echo "*** WARNING:" >&4 +sed -e 's/^/*** /' <msg >&4 +echo "*** " >&4 +?X: Save the warning in the logs, which will be shown again at the end +cat msg >>config.msg +echo " " >>config.msg +rm -f msg +EOS +chmod +x warn +$eunicefix warn + diff --git a/mcon/U/Warn_v7EXT.U b/mcon/U/Warn_v7EXT.U index 2d5be5a..d015400 100644 --- a/mcon/U/Warn_v7EXT.U +++ b/mcon/U/Warn_v7EXT.U @@ -1,12 +1,12 @@ -?RCS: $Id: Warn_v7EXT.U,v 3.0.1.1 1994/10/29 16:01:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Warn_v7EXT.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:01:42 ram @@ -23,7 +23,7 @@ ?MAKE: -pick add $@ %< : Warnings if ./v7; then - cat <<'EOM' + cat <<EOM NOTE: the V7 compiler may ignore some #undefs that $package uses. If so, you may get messages about redefining EXT. Some V7 compilers also have diff --git a/mcon/U/Warn_v7ND.U b/mcon/U/Warn_v7ND.U index 2760c18..d7ef599 100644 --- a/mcon/U/Warn_v7ND.U +++ b/mcon/U/Warn_v7ND.U @@ -1,12 +1,12 @@ -?RCS: $Id: Warn_v7ND.U,v 3.0.1.1 1994/10/29 16:01:46 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Warn_v7ND.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:01:46 ram @@ -23,7 +23,7 @@ ?MAKE: -pick add $@ %< : Warnings if ./v7; then - cat <<'EOM' + cat <<EOM NOTE: many V7 systems do not have a way to do a non-blocking read. If you don't have any of FIONREAD, O_NDELAY, or rdchk(), the $package package diff --git a/mcon/U/Whoa.U b/mcon/U/Whoa.U index cb993d0..7519fac 100644 --- a/mcon/U/Whoa.U +++ b/mcon/U/Whoa.U @@ -1,12 +1,12 @@ -?RCS: $Id: Whoa.U,v 3.0.1.2 1997/02/28 15:21:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Whoa.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:21:21 ram @@ -31,7 +31,8 @@ ?MAKE:Whoa: Myread startsh hint ?MAKE: -pick add $@ %< ?F:./whoa -?T:var was td tu +?T:var was +?LINT:change td tu : set up the script used to warn in case of inconsistency cat <<EOS >whoa $startsh diff --git a/mcon/U/abortsig.U b/mcon/U/abortsig.U index f7b1efb..a13f30f 100644 --- a/mcon/U/abortsig.U +++ b/mcon/U/abortsig.U @@ -1,12 +1,12 @@ -?RCS: $Id: abortsig.U,v 3.0.1.1 1994/10/29 16:02:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: abortsig.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:02:19 ram @@ -40,7 +40,7 @@ case "$abortsig" in '') $cat >abort.c <<EOP #include <signal.h> caught() { exit(0); } -main() +int main() { #ifdef $signal signal($signal, caught); diff --git a/mcon/U/active.U b/mcon/U/active.U index bd977c4..3a1a65c 100644 --- a/mcon/U/active.U +++ b/mcon/U/active.U @@ -1,12 +1,12 @@ -?RCS: $Id: active.U,v 3.0 1993/08/18 12:05:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: active.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:21 ram diff --git a/mcon/U/afs.U b/mcon/U/afs.U index bcd787b..4cf024b 100644 --- a/mcon/U/afs.U +++ b/mcon/U/afs.U @@ -1,13 +1,13 @@ -?RCS: $Id: afs.U,v 3.0.1.2 1997/02/28 15:23:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: afs.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:23:06 ram ?RCS: patch61: can now explicitely tell Configure whether AFS is running @@ -15,7 +15,7 @@ ?RCS: Revision 3.0.1.1 1993/08/24 12:24:43 ram ?RCS: patch3: created ?RCS: -?MAKE:afs: Nothing +?MAKE:afs afsroot: test ?MAKE: -pick add $@ %< ?S:afs: ?S: This variable is set to 'true' if AFS (Andrew File System) is used @@ -23,12 +23,24 @@ ?S: with a hint value or command line option, but you'd better know ?S: what you are doing. ?S:. +?S:afsroot: +?S: This variable is by default set to '/afs'. In the unlikely case +?S: this is not the correct root, it is possible to override this with +?S: a hint value or command line option. This will be used in subsequent +?S: tests for AFSness in the configure and test process. +?S:. +: allow them to override the AFS root +case "$afsroot" in +'') afsroot=/afs ;; +*) afsroot=$afsroot ;; +esac + : is AFS running? echo " " case "$afs" in $define|true) afs=true ;; $undef|false) afs=false ;; -*) if test -d /afs; then +*) if $test -d $afsroot; then afs=true else afs=false diff --git a/mcon/U/alignbytes.U b/mcon/U/alignbytes.U index 94f1826..f31ec80 100644 --- a/mcon/U/alignbytes.U +++ b/mcon/U/alignbytes.U @@ -1,12 +1,12 @@ -?RCS: $Id: alignbytes.U,v 3.0.1.2 1994/10/29 16:02:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: alignbytes.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 16:02:28 ram @@ -42,7 +42,7 @@ struct foobar { char foo; double bar; } try; -main() +int main() { printf("%d\n", (char *)&try.bar - (char *)&try.foo); } @@ -51,7 +51,7 @@ EOCP dflt=`./try` else dflt='8' - echo"(I can't seem to compile the test program...)" + echo "(I can't seem to compile the test program...)" fi ;; *) dflt="$alignbytes" diff --git a/mcon/U/archlib.U b/mcon/U/archlib.U index 343e032..d0c2b29 100644 --- a/mcon/U/archlib.U +++ b/mcon/U/archlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: archlib.U,v 3.0.1.5 1997/02/28 15:23:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/archname.U b/mcon/U/archname.U index 1ff5a9a..231e159 100644 --- a/mcon/U/archname.U +++ b/mcon/U/archname.U @@ -1,12 +1,12 @@ -?RCS: $Id: archname.U,v 3.0.1.3 1997/02/28 15:24:32 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: archname.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:24:32 ram diff --git a/mcon/U/baserev.U b/mcon/U/baserev.U index 6dd04b0..3fc675c 100644 --- a/mcon/U/baserev.U +++ b/mcon/U/baserev.U @@ -1,12 +1,12 @@ -?RCS: $Id: baserev.U,v 3.0 1993/08/18 12:05:24 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: baserev.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:24 ram diff --git a/mcon/U/basicshell.U b/mcon/U/basicshell.U index 36f03b9..b5ccfbc 100644 --- a/mcon/U/basicshell.U +++ b/mcon/U/basicshell.U @@ -1,12 +1,12 @@ -?RCS: $Id: basicshell.U,v 3.0 1993/08/18 12:05:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: basicshell.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:25 ram diff --git a/mcon/U/bin.U b/mcon/U/bin.U index 26ec89d..81c0a96 100644 --- a/mcon/U/bin.U +++ b/mcon/U/bin.U @@ -1,12 +1,12 @@ -?RCS: $Id: bin.U,v 3.0.1.4 1995/09/25 09:15:32 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: bin.U,v $ ?RCS: Revision 3.0.1.4 1995/09/25 09:15:32 ram diff --git a/mcon/U/bitpbyte.U b/mcon/U/bitpbyte.U index 978757f..c56ac01 100644 --- a/mcon/U/bitpbyte.U +++ b/mcon/U/bitpbyte.U @@ -1,12 +1,12 @@ -?RCS: $Id: bitpbyte.U,v 3.0.1.1 1994/10/29 16:02:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: bitpbyte.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:02:54 ram @@ -51,12 +51,12 @@ case "$bitpbyte" in #define BITSPERBYTE 8 #endif #endif -main() +int main() { printf("%d\n", BITSPERBYTE); } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then dflt=`./try` else dflt='8' diff --git a/mcon/U/byteorder.U b/mcon/U/byteorder.U index 1ef79f8..a337080 100644 --- a/mcon/U/byteorder.U +++ b/mcon/U/byteorder.U @@ -1,12 +1,12 @@ -?RCS: $Id: byteorder.U,v 3.0.1.2 1997/02/28 15:24:55 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: byteorder.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:24:55 ram @@ -48,7 +48,7 @@ I'm now running the test program... EOM $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { int i; union { @@ -67,7 +67,7 @@ main() } EOCP xxx_prompt=y - if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 && ./try > /dev/null; then dflt=`./try` case "$dflt" in [1-4][1-4][1-4][1-4]|12345678|87654321) diff --git a/mcon/U/cc.U b/mcon/U/cc.U index 0c63735..15366ff 100644 --- a/mcon/U/cc.U +++ b/mcon/U/cc.U @@ -1,13 +1,13 @@ -?RCS: $Id: cc.U,v 3.0.1.4 1995/05/12 12:06:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: cc.U,v $ ?RCS: Revision 3.0.1.4 1995/05/12 12:06:47 ram ?RCS: patch54: may now abort Configure when cc does not work @@ -26,104 +26,33 @@ ?RCS: Revision 3.0 1993/08/18 12:05:30 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:cc gccversion: cat contains sysman +large cpp rm \ - Mcc Myread Guess Options Oldconfig Loc +?MAKE:cc: Myread Oldconfig Checkcc test ?MAKE: -pick add $@ %< ?S:cc: ?S: This variable holds the name of a command to execute a C compiler which ?S: can resolve multiple global references that happen to have the same -?S: name. Usual values are "cc", "Mcc", "cc -M", and "gcc". +?S: name. Usual values are 'cc' and 'gcc'. +?S: Fervent ANSI compilers may be called 'c89'. AIX has xlc. ?S:. -?S:gccversion: -?S: If GNU cc (gcc) is used, this variable holds '1' or '2' to -?S: indicate whether the compiler is version 1 or 2. This is used in -?S: setting some of the default cflags. It is set to '' if not gcc. -?S:. -?F:!gccvers +?F:!cc.cbu ?D:cc='cc' -?D:gccversion='' -?LINT:change cpp -: see if we need a special compiler +: Determine the C compiler to be used echo " " -if ./usg; then - case "$cc" in - '') case "$Mcc" in - /*) dflt='Mcc';; - *) case "$large" in - -M*) dflt='cc';; - *) if $contains '\-M' $sysman/cc.1 >/dev/null 2>&1 ; then - if $contains '\-M' $sysman/cpp.1 >/dev/null 2>&1; then - dflt='cc' - else - dflt='cc -M' - fi - else - dflt='cc' - fi;; - esac;; - esac;; - *) dflt="$cc";; - esac - $cat <<'EOM' -On some systems the default C compiler will not resolve multiple global -references that happen to have the same name. On some such systems the "Mcc" -command may be used to force these to be resolved. On other systems a "cc -M" -command is required. (Note that the -M flag on other systems indicates a -memory model to use!) If you have the Gnu C compiler, you might wish to use -that instead. +case "$cc" in +'') dflt=cc;; +*) dflt="$cc";; +esac +rp="Use which C compiler?" +. ./myread +cc="$ans" -EOM - rp="What command will force resolution on this system?" - . ./myread - cc="$ans" -else - case "$cc" in - '') dflt=cc;; - *) dflt="$cc";; - esac - rp="Use which C compiler?" - . ./myread - cc="$ans" +: See whether they have no cc but they do have gcc +. ./trygcc +?X: Look for a hint-file generated 'call-back-unit'. Now that the +?X: user has specified the compiler, we may need to set or change some +?X: other defaults. +if $test -f cc.cbu; then + . ./cc.cbu fi -?X: Check if they have gcc in any guise. This is really only needed -?X: if the user has version 1.x.x and needs -fpcc-struct-return. Alas -?X: BSD/386 ships a version of gcc 1.4.2 and calls it cc. Hence the -?X: paranoid test -- ADO. -echo " " -echo "Checking for GNU cc in disguise and/or its version number..." >&4 -$cat >gccvers.c <<EOM -#include <stdio.h> -int main() { -#ifdef __GNUC__ -#ifdef __VERSION__ - printf("%s\n", __VERSION__); -#else - printf("%s\n", "1"); -#endif -#endif - exit(0); -} -EOM -if $cc -o gccvers gccvers.c >/dev/null 2>&1; then - gccversion=`./gccvers` - case "$gccversion" in - '') echo "You are not using GNU cc." ;; - *) echo "You are using GNU cc $gccversion." ;; - esac -else - echo " " - echo "*** WHOA THERE!!! ***" >&4 - echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 -?X: using -K will prevent aborting--maybe they're cross compiling? - case "$knowitall" in - '') - echo " You'd better start hunting for one and let me know about it." >&4 - exit 1 - ;; - esac -fi -$rm -f gccvers* -case "$gccversion" in -1*) cpp=`./loc gcc-cpp $cpp $pth` ;; -esac +. ./checkcc diff --git a/mcon/U/ccflags.U b/mcon/U/ccflags.U index dc8beb7..0deb0c3 100644 --- a/mcon/U/ccflags.U +++ b/mcon/U/ccflags.U @@ -1,12 +1,12 @@ -?RCS: $Id: ccflags.U,v 3.0.1.9 1997/02/28 15:27:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: ccflags.U,v $ ?RCS: Revision 3.0.1.9 1997/02/28 15:27:07 ram @@ -46,7 +46,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:ccflags ldflags lkflags cppflags optimize locincpth: test cat \ - Myread Guess Options Oldconfig +gccversion mips_type +usrinc \ + Myread Guess Options Oldconfig gccversion mips_type +usrinc \ package contains rm +cc cppstdin cppminus cpprun cpplast libpth \ loclibpth hint ?MAKE: -pick add $@ %< @@ -78,6 +78,7 @@ ?S: It's not much, but it parallels the loclibpth stuff in libpth.U. ?S:. ?T:inctest thisincl xxx flag inclwanted ftry previous thislibdir +?F:!cpp.c ?D:cppflags='' ?D:ccflags='' ?D:ldflags='' @@ -92,11 +93,17 @@ ?INIT: : determine optimize, if desired, or use for debug flag also case "$optimize" in -' ') dflt='none';; -'') dflt='-O';; +' '|$undef) dflt='none';; +'') + case "$gccversion" in + '') dflt='-O';; + *) dflt='-O2 -g';; + esac + ;; *) dflt="$optimize";; esac -$cat <<EOH +case "$gccversion" in +'') $cat <<EOH Some C compilers have problems with their optimizers. By default, $package compiles with the -O flag to use the optimizer. Alternately, you might want @@ -105,6 +112,17 @@ systems). Either flag can be specified here. To use neither flag, specify the word "none". EOH + ;; +*) $cat <<EOH + +With the GNU C compiler, it is possible to supply both -O2 and -g flags, to +be able to reasonably optimize, whilst retaining the ability to use a +symbolic debugger. Either flag can be specified here. To use neither flag, +specify the word "none". + +EOH + ;; +esac rp="What optimizer/debugger flag should be used?" . ./myread optimize="$ans" @@ -116,13 +134,10 @@ dflt='' : We will not override a previous value, but we might want to : augment a hint file case "$hint" in -none|recommended) +default|recommended) case "$gccversion" in 1*) dflt='-fpcc-struct-return' ;; esac - case "$optimize" in - *-g*) dflt="$dflt -DDEBUGGING";; - esac ?X: check for POSIXized ISC case "$gccversion" in 2*) if test -d /etc/conf/kconfig.d && @@ -132,6 +147,12 @@ none|recommended) fi ;; esac +?X: turn warnings on if they're using gcc + case "$gccversion" in + 1*|2*) dflt="$dflt -Wall";; +?X: starting with version 3, add "-W -Wall -Wformat=2 -Wshadow" by default + *) dflt="$dflt -W -Wall -Wformat=2 -Wshadow";; + esac ;; esac @@ -176,7 +197,7 @@ else fi case "$hint" in -none|recommended) dflt="$ccflags $dflt" ;; +default|recommended) dflt="$ccflags $dflt" ;; *) dflt="$ccflags";; esac @@ -187,8 +208,7 @@ $cat <<EOH Your C compiler may want other flags. For this question you should include -I/whatever and -DWHATEVER flags and any other flags used by the C compiler, -but you should NOT include libraries or ld flags like -lwhatever. If you -want $package to honor its debug switch, you should include -DDEBUG here. +but you should NOT include libraries or ld flags like -lwhatever. To use no flags, specify the word "none". @@ -289,6 +309,7 @@ done case "$dflt" in '') dflt='none' ;; +*) set X $dflt; shift; dflt="$@";; esac $cat <<EOH @@ -341,7 +362,7 @@ esac echo " " echo "Checking your choice of C compiler and flags for coherency..." >&4 ?X: Strip extra blanks in case some of the following variables are empty -set X $cc $optimize $ccflags $ldflags try.c -o try +set X $cc $optimize $ccflags $ldflags -o try try.c shift $cat >try.msg <<EOM I've tried to compile and run a simple program with: @@ -354,14 +375,14 @@ and I got the following output: EOM $cat > try.c <<'EOF' #include <stdio.h> -main() { exit(0); } +int main() { exit(0); } EOF dflt=y ?X: Use "sh -c" to avoid error messages tagged with leading "Configure:". ?X: We need to try the resulting executable, because cc might yield a 0 status ?X: even when ld failed, in which case the executable will not run properly, ?X: if its x bit is set at all... -if sh -c "$cc $optimize $ccflags try.c -o try $ldflags" >>try.msg 2>&1; then +if sh -c "$cc $optimize $ccflags $ldflags -o try try.c" >>try.msg 2>&1; then if sh -c './try' >>try.msg 2>&1; then dflt=n else @@ -376,7 +397,7 @@ else fi case "$dflt" in y) - $cat try.msg + $cat try.msg >&4 ?X: using -K will prevent default aborting--maybe they're cross compiling? case "$knowitall" in '') diff --git a/mcon/U/cf_email.U b/mcon/U/cf_email.U index 979cfd4..caad32e 100644 --- a/mcon/U/cf_email.U +++ b/mcon/U/cf_email.U @@ -1,12 +1,12 @@ -?RCS: $Id: cf_email.U,v 3.0.1.1 1994/01/24 14:05:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: cf_email.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:05:06 ram @@ -20,12 +20,13 @@ ?S: used by units that require the user's e-mail, like MailList.U. ?S:. ?T:cont +: determine the e-mail address of the user who is running us $cat <<EOM I need to get your e-mail address in Internet format if possible, i.e. something like user@host.domain. Please answer accurately since I have no easy means to double check it. The default value provided below -is most probably close to the reality but may not be valid from outside +is most probably close to reality but may not be valid from outside your organization... EOM diff --git a/mcon/U/cf_name.U b/mcon/U/cf_name.U index 6e7ee67..c1ea650 100644 --- a/mcon/U/cf_name.U +++ b/mcon/U/cf_name.U @@ -1,12 +1,12 @@ -?RCS: $Id: cf_name.U,v 3.0.1.2 1994/05/06 14:29:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: diff --git a/mcon/U/cf_who.U b/mcon/U/cf_who.U index 7c7deac..2643d24 100644 --- a/mcon/U/cf_who.U +++ b/mcon/U/cf_who.U @@ -1,12 +1,12 @@ -?RCS: $Id: cf_who.U,v 3.0.1.2 1997/02/28 15:28:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: cf_who.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:28:50 ram @@ -32,8 +32,10 @@ ?S: Login name of the person who ran the Configure script and answered the ?S: questions. This is used to tag both config.sh and config_h.SH. ?S:. +?LINT:change LC_ALL LANGUAGE : who configured the system -cf_time=`$date 2>&1` +?X: Ensure English date -- Jarkko Hietaniemi +cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ?X: ?X: Leave a white space between first two '(' for ksh. The sub-shell is needed ?X: on some machines to avoid the error message when logname is not found; e.g. diff --git a/mcon/U/charorder.U b/mcon/U/charorder.U index 2731c61..8ed5428 100644 --- a/mcon/U/charorder.U +++ b/mcon/U/charorder.U @@ -1,12 +1,12 @@ -?RCS: $Id: charorder.U,v 3.0.1.1 1994/10/29 16:07:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: charorder.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:07:08 ram diff --git a/mcon/U/charsize.U b/mcon/U/charsize.U index baf3aac..ba6b9b3 100644 --- a/mcon/U/charsize.U +++ b/mcon/U/charsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: charsize.U,v 3.0.1.1 1994/10/29 16:07:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: charsize.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:07:13 ram @@ -35,12 +35,12 @@ case "$charsize" in echo "Checking to see how big your characters are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(char)); } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then dflt=`./try` else dflt='1' diff --git a/mcon/U/contains.U b/mcon/U/contains.U index 7d9883a..fcfd216 100644 --- a/mcon/U/contains.U +++ b/mcon/U/contains.U @@ -1,12 +1,12 @@ -?RCS: $Id: contains.U,v 3.0 1993/08/18 12:05:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: contains.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:35 ram diff --git a/mcon/U/cpp_stuff.U b/mcon/U/cpp_stuff.U index 67b16c6..2473ef2 100644 --- a/mcon/U/cpp_stuff.U +++ b/mcon/U/cpp_stuff.U @@ -1,12 +1,12 @@ -?RCS: $Id: cpp_stuff.U,v 3.0.1.2 1997/02/28 15:30:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: cpp_stuff.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:30:48 ram @@ -19,12 +19,20 @@ ?RCS: Revision 3.0 1993/08/18 12:05:36 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:cpp_stuff: cat contains cppstdin cppflags cppminus rm +?MAKE:cpp_stuff cpp_quote: cat contains cppstdin cppflags cppminus rm Warn \ + package ?MAKE: -pick add $@ %< ?S:cpp_stuff: ?S: This variable contains an identification of the catenation mechanism ?S: used by the C preprocessor. ?S:. +?S:cpp_quote: +?S: This variable is set to either '"' or '' depending on whether the +?S: pre-processor pre-dates ANSI or not. It is used in the production of +?S: the SQuoTe() and EQuoTe() macros, and was introduced to overcome a bug +?S: in gcc 3.x whereby the pre-processor complained loudly about the +?S: unterminated strings. +?S:. ?C:CAT2: ?C: This macro catenates 2 tokens together. ?C:. @@ -58,18 +66,21 @@ ?H:?CAT4:#define CAT4(a,b,c,d)a/**/b/**/c/**/d ?H:?CAT5:#define CAT5(a,b,c,d,e)a/**/b/**/c/**/d/**/e ?H:?STRINGIFY:#define STRINGIFY(a)"a" -?H:?%<:#define SQuoTe(a)"a -?H:?%<:#define EQuoTe(a)a" +?H:?%<:#define SQuoTe(a)${cpp_quote}a +?H:?%<:#define EQuoTe(a)a${cpp_quote} ?H:?SCAT2:#define SCAT2(a,b)EQuoTe(SQuoTe(a)b) ?H:?SCAT3:#define SCAT3(a,b,c)EQuoTe(SQuoTe(a)b/**/c) ?H:?SCAT4:#define SCAT4(a,b,c,d)EQuoTe(SQuoTe(a)b/**/c/**/d) ?H:?SCAT5:#define SCAT5(a,b,c,d,e)EQuoTe(SQuoTe(a)b/**/c/**/d/**/e) ?H:?%<:#endif ?H:?%<:#if $cpp_stuff == 42 -?H:?CAT2:#define CAT2(a,b)a ## b -?H:?CAT3:#define CAT3(a,b,c)a ## b ## c -?H:?CAT4:#define CAT4(a,b,c,d)a ## b ## c ## d -?H:?CAT5:#define CAT5(a,b,c,d,e)a ## b ## c ## d ## e +?X: The additional level of indirection enables these macros to be +?X: used as arguments to other macros. See K&R 2nd ed., page 231. +?H:?%<:#define CaTiFy(a,b) a ## b +?H:?%<:#define CAT2(a,b) CaTiFy(a,b) +?H:?CAT3:#define CAT3(a,b,c) CAT2(CaTiFy(a,b),c) +?H:?CAT4:#define CAT4(a,b,c,d) CAT2(CaTiFy(a,b), CaTiFy(c,d)) +?H:?CAT5:#define CAT5(a,b,c,d,e) CAT2(CAT2(CaTiFy(a,b), CaTiFy(c,d)), e) ?H:?%<:#define StGiFy(a)# a ?H:?STRINGIFY:#define STRINGIFY(a)StGiFy(a) ?H:?SCAT2:#define SCAT2(a,b)StGiFy(a) StGiFy(b) @@ -82,10 +93,12 @@ ?H:?%<:#endif ?H:. ?W:%<:CAT2 CAT3 CAT4 CAT5 STRINGIFY SCAT2 SCAT3 SCAT4 SCAT5 -?LINT:known StGiFy EQuoTe SQuoTe +?F:!cpp_stuff.c +?LINT:known StGiFy EQuoTe SQuoTe CaTiFy : how do we catenate cpp tokens here? echo " " echo "Checking to see how your cpp does stuff like catenate tokens..." >&4 +cpp_quote='' $cat >cpp_stuff.c <<'EOCP' #define RCAT(a,b)a/**/b #define ACAT(a,b)a ## b @@ -98,20 +111,46 @@ if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then echo "We can catify or stringify, separately or together!" cpp_stuff=42 elif $contains 'Reiser' cpp_stuff.out >/dev/null 2>&1; then - $cat <<EOM -Ah, yes! The good old days! + echo "Ah, yes! The good old days!" + cpp_stuff=1 + $cat >cpp_stuff.c <<'EOCP' +#define SQuoTe(a)"a +#define EQuoTe(a)a" +#define CAT2(a,b)EQuoTe(SQuoTe(a)b) +CAT2(Vic,tory) +EOCP + $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1 + if $contains '"Victory"' cpp_stuff.out >/dev/null 2>&1; then + echo "I'll resort to a cute trick to also be able to stringify." + cpp_quote='"' + else + $cat <<EOM However, in the good old days we don't know how to stringify and catify at the same time... -Unless we have a cute trick... which I have! +@if SCAT2 || SCAT3 || SCAT4 || SCAT5 +You might have to edit the values of the SCAT[2-5] macros in config.h... +@else +Hopefully, $package does not need this feature. +@end EOM - cpp_stuff=1 + fi else - $cat >&4 <<EOM -Hmm, I don't seem to be able to catenate tokens with your cpp. You're going -to have to edit the values of CAT[2-5] and SCAT[2-5] in config.h... + ./warn <<EOM +I can't seem to be able to catenate tokens with your cpp. +@if CAT2 || CAT3 || CAT4 || CAT5 || SCAT2 || SCAT3 || SCAT4 || SCAT5 +You're going to have to edit the values of the following +macros in config.h: + +@if CAT2 || CAT3 || CAT4 || CAT5 + CAT[2-5] +@end +@if SCAT2 || SCAT3 || SCAT4 || SCAT5 + SCAT[2-5] +@end + +in order to let me compile. +@end EOM -?X: It would be nice to have configure remind us at the end that some manual -?X: intervention is needed -- FIXME cpp_stuff="/* Help! How do we handle cpp_stuff? */*/" fi $rm -f cpp_stuff.* diff --git a/mcon/U/cpp_trad.U b/mcon/U/cpp_trad.U new file mode 100644 index 0000000..7b0fa85 --- /dev/null +++ b/mcon/U/cpp_trad.U @@ -0,0 +1,41 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: cpp_stuff.U,v $ +?MAKE:cpp_trad: cpp cat contains rm +?MAKE: -pick add $@ %< +?S:cpp_trad: +?S: This variable contains the program to run to get traditional C +?S: preprocessor semantics and not ISO C semantics: we want something +?S: that knows as little about C as possible to use as a more general +?S: purpose preprocessor. +?S:. +?F:!foo.c !foo.cpp +: how do we get traditional cpp semantics? +echo " " +echo "Checking to see how to get traditional cpp semantics..." >&4 +$cat >foo.c <<'EOF' +#define A(x) x +#define B(y) y +A(a)B(b) +EOF +if $cpp foo.c >foo.cpp; $contains ab foo.cpp >/dev/null 2>&1; then + echo "Plain '$cpp' works just fine." + cpp_trad="$cpp" +elif $cpp -traditional foo.c >foo.cpp; \ + $contains ab foo.cpp >/dev/null 2>&1; then + echo "We'll use '$cpp -traditional' to get proper semantics." + cpp_trad="$cpp -traditional" +else + echo "I don't know how to get traditional semantics with '$cpp'." >&4 + cpp_trad="$cpp" +fi +$rm -f foo.c foo.cpp + diff --git a/mcon/U/cppfilecom.U b/mcon/U/cppfilecom.U index 3caa41c..d796ce8 100644 --- a/mcon/U/cppfilecom.U +++ b/mcon/U/cppfilecom.U @@ -1,12 +1,12 @@ -?RCS: $Id: cppfilecom.U,v 3.0 1993/08/18 12:05:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Orginal Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: @@ -56,7 +56,9 @@ ?H:#$d_cppcanstdin CPP_CAN_STDIN /* can CPP read stdin directly? */ ?H:. ?T:cont +?F:!testcpp.c !testcpp.h !testcpp.out ?LINT:set d_cppcanstdin d_cppignhdrs +?LINT:usefile testcpp.c testcpp.out : see how we invoke the C preprocessor $cat <<EOM diff --git a/mcon/U/cppstdin.U b/mcon/U/cppstdin.U index 7153ac3..85d556d 100644 --- a/mcon/U/cppstdin.U +++ b/mcon/U/cppstdin.U @@ -1,12 +1,12 @@ -?RCS: $Id: cppstdin.U,v 3.0.1.4 1994/10/29 16:08:34 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: cppstdin.U,v $ ?RCS: Revision 3.0.1.4 1994/10/29 16:08:34 ram @@ -26,7 +26,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:cppstdin cppminus cpprun cpplast: contains test Myread Oldconfig Loc \ - cpp +cc rm + cpp +cc rm hint osname gccversion startsh eunicefix ?MAKE: -pick add $@ %< ?S:cppstdin: ?S: This variable contains the command which will invoke the C @@ -37,8 +37,8 @@ ?S:cppminus: ?S: This variable contains the second part of the string which will invoke ?S: the C preprocessor on the standard input and produce to standard -?S: output. This variable will have the value "-" if cppstdin needs a minus -?S: to specify standard input, otherwise the value is "". +?S: output. This variable will have the value "-" if cppstdin needs +?S: a minus to specify standard input, otherwise the value is "". ?S:. ?S:cpprun: ?S: This variable contains the command which will invoke a C preprocessor @@ -74,7 +74,7 @@ ?C: the preprocessor used to compile the C program. ?C:. ?C:CPPLAST: -?C: This symbol is intended to be used along with CPPRUN in the same manner +?C: This symbol is intended to be used along with CPPRUN in the same manner ?C: symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". ?C:. ?H:#define CPPSTDIN "$cppstdin" @@ -82,7 +82,7 @@ ?H:#define CPPRUN "$cpprun" ?H:#define CPPLAST "$cpplast" ?H:. -?F:cppstdin +?F:cppstdin !testcpp.out !testcpp.c ?T:wrapper x_cpp x_minus ok : see how we invoke the C preprocessor echo " " @@ -93,8 +93,22 @@ cat <<'EOT' >testcpp.c ABC.XYZ EOT cd .. -echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >cppstdin +if $test ! -f cppstdin; then + echo "$startsh" >cppstdin +if $test "X$osname" = "Xaix" -a "X$gccversion" = X; then +?X: AIX cc -E doesn't show the absolute headerfile +?X: locations but we'll cheat by using the -M flag. + echo 'cat >.$$.c; rm -f .$$.u; '"$cc"' ${1+"$@"} -M -c .$$.c 2>/dev/null; \ + test -s .$$.u && \ + awk '"'"'$2 ~ /\.h$/ { print "# 0 \""$2"\"" }'"'"' .$$.u; \ + rm -f .$$.o .$$.u; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >> cppstdin +else + echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >>cppstdin +fi; else + echo "Keeping your $hint cppstdin wrapper." +fi chmod 755 cppstdin +$eunicefix cppstdin wrapper=`pwd`/cppstdin ok='false' cd UU @@ -228,7 +242,7 @@ false) esac case "$cppstdin" in -"$wrapper") ;; +"$wrapper"|'cppstdin') ;; *) $rm -f $wrapper;; esac $rm -f testcpp.c testcpp.out diff --git a/mcon/U/d_NOFILE.U b/mcon/U/d_NOFILE.U index 45ebabd..7685cd1 100644 --- a/mcon/U/d_NOFILE.U +++ b/mcon/U/d_NOFILE.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_NOFILE.U,v 3.0.1.1 1994/10/29 16:08:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_NOFILE.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:08:38 ram @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:39 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:nofile d_gettblsz tablesize: Myread Guess libc cat +cc +ccflags +libs \ +?MAKE:nofile d_gettblsz tablesize: Myread Guess cat +cc +ccflags +libs \ test rm Csym ?MAKE: -pick add $@ %< ?S:nofile: @@ -58,13 +58,13 @@ if set getdtablesize val -f d_gettblsz; eval $csym; $val; then @if VAL_NOFILE || nofile $cat >nofile.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", getdtablesize()); } EOCP nofile='' - if $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1; then + if $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1; then nofile=`./nofile 2>/dev/null` fi if $test "$nofile"; then @@ -86,7 +86,7 @@ else #ifdef GETPARAM_H #include <sys/param.h> #endif -main() +int main() { printf("%d %d\n", #ifdef NOFILE @@ -98,8 +98,8 @@ main() exit(0); } EOCP - if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \ - || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then + if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \ + || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then set `./nofile` d_gettblsz=$1 d_ulimit4=$2 @@ -157,7 +157,7 @@ case "$nofile" in #ifdef GETPARAM_H #include <sys/param.h> #endif -main() +int main() { printf("%d\n", #ifdef NOFILE @@ -169,8 +169,8 @@ main() exit(0); } EOCP - if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \ - || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then + if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \ + || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then nofile=`./nofile 2>/dev/null` fi if $test "$nofile"; then diff --git a/mcon/U/d_NeWS.U b/mcon/U/d_NeWS.U index 687e01e..29d1539 100644 --- a/mcon/U/d_NeWS.U +++ b/mcon/U/d_NeWS.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_NeWS.U,v 3.0 1993/08/18 12:05:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_NeWS.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:39 ram diff --git a/mcon/U/d_PORTAR.U b/mcon/U/d_PORTAR.U index 4be99b2..55251c7 100644 --- a/mcon/U/d_PORTAR.U +++ b/mcon/U/d_PORTAR.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_PORTAR.U,v 3.0.1.1 1994/10/29 16:08:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_PORTAR.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:08:42 ram @@ -37,7 +37,7 @@ echo " " echo 'Checking to see if we need to define PORTAR for portable archives...' >&4 $cat >portar.c <<'EOCP' #include <ar.h> -main() { +int main() { char *arfmag = ARFMAG; int sarmag = SARMAG; struct ar_hdr arh; @@ -51,8 +51,8 @@ main() { #endif exit(0);} EOCP -if $cc portar.c -o portar >/dev/null 2>&1 || \ - $cc -DPORTAR=1 portar.c -o portar >/dev/null 2>&1 ; then +if $cc -o portar portar.c >/dev/null 2>&1 || \ + $cc -DPORTAR=1 -o portar portar.c >/dev/null 2>&1 ; then case "`./portar`" in D) val="$define" diff --git a/mcon/U/d_SHM_MAC.U b/mcon/U/d_SHM_MAC.U index 78ea122..f8e87aa 100644 --- a/mcon/U/d_SHM_MAC.U +++ b/mcon/U/d_SHM_MAC.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_SHM_MAC.U,v 3.0 1993/08/18 12:05:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_SHM_MAC.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:41 ram @@ -86,7 +86,7 @@ EOM #include <sys/seg.h> #endif -main() { +int main() { int foo = SHMLBA ; } EOCP @@ -105,9 +105,9 @@ EOCP echo "Trying $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg" ;; esac - if $cc shm_mac.c $ccflags \ + if $cc $ccflags \ $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg \ - -o shm_mac >/dev/null 2>&1 ; then + -o shm_mac shm_mac.c >/dev/null 2>&1 ; then set X $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg shift flags="$*" diff --git a/mcon/U/d_access.U b/mcon/U/d_access.U index ddef65f..2e1db7d 100644 --- a/mcon/U/d_access.U +++ b/mcon/U/d_access.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_access.U,v 3.0 1993/08/18 12:05:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_access.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:42 ram @@ -47,22 +47,22 @@ case "$d_access" in #ifdef I_UNISTD #include <unistd.h> #endif -main() { +int main() { exit(R_OK); } EOCP : check sys/file.h first, no particular reason here if $test `./findhdr sys/file.h` && \ - $cc $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then + $cc -o access $cppflags -DI_SYS_FILE access.c >/dev/null 2>&1 ; then h_sysfile=true; echo "<sys/file.h> defines the *_OK access constants." >&4 elif $test `./findhdr fcntl.h` && \ - $cc $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then + $cc -o access $cppflags -DI_FCNTL access.c >/dev/null 2>&1 ; then h_fcntl=true; echo "<fcntl.h> defines the *_OK access constants." >&4 @if I_UNISTD elif $test `./findhdr unistd.h` && \ - $cc $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then + $cc -o access $cppflags -DI_UNISTD access.c >/dev/null 2>&1 ; then echo "<unistd.h> defines the *_OK access constants." >&4 @end else diff --git a/mcon/U/d_alarm.U b/mcon/U/d_alarm.U index db57207..589d125 100644 --- a/mcon/U/d_alarm.U +++ b/mcon/U/d_alarm.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_alarm.U,v 3.0.1.1 1994/08/29 16:06:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_attribut.U b/mcon/U/d_attribut.U index bcd3ae1..8ff5422 100644 --- a/mcon/U/d_attribut.U +++ b/mcon/U/d_attribut.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_attribut.U,v 3.0.1.3 1995/01/30 14:33:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_bcmp.U b/mcon/U/d_bcmp.U index 5090523..ae2e4bd 100644 --- a/mcon/U/d_bcmp.U +++ b/mcon/U/d_bcmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_bcmp.U,v 3.0.1.2 1993/10/16 13:47:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_bcmp.U,v $ ?RCS: Revision 3.0.1.2 1993/10/16 13:47:52 ram diff --git a/mcon/U/d_bcopy.U b/mcon/U/d_bcopy.U index c373d29..2ae3ad8 100644 --- a/mcon/U/d_bcopy.U +++ b/mcon/U/d_bcopy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_bcopy.U,v 3.0.1.2 1993/10/16 13:48:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_bcopy.U,v $ ?RCS: Revision 3.0.1.2 1993/10/16 13:48:04 ram diff --git a/mcon/U/d_brokstat.U b/mcon/U/d_brokstat.U index 29886f3..a330dba 100644 --- a/mcon/U/d_brokstat.U +++ b/mcon/U/d_brokstat.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_brokstat.U,v 3.0.1.1 1997/02/28 15:30:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_brokstat.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:30:53 ram @@ -26,8 +26,11 @@ ?C:. ?H:#$d_brokstat STAT_MACROS_BROKEN /**/ ?H:. +?F:!try.c !try ?LINT:set d_brokstat +?LINT:usefile try ?X: This test inspired by autoconf -- RAM, 28/02/97 +: are stat macros sane? echo " " echo "Checking whether your stat() macros are broken..." $cat >try.c <<'EOC' diff --git a/mcon/U/d_bsdjmp.U b/mcon/U/d_bsdjmp.U index 61ed61c..da2f496 100644 --- a/mcon/U/d_bsdjmp.U +++ b/mcon/U/d_bsdjmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_bsdjmp.U,v 3.0.1.2 1997/02/28 15:31:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_bsdjmp.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:31:10 ram @@ -43,7 +43,7 @@ case "$d_bsdjmp" in #include <setjmp.h> jmp_buf env; int set = 1; -main() +int main() { if (_setjmp(env)) exit(set); @@ -52,7 +52,7 @@ main() exit(1); } EOP - if $cc set.c -o set $libs >/dev/null 2>&1; then + if $cc -o set set.c $libs >/dev/null 2>&1; then if ./set >/dev/null 2>&1; then echo "Good! You have BSD _setjmp and _longjmp routines." >&4 val="$define" diff --git a/mcon/U/d_byacc.U b/mcon/U/d_byacc.U index 75bfbf0..aa02d79 100644 --- a/mcon/U/d_byacc.U +++ b/mcon/U/d_byacc.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_byacc.U,v 3.0.1.1 1997/02/28 15:31:14 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_byacc.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:31:14 ram diff --git a/mcon/U/d_bzero.U b/mcon/U/d_bzero.U index a891c26..6c7d87b 100644 --- a/mcon/U/d_bzero.U +++ b/mcon/U/d_bzero.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_bzero.U,v 3.0.1.2 1993/10/16 13:48:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_bzero.U,v $ ?RCS: Revision 3.0.1.2 1993/10/16 13:48:15 ram diff --git a/mcon/U/d_casti32.U b/mcon/U/d_casti32.U index 7a0a189..7d24f08 100644 --- a/mcon/U/d_casti32.U +++ b/mcon/U/d_casti32.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_casti32.U,v 3.0.1.3 1995/05/12 12:10:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -36,6 +36,7 @@ ?T:xxx yyy ?H:#$d_casti32 CASTI32 /**/ ?H:. +?F:!try ?LINT:set d_casti32 : check for ability to cast large floats to 32-bit ints. echo " " @@ -49,7 +50,7 @@ $cat >try.c <<EOCP #include <sys/types.h> #include <signal.h> $signal_t blech() { exit(3); } -main() +int main() { $xxx i32; double f; @@ -65,7 +66,7 @@ main() exit(result); } EOCP -if $cc -o try $ccflags try.c >/dev/null 2>&1; then +if $cc $ccflags -o try try.c >/dev/null 2>&1; then ./try yyy=$? else diff --git a/mcon/U/d_castneg.U b/mcon/U/d_castneg.U index 815003f..ce879df 100644 --- a/mcon/U/d_castneg.U +++ b/mcon/U/d_castneg.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_castneg.U,v 3.0.1.2 1995/05/12 12:11:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_castneg.U,v $ ?RCS: Revision 3.0.1.2 1995/05/12 12:11:21 ram @@ -52,6 +52,7 @@ ?H:#$d_castneg CASTNEGFLOAT /**/ ?H:#define CASTFLAGS $castflags /**/ ?H:. +?F:!try ?LINT:set d_castneg : check for ability to cast negative floats to unsigned echo " " @@ -64,7 +65,7 @@ $signal_t blech_in_list() { exit(4); } unsigned long dummy_long(p) unsigned long p; { return p; } unsigned int dummy_int(p) unsigned int p; { return p; } unsigned short dummy_short(p) unsigned short p; { return p; } -main() +int main() { double f = -123.; unsigned long along; @@ -121,7 +122,7 @@ main() } EOCP -if $cc -o try $ccflags try.c >/dev/null 2>&1; then +if $cc $ccflags -o try try.c >/dev/null 2>&1; then ./try castflags=$? else diff --git a/mcon/U/d_cbrt.U b/mcon/U/d_cbrt.U index a245789..11f8baa 100644 --- a/mcon/U/d_cbrt.U +++ b/mcon/U/d_cbrt.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_cbrt.U,v 3.0 1993/08/18 12:05:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_cbrt.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:48 ram diff --git a/mcon/U/d_charsprf.U b/mcon/U/d_charsprf.U index 473ba97..c7d5522 100644 --- a/mcon/U/d_charsprf.U +++ b/mcon/U/d_charsprf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_charsprf.U,v 3.0 1993/08/18 12:05:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_charsprf.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:49 ram @@ -27,18 +27,19 @@ ?C:. ?H:#$d_charsprf CHARSPRINTF /**/ ?H:. +?F:!ucbsprf.c !ucbsprf ?LINT:set d_charsprf : see if sprintf is declared as int or pointer to char echo " " $cat >ucbsprf.c <<'EOF' -main() +int main() { int sprintf(); char buf[10]; exit((unsigned long)sprintf(buf,"%s","foo") > 10L); } EOF -if $cc ucbsprf.c -o ucbsprf >/dev/null 2>&1 && ./ucbsprf; then +if $cc -o ucbsprf ucbsprf.c >/dev/null 2>&1 && ./ucbsprf; then echo "Your sprintf() returns (int)." >&4 val="$undef" else diff --git a/mcon/U/d_chown.U b/mcon/U/d_chown.U index f7e619f..c0fff39 100644 --- a/mcon/U/d_chown.U +++ b/mcon/U/d_chown.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_chown.U,v 3.0.1.1 1994/08/29 16:07:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_chroot.U b/mcon/U/d_chroot.U index 3a31a23..c31ef3c 100644 --- a/mcon/U/d_chroot.U +++ b/mcon/U/d_chroot.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_chroot.U,v 3.0.1.1 1994/08/29 16:07:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_chsize.U b/mcon/U/d_chsize.U index a815c4c..236effb 100644 --- a/mcon/U/d_chsize.U +++ b/mcon/U/d_chsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_chsize.U,v 3.0 1993/08/18 12:05:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_chsize.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:50 ram diff --git a/mcon/U/d_ckeypad.U b/mcon/U/d_ckeypad.U index c1f8307..0430877 100644 --- a/mcon/U/d_ckeypad.U +++ b/mcon/U/d_ckeypad.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ckeypad.U,v 3.0 1993/08/18 12:05:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ckeypad.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:50 ram @@ -26,7 +26,7 @@ ?H:#$d_ckeypad HAS_CURSES_KEYPAD /**/ ?H:. ?LINT:set d_ckeypad -: check for the keypad() function in the curses library +: check for the "keypad()" function in the curses library echo " " case "$termlib" in '') @@ -36,7 +36,7 @@ case "$termlib" in echo "Checking the curses library ($termlib) for the keypad() function..." >&4 $cat >c_keypad.c <<'EOCP' #include <curses.h> -main() { +int main() { keypad(stdscr, TRUE); exit(0); } diff --git a/mcon/U/d_closedir.U b/mcon/U/d_closedir.U index 94f02ad..071f242 100644 --- a/mcon/U/d_closedir.U +++ b/mcon/U/d_closedir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_closedir.U,v 3.0.1.3 1997/02/28 15:31:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_const.U b/mcon/U/d_const.U index cde8bd1..4801d09 100644 --- a/mcon/U/d_const.U +++ b/mcon/U/d_const.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_const.U,v 3.0.1.1 1993/11/10 17:33:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_const.U,v $ ?RCS: Revision 3.0.1.1 1993/11/10 17:33:41 ram @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:51 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_const: cat cc ccflags Setvar +?MAKE:d_const: cat rm cc ccflags Setvar ?MAKE: -pick add $@ %< ?S:d_const: ?S: This variable conditionally defines the HASCONST symbol, which @@ -34,6 +34,7 @@ ?H:?%<:#endif ?H:. ?W:%<:const +?F:const.c const.o ?LINT:set d_const ?LINT:known const : check for const keyword @@ -46,7 +47,7 @@ $cat >const.c <<'EOCP' ?X: handle typedefs properly if they're declared const. To guard ?X: against this, boost up the test by using an explicit typedef... typedef struct spug { int drokk; } spug; -main() +int main() { const char *foo; const spug y; @@ -61,4 +62,5 @@ else fi set d_const eval $setvar +$rm -f const.c const.o diff --git a/mcon/U/d_crypt.U b/mcon/U/d_crypt.U index ff5d791..84906e6 100644 --- a/mcon/U/d_crypt.U +++ b/mcon/U/d_crypt.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_crypt.U,v 3.0.1.1 1997/02/28 15:31:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: $Log: d_crypt.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:31:47 ram ?RCS: patch61: replaced .a with $_a all over the place @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:52 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_crypt cryptlib: Loc test xlibpth libpth Csym Setvar _a +?MAKE:d_crypt cryptlib: Loc test xlibpth libpth Csym Setvar _a Inlibc ?MAKE: -pick add $@ %< ?S:d_crypt: ?S: This variable conditionally defines the CRYPT symbol, which @@ -37,34 +37,40 @@ ?T:val : see if crypt exists echo " " -if set crypt val -f d_crypt; eval $csym; $val; then - echo 'crypt() found.' >&4 - val="$define" - cryptlib='' -else - cryptlib=`./loc Slibcrypt$_a "" $xlibpth` - if $test -z "$cryptlib"; then - cryptlib=`./loc Mlibcrypt$_a "" $xlibpth` - else - cryptlib=-lcrypt - fi - if $test -z "$cryptlib"; then - cryptlib=`./loc Llibcrypt$_a "" $xlibpth` - else - cryptlib=-lcrypt - fi - if $test -z "$cryptlib"; then - cryptlib=`./loc libcrypt$_a "" $libpth` - else - cryptlib=-lcrypt - fi - if $test -z "$cryptlib"; then - echo 'crypt() NOT found.' >&4 - val="$undef" - else +set crypt d_crypt +eval $inlibc +case "$d_crypt" in +$define) cryptlib='' ;; +*) if set crypt val -f d_crypt; eval $csym; $val; then + echo 'crypt() found.' >&4 val="$define" + cryptlib='' + else + cryptlib=`./loc Slibcrypt$_a "" $xlibpth` + if $test -z "$cryptlib"; then + cryptlib=`./loc Mlibcrypt$_a "" $xlibpth` + else + cryptlib=-lcrypt + fi + if $test -z "$cryptlib"; then + cryptlib=`./loc Llibcrypt$_a "" $xlibpth` + else + cryptlib=-lcrypt + fi + if $test -z "$cryptlib"; then + cryptlib=`./loc libcrypt$_a "" $libpth` + else + cryptlib=-lcrypt + fi + if $test -z "$cryptlib"; then + echo 'crypt() NOT found.' >&4 + val="$undef" + else + val="$define" + fi fi -fi -set d_crypt -eval $setvar + set d_crypt + eval $setvar + ;; +esac diff --git a/mcon/U/d_csh.U b/mcon/U/d_csh.U index 47d64b7..c0a792e 100644 --- a/mcon/U/d_csh.U +++ b/mcon/U/d_csh.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_csh.U,v 3.0.1.1 1997/02/28 15:32:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_csh.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:32:18 ram @@ -28,15 +28,24 @@ ?S: can share this executable will have the same full pathname to ?S: 'csh.' ?S:. -?X: Yes, I know about the C symbol PORTABLE, but I think csh -?X: is unlikely to move, and I'm too lazy to add all the -?X: #ifdef PORTABLE sections to the perl source. -?X: -?C:CSH: +?C:HAS_CSH: ?C: This symbol, if defined, indicates that the C-shell exists. -?C: If defined, contains the full pathname of csh. ?C:. -?H:#$d_csh CSH "$full_csh" /**/ +?C:CSH: +?C: This symbol, if defined, contains the full pathname of csh. +?C:. +?X: Previously, I just did $d_csh CSH "$full_csh", but that caused +?X: problems on VMS where the config.sh extraction program changes +?X: $undef to a real cpp undef, and they then had #undef CSH "" +?X: which the compiler didn't like. It's easy to work around this, +?X: so I did. --AD 3/1998. +?X: And we don't want to define CSH if !HAS_CSH, but we don't want +?X: those lines in config.h if they don't need CSH, so protect with ?CSH +?X: and not ?%<. --RAM, 15/02/2004 +?H:?%<:#$d_csh HAS_CSH /**/ +?H:?CSH:#ifdef HAS_CSH +?H:?CSH:#define CSH "$full_csh" /**/ +?H:?CSH:#endif ?H:. ?LINT:set d_csh : get csh whereabouts @@ -46,5 +55,8 @@ case "$csh" in esac set d_csh eval $setvar -full_csh=$csh +: Respect a hint or command line value for full_csh. +case "$full_csh" in +'') full_csh=$csh ;; +esac diff --git a/mcon/U/d_ctermid.U b/mcon/U/d_ctermid.U index 8d363e7..5f1f7ee 100644 --- a/mcon/U/d_ctermid.U +++ b/mcon/U/d_ctermid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ctermid.U,v 3.0 1993/08/18 12:05:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ctermid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:54 ram diff --git a/mcon/U/d_cuserid.U b/mcon/U/d_cuserid.U index 7b38dbb..a6d46c5 100644 --- a/mcon/U/d_cuserid.U +++ b/mcon/U/d_cuserid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_cuserid.U,v 3.0.1.1 1994/08/29 16:07:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_dbl_dig.U b/mcon/U/d_dbl_dig.U index 12f824e..aa53e73 100644 --- a/mcon/U/d_dbl_dig.U +++ b/mcon/U/d_dbl_dig.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_dbl_dig.U,v 3.0.1.1 1994/08/29 16:07:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -30,6 +30,7 @@ ?C:. ?H:#$d_dbl_dig HAS_DBL_DIG /* */ ?H:. +?F:!dbl_dig.c ?LINT:set d_dbl_dig : See if number of significant digits in a double precision number is known echo " " diff --git a/mcon/U/d_debugging.U b/mcon/U/d_debugging.U new file mode 100644 index 0000000..fabe096 --- /dev/null +++ b/mcon/U/d_debugging.U @@ -0,0 +1,42 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:d_debugging: Myread Setvar spackage cat +?MAKE: -pick add $@ %< +?S:d_debugging: +?S: This variable conditionally defines the DEBUGGING symbol. +?S:. +?C:DEBUGGING: +?C: This symbol, when defined, activates extra debugging. +?C:. +?H:#$d_debugging DEBUGGING +?H:. +?LINT:set d_debugging +: see whether debugging should be turned on +$cat <<EOM + +$spackage comes with a debugging option. Enabling that option will +compile extra debugging code that may slow-down the execution and/or +bloat the size of the executable by a significant amount. + +EOM +case "$d_debugging" in +"$define") dflt=y;; +*) dflt=n;; +esac +rp='Enable extra debugging code' +. ./myread +val="$undef" +case "$ans" in +y|Y) val="$define";; +esac +set d_debugging +eval $setvar + diff --git a/mcon/U/d_difftime.U b/mcon/U/d_difftime.U index f83c78d..364ccbc 100644 --- a/mcon/U/d_difftime.U +++ b/mcon/U/d_difftime.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_difftime.U,v 3.0.1.1 1994/08/29 16:07:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_dlerror.U b/mcon/U/d_dlerror.U index d019764..a3bb995 100644 --- a/mcon/U/d_dlerror.U +++ b/mcon/U/d_dlerror.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_dlerror.U,v 3.0.1.2 1995/07/25 13:52:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_dlopen.U b/mcon/U/d_dlopen.U index 9491ba7..ad62c53 100644 --- a/mcon/U/d_dlopen.U +++ b/mcon/U/d_dlopen.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_dlopen.U,v 3.0.1.2 1995/07/25 13:52:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_dosuid.U b/mcon/U/d_dosuid.U index 7b15577..a584e1a 100644 --- a/mcon/U/d_dosuid.U +++ b/mcon/U/d_dosuid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_dosuid.U,v 3.0.1.2 1997/02/28 15:33:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Tye McQueen <tye@metronet.com> added safe setuid script checks. ?RCS: @@ -54,6 +54,7 @@ ?H:#$d_dosuid DOSUID /**/ ?H:. ?Y:TOP +?F:!reflect ?LINT: set d_suidsafe ?LINT: set d_dosuid : see if setuid scripts can be secure diff --git a/mcon/U/d_drem.U b/mcon/U/d_drem.U index 4e86499..4da2414 100644 --- a/mcon/U/d_drem.U +++ b/mcon/U/d_drem.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_drem.U,v 3.0.1.1 1994/10/29 16:12:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_dup2.U b/mcon/U/d_dup2.U index b63babb..070bfaa 100644 --- a/mcon/U/d_dup2.U +++ b/mcon/U/d_dup2.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_dup2.U,v 3.0 1993/08/18 12:05:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_dup2.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:56 ram diff --git a/mcon/U/d_eofpipe.U b/mcon/U/d_eofpipe.U index 7f77c08..86b30a5 100644 --- a/mcon/U/d_eofpipe.U +++ b/mcon/U/d_eofpipe.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_eofpipe.U,v 3.0.1.1 1994/10/29 16:12:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_eofpipe.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:12:40 ram @@ -30,13 +30,14 @@ ?C:. ?H:#$d_eofpipe EOFPIPE /**/ ?H:. +?F:!mpipe : see if pipe correctly gives the EOF condition echo " " case "$d_eofpipe" in '') echo "Let's see if your pipes return EOF to select() upon closing..." >&4 $cat >pipe.c <<'EOP' -main() +int main() { int pd[2]; int mask; @@ -58,7 +59,7 @@ main() exit(1); } EOP - if $cc $ccflags pipe.c -o pipe $libs >/dev/null 2>&1; then + if $cc $ccflags -o pipe pipe.c $libs >/dev/null 2>&1; then ?X: Use a script to avoid the possible 'alarm call' message echo "./pipe || exit 1" > mpipe chmod +x mpipe diff --git a/mcon/U/d_euc2jis.U b/mcon/U/d_euc2jis.U index 4e02da7..a80406d 100644 --- a/mcon/U/d_euc2jis.U +++ b/mcon/U/d_euc2jis.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_euc2jis.U,v 3.0 1993/08/18 12:05:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_euc2jis.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:58 ram diff --git a/mcon/U/d_fchmod.U b/mcon/U/d_fchmod.U index 4880384..1939d78 100644 --- a/mcon/U/d_fchmod.U +++ b/mcon/U/d_fchmod.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fchmod.U,v 3.0 1993/08/18 12:05:59 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fchmod.U,v $ ?RCS: Revision 3.0 1993/08/18 12:05:59 ram diff --git a/mcon/U/d_fchown.U b/mcon/U/d_fchown.U index 296bfd7..0efbbe2 100644 --- a/mcon/U/d_fchown.U +++ b/mcon/U/d_fchown.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fchown.U,v 3.0 1993/08/18 12:06:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fchown.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:01 ram diff --git a/mcon/U/d_fcntl.U b/mcon/U/d_fcntl.U index 8e9b005..24ea9b2 100644 --- a/mcon/U/d_fcntl.U +++ b/mcon/U/d_fcntl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fcntl.U,v 3.0 1993/08/18 12:06:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fcntl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:01 ram diff --git a/mcon/U/d_fd_set.U b/mcon/U/d_fd_set.U index 1b08f5d..8e13de2 100644 --- a/mcon/U/d_fd_set.U +++ b/mcon/U/d_fd_set.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fd_set.U,v 3.0.1.3 1997/02/28 15:33:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fd_set.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:33:16 ram @@ -82,7 +82,7 @@ $cat >fd_set.c <<EOCP #ifdef I_SYS_SELECT #include <sys/select.h> #endif -main() { +int main() { fd_set fds; #ifdef TRYBITS @@ -96,7 +96,7 @@ main() { #endif } EOCP -if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then +if $cc $ccflags -DTRYBITS -o fd_set fd_set.c >fd_set.out 2>&1 ; then d_fds_bits="$define" d_fd_set="$define" echo "Well, your system knows about the normal fd_set typedef..." >&4 @@ -113,7 +113,7 @@ else $cat <<'EOM' Hmm, your compiler has some difficulty with fd_set. Checking further... EOM - if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then + if $cc $ccflags -o fd_set fd_set.c >fd_set.out 2>&1 ; then d_fds_bits="$undef" d_fd_set="$define" echo "Well, your system has some sort of fd_set available..." >&4 diff --git a/mcon/U/d_ffs.U b/mcon/U/d_ffs.U index fc381eb..cda3896 100644 --- a/mcon/U/d_ffs.U +++ b/mcon/U/d_ffs.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ffs.U,v 3.0 1993/08/18 12:06:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ffs.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:03 ram diff --git a/mcon/U/d_fgetpos.U b/mcon/U/d_fgetpos.U index 3c8ebc9..8553f96 100644 --- a/mcon/U/d_fgetpos.U +++ b/mcon/U/d_fgetpos.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fgetpos.U,v 3.0.1.1 1994/06/20 06:57:33 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fgetpos.U,v $ ?RCS: Revision 3.0.1.1 1994/06/20 06:57:33 ram diff --git a/mcon/U/d_flexfnam.U b/mcon/U/d_flexfnam.U index 4e1ddbf..0f53a0b 100644 --- a/mcon/U/d_flexfnam.U +++ b/mcon/U/d_flexfnam.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_flexfnam.U,v 3.0 1993/08/18 12:06:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_flexfnam.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:04 ram diff --git a/mcon/U/d_flock.U b/mcon/U/d_flock.U index fd17308..c3252e3 100644 --- a/mcon/U/d_flock.U +++ b/mcon/U/d_flock.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_flock.U,v 3.0 1993/08/18 12:06:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_flock.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:05 ram diff --git a/mcon/U/d_fmod.U b/mcon/U/d_fmod.U index d3d053c..bad72e7 100644 --- a/mcon/U/d_fmod.U +++ b/mcon/U/d_fmod.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fmod.U,v 3.0.1.1 1994/10/29 16:12:46 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_fork.U b/mcon/U/d_fork.U index 41c35b9..796aee3 100644 --- a/mcon/U/d_fork.U +++ b/mcon/U/d_fork.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fork.U,v 3.0.1.1 1994/08/29 16:07:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_fsetpos.U b/mcon/U/d_fsetpos.U index 6c31190..ce3d195 100644 --- a/mcon/U/d_fsetpos.U +++ b/mcon/U/d_fsetpos.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_fsetpos.U,v 3.0.1.1 1994/06/20 06:57:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_fsetpos.U,v $ ?RCS: Revision 3.0.1.1 1994/06/20 06:57:38 ram diff --git a/mcon/U/d_ftime.U b/mcon/U/d_ftime.U index 6888499..0e41cc7 100644 --- a/mcon/U/d_ftime.U +++ b/mcon/U/d_ftime.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ftime.U,v 3.0 1993/08/18 12:06:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ftime.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:06 ram diff --git a/mcon/U/d_ftrncate.U b/mcon/U/d_ftrncate.U index b81f281..29202b2 100644 --- a/mcon/U/d_ftrncate.U +++ b/mcon/U/d_ftrncate.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ftrncate.U,v 3.0 1993/08/18 12:06:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ftrncate.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:07 ram diff --git a/mcon/U/d_gconvert.U b/mcon/U/d_gconvert.U index b664cbc..367da20 100644 --- a/mcon/U/d_gconvert.U +++ b/mcon/U/d_gconvert.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gconvert.U,v 3.0.1.3 1997/02/28 15:33:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -82,7 +82,7 @@ char *got; } int -main() +int main() { char buf[64]; buf[63] = '\0'; diff --git a/mcon/U/d_getgrps.U b/mcon/U/d_getgrps.U index c05d531..0cd16ea 100644 --- a/mcon/U/d_getgrps.U +++ b/mcon/U/d_getgrps.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getgrps.U,v 3.0 1993/08/18 12:06:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getgrps.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:08 ram diff --git a/mcon/U/d_gethbynm.U b/mcon/U/d_gethbynm.U index f5ed463..a7040ed 100644 --- a/mcon/U/d_gethbynm.U +++ b/mcon/U/d_gethbynm.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gethbynm.U,v 3.0 1993/08/18 12:06:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_gethbynm.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:08 ram diff --git a/mcon/U/d_gethent.U b/mcon/U/d_gethent.U index 4a39465..fa1427f 100644 --- a/mcon/U/d_gethent.U +++ b/mcon/U/d_gethent.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gethent.U,v 3.0 1993/08/18 12:06:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_gethent.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:09 ram diff --git a/mcon/U/d_gethid.U b/mcon/U/d_gethid.U index c5131b6..d19c9f8 100644 --- a/mcon/U/d_gethid.U +++ b/mcon/U/d_gethid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gethid.U,v 3.0 1993/08/18 12:06:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_gethid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:10 ram diff --git a/mcon/U/d_gethname.U b/mcon/U/d_gethname.U index 67b59f0..8ce181f 100644 --- a/mcon/U/d_gethname.U +++ b/mcon/U/d_gethname.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gethname.U,v 3.0.1.1 1994/10/29 16:13:00 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_gethname.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:13:00 ram @@ -16,7 +16,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:d_gethname d_uname d_phostname aphostname: phostname cat \ - myhostname package d_portable Loc libc echo n c +i_whoami +usrinc \ + myhostname package d_portable Loc echo n c +i_whoami +usrinc \ Myread Guess Oldconfig Csym ?MAKE: -pick add $@ %< ?S:d_gethname: diff --git a/mcon/U/d_getlogin.U b/mcon/U/d_getlogin.U index f93b762..abb9dd5 100644 --- a/mcon/U/d_getlogin.U +++ b/mcon/U/d_getlogin.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getlogin.U,v 3.0.1.1 1994/08/29 16:07:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_getopt.U b/mcon/U/d_getopt.U index de625dc..c5438b4 100644 --- a/mcon/U/d_getopt.U +++ b/mcon/U/d_getopt.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getopt.U,v 3.0 1993/08/18 12:06:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getopt.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:13 ram diff --git a/mcon/U/d_getpagsz.U b/mcon/U/d_getpagsz.U index 428e64e..6083653 100644 --- a/mcon/U/d_getpagsz.U +++ b/mcon/U/d_getpagsz.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getpagsz.U,v 3.0.1.1 1994/10/29 16:13:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getpagsz.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:13:10 ram @@ -54,7 +54,7 @@ case "$pagesize" in '') $cat >page.c <<EOP extern int getpagesize(); -main() +int main() { printf("%d\n", getpagesize()); } @@ -63,7 +63,7 @@ EOP dflt='4096' case "$d_getpagsz" in "$define") - if $cc $ccflags page.c -o page $libs >/dev/null 2>&1; then + if $cc $ccflags -o page page.c $libs >/dev/null 2>&1; then dflt=`./page` guess='' else @@ -71,7 +71,7 @@ EOP fi ;; *) - if $cc $ccflags page.c -o page $libs -lPW >/dev/null 2>&1; then + if $cc $ccflags -o page page.c $libs -lPW >/dev/null 2>&1; then dflt=`./page` guess='' echo "(For your eyes only: I used the getpagesize() from -lPW.)" @@ -79,12 +79,12 @@ EOP if $contains PAGESIZE `./findhdr sys/param.h` >/dev/null 2>&1; then $cat >page.c <<EOP #include <sys/param.h> -main() +int main() { printf("%d\n", PAGESIZE); } EOP - if $cc $ccflags page.c -o page $libs >/dev/null 2>&1; then + if $cc $ccflags -o page page.c $libs >/dev/null 2>&1; then dflt=`./page` guess='' echo "(Using value of PAGESIZE found in <sys/param.h>.)" diff --git a/mcon/U/d_getpgid.U b/mcon/U/d_getpgid.U index 5462570..de6a1a7 100644 --- a/mcon/U/d_getpgid.U +++ b/mcon/U/d_getpgid.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_getpgid.U,v 3.0.1.1 1997/02/28 15:33:44 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getpgid.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:33:44 ram diff --git a/mcon/U/d_getpgrp.U b/mcon/U/d_getpgrp.U index c4d6d01..bc5f5d2 100644 --- a/mcon/U/d_getpgrp.U +++ b/mcon/U/d_getpgrp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getpgrp.U,v 3.0.1.1 1997/02/28 15:34:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getpgrp.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:34:28 ram @@ -37,6 +37,7 @@ ?H:#$d_getpgrp HAS_GETPGRP /**/ ?H:#$d_bsdgetpgrp USE_BSD_GETPGRP /**/ ?H:. +?F:!set !set.c ?T:xxx ?LINT:set d_getpgrp d_bsdgetpgrp : see if getpgrp exists @@ -54,7 +55,7 @@ case "$d_getpgrp" in #ifdef I_UNISTD # include <unistd.h> #endif -main() +int main() { if (getuid() == 0) { printf("(I see you are running Configure as super-user...)\n"); @@ -70,7 +71,9 @@ main() exit(1); } EOP - if $cc -DTRY_BSD_PGRP $ccflags $ldflags -o set set.c $libs >/dev/null 2>&1 && ./set; then + if $cc -DTRY_BSD_PGRP $ccflags $ldflags -o set set.c $libs >/dev/null 2>&1 + && ./set + then echo "You have to use getpgrp(pid) instead of getpgrp()." >&4 val="$define" elif $cc $ccflags $ldflags -o set set.c $libs >/dev/null 2>&1 && ./set; then diff --git a/mcon/U/d_getpgrp2.U b/mcon/U/d_getpgrp2.U index f10152a..3aa5e1d 100644 --- a/mcon/U/d_getpgrp2.U +++ b/mcon/U/d_getpgrp2.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getpgrp2.U,v 3.0 1993/08/18 12:06:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getpgrp2.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:15 ram diff --git a/mcon/U/d_getppid.U b/mcon/U/d_getppid.U index ca73aa5..6754924 100644 --- a/mcon/U/d_getppid.U +++ b/mcon/U/d_getppid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getppid.U,v 3.0.1.1 1994/08/29 16:07:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_getprior.U b/mcon/U/d_getprior.U index a8708ad..0397f1c 100644 --- a/mcon/U/d_getprior.U +++ b/mcon/U/d_getprior.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getprior.U,v 3.0 1993/08/18 12:06:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getprior.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:16 ram diff --git a/mcon/U/d_getpwent.U b/mcon/U/d_getpwent.U index 6cdf6bc..fbec685 100644 --- a/mcon/U/d_getpwent.U +++ b/mcon/U/d_getpwent.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getpwent.U,v 3.0 1993/08/18 12:06:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getpwent.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:17 ram diff --git a/mcon/U/d_getwd.U b/mcon/U/d_getwd.U index ab56449..987e93b 100644 --- a/mcon/U/d_getwd.U +++ b/mcon/U/d_getwd.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_getwd.U,v 3.0 1993/08/18 12:06:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_getwd.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:18 ram diff --git a/mcon/U/d_gnulibc.U b/mcon/U/d_gnulibc.U index 7cf63ca..ead5dfa 100644 --- a/mcon/U/d_gnulibc.U +++ b/mcon/U/d_gnulibc.U @@ -1,53 +1,98 @@ -?RCS: $Id: d_gnulibc.U,v 3.0.1.1 1997/02/28 15:34:33 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1996, Andy Dougherty +?RCS: Copyright (c) 1996,1998 Andy Dougherty ?RCS: Copyright (c) 1996, Sven Verdoolaege -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: -?RCS: $Log: d_gnulibc.U,v $ -?RCS: Revision 3.0.1.1 1997/02/28 15:34:33 ram -?RCS: patch61: created -?RCS: -?MAKE:d_gnulibc: Myread Oldconfig Setvar contains rm \ - +cc +ccflags +ldflags +libs +?MAKE:d_gnulibc gnulibc_version: Myread Oldconfig Setvar rm \ + cat Compile run ?MAKE: -pick add $@ %< ?S:d_gnulibc: ?S: Defined if we're dealing with the GNU C Library. ?S:. -?C:HAS_GNULIBC: +?S:gnulibc_version: +?S: This variable contains the version number of the GNU C library. +?S: It is usually something like '2.2.5'. It is a plain '' if this +?S: is not the GNU C library, or if the version is unknown. +?S:. +?C:HAS_GNULIBC ~ %<: ?C: This symbol, if defined, indicates to the C program that -?C: the GNU C library is being used. +?C: the GNU C library is being used. A better check is to use +?C: the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc. ?C:. -?H:#$d_gnulibc HAS_GNULIBC /**/ -?H. +?H:?%<:#$d_gnulibc HAS_GNULIBC /**/ +?H:?%<:#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE) +?H:?%<:#define _GNU_SOURCE +?H:?%<:#endif +?H:. +?F:!glibc.ver !try.c !try ?LINT: set d_gnulibc -?X: gnulibc can be executed by calling this entry point. +?LINT: usefile try.c +?LINT: known _GNU_SOURCE +?X: gnulibc can be executed by calling __libc_main(). ?X: Ulrich Drepper doesn't think any other libc does that, ?X: but we check if it says 'GNU C Library' to be sure. +?X: +?X: Alas, as of 3/1998 glibc 2.0.7 reportedly isn't going to +?X: have __libc_main() anymore. :-(. Fortunately, all released +?X: versions of glibc 2.x.x _do_ have CPP variables. For 2.0.6, +?X: they are: +?X: #define __GLIBC__ 2 +?X: #define__GLIBC_MINOR__ 0. +?X: (The '6' isn't available :-(. +?X: glibc2.1 will also have +?X: extern const char * __gnu_get_libc_release(void); +?X: extern const char * __gnu_get_libc_version(void); +?X: functions. --thanks to Andreas Jaeger. --AD 6/1998. +?X: Although the exact format isn't documented, __gnu_get_libc_version() +?X: returns a simple string '2.1.3' in glibc 2.1.3. +?X: +: determine whether we are using a GNU C library echo " " echo "Checking for GNU C Library..." >&4 -cat >gnulibc.c <<EOM -int -main() +cat >try.c <<'EOCP' +/* Find out version of GNU C library. __GLIBC__ and __GLIBC_MINOR__ + alone are insufficient to distinguish different versions, such as + 2.0.6 and 2.0.7. The function gnu_get_libc_version() appeared in + libc version 2.1.0. A. Dougherty, June 3, 2002. +*/ +#include <stdio.h> +int main(void) { - return __libc_main(); +#ifdef __GLIBC__ +# ifdef __GLIBC_MINOR__ +# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +# include <gnu/libc-version.h> + printf("%s\n", gnu_get_libc_version()); +# else + printf("%d.%d\n", __GLIBC__, __GLIBC_MINOR__); +# endif +# else + printf("%d\n", __GLIBC__); +# endif + return 0; +#else + return 1; +#endif } -EOM -if $cc $ccflags $ldflags -o gnulibc gnulibc.c $libs >/dev/null 2>&1 && \ - ./gnulibc | $contains '^GNU C Library' >/dev/null 2>&1; then +EOCP +set try +if eval $compile_ok && $run ./try > glibc.ver; then val="$define" - echo "You are using the GNU C Library" + gnulibc_version=`$cat glibc.ver` + echo "You are using the GNU C Library version $gnulibc_version" else val="$undef" + gnulibc_version='' echo "You are not using the GNU C Library" fi -$rm -f gnulibc* +$rm -f try try.* glibc.ver set d_gnulibc eval $setvar diff --git a/mcon/U/d_group.U b/mcon/U/d_group.U index ebcb4fb..af841a7 100644 --- a/mcon/U/d_group.U +++ b/mcon/U/d_group.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_group.U,v 3.0.1.2 1997/02/28 15:34:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_havetlib.U b/mcon/U/d_havetlib.U index 4abfb71..b564e65 100644 --- a/mcon/U/d_havetlib.U +++ b/mcon/U/d_havetlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_havetlib.U,v 3.0.1.2 1997/02/28 15:36:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_havetlib.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:36:31 ram diff --git a/mcon/U/d_hidnet.U b/mcon/U/d_hidnet.U index 0388b6b..ce952f4 100644 --- a/mcon/U/d_hidnet.U +++ b/mcon/U/d_hidnet.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_hidnet.U,v 3.0 1993/08/18 12:06:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_hidnet.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:20 ram diff --git a/mcon/U/d_htonl.U b/mcon/U/d_htonl.U index 6db8771..82b176d 100644 --- a/mcon/U/d_htonl.U +++ b/mcon/U/d_htonl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_htonl.U,v 3.0.1.2 1994/08/29 16:09:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_htonl.U,v $ ?RCS: Revision 3.0.1.2 1994/08/29 16:09:25 ram @@ -50,6 +50,7 @@ ?H:#$d_htonl HAS_NTOHL /**/ ?H:#$d_htonl HAS_NTOHS /**/ ?H:. +?F:!htonl.c ?LINT:set d_htonl : see if htonl --and friends-- exists val='' diff --git a/mcon/U/d_inetaton.U b/mcon/U/d_inetaton.U index ef14bde..d3a4607 100644 --- a/mcon/U/d_inetaton.U +++ b/mcon/U/d_inetaton.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_inetaton.U,v 3.0.1.1 1997/02/28 15:36:35 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Spider Boardman -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_inetaton.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:36:35 ram diff --git a/mcon/U/d_inetd.U b/mcon/U/d_inetd.U index 169fbbe..02881ad 100644 --- a/mcon/U/d_inetd.U +++ b/mcon/U/d_inetd.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_inetd.U,v 3.0 1993/08/18 12:06:23 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_inetd.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:23 ram diff --git a/mcon/U/d_internet.U b/mcon/U/d_internet.U index 8554eb0..ca2d3fc 100644 --- a/mcon/U/d_internet.U +++ b/mcon/U/d_internet.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_internet.U,v 3.0.1.1 1993/09/13 16:02:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_internet.U,v $ ?RCS: Revision 3.0.1.1 1993/09/13 16:02:04 ram diff --git a/mcon/U/d_isascii.U b/mcon/U/d_isascii.U index 925aeab..a4a0fff 100644 --- a/mcon/U/d_isascii.U +++ b/mcon/U/d_isascii.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_isascii.U,v 3.0.1.2 1994/10/29 16:13:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -36,7 +36,7 @@ echo " " $cat >isascii.c <<'EOCP' #include <stdio.h> #include <ctype.h> -main() { +int main() { int c = 'A'; if (isascii(c)) exit(0); diff --git a/mcon/U/d_itimer.U b/mcon/U/d_itimer.U index 0ef5164..027112e 100644 --- a/mcon/U/d_itimer.U +++ b/mcon/U/d_itimer.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_itimer.U,v 3.0 1993/08/18 12:06:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_itimer.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:25 ram diff --git a/mcon/U/d_keepsig.U b/mcon/U/d_keepsig.U index 403150f..43a8f88 100644 --- a/mcon/U/d_keepsig.U +++ b/mcon/U/d_keepsig.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_keepsig.U,v 3.0.1.4 1995/07/25 13:57:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_keepsig.U,v $ ?RCS: Revision 3.0.1.4 1995/07/25 13:57:56 ram @@ -24,7 +24,7 @@ ?RCS: Revision 3.0 1993/08/18 12:06:26 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_keepsig: cat +cc +ccflags rm Guess contains echo n c Setvar +?MAKE:d_keepsig: cat Compile rm Guess contains echo n c Setvar run ?MAKE: -pick add $@ %< ?S:d_keepsig: ?S: This variable contains the eventual value of the SIGNALS_KEPT symbol, @@ -37,6 +37,7 @@ ?C:. ?H:#$d_keepsig SIGNALS_KEPT /**/ ?H:. +?F:!try !try.out ?LINT:set d_keepsig : see if signals are kept val="$undef"; @@ -45,7 +46,7 @@ echo "Checking to see if signal handlers stick around..." >&4 $cat >try.c <<'EOCP' foo() {} -main() +int main() { signal(2, foo); kill(getpid(), 2); @@ -53,11 +54,12 @@ main() printf("abc\n"); } EOCP -if $cc -o try $ccflags try.c >/dev/null 2>&1; then +set try +if eval $compile; then ?X: On AIX a single ./try will not work (with ksh) ?X: Backquotes required on Linux and SGI (prevents "ambiguous output redirect") ?X: (reported by Xavier LeVourch <xavierl@eiffel.com>) - `sh -c ./try >try.out 2>/dev/null` + echo `sh -c $run ./try >try.out 2>/dev/null` >/dev/null if $contains abc try.out >/dev/null 2>&1; then echo "Yes, they do." val="$define"; diff --git a/mcon/U/d_killpg.U b/mcon/U/d_killpg.U index e4b1105..220932a 100644 --- a/mcon/U/d_killpg.U +++ b/mcon/U/d_killpg.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_killpg.U,v 3.0 1993/08/18 12:06:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_killpg.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:27 ram diff --git a/mcon/U/d_link.U b/mcon/U/d_link.U index c37ec99..cd5d889 100644 --- a/mcon/U/d_link.U +++ b/mcon/U/d_link.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_link.U,v 3.0.1.1 1993/08/25 14:01:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_link.U,v $ ?RCS: Revision 3.0.1.1 1993/08/25 14:01:13 ram diff --git a/mcon/U/d_linuxstd.U b/mcon/U/d_linuxstd.U index 29ce10a..a18890a 100644 --- a/mcon/U/d_linuxstd.U +++ b/mcon/U/d_linuxstd.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_linuxstd.U,v 3.0.1.1 1994/10/29 16:14:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_locconv.U b/mcon/U/d_locconv.U index 3ac86be..a7bec1f 100644 --- a/mcon/U/d_locconv.U +++ b/mcon/U/d_locconv.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_locconv.U,v 3.0.1.1 1994/10/29 16:14:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_lockf.U b/mcon/U/d_lockf.U index 45bbc57..062f753 100644 --- a/mcon/U/d_lockf.U +++ b/mcon/U/d_lockf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_lockf.U,v 3.0.1.1 1994/08/29 16:09:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_lstat.U b/mcon/U/d_lstat.U index dd6f7e7..4d5bc46 100644 --- a/mcon/U/d_lstat.U +++ b/mcon/U/d_lstat.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_lstat.U,v 3.0 1993/08/18 12:06:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_lstat.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:28 ram diff --git a/mcon/U/d_mblen.U b/mcon/U/d_mblen.U index d7d273f..b990066 100644 --- a/mcon/U/d_mblen.U +++ b/mcon/U/d_mblen.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mblen.U,v 3.0.1.1 1994/08/29 16:09:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_mbstowcs.U b/mcon/U/d_mbstowcs.U index 06617a5..c73ca45 100644 --- a/mcon/U/d_mbstowcs.U +++ b/mcon/U/d_mbstowcs.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mbstowcs.U,v 3.0 1993/08/18 12:06:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_mbstowcs.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:29 ram diff --git a/mcon/U/d_mbtowc.U b/mcon/U/d_mbtowc.U index 0010b03..ea24f92 100644 --- a/mcon/U/d_mbtowc.U +++ b/mcon/U/d_mbtowc.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mbtowc.U,v 3.0 1993/08/18 12:06:30 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_mbtowc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:30 ram diff --git a/mcon/U/d_memalign.U b/mcon/U/d_memalign.U new file mode 100644 index 0000000..a27a559 --- /dev/null +++ b/mcon/U/d_memalign.U @@ -0,0 +1,29 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_memalign.U,v $ +?RCS: +?MAKE:d_memalign: Inlibc +?MAKE: -pick add $@ %< +?S:d_memalign: +?S: This variable conditionally defines the HAS_MEMALIGN symbol, which +?S: indicates to the C program that the memalign() routine is available. +?S:. +?C:HAS_MEMALIGN : +?C: This symbol, if defined, indicates that the memalign routine is +?C: available to allocate aligned memory. +?C:. +?H:#$d_memalign HAS_MEMALIGN /**/ +?H:. +?LINT:set d_memalign +: see if memalign exists +set memalign d_memalign +eval $inlibc + diff --git a/mcon/U/d_memccpy.U b/mcon/U/d_memccpy.U index 251a406..386ee30 100644 --- a/mcon/U/d_memccpy.U +++ b/mcon/U/d_memccpy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memccpy.U,v 3.0 1993/08/18 12:06:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memccpy.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:31 ram diff --git a/mcon/U/d_memchr.U b/mcon/U/d_memchr.U index fcb44a7..00b5b87 100644 --- a/mcon/U/d_memchr.U +++ b/mcon/U/d_memchr.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memchr.U,v 3.0 1993/08/18 12:06:32 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memchr.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:32 ram diff --git a/mcon/U/d_memcmp.U b/mcon/U/d_memcmp.U index 8e5a0a8..1761865 100644 --- a/mcon/U/d_memcmp.U +++ b/mcon/U/d_memcmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memcmp.U,v 3.0.1.1 1993/09/13 16:02:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memcmp.U,v $ ?RCS: Revision 3.0.1.1 1993/09/13 16:02:35 ram diff --git a/mcon/U/d_memcpy.U b/mcon/U/d_memcpy.U index 3b6899c..b500662 100644 --- a/mcon/U/d_memcpy.U +++ b/mcon/U/d_memcpy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memcpy.U,v 3.0.1.1 1993/09/13 16:02:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memcpy.U,v $ ?RCS: Revision 3.0.1.1 1993/09/13 16:02:58 ram diff --git a/mcon/U/d_memmove.U b/mcon/U/d_memmove.U index 79be88c..34280e0 100644 --- a/mcon/U/d_memmove.U +++ b/mcon/U/d_memmove.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memmove.U,v 3.0 1993/08/18 12:06:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memmove.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:35 ram diff --git a/mcon/U/d_memset.U b/mcon/U/d_memset.U index e5aab60..812c4de 100644 --- a/mcon/U/d_memset.U +++ b/mcon/U/d_memset.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_memset.U,v 3.0.1.1 1993/09/13 16:03:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_memset.U,v $ ?RCS: Revision 3.0.1.1 1993/09/13 16:03:11 ram diff --git a/mcon/U/d_mkdir.U b/mcon/U/d_mkdir.U index 08c761e..9cb6961 100644 --- a/mcon/U/d_mkdir.U +++ b/mcon/U/d_mkdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mkdir.U,v 3.0 1993/08/18 12:06:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_mkdir.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:37 ram diff --git a/mcon/U/d_mkfifo.U b/mcon/U/d_mkfifo.U index c235d41..cca2262 100644 --- a/mcon/U/d_mkfifo.U +++ b/mcon/U/d_mkfifo.U @@ -1,5 +1,13 @@ -?RCS: $Id: d_mkfifo.U,v 3.0.1.1 1994/10/29 16:14:17 ram Exp $ +?RCS: $Id$ ?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: ?RCS: $Log: d_mkfifo.U,v $ diff --git a/mcon/U/d_mktime.U b/mcon/U/d_mktime.U index 0e3c46d..fd62716 100644 --- a/mcon/U/d_mktime.U +++ b/mcon/U/d_mktime.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mktime.U,v 3.0.1.1 1994/08/29 16:09:44 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_mmap.U b/mcon/U/d_mmap.U index e151b6f..ad5448e 100644 --- a/mcon/U/d_mmap.U +++ b/mcon/U/d_mmap.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_mmap.U,v 3.0.1.1 1993/12/15 08:19:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_mmap.U,v $ ?RCS: Revision 3.0.1.1 1993/12/15 08:19:12 ram diff --git a/mcon/U/d_msem_lck.U b/mcon/U/d_msem_lck.U new file mode 100644 index 0000000..80308a4 --- /dev/null +++ b/mcon/U/d_msem_lck.U @@ -0,0 +1,28 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_msem_lck.U,v $ +?MAKE:d_msem_lck: Inlibc +?MAKE: -pick add $@ %< +?S:d_msem_lck: +?S: This variable conditionally defines HAS_MSEM_LOCK if msem_lock() is +?S: available, thereby indicating kernel support for memory semaphores. +?S:. +?C:HAS_MSEM_LOCK: +?C: This symbol, if defined, indicates that memory semaphores are +?C: available to protect mmap()'ed regions. +?C:. +?H:#$d_msem_lck HAS_MSEM_LOCK /**/ +?H:. +?LINT:set d_msem_lck +: see if msem_lock exists +set msem_lock d_msem_lck +eval $inlibc + diff --git a/mcon/U/d_msg.U b/mcon/U/d_msg.U index a2742df..7f090da 100644 --- a/mcon/U/d_msg.U +++ b/mcon/U/d_msg.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msg.U,v 3.0 1993/08/18 12:06:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msg.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:37 ram diff --git a/mcon/U/d_msgctl.U b/mcon/U/d_msgctl.U index 997d520..4f50ad3 100644 --- a/mcon/U/d_msgctl.U +++ b/mcon/U/d_msgctl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msgctl.U,v 3.0 1993/08/18 12:06:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msgctl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:38 ram diff --git a/mcon/U/d_msgget.U b/mcon/U/d_msgget.U index 9a615a7..8313591 100644 --- a/mcon/U/d_msgget.U +++ b/mcon/U/d_msgget.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msgget.U,v 3.0 1993/08/18 12:06:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msgget.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:39 ram diff --git a/mcon/U/d_msgrcv.U b/mcon/U/d_msgrcv.U index 8dadcfa..9f7c27e 100644 --- a/mcon/U/d_msgrcv.U +++ b/mcon/U/d_msgrcv.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msgrcv.U,v 3.0 1993/08/18 12:06:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msgrcv.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:40 ram diff --git a/mcon/U/d_msgsnd.U b/mcon/U/d_msgsnd.U index e1e7d67..924d59a 100644 --- a/mcon/U/d_msgsnd.U +++ b/mcon/U/d_msgsnd.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msgsnd.U,v 3.0 1993/08/18 12:06:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msgsnd.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:41 ram diff --git a/mcon/U/d_msync.U b/mcon/U/d_msync.U index 34e1cf4..49db7e2 100644 --- a/mcon/U/d_msync.U +++ b/mcon/U/d_msync.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_msync.U,v 3.0.1.1 1993/12/15 08:19:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_msync.U,v $ ?RCS: Revision 3.0.1.1 1993/12/15 08:19:17 ram diff --git a/mcon/U/d_munmap.U b/mcon/U/d_munmap.U index 08bb791..d1cc5a0 100644 --- a/mcon/U/d_munmap.U +++ b/mcon/U/d_munmap.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_munmap.U,v 3.0.1.1 1993/12/15 08:19:22 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_munmap.U,v $ ?RCS: Revision 3.0.1.1 1993/12/15 08:19:22 ram diff --git a/mcon/U/d_newsadm.U b/mcon/U/d_newsadm.U index 6a01138..cd13f41 100644 --- a/mcon/U/d_newsadm.U +++ b/mcon/U/d_newsadm.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_newsadm.U,v 3.0.1.2 1997/02/28 15:36:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_newsadm.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:36:53 ram diff --git a/mcon/U/d_nice.U b/mcon/U/d_nice.U index 9c0c83b..3ca22a6 100644 --- a/mcon/U/d_nice.U +++ b/mcon/U/d_nice.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_nice.U,v 3.0.1.1 1994/08/29 16:09:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_nolnbuf.U b/mcon/U/d_nolnbuf.U index 8770dbb..9e63280 100644 --- a/mcon/U/d_nolnbuf.U +++ b/mcon/U/d_nolnbuf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_nolnbuf.U,v 3.0.1.1 1994/05/06 14:46:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_nolnbuf.U,v $ ?RCS: Revision 3.0.1.1 1994/05/06 14:46:07 ram @@ -29,6 +29,7 @@ ?H:#$d_nolnbuf NOLINEBUF /**/ ?H:. ?T:xxx +?F:!blurfl ?LINT:set d_nolnbuf : check for buffering of stdout echo " " @@ -36,7 +37,7 @@ case "$d_nolnbuf" in '') $cat <<'EOT' >blurfl.c #include <stdio.h> -main() +int main() { int i; @@ -47,7 +48,7 @@ main() putchar('\n'); } EOT - $cc blurfl.c -o blurfl >/dev/null 2>&1; + $cc -o blurfl blurfl.c >/dev/null 2>&1; $rm -f blurfl.c $cat >&4 <<'EOM' Checking for buffering of stdout to terminal. diff --git a/mcon/U/d_normsig.U b/mcon/U/d_normsig.U index c1e67bb..ae3c7e5 100644 --- a/mcon/U/d_normsig.U +++ b/mcon/U/d_normsig.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_normsig.U,v 3.0.1.2 1997/02/28 15:37:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_normsig.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:37:03 ram diff --git a/mcon/U/d_open3.U b/mcon/U/d_open3.U index 4abe42b..4d24d51 100644 --- a/mcon/U/d_open3.U +++ b/mcon/U/d_open3.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_open3.U,v 3.0.1.2 1997/02/28 15:37:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_open3.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:37:12 ram @@ -18,7 +18,7 @@ ?RCS: Revision 3.0 1993/08/18 12:06:44 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_open3: test +cc cat +cppflags h_fcntl h_sysfile rm Setvar Findhdr +?MAKE:d_open3: test +cc cat +cppflags h_fcntl h_sysfile rm Setvar Findhdr Warn ?MAKE: -pick add $@ %< ?X: It would be easy to separate the h_O_stuff from this. ?X: Is there a reason to do so? -- HMS @@ -48,7 +48,7 @@ $cat >open3.c <<'EOCP' #ifdef I_SYS_FILE #include <sys/file.h> #endif -main() { +int main() { if(O_RDONLY); #ifdef O_TRUNC exit(0); @@ -59,7 +59,7 @@ main() { EOCP : check sys/file.h first to get FREAD on Sun if $test `./findhdr sys/file.h` && \ - $cc $cppflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then + $cc $cppflags "-DI_SYS_FILE" -o open3 open3.c >/dev/null 2>&1 ; then h_sysfile=true; echo "<sys/file.h> defines the O_* constants..." >&4 if ./open3; then @@ -70,7 +70,7 @@ if $test `./findhdr sys/file.h` && \ val="$undef" fi elif $test `./findhdr fcntl.h` && \ - $cc "-DI_FCNTL" open3.c -o open3 >/dev/null 2>&1 ; then + $cc "-DI_FCNTL" -o open3 open3.c >/dev/null 2>&1 ; then h_fcntl=true; echo "<fcntl.h> defines the O_* constants..." >&4 if ./open3; then @@ -82,7 +82,7 @@ elif $test `./findhdr fcntl.h` && \ fi else val="$undef" - echo "I can't find the O_* constant definitions! You got problems." >&4 + ./warn "I can't find the O_* constant definitions! You got problems." fi set d_open3 eval $setvar diff --git a/mcon/U/d_passwd.U b/mcon/U/d_passwd.U index 4b74e6b..2504e6c 100644 --- a/mcon/U/d_passwd.U +++ b/mcon/U/d_passwd.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_passwd.U,v 3.0.1.2 1997/02/28 15:37:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_pathconf.U b/mcon/U/d_pathconf.U index 6856ce4..b39ccb5 100644 --- a/mcon/U/d_pathconf.U +++ b/mcon/U/d_pathconf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_pathconf.U,v 3.0.1.1 1994/10/29 16:14:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_pause.U b/mcon/U/d_pause.U index 675d91b..f161b4f 100644 --- a/mcon/U/d_pause.U +++ b/mcon/U/d_pause.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_pause.U,v 3.0.1.1 1994/08/29 16:09:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_perror.U b/mcon/U/d_perror.U index 5e87a75..56df478 100644 --- a/mcon/U/d_perror.U +++ b/mcon/U/d_perror.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_perror.U,v 3.0.1.1 1994/08/29 16:11:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_perror.U,v $ ?RCS: Revision 3.0.1.1 1994/08/29 16:11:38 ram diff --git a/mcon/U/d_pidcheck.U b/mcon/U/d_pidcheck.U index ac62132..6744334 100644 --- a/mcon/U/d_pidcheck.U +++ b/mcon/U/d_pidcheck.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_pidcheck.U,v 3.0.1.1 1997/02/28 15:37:55 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_pidcheck.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:37:55 ram @@ -42,7 +42,7 @@ echo "We both know your system does not support signal #0 for pid checks." >&4 *) echo "Checking to see if kill(pid, 0) works..." >&4 $cat >try.c <<'EOCP' -main() +int main() { int pid, status0, status9; @@ -56,7 +56,7 @@ main() exit(status0 == status9); } EOCP - if $cc try.c -o try >/dev/null 2>&1 ; then + if $cc -o try try.c >/dev/null 2>&1 ; then if ./try >/dev/null 2>&1 ; then echo "Yes, it does marvels." d_pidcheck="$undef" diff --git a/mcon/U/d_pipe.U b/mcon/U/d_pipe.U index b7ac152..e139dd0 100644 --- a/mcon/U/d_pipe.U +++ b/mcon/U/d_pipe.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_pipe.U,v 3.0.1.1 1994/08/29 16:11:44 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_poll.U b/mcon/U/d_poll.U index f8a0037..54db1b8 100644 --- a/mcon/U/d_poll.U +++ b/mcon/U/d_poll.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_poll.U,v 3.0.1.2 1997/02/28 15:38:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_poll.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:38:17 ram @@ -24,8 +24,8 @@ ?S:. ?C:HAS_POLL : ?C: This symbol, if defined, indicates that the poll routine is -?C: available to poll active file descriptors. You may safely -?C: include <poll.h> when this symbol is defined. +?C: available to poll active file descriptors. Please check I_POLL and +?C: I_SYS_POLL to know which header should be included as well. ?C:. ?H:#$d_poll HAS_POLL /**/ ?H:. diff --git a/mcon/U/d_popen.U b/mcon/U/d_popen.U index d8d7365..73d5d43 100644 --- a/mcon/U/d_popen.U +++ b/mcon/U/d_popen.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_popen.U,v 3.0 1993/08/18 12:06:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_popen.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:47 ram diff --git a/mcon/U/d_portable.U b/mcon/U/d_portable.U index 89bf8f5..36389b4 100644 --- a/mcon/U/d_portable.U +++ b/mcon/U/d_portable.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_portable.U,v 3.0.1.2 1995/01/11 15:28:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_portable.U,v $ ?RCS: Revision 3.0.1.2 1995/01/11 15:28:52 ram diff --git a/mcon/U/d_pread.U b/mcon/U/d_pread.U new file mode 100644 index 0000000..6f55bb6 --- /dev/null +++ b/mcon/U/d_pread.U @@ -0,0 +1,29 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_pread.U,v $ +?RCS: +?MAKE:d_pread: Inlibc +?MAKE: -pick add $@ %< +?S:d_pread: +?S: This variable conditionally defines the HAS_PREAD symbol, which +?S: indicates to the C program that the pread() routine is available. +?S:. +?C:HAS_PREAD : +?C: This symbol, if defined, indicates that the pread routine is +?C: available to perform reads on a file descriptor at a given offset. +?C:. +?H:#$d_pread HAS_PREAD /**/ +?H:. +?LINT:set d_pread +: see if pread exists +set pread d_pread +eval $inlibc + diff --git a/mcon/U/d_preadv.U b/mcon/U/d_preadv.U new file mode 100644 index 0000000..f0ee540 --- /dev/null +++ b/mcon/U/d_preadv.U @@ -0,0 +1,30 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_preadv.U,v $ +?RCS: +?MAKE:d_preadv: Inlibc +?MAKE: -pick add $@ %< +?S:d_preadv: +?S: This variable conditionally defines the HAS_PREADV symbol, which +?S: indicates to the C program that the preadv() routine is available. +?S:. +?C:HAS_PREADV : +?C: This symbol, if defined, indicates that the preadv routine is +?C: available to perform vectored reads on a file descriptor at a +?C: given offset. +?C:. +?H:#$d_preadv HAS_PREADV /**/ +?H:. +?LINT:set d_preadv +: see if preadv exists +set preadv d_preadv +eval $inlibc + diff --git a/mcon/U/d_psignal.U b/mcon/U/d_psignal.U index ca535f5..b6bbdc5 100644 --- a/mcon/U/d_psignal.U +++ b/mcon/U/d_psignal.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_psignal.U,v 3.0 1993/08/18 12:06:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_psignal.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:49 ram diff --git a/mcon/U/d_pwrite.U b/mcon/U/d_pwrite.U new file mode 100644 index 0000000..f72fe58 --- /dev/null +++ b/mcon/U/d_pwrite.U @@ -0,0 +1,29 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_pwrite.U,v $ +?RCS: +?MAKE:d_pwrite: Inlibc +?MAKE: -pick add $@ %< +?S:d_pwrite: +?S: This variable conditionally defines the HAS_PWRITE symbol, which +?S: indicates to the C program that the pwrite() routine is available. +?S:. +?C:HAS_PWRITE : +?C: This symbol, if defined, indicates that the pwrite routine is +?C: available to perform writes on a file descriptor at a given offset. +?C:. +?H:#$d_pwrite HAS_PWRITE /**/ +?H:. +?LINT:set d_pwrite +: see if pwrite exists +set pwrite d_pwrite +eval $inlibc + diff --git a/mcon/U/d_pwritev.U b/mcon/U/d_pwritev.U new file mode 100644 index 0000000..15e96dc --- /dev/null +++ b/mcon/U/d_pwritev.U @@ -0,0 +1,30 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_pwritev.U,v $ +?RCS: +?MAKE:d_pwritev: Inlibc +?MAKE: -pick add $@ %< +?S:d_pwritev: +?S: This variable conditionally defines the HAS_PWRITEV symbol, which +?S: indicates to the C program that the pwritev() routine is available. +?S:. +?C:HAS_PWRITEV : +?C: This symbol, if defined, indicates that the pwritev routine is +?C: available to perform vectored writes on a file descriptor at a +?C: given offset. +?C:. +?H:#$d_pwritev HAS_PWRITEV /**/ +?H:. +?LINT:set d_pwritev +: see if pwritev exists +set pwritev d_pwritev +eval $inlibc + diff --git a/mcon/U/d_raster.U b/mcon/U/d_raster.U index 85dcaad..7159de7 100644 --- a/mcon/U/d_raster.U +++ b/mcon/U/d_raster.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_raster.U,v 3.0 1993/08/18 12:06:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_raster.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:50 ram diff --git a/mcon/U/d_rdchk.U b/mcon/U/d_rdchk.U index 21ca6fc..0d45342 100644 --- a/mcon/U/d_rdchk.U +++ b/mcon/U/d_rdchk.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_rdchk.U,v 3.0 1993/08/18 12:06:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_rdchk.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:51 ram diff --git a/mcon/U/d_readdir.U b/mcon/U/d_readdir.U index 75997b7..3b2b484 100644 --- a/mcon/U/d_readdir.U +++ b/mcon/U/d_readdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_readdir.U,v 3.0.1.1 1994/05/06 14:46:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_readdir.U,v $ ?RCS: Revision 3.0.1.1 1994/05/06 14:46:37 ram diff --git a/mcon/U/d_readlink.U b/mcon/U/d_readlink.U index 2dd1d28..ed6f06a 100644 --- a/mcon/U/d_readlink.U +++ b/mcon/U/d_readlink.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_readlink.U,v 3.0.1.1 1994/08/29 16:11:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_regcmp.U b/mcon/U/d_regcmp.U index 2a5073c..50fe24c 100644 --- a/mcon/U/d_regcmp.U +++ b/mcon/U/d_regcmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_regcmp.U,v 3.0.1.1 1995/01/30 14:34:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_regcmp.U,v $ ?RCS: Revision 3.0.1.1 1995/01/30 14:34:45 ram diff --git a/mcon/U/d_rename.U b/mcon/U/d_rename.U index 211feb5..20b3305 100644 --- a/mcon/U/d_rename.U +++ b/mcon/U/d_rename.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_rename.U,v 3.0 1993/08/18 12:06:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_rename.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:54 ram diff --git a/mcon/U/d_rmdir.U b/mcon/U/d_rmdir.U index 6e1b49e..078a6a0 100644 --- a/mcon/U/d_rmdir.U +++ b/mcon/U/d_rmdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_rmdir.U,v 3.0 1993/08/18 12:06:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_rmdir.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:56 ram diff --git a/mcon/U/d_rusage.U b/mcon/U/d_rusage.U index 6f841cd..a2d1c33 100644 --- a/mcon/U/d_rusage.U +++ b/mcon/U/d_rusage.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_rusage.U,v 3.0 1993/08/18 12:06:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_rusage.U,v $ ?RCS: Revision 3.0 1993/08/18 12:06:57 ram diff --git a/mcon/U/d_safebcpy.U b/mcon/U/d_safebcpy.U index 2c1b700..f30aff7 100644 --- a/mcon/U/d_safebcpy.U +++ b/mcon/U/d_safebcpy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_safebcpy.U,v 3.0.1.4 1997/02/28 15:40:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_safebcpy.U,v $ ?RCS: Revision 3.0.1.4 1997/02/28 15:40:58 ram @@ -72,7 +72,7 @@ EOCP #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char buf[128], abc[128]; char *b; @@ -99,8 +99,8 @@ for (align = 7; align >= 0; align--) { exit(0); } EOCP - if $cc $optimize $ccflags $ldflags foo.c \ - -o safebcpy $libs >/dev/null 2>&1; then + if $cc $optimize $ccflags $ldflags \ + -o safebcpy foo.c $libs >/dev/null 2>&1; then if ./safebcpy 2>/dev/null; then echo "Yes, it can." val="$define" diff --git a/mcon/U/d_safemcpy.U b/mcon/U/d_safemcpy.U index 1287fa3..d59475b 100644 --- a/mcon/U/d_safemcpy.U +++ b/mcon/U/d_safemcpy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_safemcpy.U,v 3.0.1.5 1997/02/28 15:41:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_safemcpy.U,v $ ?RCS: Revision 3.0.1.5 1997/02/28 15:41:12 ram @@ -75,7 +75,7 @@ EOCP #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char buf[128], abc[128]; char *b; @@ -102,8 +102,8 @@ for (align = 7; align >= 0; align--) { exit(0); } EOCP - if $cc $optimize $ccflags $ldflags foo.c \ - -o safemcpy $libs >/dev/null 2>&1; then + if $cc $optimize $ccflags $ldflags \ + -o safemcpy foo.c $libs >/dev/null 2>&1; then if ./safemcpy 2>/dev/null; then echo "Yes, it can." val="$define" diff --git a/mcon/U/d_sanemcmp.U b/mcon/U/d_sanemcmp.U index 7198242..07d1f84 100644 --- a/mcon/U/d_sanemcmp.U +++ b/mcon/U/d_sanemcmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sanemcmp.U,v 3.0.1.1 1997/02/28 15:41:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sanemcmp.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:41:19 ram @@ -60,7 +60,7 @@ EOCP #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char a = -1; char b = 0; @@ -69,8 +69,8 @@ if ((a < b) && memcmp(&a, &b, 1) < 0) exit(0); } EOCP - if $cc $optimize $ccflags $ldflags foo.c \ - -o sanemcmp $libs >/dev/null 2>&1; then + if $cc $optimize $ccflags $ldflags \ + -o sanemcmp foo.c $libs >/dev/null 2>&1; then if ./sanemcmp 2>/dev/null; then echo "Yes, it can." val="$define" diff --git a/mcon/U/d_sbrk.U b/mcon/U/d_sbrk.U index ea65f38..3e3ab1f 100644 --- a/mcon/U/d_sbrk.U +++ b/mcon/U/d_sbrk.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sbrk.U,v 3.0.1.1 1994/01/24 14:06:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sbrk.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:06:31 ram diff --git a/mcon/U/d_scandir.U b/mcon/U/d_scandir.U index ff45b0d..5bffb17 100644 --- a/mcon/U/d_scandir.U +++ b/mcon/U/d_scandir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_scandir.U,v 3.0.1.1 1994/01/24 14:06:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_scandir.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:06:35 ram diff --git a/mcon/U/d_scannl.U b/mcon/U/d_scannl.U index 70b0321..74c0a3f 100644 --- a/mcon/U/d_scannl.U +++ b/mcon/U/d_scannl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_scannl.U,v 3.0.1.2 1997/02/28 15:41:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_scannl.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:41:27 ram @@ -45,7 +45,7 @@ val="$define" ?X: to the string given as argument to scanf(). echo 'Let'"'"'s see if scanf() handles "\\n" correctly...' >&4 $cat >try.c <<'EOCP' -main() +int main() { int i = 0, j = 0; scanf("%d\n%d", &i, &j); @@ -54,7 +54,7 @@ main() exit(0); } EOCP -if $cc -o try $ccflags try.c >/dev/null 2>&1; then +if $cc $ccflags -o try try.c >/dev/null 2>&1; then if ./try <<'EOD' 2 3 diff --git a/mcon/U/d_scorfl.U b/mcon/U/d_scorfl.U index 77d14eb..c42e1bf 100644 --- a/mcon/U/d_scorfl.U +++ b/mcon/U/d_scorfl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_scorfl.U,v 3.0 1993/08/18 12:07:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_scorfl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:01 ram diff --git a/mcon/U/d_select.U b/mcon/U/d_select.U index bc7d207..86b2d73 100644 --- a/mcon/U/d_select.U +++ b/mcon/U/d_select.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_select.U,v 3.0 1993/08/18 12:07:02 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_select.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:02 ram @@ -19,7 +19,7 @@ ?S: available to select active file descriptors. A <sys/time.h> ?S: inclusion may be necessary for the timeout field. ?S:. -?C:HAS_SELECT (SELECT): +?C:HAS_SELECT: ?C: This symbol, if defined, indicates that the select routine is ?C: available to select active file descriptors. If the timeout field ?C: is used, <sys/time.h> may need to be included. diff --git a/mcon/U/d_sem.U b/mcon/U/d_sem.U index 2929f11..f00a820 100644 --- a/mcon/U/d_sem.U +++ b/mcon/U/d_sem.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sem.U,v 3.0 1993/08/18 12:07:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sem.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:03 ram diff --git a/mcon/U/d_semctl.U b/mcon/U/d_semctl.U index 9fab601..4029c55 100644 --- a/mcon/U/d_semctl.U +++ b/mcon/U/d_semctl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_semctl.U,v 3.0 1993/08/18 12:07:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_semctl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:04 ram diff --git a/mcon/U/d_semget.U b/mcon/U/d_semget.U index d2c8b51..2d78fcb 100644 --- a/mcon/U/d_semget.U +++ b/mcon/U/d_semget.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_semget.U,v 3.0 1993/08/18 12:07:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_semget.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:05 ram diff --git a/mcon/U/d_semop.U b/mcon/U/d_semop.U index 8e248e6..ba05864 100644 --- a/mcon/U/d_semop.U +++ b/mcon/U/d_semop.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_semop.U,v 3.0 1993/08/18 12:07:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_semop.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:05 ram diff --git a/mcon/U/d_setegid.U b/mcon/U/d_setegid.U index 3b2092d..f4c63a8 100644 --- a/mcon/U/d_setegid.U +++ b/mcon/U/d_setegid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setegid.U,v 3.0 1993/08/18 12:07:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setegid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:07 ram diff --git a/mcon/U/d_seteuid.U b/mcon/U/d_seteuid.U index 4934728..b1a34c3 100644 --- a/mcon/U/d_seteuid.U +++ b/mcon/U/d_seteuid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_seteuid.U,v 3.0 1993/08/18 12:07:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_seteuid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:08 ram diff --git a/mcon/U/d_setgrps.U b/mcon/U/d_setgrps.U new file mode 100644 index 0000000..7fc874e --- /dev/null +++ b/mcon/U/d_setgrps.U @@ -0,0 +1,33 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: d_setgrps.U,v $ +?RCS: Revision 3.0 1993/08/18 12:06:08 ram +?RCS: Baseline for dist 3.0 netwide release. +?RCS: +?MAKE:d_setgrps: Inlibc +?MAKE: -pick add $@ %< +?S:d_setgrps: +?S: This variable conditionally defines the HAS_SETGROUPS symbol, which +?S: indicates to the C program that the setgroups() routine is available +?S: to set the list of process groups. +?S:. +?C:HAS_SETGROUPS: +?C: This symbol, if defined, indicates that the setgroups() routine is +?C: available to set the list of process groups. If unavailable, multiple +?C: groups are probably not supported. +?C:. +?H:#$d_setgrps HAS_SETGROUPS /**/ +?H:. +?LINT:set d_setgrps +: see if setgroups exists +set setgroups d_setgrps +eval $inlibc + diff --git a/mcon/U/d_setlnbuf.U b/mcon/U/d_setlnbuf.U index 57cde12..dffe971 100644 --- a/mcon/U/d_setlnbuf.U +++ b/mcon/U/d_setlnbuf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setlnbuf.U,v 3.0.1.1 1994/08/29 16:11:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_setlocale.U b/mcon/U/d_setlocale.U index ed3b95d..09228cb 100644 --- a/mcon/U/d_setlocale.U +++ b/mcon/U/d_setlocale.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setlocale.U,v 3.0.1.1 1994/06/20 06:57:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_setpgid.U b/mcon/U/d_setpgid.U index c697b00..f34e9a3 100644 --- a/mcon/U/d_setpgid.U +++ b/mcon/U/d_setpgid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setpgid.U,v 3.0.1.2 1997/02/28 15:41:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setpgid.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:41:49 ram diff --git a/mcon/U/d_setpgrp.U b/mcon/U/d_setpgrp.U index 42f69c5..08716e4 100644 --- a/mcon/U/d_setpgrp.U +++ b/mcon/U/d_setpgrp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setpgrp.U,v 3.0.1.3 1997/02/28 15:44:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setpgrp.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:44:16 ram @@ -48,6 +48,7 @@ ?H:#$d_setpgrp HAS_SETPGRP /**/ ?H:#$d_bsdsetpgrp USE_BSD_SETPGRP /**/ ?H:. +?F:!set.c !set ?T:xxx ?LINT:set d_setpgrp d_bsdsetpgrp : see if setpgrp exists @@ -65,7 +66,7 @@ case "$d_setpgrp" in #ifdef I_UNISTD # include <unistd.h> #endif -main() +int main() { if (getuid() == 0) { printf("(I see you are running Configure as super-user...)\n"); diff --git a/mcon/U/d_setpgrp2.U b/mcon/U/d_setpgrp2.U index 95efde2..665077d 100644 --- a/mcon/U/d_setpgrp2.U +++ b/mcon/U/d_setpgrp2.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setpgrp2.U,v 3.0 1993/08/18 12:07:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setpgrp2.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:10 ram diff --git a/mcon/U/d_setprior.U b/mcon/U/d_setprior.U index 5baacd3..9f0ad79 100644 --- a/mcon/U/d_setprior.U +++ b/mcon/U/d_setprior.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setprior.U,v 3.0 1993/08/18 12:07:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setprior.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:11 ram diff --git a/mcon/U/d_setregid.U b/mcon/U/d_setregid.U index 6462e50..642a006 100644 --- a/mcon/U/d_setregid.U +++ b/mcon/U/d_setregid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setregid.U,v 3.0 1993/08/18 12:07:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setregid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:12 ram diff --git a/mcon/U/d_setreuid.U b/mcon/U/d_setreuid.U index 06bb060..2d829d6 100644 --- a/mcon/U/d_setreuid.U +++ b/mcon/U/d_setreuid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setreuid.U,v 3.0 1993/08/18 12:07:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setreuid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:13 ram diff --git a/mcon/U/d_setrgid.U b/mcon/U/d_setrgid.U index d52ff72..04d1770 100644 --- a/mcon/U/d_setrgid.U +++ b/mcon/U/d_setrgid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setrgid.U,v 3.0 1993/08/18 12:07:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setrgid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:14 ram diff --git a/mcon/U/d_setruid.U b/mcon/U/d_setruid.U index 5559994..900ca25 100644 --- a/mcon/U/d_setruid.U +++ b/mcon/U/d_setruid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setruid.U,v 3.0 1993/08/18 12:07:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setruid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:15 ram diff --git a/mcon/U/d_setsid.U b/mcon/U/d_setsid.U index d8dfc51..c9e4113 100644 --- a/mcon/U/d_setsid.U +++ b/mcon/U/d_setsid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_setsid.U,v 3.0.1.1 1994/01/24 14:06:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_setsid.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:06:49 ram diff --git a/mcon/U/d_sgndchr.U b/mcon/U/d_sgndchr.U index 1aca3dd..08179c9 100644 --- a/mcon/U/d_sgndchr.U +++ b/mcon/U/d_sgndchr.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sgndchr.U,v 3.0.1.2 1997/02/28 15:44:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sgndchr.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:44:25 ram @@ -37,7 +37,7 @@ echo " " echo "Checking to see if your C compiler can do signed chars..." >&4 $cat >try.c <<'EOCP' -main() +int main() { char c = 0; diff --git a/mcon/U/d_shm.U b/mcon/U/d_shm.U index 47ebbc3..eba4c56 100644 --- a/mcon/U/d_shm.U +++ b/mcon/U/d_shm.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_shm.U,v 3.0 1993/08/18 12:07:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_shm.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:17 ram diff --git a/mcon/U/d_shmat.U b/mcon/U/d_shmat.U index 8ae2729..4646fc5 100644 --- a/mcon/U/d_shmat.U +++ b/mcon/U/d_shmat.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_shmat.U,v 3.0.1.3 1995/07/25 14:04:23 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_shmat.U,v $ ?RCS: Revision 3.0.1.3 1995/07/25 14:04:23 ram diff --git a/mcon/U/d_shmctl.U b/mcon/U/d_shmctl.U index 011a293..fc7415e 100644 --- a/mcon/U/d_shmctl.U +++ b/mcon/U/d_shmctl.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_shmctl.U,v 3.0 1993/08/18 12:07:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_shmctl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:18 ram diff --git a/mcon/U/d_shmdt.U b/mcon/U/d_shmdt.U index 9c81171..aab2aa6 100644 --- a/mcon/U/d_shmdt.U +++ b/mcon/U/d_shmdt.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_shmdt.U,v 3.0 1993/08/18 12:07:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_shmdt.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:19 ram diff --git a/mcon/U/d_shmget.U b/mcon/U/d_shmget.U index 3ccc625..86359a0 100644 --- a/mcon/U/d_shmget.U +++ b/mcon/U/d_shmget.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_shmget.U,v 3.0 1993/08/18 12:07:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_shmget.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:20 ram diff --git a/mcon/U/d_sigaction.U b/mcon/U/d_sigaction.U index 7aef7b1..782f27e 100644 --- a/mcon/U/d_sigaction.U +++ b/mcon/U/d_sigaction.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sigaction.U,v 3.0.1.1 1997/02/28 15:44:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sigaction.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:44:29 ram @@ -27,8 +27,8 @@ ?H:. ?T:val ?LINT:set d_sigaction -echo " " : see if we have sigaction +echo " " if set sigaction val -f d_sigaction; eval $csym; $val; then echo 'sigaction() found.' >&4 val="$define" @@ -45,7 +45,7 @@ $cat > set.c <<'EOP' #include <stdio.h> #include <sys/types.h> #include <signal.h> -main() +int main() { struct sigaction act, oact; } diff --git a/mcon/U/d_sigblock.U b/mcon/U/d_sigblock.U index a7353a1..15554b7 100644 --- a/mcon/U/d_sigblock.U +++ b/mcon/U/d_sigblock.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sigblock.U,v 3.0 1993/08/18 12:07:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sigblock.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:21 ram diff --git a/mcon/U/d_sighold.U b/mcon/U/d_sighold.U index 31db541..31dabaa 100644 --- a/mcon/U/d_sighold.U +++ b/mcon/U/d_sighold.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sighold.U,v 3.0 1993/08/18 12:07:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sighold.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:21 ram diff --git a/mcon/U/d_siglist.U b/mcon/U/d_siglist.U index b7f7fb3..6b24db8 100644 --- a/mcon/U/d_siglist.U +++ b/mcon/U/d_siglist.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_siglist.U,v 3.0 1993/08/18 12:07:22 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_siglist.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:22 ram diff --git a/mcon/U/d_sigsetjmp.U b/mcon/U/d_sigsetjmp.U index b110a44..427933f 100644 --- a/mcon/U/d_sigsetjmp.U +++ b/mcon/U/d_sigsetjmp.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_sigsetjmp.U,v 3.0.1.1 1997/02/28 15:44:33 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: You may distribute under the terms of either the GNU General Public ?RCS: License or the Artistic License, as specified in the README file. @@ -67,7 +67,7 @@ case "$d_sigsetjmp" in #include <setjmp.h> sigjmp_buf env; int set = 1; -main() +int main() { if (sigsetjmp(env,1)) exit(set); diff --git a/mcon/U/d_sigsetmk.U b/mcon/U/d_sigsetmk.U index bbb2cf2..ff07e8d 100644 --- a/mcon/U/d_sigsetmk.U +++ b/mcon/U/d_sigsetmk.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sigsetmk.U,v 3.0 1993/08/18 12:07:23 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sigsetmk.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:23 ram diff --git a/mcon/U/d_sigvec.U b/mcon/U/d_sigvec.U index 400b846..cfff2f1 100644 --- a/mcon/U/d_sigvec.U +++ b/mcon/U/d_sigvec.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sigvec.U,v 3.0.1.1 1997/02/28 15:45:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sigvec.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:45:37 ram @@ -51,9 +51,9 @@ ?H:. ?T:val ?LINT:set d_sigvec d_sigintrp -echo " " @if d_sigvectr || d_sigvec || HAS_SIGVEC || HAS_SIGVECTOR : see if sigvector exists -- since sigvec will match the substring +echo " " if set sigvector val -f d_sigvectr; eval $csym; $val; then echo 'sigvector() found--you must be running HP-UX.' >&4 val="$define"; set d_sigvectr; eval $setvar diff --git a/mcon/U/d_sjis2jis.U b/mcon/U/d_sjis2jis.U index 646bf97..e74eeb7 100644 --- a/mcon/U/d_sjis2jis.U +++ b/mcon/U/d_sjis2jis.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sjis2jis.U,v 3.0 1993/08/18 12:07:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_sjis2jis.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:25 ram diff --git a/mcon/U/d_socket.U b/mcon/U/d_socket.U index 4ea0400..f7d59d4 100644 --- a/mcon/U/d_socket.U +++ b/mcon/U/d_socket.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_socket.U,v 3.0.1.2 1997/02/28 15:46:00 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_socket.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:46:00 ram @@ -57,10 +57,11 @@ ?H:#$d_oldsock USE_OLDSOCKET /**/ ?H:. ?T:val +?LINT:use libc ?LINT:set d_sockpair +: see whether socket exists socketlib='' sockethdr='' -: see whether socket exists echo " " $echo $n "Hmm... $c" >&4 if set socket val -f d_socket; eval $csym; $val; then diff --git a/mcon/U/d_speedopt.U b/mcon/U/d_speedopt.U index cdc4380..4c2043c 100644 --- a/mcon/U/d_speedopt.U +++ b/mcon/U/d_speedopt.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_speedopt.U,v 3.0.1.1 1994/10/29 16:15:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_speedopt.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:15:51 ram diff --git a/mcon/U/d_stat.U b/mcon/U/d_stat.U index 69bec5a..d669876 100644 --- a/mcon/U/d_stat.U +++ b/mcon/U/d_stat.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_stat.U,v 3.0 1993/08/18 12:07:28 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_stat.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:28 ram diff --git a/mcon/U/d_statblks.U b/mcon/U/d_statblks.U index 56c3b8d..9a22166 100644 --- a/mcon/U/d_statblks.U +++ b/mcon/U/d_statblks.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_statblks.U,v 3.0 1993/08/18 12:07:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_statblks.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:29 ram diff --git a/mcon/U/d_stdstdio.U b/mcon/U/d_stdstdio.U index 97c4cd0..b04acbc 100644 --- a/mcon/U/d_stdstdio.U +++ b/mcon/U/d_stdstdio.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_stdstdio.U,v 3.0.1.3 1997/02/28 15:46:32 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Tye McQueen <tye@metronet.com> ?RCS: @@ -145,7 +145,7 @@ ?H:?d_stdiobase:#endif ?H:. ?W:d_stdiobase:FILE_base FILE_bufsiz -?LINT:set d_stdstdio d_stdiobase d_stdio_ptr_lval d_stdio_cnt_lval +?LINT:set d_stdstdio d_stdiobase ?T:ptr_lval cnt_lval filbuf xxx ?F:!try : see if _ptr and _cnt from stdio act std @@ -196,7 +196,7 @@ $cat >try.c <<EOP #include <stdio.h> #define FILE_ptr(fp) $stdio_ptr #define FILE_cnt(fp) $stdio_cnt -main() { +int main() { FILE *fp = fopen("try.c", "r"); char c = getc(fp); if ( @@ -249,8 +249,8 @@ eval $setvar : If this fails, check how the getc macro in stdio.h works. case "${d_stdio_ptr_lval}${d_stdio_cnt_lval}" in ${define}${define}) - : Try $hint value, if any, then _filbuf, __filbuf, _fill, then punt. - : _fill is for os/2. + : Try hint value, if any, then _filbuf, __filbuf, _fill, then punt. + : _fill is for OS/2. xxx='notok' for filbuf in $stdio_filbuf '_filbuf(fp)' '__filbuf(fp) ' '_fill(fp)' ; do $cat >try.c <<EOP @@ -258,7 +258,7 @@ ${define}${define}) #define FILE_ptr(fp) $stdio_ptr #define FILE_cnt(fp) $stdio_cnt #define FILE_filbuf(fp) $filbuf -main() { +int main() { FILE *fp = fopen("try.c", "r"); int c; c = getc(fp); @@ -295,7 +295,7 @@ $define) #include <stdio.h> #define FILE_base(fp) $stdio_base #define FILE_bufsiz(fp) $stdio_bufsiz -main() { +int main() { FILE *fp = fopen("try.c", "r"); char c = getc(fp); if ( diff --git a/mcon/U/d_strccmp.U b/mcon/U/d_strccmp.U index 0a93d82..0b36c24 100644 --- a/mcon/U/d_strccmp.U +++ b/mcon/U/d_strccmp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strccmp.U,v 3.0.1.2 1994/05/06 14:54:34 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strccmp.U,v $ ?RCS: Revision 3.0.1.2 1994/05/06 14:54:34 ram diff --git a/mcon/U/d_strchr.U b/mcon/U/d_strchr.U index 7f2abe0..ce28b6e 100644 --- a/mcon/U/d_strchr.U +++ b/mcon/U/d_strchr.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strchr.U,v 3.0.1.2 1993/10/16 13:49:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strchr.U,v $ ?RCS: Revision 3.0.1.2 1993/10/16 13:49:20 ram diff --git a/mcon/U/d_strcoll.U b/mcon/U/d_strcoll.U index e50dd4c..0ba2ba1 100644 --- a/mcon/U/d_strcoll.U +++ b/mcon/U/d_strcoll.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strcoll.U,v 3.0.1.1 1994/08/29 16:12:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_strcspn.U b/mcon/U/d_strcspn.U index 7dc5fff..04097ef 100644 --- a/mcon/U/d_strcspn.U +++ b/mcon/U/d_strcspn.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strcspn.U,v 3.0 1993/08/18 12:07:33 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strcspn.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:33 ram diff --git a/mcon/U/d_strctcpy.U b/mcon/U/d_strctcpy.U index bf77cae..a44597e 100644 --- a/mcon/U/d_strctcpy.U +++ b/mcon/U/d_strctcpy.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strctcpy.U,v 3.0 1993/08/18 12:07:34 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strctcpy.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:34 ram @@ -31,7 +31,7 @@ echo " " echo "Checking to see if your C compiler can copy structs..." >&4 $cat >try.c <<'EOCP' -main() +int main() { struct blurfl { int dyick; diff --git a/mcon/U/d_strdup.U b/mcon/U/d_strdup.U index a62a497..9a948a9 100644 --- a/mcon/U/d_strdup.U +++ b/mcon/U/d_strdup.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strdup.U,v 3.0.1.1 1993/12/15 08:21:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strdup.U,v $ ?RCS: Revision 3.0.1.1 1993/12/15 08:21:41 ram diff --git a/mcon/U/d_strerror.U b/mcon/U/d_strerror.U index 72124c8..4949630 100644 --- a/mcon/U/d_strerror.U +++ b/mcon/U/d_strerror.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strerror.U,v 3.0.1.3 1994/05/13 15:20:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strerror.U,v $ ?RCS: Revision 3.0.1.3 1994/05/13 15:20:27 ram diff --git a/mcon/U/d_strftime.U b/mcon/U/d_strftime.U index f8f5050..c634105 100644 --- a/mcon/U/d_strftime.U +++ b/mcon/U/d_strftime.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strftime.U,v 3.0 1993/08/18 12:07:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strftime.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:36 ram diff --git a/mcon/U/d_strstr.U b/mcon/U/d_strstr.U index 78ef5fc..022359a 100644 --- a/mcon/U/d_strstr.U +++ b/mcon/U/d_strstr.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strstr.U,v 3.0 1993/08/18 12:07:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strstr.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:37 ram diff --git a/mcon/U/d_strtod.U b/mcon/U/d_strtod.U index 2fd0054..13e6dee 100644 --- a/mcon/U/d_strtod.U +++ b/mcon/U/d_strtod.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_strtod.U,v 3.0.1.1 1997/02/28 15:46:36 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strtod.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:46:36 ram diff --git a/mcon/U/d_strtok.U b/mcon/U/d_strtok.U index 2d2b3ba..d6cf2f1 100644 --- a/mcon/U/d_strtok.U +++ b/mcon/U/d_strtok.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strtok.U,v 3.0 1993/08/18 12:07:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strtok.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:38 ram diff --git a/mcon/U/d_strtol.U b/mcon/U/d_strtol.U index 279c8b8..1d84274 100644 --- a/mcon/U/d_strtol.U +++ b/mcon/U/d_strtol.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strtol.U,v 3.0 1993/08/18 12:07:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strtol.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:39 ram diff --git a/mcon/U/d_strtoul.U b/mcon/U/d_strtoul.U index 399f947..54d79e4 100644 --- a/mcon/U/d_strtoul.U +++ b/mcon/U/d_strtoul.U @@ -1,13 +1,13 @@ -?RCS: $Id: d_strtoul.U,v 3.0.1.1 1997/02/28 15:46:43 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_strtoul.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:46:43 ram diff --git a/mcon/U/d_strxfrm.U b/mcon/U/d_strxfrm.U index d69d124..898a30f 100644 --- a/mcon/U/d_strxfrm.U +++ b/mcon/U/d_strxfrm.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_strxfrm.U,v 3.0.1.1 1994/08/29 16:12:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_su_chown.U b/mcon/U/d_su_chown.U index 515f34f..b43993c 100644 --- a/mcon/U/d_su_chown.U +++ b/mcon/U/d_su_chown.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_su_chown.U,v 3.0 1993/08/18 12:07:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_su_chown.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:40 ram diff --git a/mcon/U/d_symlink.U b/mcon/U/d_symlink.U index 9004693..f95c4da 100644 --- a/mcon/U/d_symlink.U +++ b/mcon/U/d_symlink.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_symlink.U,v 3.0 1993/08/18 12:07:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_symlink.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:41 ram diff --git a/mcon/U/d_syscall.U b/mcon/U/d_syscall.U index 87d8f48..4620b04 100644 --- a/mcon/U/d_syscall.U +++ b/mcon/U/d_syscall.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_syscall.U,v 3.0 1993/08/18 12:07:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_syscall.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:42 ram diff --git a/mcon/U/d_sysconf.U b/mcon/U/d_sysconf.U index 7de0037..13c6177 100644 --- a/mcon/U/d_sysconf.U +++ b/mcon/U/d_sysconf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_sysconf.U,v 3.0.1.1 1994/10/29 16:15:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_syslog.U b/mcon/U/d_syslog.U index 068b5b0..8245d48 100644 --- a/mcon/U/d_syslog.U +++ b/mcon/U/d_syslog.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_syslog.U,v 3.0.1.1 1997/02/28 15:46:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_syslog.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:46:56 ram @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:43 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_syslog syslogc syslogo: test Csym Setvar Findhdr _o +?MAKE:d_syslog: test Csym Setvar Findhdr ?MAKE: -pick add $@ %< ?S:d_syslog: ?S: This variable conditionally defines the HAS_SYSLOG symbol, which @@ -29,20 +29,15 @@ ?H:#$d_syslog HAS_SYSLOG /**/ ?H:. ?LINT:set d_syslog -?LINT:describe syslogc syslogo : see if syslog is available echo " " if $test `./findhdr syslog.h` && \ (set syslog val -f d_syslog; eval $csym; $val); then echo "syslog() found." >&4 val="$define" - syslogc='' - syslogo='' else - echo "syslog() not found in your C library--using ./syslog.c." >&4 + echo "syslog() not found in your C library." >&4 val="$undef" - syslogc='syslog.c' - syslogo="syslog$_o" fi set d_syslog eval $setvar diff --git a/mcon/U/d_system.U b/mcon/U/d_system.U index fc69540..cd8737c 100644 --- a/mcon/U/d_system.U +++ b/mcon/U/d_system.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_system.U,v 3.0 1993/08/18 12:07:44 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_system.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:44 ram diff --git a/mcon/U/d_table.U b/mcon/U/d_table.U index c8d0ee9..1144456 100644 --- a/mcon/U/d_table.U +++ b/mcon/U/d_table.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_table.U,v 3.0.1.2 1993/11/10 17:34:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_table.U,v $ ?RCS: Revision 3.0.1.2 1993/11/10 17:34:14 ram diff --git a/mcon/U/d_tcgtpgrp.U b/mcon/U/d_tcgtpgrp.U index 2462dab..61d0f59 100644 --- a/mcon/U/d_tcgtpgrp.U +++ b/mcon/U/d_tcgtpgrp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_tcgtpgrp.U,v 3.0.1.1 1994/08/29 16:12:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_tcstpgrp.U b/mcon/U/d_tcstpgrp.U index dc77615..ba7aa42 100644 --- a/mcon/U/d_tcstpgrp.U +++ b/mcon/U/d_tcstpgrp.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_tcstpgrp.U,v 3.0.1.1 1994/08/29 16:12:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_time.U b/mcon/U/d_time.U index 07030e3..8e5efa7 100644 --- a/mcon/U/d_time.U +++ b/mcon/U/d_time.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_time.U,v 3.0.1.2 1995/07/25 14:07:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_time.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:07:43 ram diff --git a/mcon/U/d_times.U b/mcon/U/d_times.U index 9375758..c22c31f 100644 --- a/mcon/U/d_times.U +++ b/mcon/U/d_times.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_times.U,v 3.0.1.2 1995/07/25 14:07:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_times.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:07:50 ram diff --git a/mcon/U/d_tminsys.U b/mcon/U/d_tminsys.U index 14234ab..3c81057 100644 --- a/mcon/U/d_tminsys.U +++ b/mcon/U/d_tminsys.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_tminsys.U,v 3.0 1993/08/18 12:07:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_tminsys.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:47 ram diff --git a/mcon/U/d_truncate.U b/mcon/U/d_truncate.U index b505944..75ca730 100644 --- a/mcon/U/d_truncate.U +++ b/mcon/U/d_truncate.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_truncate.U,v 3.0 1993/08/18 12:07:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_truncate.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:48 ram diff --git a/mcon/U/d_tzmin.U b/mcon/U/d_tzmin.U index cd00129..23f4c9d 100644 --- a/mcon/U/d_tzmin.U +++ b/mcon/U/d_tzmin.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_tzmin.U,v 3.0.1.1 1994/10/29 16:16:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_tzmin.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:16:58 ram diff --git a/mcon/U/d_tzname.U b/mcon/U/d_tzname.U index d3dc410..4cc2302 100644 --- a/mcon/U/d_tzname.U +++ b/mcon/U/d_tzname.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_tzname.U,v 3.0.1.2 1994/08/29 16:14:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_tzname.U,v $ ?RCS: Revision 3.0.1.2 1994/08/29 16:14:43 ram diff --git a/mcon/U/d_ulimit.U b/mcon/U/d_ulimit.U index c0c2ca2..da2e54a 100644 --- a/mcon/U/d_ulimit.U +++ b/mcon/U/d_ulimit.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_ulimit.U,v 3.0 1993/08/18 12:07:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_ulimit.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:51 ram diff --git a/mcon/U/d_umask.U b/mcon/U/d_umask.U index afda701..bee9d02 100644 --- a/mcon/U/d_umask.U +++ b/mcon/U/d_umask.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_umask.U,v 3.0.1.1 1994/08/29 16:14:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_usendir.U b/mcon/U/d_usendir.U index 00f604c..21484c3 100644 --- a/mcon/U/d_usendir.U +++ b/mcon/U/d_usendir.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_usendir.U,v 3.0.1.1 1997/02/28 15:47:34 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_usendir.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:47:34 ram @@ -16,7 +16,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:52 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_usendir i_ndir ndirc ndiro ndirlib: test Csym Findhdr _a _o +?MAKE:d_usendir i_ndir ndirlib: test Setvar Findhdr d_readdir _a ?MAKE: -pick add $@ %< ?S:d_usendir: ?S: This variable conditionally defines the EMULATE_NDIR symbol, which @@ -43,8 +43,8 @@ ?H:#$d_usendir EMULATE_NDIR /**/ ?H:#$i_ndir I_NDIR /**/ ?H:. -?T:val -?LINT:describe ndirc ndiro +?T:val2 +?LINT: set d_usendir i_ndir : see if there are directory access routines out there echo " " if $test `./findhdr ndir.h` && \ @@ -55,23 +55,25 @@ if $test `./findhdr ndir.h` && \ else ndirlib="/usr/local/lib/libndir$_a" fi - i_ndir="$define" - d_usendir="$undef" - ndirc='' - ndiro='' + val2="$define" + val="$undef" else ndirlib='' - i_ndir="$undef" - if set readdir val -f; eval $csym; $val; then + val2="$undef" + case "$d_readdir" in + "$define") echo "No ndir library found, but you have readdir() so we'll use that." >&4 - d_usendir="$undef" - ndirc='' - ndiro='' - else - echo "No ndir library found--using ./ndir.c." >&4 - d_usendir="$define" - ndirc='ndir.c' - ndiro="ndir$_o" - fi + val="$undef"; + ;; + *) + echo "No ndir library found." >&4 + val="$define" + ;; + esac fi +set d_usendir +eval $setvar +val="$val2" +set i_ndir +eval $setvar diff --git a/mcon/U/d_usleep.U b/mcon/U/d_usleep.U index 617c68e..b6dee14 100644 --- a/mcon/U/d_usleep.U +++ b/mcon/U/d_usleep.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_usleep.U,v 3.0 1993/08/18 12:07:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_usleep.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:53 ram diff --git a/mcon/U/d_uwait.U b/mcon/U/d_uwait.U index 407b105..e05eb8d 100644 --- a/mcon/U/d_uwait.U +++ b/mcon/U/d_uwait.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_uwait.U,v 3.0.1.1 1994/01/24 14:10:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_uwait.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:10:49 ram diff --git a/mcon/U/d_vfork.U b/mcon/U/d_vfork.U index 279d241..9bd7089 100644 --- a/mcon/U/d_vfork.U +++ b/mcon/U/d_vfork.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_vfork.U,v 3.0.1.6 1994/08/29 16:18:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_vfork.U,v $ ?RCS: Revision 3.0.1.6 1994/08/29 16:18:21 ram @@ -53,15 +53,6 @@ ?M:#endif ?M:. ?LINT:set d_vfork -?X: TO BE REMOVED in dist 4.0 -?X:========================== -?T:d_hvfork -: backward compatibility for d_hvfork -if test X$d_hvfork != X; then - d_vfork="$d_hvfork" - d_hvfork='' -fi -?X:========================== : see if there is a vfork val='' set vfork val diff --git a/mcon/U/d_voidsig.U b/mcon/U/d_voidsig.U index 5ad07b5..d91dc51 100644 --- a/mcon/U/d_voidsig.U +++ b/mcon/U/d_voidsig.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_voidsig.U,v 3.0.1.3 1995/05/12 12:12:46 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_voidsig.U,v $ ?RCS: Revision 3.0.1.3 1995/05/12 12:12:46 ram diff --git a/mcon/U/d_volatile.U b/mcon/U/d_volatile.U index fdedc8e..f94ca4f 100644 --- a/mcon/U/d_volatile.U +++ b/mcon/U/d_volatile.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_volatile.U,v 3.0.1.2 1995/07/25 14:08:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_volatile.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:08:49 ram @@ -41,7 +41,7 @@ echo " " echo 'Checking to see if your C compiler knows about "volatile"...' >&4 $cat >try.c <<'EOCP' -main() +int main() { ?X: ?X: The following seven lines added by Bill Campbell <billc@sierra.com> diff --git a/mcon/U/d_vprintf.U b/mcon/U/d_vprintf.U index df02054..f74422d 100644 --- a/mcon/U/d_vprintf.U +++ b/mcon/U/d_vprintf.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_vprintf.U,v 3.0 1993/08/18 12:07:59 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_vprintf.U,v $ ?RCS: Revision 3.0 1993/08/18 12:07:59 ram @@ -38,6 +38,7 @@ ?H:#$d_vprintf HAS_VPRINTF /**/ ?H:#$d_charvspr USE_CHAR_VSPRINTF /**/ ?H:. +?F:!vprintf !vprintf.c ?T:val2 ?LINT:set d_vprintf d_charvspr : see if vprintf exists @@ -48,7 +49,7 @@ if set vprintf val -f d_vprintf; eval $csym; $val; then $cat >vprintf.c <<'EOF' #include <varargs.h> -main() { xxx("foo"); } +int main() { xxx("foo"); } xxx(va_alist) va_dcl @@ -60,7 +61,7 @@ va_dcl exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } EOF - if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then + if $cc $ccflags -o vprintf vprintf.c >/dev/null 2>&1 && ./vprintf; then echo "Your vsprintf() returns (int)." >&4 val2="$undef" else diff --git a/mcon/U/d_wait3.U b/mcon/U/d_wait3.U index c503940..16a92b0 100644 --- a/mcon/U/d_wait3.U +++ b/mcon/U/d_wait3.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_wait3.U,v 3.0 1993/08/18 12:08:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_wait3.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:01 ram diff --git a/mcon/U/d_wait4.U b/mcon/U/d_wait4.U index 93719f3..eadb82b 100644 --- a/mcon/U/d_wait4.U +++ b/mcon/U/d_wait4.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_wait4.U,v 3.0 1993/08/18 12:08:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_wait4.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:01 ram diff --git a/mcon/U/d_waitpid.U b/mcon/U/d_waitpid.U index 58abeca..f0e4c53 100644 --- a/mcon/U/d_waitpid.U +++ b/mcon/U/d_waitpid.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_waitpid.U,v 3.0 1993/08/18 12:08:02 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_waitpid.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:02 ram diff --git a/mcon/U/d_wcstombs.U b/mcon/U/d_wcstombs.U index 88a6d04..e68ff9d 100644 --- a/mcon/U/d_wcstombs.U +++ b/mcon/U/d_wcstombs.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_wcstombs.U,v 3.0 1993/08/18 12:08:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_wcstombs.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:03 ram diff --git a/mcon/U/d_wctomb.U b/mcon/U/d_wctomb.U index 3615b98..41724ab 100644 --- a/mcon/U/d_wctomb.U +++ b/mcon/U/d_wctomb.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_wctomb.U,v 3.0.1.1 1994/08/29 16:20:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/d_wifstat.U b/mcon/U/d_wifstat.U index 40c0f57..c78684e 100644 --- a/mcon/U/d_wifstat.U +++ b/mcon/U/d_wifstat.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_wifstat.U,v 3.0.1.3 1997/02/28 15:47:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_wifstat.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:47:43 ram @@ -56,7 +56,7 @@ case "$d_wifstat" in #include <sys/types.h> #include <sys/wait.h> -main() +int main() { $type status; int e = 0; @@ -71,7 +71,7 @@ main() } EOCP d_wifstat="$undef" - if $cc $ccflags $ldflags foo.c -o foo $libs >/dev/null 2>&1; then + if $cc $ccflags $ldflags -o foo foo.c $libs >/dev/null 2>&1; then if ./foo >/dev/null; then echo "Great! Looks like we can use the WIFxxx macros." >&4 d_wifstat="$define" diff --git a/mcon/U/d_xdrs.U b/mcon/U/d_xdrs.U index e0931a4..cef7c0e 100644 --- a/mcon/U/d_xdrs.U +++ b/mcon/U/d_xdrs.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_xdrs.U,v 3.0 1993/08/18 12:08:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_xdrs.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:04 ram diff --git a/mcon/U/defeditor.U b/mcon/U/defeditor.U index 38c8f54..799afd3 100644 --- a/mcon/U/defeditor.U +++ b/mcon/U/defeditor.U @@ -1,12 +1,12 @@ -?RCS: $Id: defeditor.U,v 3.0.1.1 1995/01/11 15:30:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: defeditor.U,v $ ?RCS: Revision 3.0.1.1 1995/01/11 15:30:16 ram diff --git a/mcon/U/doublesize.U b/mcon/U/doublesize.U index b836570..8637c1e 100644 --- a/mcon/U/doublesize.U +++ b/mcon/U/doublesize.U @@ -1,12 +1,12 @@ -?RCS: $Id: doublesize.U,v 3.0.1.1 1994/10/29 16:17:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: doublesize.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:17:06 ram @@ -35,12 +35,12 @@ case "$doublesize" in echo "Checking to see how big your double precision numbers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(double)); } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then dflt=`./try` else dflt='8' diff --git a/mcon/U/ebcdic.U b/mcon/U/ebcdic.U new file mode 100644 index 0000000..6a05eef --- /dev/null +++ b/mcon/U/ebcdic.U @@ -0,0 +1,58 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 1998 Andy Dougherty +?RCS: +?RCS: Original author Jarkko Hietaniemi <jhi@iki.fi> +?RCS: Merged into dist by Andy Dougherty July 13, 1998 +?RCS: +?MAKE:ebcdic: Compile Setvar cat rm run +?MAKE: -pick add $@ %< +?S:ebcdic: +?S: This variable conditionally defines EBCDIC if this +?S: system uses EBCDIC encoding. Among other things, this +?S: means that the character ranges are not contiguous. +?S: See trnl.U +?S:. +?C:EBCDIC: +?C: This symbol, if defined, indicates that this system uses +?C: EBCDIC encoding. +?C:. +?H:#$ebcdic EBCDIC /**/ +?H:. +?F:!try +?LINT:set ebcdic +: look whether system uses EBCDIC +echo " " +echo "Determining whether or not we are on an EBCDIC system..." >&4 +$cat >try.c <<'EOM' +int main() +{ + if ('M'==0xd4) return 0; + return 1; +} +EOM +val=$undef +set try +if eval $compile_ok; then + if $run ./try; then + echo "You seem to speak EBCDIC." >&4 + val="$define" + else + echo "Nope, no EBCDIC, probably ASCII or some ISO Latin. Or UTF-8." >&4 + fi +else + echo "I'm unable to compile the test program." >&4 + echo "I'll assume ASCII or some ISO Latin. Or UTF8." >&4 +fi +$rm -f try try.* +set ebcdic +eval $setvar + diff --git a/mcon/U/errnolist.U b/mcon/U/errnolist.U index 9e4f438..d9f5a37 100644 --- a/mcon/U/errnolist.U +++ b/mcon/U/errnolist.U @@ -1,12 +1,12 @@ -?RCS: $Id: errnolist.U,v 3.0.1.2 1997/02/28 15:48:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: errnolist.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:48:01 ram @@ -81,7 +81,7 @@ Checking to see if your C library provides us with sys_errnolist[]... EOM $cat >errnolist.c <<'EOCP' extern char *sys_errnolist[]; -main() { +int main() { char *p0 = sys_errnolist[0]; char *p1 = sys_errnolist[1]; diff --git a/mcon/U/etc.U b/mcon/U/etc.U index bfd87d9..4414fbd 100644 --- a/mcon/U/etc.U +++ b/mcon/U/etc.U @@ -1,12 +1,12 @@ -?RCS: $Id: etc.U,v 3.0 1993/08/18 12:08:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: etc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:07 ram diff --git a/mcon/U/filexp.U b/mcon/U/filexp.U index 5a208f4..73bf64d 100644 --- a/mcon/U/filexp.U +++ b/mcon/U/filexp.U @@ -1,12 +1,12 @@ -?RCS: $Id: filexp.U,v 3.0 1993/08/18 12:08:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: filexp.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:08 ram diff --git a/mcon/U/floatsize.U b/mcon/U/floatsize.U index 4d5aa92..efc958a 100644 --- a/mcon/U/floatsize.U +++ b/mcon/U/floatsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: floatsize.U,v 3.0.1.1 1994/10/29 16:17:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: floatsize.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:17:09 ram @@ -35,12 +35,12 @@ case "$floatsize" in echo "Checking to see how big your floating point numbers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(float)); } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then dflt=`./try` else dflt='4' diff --git a/mcon/U/fpostype.U b/mcon/U/fpostype.U index f52e200..8270ba9 100644 --- a/mcon/U/fpostype.U +++ b/mcon/U/fpostype.U @@ -1,12 +1,12 @@ -?RCS: $Id: fpostype.U,v 3.0.1.2 1994/08/29 16:20:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: fpostype.U,v $ ?RCS: Revision 3.0.1.2 1994/08/29 16:20:52 ram diff --git a/mcon/U/fpu.U b/mcon/U/fpu.U index f3aaceb..5e6cb09 100644 --- a/mcon/U/fpu.U +++ b/mcon/U/fpu.U @@ -1,12 +1,12 @@ -?RCS: $Id: fpu.U,v 3.0 1993/08/18 12:08:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: fpu.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:10 ram @@ -28,7 +28,7 @@ if $test -r /dev/fpa; then $cat>fpa.c << GOOP main(){return(1);} GOOP - $cc -ffpa fpa.c -o fpa + $cc -ffpa -o fpa fpa.c fpa > fpa.out 2>&1 if $test ! -s fpa.out; then dflt='y' diff --git a/mcon/U/gccvers.U b/mcon/U/gccvers.U new file mode 100644 index 0000000..b7b42fa --- /dev/null +++ b/mcon/U/gccvers.U @@ -0,0 +1,117 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 2000, Jarkko Hietaniemi +?RCS: +?MAKE:gccversion gccosandvers: cat cpp rm +cc \ + Myread Guess Options Oldconfig Loc osname osvers grep run ccname +?MAKE: -pick add $@ %< +?S:gccversion: +?S: If GNU cc (gcc) is used, this variable holds '1' or '3' (for instance) +?S: to indicate whether the compiler is version 1 or 3. This is used in +?S: setting some of the default cflags. It is set to '' if not gcc. +?S:. +?S:gccosandvers: +?S: If GNU cc (gcc) is used, this variable the operating system and +?S: version used to compile the gcc. It is set to '' if not gcc, +?S: or if nothing useful can be parsed as the os version. +?S:. +?T:gccshortvers incdir d +?F:!try.c !try +?LINT:extern locincpth ccflags ldflags +?LINT:change locincpth ccname cpp +: Check whether they have gcc in any guise. +echo " " +echo "Checking for GNU cc in disguise and/or its version number..." >&4 +$cat >try.c <<EOM +#include <stdio.h> +int main() { +#ifdef __GNUC__ +#ifdef __VERSION__ + printf("%s\n", __VERSION__); +#else + printf("%s\n", "1"); +#endif +#endif + exit(0); +} +EOM +if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then + gccversion=`$run ./try` + case "$gccversion" in + '') echo "You are not using GNU cc." ;; + *) echo "You are using GNU cc $gccversion." + ccname=gcc + ;; + esac +else + echo " " + echo "*** WHOA THERE!!! ***" >&4 + echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 +?X: using -K will prevent aborting--maybe they're cross compiling? + case "$knowitall" in + '') + echo " You'd better start hunting for one and let me know about it." >&4 + exit 1 + ;; + esac +fi +$rm -f try try.* +case "$gccversion" in +1*) cpp=`./loc gcc-cpp $cpp $pth` ;; +esac +case "$gccversion" in +'') gccosandvers='' ;; +*) gccshortvers=`echo "$gccversion"|sed 's/ .*//'` + gccosandvers=`$cc -v 2>&1 | \ + $grep '/specs$'|sed "s!.*/[^-/]*-[^-/]*-\([^-/]*\)/$gccshortvers/specs!\1!"` + gccshortvers='' + case "$gccosandvers" in + $osname) gccosandvers='' ;; # linux gccs seem to have no linux osvers, grr + $osname$osvers) ;; # looking good + $osname*) cat <<EOM >&4 + +*** WHOA THERE!!! *** + + Your gcc has not been compiled for the exact release of + your operating system ($gccosandvers versus $osname$osvers). + + In general it is a good idea to keep gcc synchronized with + the operating system because otherwise serious problems + may ensue when trying to compile software, like Perl. + + I'm trying to be optimistic here, though, and will continue. + If later during the configuration and build icky compilation + problems appear (headerfile conflicts being the most common + manifestation), I suggest reinstalling the gcc to match + your operating system release. + +EOM + ;; + *) gccosandvers='' ;; # failed to parse, better be silent + esac + ;; +esac +case "$ccname" in +'') ccname="$cc" ;; +esac + +: gcc 3.1 complains about adding -Idirectories that it already knows about, +: so we will take those off from locincpth. +case "$gccversion" in +3*) + echo "main(){}">try.c + for incdir in `$cc -v -c try.c 2>&1 | \ + sed '1,/^#include <\.\.\.>/d;/^End of search list/,$d;s/^ //'` ; do + locincpth=`echo $locincpth | sed s!$incdir!!` + done + $rm -f try try.* +esac + diff --git a/mcon/U/gidtype.U b/mcon/U/gidtype.U index a52d339..58b693e 100644 --- a/mcon/U/gidtype.U +++ b/mcon/U/gidtype.U @@ -1,12 +1,12 @@ -?RCS: $Id: gidtype.U,v 3.0.1.3 1994/08/29 16:21:44 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: gidtype.U,v $ ?RCS: Revision 3.0.1.3 1994/08/29 16:21:44 ram diff --git a/mcon/U/groupstype.U b/mcon/U/groupstype.U index 55b5638..39727f1 100644 --- a/mcon/U/groupstype.U +++ b/mcon/U/groupstype.U @@ -1,13 +1,13 @@ -?RCS: $Id: groupstype.U,v 3.0.1.2 1994/10/29 16:18:08 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: +?RCS: of the source tree for dist 4.0. +?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: ?RCS: $Log: groupstype.U,v $ @@ -18,42 +18,43 @@ ?RCS: Revision 3.0.1.1 1994/06/20 07:00:18 ram ?RCS: patch30: created by ADO ?RCS: -?MAKE:groupstype: gidtype d_getgrps Myread Oldconfig Findhdr cat +?MAKE:groupstype: gidtype d_getgrps Myread Oldconfig Findhdr cat d_setgrps ?MAKE: -pick add $@ %< ?INIT:groupstype='' ?S:groupstype: ?S: This variable defines Groups_t to be something like gid_t, int, ?S: ushort, or whatever type is used for the second argument to -?S: getgroups(). Usually, this is the same of gidtype, but -?S: sometimes it isn't. +?S: getgroups() and setgroups(). Usually, this is the same as +?S: gidtype (gid_t), but sometimes it isn't. ?S:. ?C:Groups_t (GROUPSTYPE): ?C: This symbol holds the type used for the second argument to -?C: getgroups(). Usually, this is the same of gidtype, but -?C: sometimes it isn't. It can be int, ushort, uid_t, etc... +?C: getgroups() and setgroups(). Usually, this is the same as +?C: gidtype (gid_t) , but sometimes it isn't. +?C: It can be int, ushort, gid_t, etc... ?C: It may be necessary to include <sys/types.h> to get any ?C: typedef'ed information. This is only required if you have -?C: getgroups(). +?C: getgroups() or setgroups().. ?C:. -?H:?%<:#ifdef HAS_GETGROUPS -?H:?%<:#define Groups_t $groupstype /* Type for 2nd arg to getgroups() */ +?H:?%<:#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS) +?H:?%<:#define Groups_t $groupstype /* Type for 2nd arg to [sg]etgroups() */ ?H:?%<:#endif ?H:. -?W:%<:getgroups HAS_GETGROUPS -: Find type of 2nd arg to getgroups +?W:%<:getgroups HAS_GETGROUPS setgroups HAS_SETGROUPS +: Find type of 2nd arg to 'getgroups()' and 'setgroups()' echo " " -case "$d_getgrps" in -'define') +case "$d_getgrps$d_setgrps" in +*define*) case "$groupstype" in '') dflt="$gidtype" ;; *) dflt="$groupstype" ;; esac $cat <<EOM -What is the type of the second argument to getgroups()? Usually this -is the same as group ids, $gidtype, but not always. +What type of pointer is the second argument to getgroups() and setgroups()? +Usually this is the same as group ids, $gidtype, but not always. EOM - rp='What type is the second argument to getgroups()?' + rp='What type pointer is the second argument to getgroups() and setgroups()?' . ./myread groupstype="$ans" ;; diff --git a/mcon/U/h_fcntl.U b/mcon/U/h_fcntl.U index 53afd9e..293ebd5 100644 --- a/mcon/U/h_fcntl.U +++ b/mcon/U/h_fcntl.U @@ -1,12 +1,12 @@ -?RCS: $Id: h_fcntl.U,v 3.0 1993/08/18 12:08:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: h_fcntl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:12 ram diff --git a/mcon/U/h_sysfile.U b/mcon/U/h_sysfile.U index af11cb4..c35135b 100644 --- a/mcon/U/h_sysfile.U +++ b/mcon/U/h_sysfile.U @@ -1,12 +1,12 @@ -?RCS: $Id: h_sysfile.U,v 3.0 1993/08/18 12:08:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: h_sysfile.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:13 ram diff --git a/mcon/U/i_arpainet.U b/mcon/U/i_arpainet.U index 873b23a..a00ff0d 100644 --- a/mcon/U/i_arpainet.U +++ b/mcon/U/i_arpainet.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_arpainet.U,v 3.0 1993/08/18 12:08:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_arpainet.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:15 ram diff --git a/mcon/U/i_db.U b/mcon/U/i_db.U index ee18df0..98c52c2 100644 --- a/mcon/U/i_db.U +++ b/mcon/U/i_db.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_db.U,v 3.0.1.3 1995/07/25 14:10:22 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -79,7 +79,7 @@ size_t size; { } HASHINFO info; -main() +int main() { info.hash = hash_cb; } @@ -121,7 +121,7 @@ const DBT *key2; { } BTREEINFO info; -main() +int main() { info.prefix = prefix_cb; } diff --git a/mcon/U/i_dbm.U b/mcon/U/i_dbm.U index 6c40b71..a0e5c13 100644 --- a/mcon/U/i_dbm.U +++ b/mcon/U/i_dbm.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_dbm.U,v 3.0.1.2 1997/02/28 15:48:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_dbm.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:48:20 ram diff --git a/mcon/U/i_dirent.U b/mcon/U/i_dirent.U index 4c2ee1c..65e192e 100644 --- a/mcon/U/i_dirent.U +++ b/mcon/U/i_dirent.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_dirent.U,v 3.0.1.4 1994/10/29 16:20:01 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_dirent.U,v $ ?RCS: Revision 3.0.1.4 1994/10/29 16:20:01 ram @@ -68,7 +68,7 @@ ?H:?%<:@end ?H:. ?T:xinc guess1 guess2 -?LINT:set i_dirent d_dirnamlen direntrytype +?LINT:set i_dirent d_dirnamlen : see if this is a dirent system echo " " if xinc=`./findhdr dirent.h`; $test "$xinc"; then diff --git a/mcon/U/i_dld.U b/mcon/U/i_dld.U index a089240..531d914 100644 --- a/mcon/U/i_dld.U +++ b/mcon/U/i_dld.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_dld.U,v 3.0.1.1 1994/10/29 16:20:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/i_dlfcn.U b/mcon/U/i_dlfcn.U index 8e95b0c..c0808ce 100644 --- a/mcon/U/i_dlfcn.U +++ b/mcon/U/i_dlfcn.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_dlfcn.U,v 3.0.1.1 1994/08/29 16:21:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/i_fcntl.U b/mcon/U/i_fcntl.U index f7a40b5..048eaff 100644 --- a/mcon/U/i_fcntl.U +++ b/mcon/U/i_fcntl.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_fcntl.U,v 3.0 1993/08/18 12:08:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_fcntl.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:18 ram diff --git a/mcon/U/i_float.U b/mcon/U/i_float.U index 7b297f5..1b060d3 100644 --- a/mcon/U/i_float.U +++ b/mcon/U/i_float.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_float.U,v 3.0.1.1 1994/08/29 16:21:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/i_gdbm.U b/mcon/U/i_gdbm.U index 0808c58..c9cdbf0 100644 --- a/mcon/U/i_gdbm.U +++ b/mcon/U/i_gdbm.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_gdbm.U,v 3.0.1.1 1995/05/12 12:16:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_gdbm.U,v $ ?RCS: Revision 3.0.1.1 1995/05/12 12:16:39 ram diff --git a/mcon/U/i_grp.U b/mcon/U/i_grp.U index b6dbf4c..95cdb07 100644 --- a/mcon/U/i_grp.U +++ b/mcon/U/i_grp.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_grp.U,v 3.0 1993/08/18 12:08:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_grp.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:20 ram diff --git a/mcon/U/i_inttypes.U b/mcon/U/i_inttypes.U new file mode 100644 index 0000000..d9f0573 --- /dev/null +++ b/mcon/U/i_inttypes.U @@ -0,0 +1,35 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: $Log: i_sysun.U,v $ +?RCS: Revision 3.0 1993/08/18 12:08:42 ram +?RCS: Baseline for dist 3.0 netwide release. +?RCS: +?X: +?X: This unit looks wether <inttypes.h> is available or not +?X: +?MAKE:i_inttypes: Inhdr +?MAKE: -pick add $@ %< +?S:i_inttypes: +?S: This variable conditionally defines I_INTTYPES, which indicates +?S: to the C program that it should include <inttypes.h> to get +?S: format conversions of integer types. +?S:. +?C:I_INTTYPES: +?C: This symbol, if defined, indicates to the C program that it should +?C: include <inttypes.h> to get format conversions of integer types. +?C:. +?H:#$i_inttypes I_INTTYPES /**/ +?H:. +?LINT:set i_inttypes +: see if this is a inttypes.h system +set inttypes.h i_inttypes +eval $inhdr + diff --git a/mcon/U/i_limits.U b/mcon/U/i_limits.U index 5958cb1..eb15e2d 100644 --- a/mcon/U/i_limits.U +++ b/mcon/U/i_limits.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_limits.U,v 3.0 1993/08/18 12:08:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_limits.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:20 ram diff --git a/mcon/U/i_locale.U b/mcon/U/i_locale.U index 0968e22..e0eb168 100644 --- a/mcon/U/i_locale.U +++ b/mcon/U/i_locale.U @@ -1,13 +1,13 @@ -?RCS: $Id: i_locale.U,v 3.0.1.1 1997/02/28 15:48:23 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_locale.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:48:23 ram diff --git a/mcon/U/i_malloc.U b/mcon/U/i_malloc.U index f64dc1b..ad98898 100644 --- a/mcon/U/i_malloc.U +++ b/mcon/U/i_malloc.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_malloc.U,v 3.0 1993/08/18 12:08:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_malloc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:21 ram diff --git a/mcon/U/i_math.U b/mcon/U/i_math.U index 72676d0..c3cd1d5 100644 --- a/mcon/U/i_math.U +++ b/mcon/U/i_math.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_math.U,v 3.0.1.1 1994/08/29 16:21:59 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/i_memory.U b/mcon/U/i_memory.U index d3e6561..ab5244d 100644 --- a/mcon/U/i_memory.U +++ b/mcon/U/i_memory.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_memory.U,v 3.0.1.3 1994/06/20 07:01:55 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_memory.U,v $ ?RCS: Revision 3.0.1.3 1994/06/20 07:01:55 ram diff --git a/mcon/U/i_ndbm.U b/mcon/U/i_ndbm.U index 12488f7..8b7eda4 100644 --- a/mcon/U/i_ndbm.U +++ b/mcon/U/i_ndbm.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_ndbm.U,v 3.0.1.1 1995/05/12 12:16:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_ndbm.U,v $ ?RCS: Revision 3.0.1.1 1995/05/12 12:16:53 ram diff --git a/mcon/U/i_neterrno.U b/mcon/U/i_neterrno.U index a4ec19a..a8de2aa 100644 --- a/mcon/U/i_neterrno.U +++ b/mcon/U/i_neterrno.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_neterrno.U,v 3.0.1.3 1994/10/29 16:20:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/i_niin.U b/mcon/U/i_niin.U index 4b91684..0e90b3a 100644 --- a/mcon/U/i_niin.U +++ b/mcon/U/i_niin.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_niin.U,v 3.0 1993/08/18 12:08:24 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_niin.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:24 ram diff --git a/mcon/U/i_poll.U b/mcon/U/i_poll.U new file mode 100644 index 0000000..162f4cb --- /dev/null +++ b/mcon/U/i_poll.U @@ -0,0 +1,28 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:i_poll: Inhdr +?MAKE: -pick add $@ %< +?S:i_poll: +?S: This variable conditionally defines the I_POLL symbol, which +?S: indicates to the C program that it should include <poll.h>. +?S:. +?C:I_POLL: +?C: This symbol, if defined, indicates that the program may include +?C: <poll.h>. If there is no <poll.h>, then you may check I_SYS_POLL +?C: instead to see whether there is a <sys/poll.h> to include. +?C:. +?H:#$i_poll I_POLL /**/ +?H:. +?LINT:set i_poll +: see if there is a poll.h file +set poll.h i_poll +eval $inhdr + diff --git a/mcon/U/i_pwd.U b/mcon/U/i_pwd.U index 5393325..09f4219 100644 --- a/mcon/U/i_pwd.U +++ b/mcon/U/i_pwd.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_pwd.U,v 3.0.1.2 1995/07/25 14:10:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_pwd.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:10:57 ram diff --git a/mcon/U/i_regex.U b/mcon/U/i_regex.U index 4212c5a..2599bbc 100644 --- a/mcon/U/i_regex.U +++ b/mcon/U/i_regex.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_regex.U,v 3.0.1.1 1995/01/30 14:35:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Sidney C. Smith <scsmith@cbda9.apgea.army.mil> ?RCS: diff --git a/mcon/U/i_sfio.U b/mcon/U/i_sfio.U index eb91d5b..0dde99f 100644 --- a/mcon/U/i_sfio.U +++ b/mcon/U/i_sfio.U @@ -1,13 +1,13 @@ -?RCS: $Id: i_sfio.U,v 3.0.1.1 1997/02/28 15:48:27 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sfio.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:48:27 ram diff --git a/mcon/U/i_stddef.U b/mcon/U/i_stddef.U index 779517e..5d34a99 100644 --- a/mcon/U/i_stddef.U +++ b/mcon/U/i_stddef.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_stddef.U,v 3.0 1993/08/18 12:08:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_stddef.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:27 ram diff --git a/mcon/U/i_stdlib.U b/mcon/U/i_stdlib.U index 8c69f6a..d570918 100644 --- a/mcon/U/i_stdlib.U +++ b/mcon/U/i_stdlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_stdlib.U,v 3.0 1993/08/18 12:08:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_stdlib.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:27 ram diff --git a/mcon/U/i_string.U b/mcon/U/i_string.U index 8421e06..ce8bdfa 100644 --- a/mcon/U/i_string.U +++ b/mcon/U/i_string.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_string.U,v 3.0.1.2 1993/10/16 13:50:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_string.U,v $ ?RCS: Revision 3.0.1.2 1993/10/16 13:50:12 ram @@ -21,7 +21,7 @@ ?X: ?X: See if we should include <string.h> or <strings.h> ?X: -?MAKE:i_string strings: test Setvar Findhdr +?MAKE:i_string strings: test Setvar Findhdr Warn ?MAKE: -pick add $@ %< ?S:i_string: ?S: This variable conditionally defines the I_STRING symbol, which @@ -50,7 +50,7 @@ else if $test "$strings" && $test -r "$strings"; then echo "Using <strings.h> instead of <string.h>." >&4 else - echo "No string header found -- You'll surely have problems." >&4 + ./warn "No string header found -- You'll surely have problems." fi fi set i_string diff --git a/mcon/U/i_sysdir.U b/mcon/U/i_sysdir.U index ad7e1d3..1fa9092 100644 --- a/mcon/U/i_sysdir.U +++ b/mcon/U/i_sysdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysdir.U,v 3.0.1.1 1994/08/29 16:22:30 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysdir.U,v $ ?RCS: Revision 3.0.1.1 1994/08/29 16:22:30 ram diff --git a/mcon/U/i_sysfile.U b/mcon/U/i_sysfile.U index b1aa2a6..b8d8b9a 100644 --- a/mcon/U/i_sysfile.U +++ b/mcon/U/i_sysfile.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysfile.U,v 3.0.1.2 1995/07/25 14:11:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysfile.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:11:36 ram @@ -32,8 +32,8 @@ ?H:. ?T:val ?D:i_sysfile='' -?LINT:set i_sysfile ?LINT:change h_sysfile +?LINT:set i_sysfile : see if this is a sys/file.h system val='' set sys/file.h val diff --git a/mcon/U/i_sysioctl.U b/mcon/U/i_sysioctl.U index 0073872..a7c35e0 100644 --- a/mcon/U/i_sysioctl.U +++ b/mcon/U/i_sysioctl.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysioctl.U,v 3.0.1.2 1994/05/06 15:04:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysioctl.U,v $ ?RCS: Revision 3.0.1.2 1994/05/06 15:04:57 ram @@ -177,7 +177,7 @@ $cat > tcio.c <<EOM #include <sys/types.h> /* Just in case */ #include <$xxx> -main() +int main() { #ifdef TIOCNOTTY exit(0); diff --git a/mcon/U/i_sysmman.U b/mcon/U/i_sysmman.U index f3ac09d..8e88249 100644 --- a/mcon/U/i_sysmman.U +++ b/mcon/U/i_sysmman.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysmman.U,v 3.0.1.1 1994/01/24 14:11:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysmman.U,v $ ?RCS: Revision 3.0.1.1 1994/01/24 14:11:20 ram diff --git a/mcon/U/i_sysndir.U b/mcon/U/i_sysndir.U index b3ca21f..8c24648 100644 --- a/mcon/U/i_sysndir.U +++ b/mcon/U/i_sysndir.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysndir.U,v 3.0 1993/08/18 12:08:33 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysndir.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:33 ram diff --git a/mcon/U/i_sysparam.U b/mcon/U/i_sysparam.U index 6d2b422..ffa6f39 100644 --- a/mcon/U/i_sysparam.U +++ b/mcon/U/i_sysparam.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysparam.U,v 3.0.1.1 1994/08/29 16:22:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysparam.U,v $ ?RCS: Revision 3.0.1.1 1994/08/29 16:22:43 ram diff --git a/mcon/U/i_syspoll.U b/mcon/U/i_syspoll.U new file mode 100644 index 0000000..c284143 --- /dev/null +++ b/mcon/U/i_syspoll.U @@ -0,0 +1,28 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:i_syspoll: Inhdr +?MAKE: -pick add $@ %< +?S:i_syspoll: +?S: This variable conditionally defines the I_SYS_POLL symbol, which +?S: indicates to the C program that it should include <sys/poll.h>. +?S:. +?C:I_SYS_POLL: +?C: This symbol, if defined, indicates that the program may include +?C: <sys/poll.h>. When I_POLL is also defined, it's probably safest +?C: to only include <poll.h>. +?C:. +?H:#$i_syspoll I_SYS_POLL /**/ +?H:. +?LINT:set i_syspoll +: see if there is a sys/poll.h file +set sys/poll.h i_syspoll +eval $inhdr + diff --git a/mcon/U/i_sysresrc.U b/mcon/U/i_sysresrc.U index 7269874..8d6f59b 100644 --- a/mcon/U/i_sysresrc.U +++ b/mcon/U/i_sysresrc.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysresrc.U,v 3.0 1993/08/18 12:08:34 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysresrc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:34 ram diff --git a/mcon/U/i_sysselct.U b/mcon/U/i_sysselct.U index 9a3f1a5..9f24002 100644 --- a/mcon/U/i_sysselct.U +++ b/mcon/U/i_sysselct.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysselct.U,v 3.0.1.1 1993/08/25 14:01:33 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysselct.U,v $ ?RCS: Revision 3.0.1.1 1993/08/25 14:01:33 ram diff --git a/mcon/U/i_syssock.U b/mcon/U/i_syssock.U index 9b29d45..5788eca 100644 --- a/mcon/U/i_syssock.U +++ b/mcon/U/i_syssock.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_syssock.U,v 3.0 1993/08/18 12:08:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_syssock.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:36 ram diff --git a/mcon/U/i_sysstat.U b/mcon/U/i_sysstat.U index 3a8ccc2..c010999 100644 --- a/mcon/U/i_sysstat.U +++ b/mcon/U/i_sysstat.U @@ -1,13 +1,13 @@ -?RCS: $Id: i_sysstat.U,v 3.0.1.1 1997/02/28 15:48:30 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysstat.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:48:30 ram diff --git a/mcon/U/i_systable.U b/mcon/U/i_systable.U index 86cb6ec..7e94d4a 100644 --- a/mcon/U/i_systable.U +++ b/mcon/U/i_systable.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_systable.U,v 3.0.1.1 1993/10/16 13:50:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_systable.U,v $ ?RCS: Revision 3.0.1.1 1993/10/16 13:50:20 ram diff --git a/mcon/U/i_systimeb.U b/mcon/U/i_systimeb.U index 0e17f68..29a89c8 100644 --- a/mcon/U/i_systimeb.U +++ b/mcon/U/i_systimeb.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_systimeb.U,v 3.0 1993/08/18 12:08:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_systimeb.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:37 ram diff --git a/mcon/U/i_systimes.U b/mcon/U/i_systimes.U index ffae1c2..41066e2 100644 --- a/mcon/U/i_systimes.U +++ b/mcon/U/i_systimes.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_systimes.U,v 3.0 1993/08/18 12:08:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_systimes.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:39 ram diff --git a/mcon/U/i_systwgcf.U b/mcon/U/i_systwgcf.U index a3391e3..eac12fb 100644 --- a/mcon/U/i_systwgcf.U +++ b/mcon/U/i_systwgcf.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_systwgcf.U,v 3.0 1993/08/18 12:08:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_systwgcf.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:39 ram diff --git a/mcon/U/i_systypes.U b/mcon/U/i_systypes.U index dc3cc6a..c94e654 100644 --- a/mcon/U/i_systypes.U +++ b/mcon/U/i_systypes.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_systypes.U,v 3.0 1993/08/18 12:08:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_systypes.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:41 ram diff --git a/mcon/U/i_sysun.U b/mcon/U/i_sysun.U index 60d41f6..2da3b11 100644 --- a/mcon/U/i_sysun.U +++ b/mcon/U/i_sysun.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_sysun.U,v 3.0 1993/08/18 12:08:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_sysun.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:42 ram diff --git a/mcon/U/i_syswait.U b/mcon/U/i_syswait.U index 02873e5..9830fac 100644 --- a/mcon/U/i_syswait.U +++ b/mcon/U/i_syswait.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_syswait.U,v 3.0 1993/08/18 12:08:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_syswait.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:42 ram diff --git a/mcon/U/i_termio.U b/mcon/U/i_termio.U index a4c8d49..1f564ea 100644 --- a/mcon/U/i_termio.U +++ b/mcon/U/i_termio.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_termio.U,v 3.0.1.4 1994/10/29 16:20:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_termio.U,v $ ?RCS: Revision 3.0.1.4 1994/10/29 16:20:54 ram @@ -25,7 +25,7 @@ ?RCS: Revision 3.0 1993/08/18 12:08:44 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:i_termio i_sgtty i_termios: test Inlibc Cppsym Guess Setvar Findhdr +?MAKE:i_termio i_sgtty i_termios: test Inlibc Cppsym Guess Setvar Findhdr Warn ?MAKE: -pick add $@ %< ?S:i_termio: ?S: This variable conditionally defines the I_TERMIO symbol, which @@ -84,14 +84,14 @@ case "$val3" in echo "<sgtty.h> found." >&4 else echo "System is pyramid with BSD universe." - echo "<sgtty.h> not found--you could have problems." >&4 + ./warn "<sgtty.h> not found--you could have problems." fi;; *) if $test `./findhdr termio.h`; then val="$define" echo "<termio.h> found." >&4 else echo "System is pyramid with USG universe." - echo "<termio.h> not found--you could have problems." >&4 + ./warn "<termio.h> not found--you could have problems." fi;; esac ?X: Start with USG to avoid problems if both usg/bsd was guessed @@ -103,7 +103,7 @@ case "$val3" in echo "<sgtty.h> found." >&4 val2="$define" else -echo "Neither <termio.h> nor <sgtty.h> found--you could have problems." >&4 + ./warn "Neither <termio.h> nor <sgtty.h> found--cross fingers!" fi else if $test `./findhdr sgtty.h`; then @@ -113,7 +113,7 @@ echo "Neither <termio.h> nor <sgtty.h> found--you could have problems." >&4 echo "<termio.h> found." >&4 val="$define" else -echo "Neither <sgtty.h> nor <termio.h> found--you could have problems." >&4 + ./warn "Neither <sgtty.h> nor <termio.h> found--cross fingers!" fi fi;; esac diff --git a/mcon/U/i_time.U b/mcon/U/i_time.U index f1ae816..cdf1519 100644 --- a/mcon/U/i_time.U +++ b/mcon/U/i_time.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_time.U,v 3.0 1993/08/18 12:08:45 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_time.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:45 ram @@ -73,7 +73,7 @@ $cat >try.c <<'EOCP' #ifdef I_SYSSELECT #include <sys/select.h> #endif -main() +int main() { struct tm foo; #ifdef S_TIMEVAL @@ -118,7 +118,7 @@ for i_systime in '-DI_SYSTIME' ''; do '') $echo $n ".$c" if $cc $ccflags \ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \ - try.c -o try >/dev/null 2>&1 ; then + -o try try.c >/dev/null 2>&1 ; then set X $i_time $i_systime $i_systimek $sysselect $s_timeval shift flags="$*" diff --git a/mcon/U/i_unistd.U b/mcon/U/i_unistd.U index e89caa6..3e199ab 100644 --- a/mcon/U/i_unistd.U +++ b/mcon/U/i_unistd.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_unistd.U,v 3.0 1993/08/18 12:08:46 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_unistd.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:46 ram diff --git a/mcon/U/i_utime.U b/mcon/U/i_utime.U index 9f70b11..23601e7 100644 --- a/mcon/U/i_utime.U +++ b/mcon/U/i_utime.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_utime.U,v 3.0 1993/08/18 12:08:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_utime.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:47 ram diff --git a/mcon/U/i_values.U b/mcon/U/i_values.U index 9219dc0..6ff6d2b 100644 --- a/mcon/U/i_values.U +++ b/mcon/U/i_values.U @@ -1,13 +1,13 @@ -?RCS: $Id: i_values.U,v 3.0.1.1 1997/02/28 15:48:34 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_values.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:48:34 ram diff --git a/mcon/U/i_varhdr.U b/mcon/U/i_varhdr.U index 909724e..d7629d4 100644 --- a/mcon/U/i_varhdr.U +++ b/mcon/U/i_varhdr.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_varhdr.U,v 3.0.1.3 1997/02/28 15:54:42 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_varhdr.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:54:42 ram @@ -23,7 +23,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:i_stdarg i_varargs i_varhdr: cat +cc +ccflags rm test Setvar \ - Findhdr startsh _o + Findhdr Warn startsh _o ?MAKE: -pick add $@ %< ?S:i_stdarg: ?S: This variable conditionally defines the I_STDARG symbol, which @@ -141,7 +141,7 @@ case "$valstd" in esac case "$val" in '') -echo "I could not find the definition for va_dcl... You have problems..." >&4 + ./warn "I could not find the definition for va_dcl... You have problems..." val="$undef"; set i_stdarg; eval $setvar val="$undef"; set i_varargs; eval $setvar ;; diff --git a/mcon/U/i_vfork.U b/mcon/U/i_vfork.U index 753dda4..4a628fd 100644 --- a/mcon/U/i_vfork.U +++ b/mcon/U/i_vfork.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_vfork.U,v 3.0.1.1 1994/05/06 15:05:44 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_vfork.U,v $ ?RCS: Revision 3.0.1.1 1994/05/06 15:05:44 ram @@ -27,7 +27,6 @@ ?C:. ?H:#$i_vfork I_VFORK /**/ ?H:. -?LINT:set i_vfork : see if this is a vfork system case "$d_vfork" in "$define") diff --git a/mcon/U/i_whoami.U b/mcon/U/i_whoami.U index c05e001..e30fd19 100644 --- a/mcon/U/i_whoami.U +++ b/mcon/U/i_whoami.U @@ -1,12 +1,12 @@ -?RCS: $Id: i_whoami.U,v 3.0.1.1 1993/08/25 14:02:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_whoami.U,v $ ?RCS: Revision 3.0.1.1 1993/08/25 14:02:21 ram diff --git a/mcon/U/inc.U b/mcon/U/inc.U index b1f8583..2c1f4ce 100644 --- a/mcon/U/inc.U +++ b/mcon/U/inc.U @@ -1,12 +1,12 @@ -?RCS: $Id: inc.U,v 3.0 1993/08/18 12:08:51 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: inc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:51 ram diff --git a/mcon/U/install.U b/mcon/U/install.U index f3b534d..5b4fdf9 100644 --- a/mcon/U/install.U +++ b/mcon/U/install.U @@ -1,12 +1,12 @@ -?RCS: $Id: install.U,v 3.0.1.2 1995/09/25 09:16:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: install.U,v $ ?RCS: Revision 3.0.1.2 1995/09/25 09:16:37 ram @@ -36,6 +36,7 @@ ?S: plain 'mkdir', and cross your fingers! ?S:. ?T:dir file tryit prog creatdir either +?F:!tryinst : locate a BSD compatible install program echo " " echo "Looking for a BSD-compatible install program..." >&4 @@ -53,13 +54,13 @@ case "$install" in done done $cat >try.c <<EOC -main() +int main() { printf("OK\n"); exit(0); } EOC - if $cc try.c -o try >/dev/null 2>&1; then + if $cc -o try try.c >/dev/null 2>&1; then cp try try.ns strip try >/dev/null 2>&1 else @@ -149,24 +150,29 @@ echo "Ok, let's see how we can create nested directories..." >&4 case "$installdir" in '') ?X: First time, maybe we already found out a working one in $creatdir above... - case "$creatdir" in - '') - $mkdir -p foo/bar >/dev/null 2>&1 - if $test -d foo/bar; then - echo "Great, we can build them using 'mkdir -p'." - creatdir='mkdir -p' - elif eval "$install -d foo/bar"; $test -d foo/bar; then - creatdir="install -d" - echo "It looks like '$creatdir' will do it for us." - fi - ;; - *) - eval "$creatdir foo/bar" >/dev/null 2>&1 - if $test -d foo/bar; then - echo "Ah! We can use '$creatdir' to do just that." - fi - ;; - esac +?X: Prefer "mkdir -p" because of bugs in GNU install when not running as root + $mkdir -p foo/bar >/dev/null 2>&1 + if $test -d foo/bar; then + echo "Great, we can build them using 'mkdir -p'." + creatdir='mkdir -p' + else + case "$creatdir" in + '') + if eval "$install -d foo/bar"; $test -d foo/bar; then + creatdir="install -d" + echo "It looks like '$creatdir' will do it for us." + fi + ;; + *) + eval "$creatdir foo/bar" >/dev/null 2>&1 + if $test -d foo/bar; then + echo "Ah! We can use '$creatdir' to do just that." + else + creatdir='' + fi + ;; + esac + fi $rm -rf foo case "$creatdir" in '') diff --git a/mcon/U/intsize.U b/mcon/U/intsize.U index 3c93b43..38c5414 100644 --- a/mcon/U/intsize.U +++ b/mcon/U/intsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: intsize.U,v 3.0.1.2 1997/02/28 15:55:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: intsize.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 15:55:26 ram @@ -51,7 +51,7 @@ ?H:#define LONGSIZE $longsize /**/ ?H:#define SHORTSIZE $shortsize /**/ ?H:. -?F:!intsize.out +?F:!intsize.out !intsize : check for lengths of integral types echo " " case "$intsize" in @@ -59,7 +59,7 @@ case "$intsize" in echo "Checking to see how big your integers are..." >&4 $cat >intsize.c <<'EOCP' #include <stdio.h> -main() +int main() { @if INTSIZE || intsize printf("intsize=%d;\n", sizeof(int)); diff --git a/mcon/U/ipc.U b/mcon/U/ipc.U index 5f7213c..3593441 100644 --- a/mcon/U/ipc.U +++ b/mcon/U/ipc.U @@ -1,12 +1,12 @@ -?RCS: $Id: ipc.U,v 3.0 1993/08/18 12:08:53 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: ipc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:53 ram diff --git a/mcon/U/issymlink.U b/mcon/U/issymlink.U new file mode 100644 index 0000000..3655450 --- /dev/null +++ b/mcon/U/issymlink.U @@ -0,0 +1,85 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> +?RCS: +?RCS: $Log: lns.U,v $ +?RCS: Revision 3.0.1.1 1994/06/20 07:05:52 ram +?RCS: patch30: created by ADO +?RCS: +?MAKE:issymlink: lns test rm +?MAKE: -pick add $@ %< +?S:issymlink: +?S: This variable holds the test command to test for a symbolic link +?S: (if they are supported). Typical values include 'test -h' and +?S: 'test -L'. +?S:. +?T:pth p +?LINT:change PATH test +: determine whether symbolic links are supported +echo " " +case "$lns" in +*"ln"*" -s") + echo "Checking how to test for symbolic links..." >&4 + $lns blurfl sym + if $test "X$issymlink" = X; then +?X: +?X: In some AIX 4 versions the (ksh) builtin test (-h) is broken. +?X: + case "$newsh" in + '') sh -c "PATH= test -h sym" >/dev/null 2>&1 ;; + *) $newsh -c "PATH= test -h sym" >/dev/null 2>&1 ;; + esac + if test $? = 0; then + issymlink="test -h" + else + echo "Your builtin 'test -h' may be broken." >&4 + case "$test" in + /*) ;; + *) pth=`echo $PATH | sed -e "s/$p_/ /g"` + for p in $pth + do + if test -f "$p/$test"; then + test="$p/$test" + break + fi + done + ;; + esac + case "$test" in + /*) + echo "Trying external '$test -h'." >&4 + issymlink="$test -h" + if $test ! -h sym >/dev/null 2>&1; then + echo "External '$test -h' is broken, too." >&4 + issymlink='' + fi + ;; + *) issymlink='' ;; + esac + fi + fi + if $test "X$issymlink" = X; then + if $test -L sym 2>/dev/null; then + issymlink="$test -L" + echo "The builtin '$test -L' worked." >&4 + fi + fi + if $test "X$issymlink" != X; then + echo "You can test for symbolic links with '$issymlink'." >&4 + else + echo "I do not know how you can test for symbolic links." >&4 + fi + $rm -f blurfl sym + ;; +*) echo "No symbolic links, so not testing for their testing..." >&4 + ;; +esac + diff --git a/mcon/U/kernel.U b/mcon/U/kernel.U index 0afeeb2..f8e5ba6 100644 --- a/mcon/U/kernel.U +++ b/mcon/U/kernel.U @@ -1,12 +1,12 @@ -?RCS: $Id: kernel.U,v 3.0 1993/08/18 12:08:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: kernel.U,v $ ?RCS: Revision 3.0 1993/08/18 12:08:54 ram diff --git a/mcon/U/lex.U b/mcon/U/lex.U index 5e527bb..0968494 100644 --- a/mcon/U/lex.U +++ b/mcon/U/lex.U @@ -1,12 +1,12 @@ -?RCS: $Id: lex.U,v 3.0.1.3 1994/10/29 16:22:50 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Orginal Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: diff --git a/mcon/U/lib.U b/mcon/U/lib.U index 59986ba..ab6257e 100644 --- a/mcon/U/lib.U +++ b/mcon/U/lib.U @@ -1,12 +1,12 @@ -?RCS: $Id: lib.U,v 3.0.1.3 1995/09/25 09:16:47 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: lib.U,v $ ?RCS: Revision 3.0.1.3 1995/09/25 09:16:47 ram diff --git a/mcon/U/libc.U b/mcon/U/libc.U index 1e2bcc0..dafd669 100644 --- a/mcon/U/libc.U +++ b/mcon/U/libc.U @@ -1,12 +1,12 @@ -?RCS: $Id: libc.U,v 3.0.1.10 1997/02/28 15:56:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libc.U,v $ ?RCS: Revision 3.0.1.10 1997/02/28 15:56:48 ram @@ -48,20 +48,27 @@ ?RCS: Revision 3.0 1993/08/18 12:08:57 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:libc +nm_extract: echo n c rm test grep Getfile Myread Oldconfig Loc \ - sed libs incpath libpth runnm nm_opt nm_so_opt contains xlibpth so _a _o +?MAKE:libc libnames +nm_extract: echo n c rm test grep Getfile Myread \ + Oldconfig Loc sed libs incpath libpth ar runnm nm nm_opt nm_so_opt \ + contains xlibpth so osname trnl tr sort uniq _o _a ?MAKE: -pick add $@ %< ?S:libc: ?S: This variable contains the location of the C library. ?S:. +?S:libnames: +?S: The constructed list of library names. Normally empty, but hint files +?S: may set this for later perusal by Configure. +?S:. ?S:nm_extract: ?S: This variable holds the name of the extraction command used to process ?S: the output of nm and yield the list of defined symbols. It is used ?S: internally by Configure. ?S:. ?T:thislib try libnames xxx xscan xrun thisname com tans file -?F:!libnames -?LINT:change nm_opt +?F:!libnames !libc.tmp !tmp.imp +?LINT:change nm_opt runnm +?INIT:libnames='' +: Figure out where the libc is located case "$runnm" in true) ?X: indentation is wrong on purpose--RAM @@ -74,7 +81,6 @@ case "$libc" in esac ;; esac -libnames=''; case "$libs" in '') ;; *) for thislib in $libs; do @@ -133,15 +139,16 @@ unknown) set /lib/libc.$so for xxx in $libpth; do $test -r $1 || set $xxx/libc.$so + : The messy sed command sorts on library version numbers. $test -r $1 || \ - set `echo blurfl; echo /usr/lib/libc.$so.[0-9]* | \ - tr ' ' '\012' | egrep -v '\.[A-Za-z]*$' | $sed -e ' + set `echo blurfl; echo $xxx/libc.$so.[0-9]* | \ + tr ' ' $trnl | egrep -v '\.[A-Za-z]*$' | $sed -e ' h s/[0-9][0-9]*/0000&/g s/0*\([0-9][0-9][0-9][0-9][0-9]\)/\1/g G s/\n/ /' | \ - sort | $sed -e 's/^.* //'` + $sort | $sed -e 's/^.* //'` eval set \$$# done $test -r $1 || set /usr/ccs/lib/libc.$so @@ -208,7 +215,7 @@ compiler, or your machine supports multiple models), you can override it here. EOM else dflt='' - echo $libpth | tr ' ' '\012' | sort | uniq > libpath + echo $libpth | $tr ' ' $trnl | $sort | $uniq > libpath cat >&4 <<EOM I can't seem to find your C library. I've looked in the following places: @@ -226,7 +233,7 @@ rp='Where is your C library?' libc="$ans" echo " " -echo $libc $libnames | tr ' ' '\012' | sort | uniq > libnames +echo $libc $libnames | $tr ' ' $trnl | $sort | $uniq > libnames set X `cat libnames` shift xxx=files @@ -244,8 +251,8 @@ $echo $n "This may take a while...$c" >&4 ?X: for file in $*; do case $file in - *$so*) nm $nm_so_opt $nm_opt $file 2>/dev/null;; - *) nm $nm_opt $file 2>/dev/null;; + *$so*) $nm $nm_so_opt $nm_opt $file 2>/dev/null;; + *) $nm $nm_opt $file 2>/dev/null;; esac done >libc.tmp @@ -261,7 +268,7 @@ $grep fprintf libc.tmp > libc.ptf ?X: some variables that will be "eval"ed. ?X: xscan='eval "<libc.ptf $com >libc.list"; $echo $n ".$c" >&4' -xrun='eval "<libc.tmp $com >libc.list"; echo "done" >&4' +xrun='eval "<libc.tmp $com >libc.list"; echo "done." >&4' ?X: BSD-like output, I and W types added for Linux ?X: Some versions of Linux include a leading __IO in the symbol name. ?X: HPUX10 reportedly has trailing spaces, though I'm suprised it has @@ -306,6 +313,10 @@ elif com="$sed -n -e 's/^__//' -e '/|Undef/d' -e '/|Proc/s/ .*//p'";\ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then eval $xrun +elif com="$sed -n -e 's/^.*|Proc .*|Text *| *//p'";\ + eval $xscan;\ + $contains '^fprintf$' libc.list >/dev/null 2>&1; then + eval $xrun elif com="$sed -n -e '/Def. Text/s/.* \([^ ]*\)\$/\1/p'";\ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then @@ -319,8 +330,13 @@ elif com="$sed -n -e 's/.*\.text n\ \ \ \.//p'";\ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then eval $xrun +?X: AIX nm output +elif com="sed -n -e 's/^__.*//' -e 's/[ ]*D[ ]*[0-9]*.*//p'";\ + eval $xscan;\ + $contains '^fprintf$' libc.list >/dev/null 2>&1; then + eval $xrun else - nm -p $* 2>/dev/null >libc.tmp + $nm -p $* 2>/dev/null >libc.tmp $grep fprintf libc.tmp > libc.ptf if com="$sed -n -e 's/^.* [ADTSIW] *_[_.]*//p' -e 's/^.* [ADTSIW] //p'";\ eval $xscan; $contains '^fprintf$' libc.list >/dev/null 2>&1 @@ -329,28 +345,48 @@ else eval $xrun else echo " " - echo "nm didn't seem to work right. Trying ar instead..." >&4 + echo "$nm didn't seem to work right. Trying $ar instead..." >&4 com='' - if ar t $libc > libc.tmp; then - for thisname in $libnames; do - ar t $thisname >>libc.tmp + if $ar t $libc > libc.tmp && \ + $contains '^fprintf$' libc.tmp >/dev/null 2>&1 + then + for thisname in $libnames $libc; do + $ar t $thisname >>libc.tmp done $sed -e "s/\\$_o\$//" < libc.tmp > libc.list echo "Ok." >&4 + elif test "X$osname" = "Xos2" && $ar tv $libc > libc.tmp; then +?X: Repeat libc to extract forwarders to DLL entries too + for thisname in $libnames $libc; do + $ar tv $thisname >>libc.tmp +?X: Revision 50 of EMX has bug in ar: it will not extract forwarders +?X: to DLL entries. Use emximp which will extract exactly them. + emximp -o tmp.imp $thisname \ + 2>/dev/null && \ + $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \ + < tmp.imp >>libc.tmp + $rm -f tmp.imp + done + $sed -e "s/\\$_o\$//" -e 's/^ \+//' < libc.tmp > libc.list + echo "Ok." >&4 else - echo "ar didn't seem to work right." >&4 + echo "$ar didn't seem to work right." >&4 echo "Maybe this is a Cray...trying bld instead..." >&4 - if bld t $libc | $sed -e 's/.*\///' -e "s/\\$_o:.*\$//" > libc.list + if + bld t $libc | \ + $sed -e 's/.*\///' -e "s/\\$_o:.*\$//" > libc.list && + $test -s libc.list then for thisname in $libnames; do bld t $libnames | \ $sed -e 's/.*\///' -e "s/\\$_o:.*\$//" >>libc.list - ar t $thisname >>libc.tmp + $ar t $thisname >>libc.tmp done echo "Ok." >&4 else - echo "That didn't work either. Giving up." >&4 - exit 1 + echo "That didn't work either." >&4 + echo "No problem, I'll be compiling test programs then..." >&4 + runnm=false fi fi fi @@ -359,7 +395,8 @@ nm_extract="$com" if $test -f /lib/syscalls.exp; then echo " " echo "Also extracting names from /lib/syscalls.exp for good ole AIX..." >&4 - $sed -n 's/^\([^ ]*\)[ ]*syscall$/\1/p' /lib/syscalls.exp >>libc.list + $sed -n 's/^\([^ ]*\)[ ]*syscall[0-9]*[ ]*$/\1/p' \ + /lib/syscalls.exp >>libc.list fi ?X: remember, indentation is wrong on purpose--RAM ;; diff --git a/mcon/U/libdbm.U b/mcon/U/libdbm.U index 06c1ab8..07568e5 100644 --- a/mcon/U/libdbm.U +++ b/mcon/U/libdbm.U @@ -1,12 +1,12 @@ -?RCS: $Id: libdbm.U,v 3.0.1.1 1997/02/28 15:56:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libdbm.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 15:56:57 ram diff --git a/mcon/U/libflex.U b/mcon/U/libflex.U index 16c9b9e..cf2c844 100644 --- a/mcon/U/libflex.U +++ b/mcon/U/libflex.U @@ -1,12 +1,12 @@ -?RCS: $Id: libflex.U,v 3.0.1.3 1997/02/28 15:57:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libflex.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 15:57:48 ram diff --git a/mcon/U/libnlist.U b/mcon/U/libnlist.U index 8ff18c7..f0f81e6 100644 --- a/mcon/U/libnlist.U +++ b/mcon/U/libnlist.U @@ -1,12 +1,12 @@ -?RCS: $Id: libnlist.U,v 3.0.1.1 1997/02/28 16:08:02 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libnlist.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:08:02 ram @@ -17,7 +17,7 @@ ?RCS: Revision 3.0 1993/08/18 12:09:00 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:libnlist: Loc libpth Guess usrinc mips _a +?MAKE:libnlist: Loc libpth Guess usrinc _a ?MAKE: -pick add $@ %< ?S:libnlist (libmld): ?S: This variable contains the name of the library required to get the @@ -25,10 +25,10 @@ ?S: Under Sys Vr4, it is -lelf. Otherwise, its value is empty. ?S:. ?T:xxx -?LINT:use usrinc mips +?LINT:use usrinc : see if we need a special library for 'nlist()' echo " " -: How about doing this of nlist is not in libc... +: How about doing this if nlist is not in libc... if ./mips ; then libnlist='-lmld' else diff --git a/mcon/U/libnm.U b/mcon/U/libnm.U index 5dbb0b2..ac5d73b 100644 --- a/mcon/U/libnm.U +++ b/mcon/U/libnm.U @@ -1,12 +1,12 @@ -?RCS: $Id: libnm.U,v 3.0.1.1 1997/02/28 16:08:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libnm.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:08:26 ram diff --git a/mcon/U/libpth.U b/mcon/U/libpth.U index a152695..d80bb00 100644 --- a/mcon/U/libpth.U +++ b/mcon/U/libpth.U @@ -1,12 +1,12 @@ -?RCS: $Id: libpth.U,v 3.0.1.6 1997/02/28 16:08:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libpth.U,v $ ?RCS: Revision 3.0.1.6 1997/02/28 16:08:49 ram @@ -35,16 +35,26 @@ ?X: This unit initializes the path for C library lookup. ?X: ?MAKE:libpth glibpth xlibpth plibpth loclibpth: \ - usrinc mips incpath test cat Myread Oldconfig + usrinc incpath test cat Myread Oldconfig ?MAKE: -pick add $@ %< ?S:libpth: -?S: This variable holds the general path used to find libraries. It is -?S: intended to be used by other units. +?S: This variable holds the general path (space-separated) used to find +?S: libraries. It is intended to be used by other units. +?S:. +?S:glibpth: +?S: This variable holds the general path (space-separated) used to +?S: find libraries. It may contain directories that do not exist on +?S: this platform, libpth is the cleaned-up version. +?S:. +?S:xlibpth: +?S: This variable holds extra path (space-separated) used to find +?S: libraries on this platform, for example CPU-specific libraries +?S: (on multi-CPU platforms) may be listed here. ?S:. ?S:loclibpth: -?S: This variable holds the paths used to find local libraries. It is -?S: prepended to libpth, and is intended to be easily set from the -?S: command line. +?S: This variable holds the paths (space-separated) used to find local +?S: libraries. It is prepended to libpth, and is intended to be easily +?S: set from the command line. ?S:. ?S:plibpth: ?S: Holds the private path used by Configure to find out the libraries. @@ -52,30 +62,26 @@ ?S: machines, like the mips. Usually, it should be empty. ?S:. ?T: xxx dlist +?LINT:use usrinc ?INIT:: change the next line if compiling for Xenix/286 on Xenix/386 ?INIT:xlibpth='/usr/lib/386 /lib/386' -?INIT: ?INIT:: Possible local library directories to search. ?INIT:loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" ?INIT:loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ?INIT: ?INIT:: general looking path for locating libraries -?X: /lib/pa1.1 is for HP-UX specially tuned PA-RISC libraries. +?INIT:glibpth="/lib /usr/lib $xlibpth" +?INIT:glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" ?X: /shlib is for Digital Unix 4.0 ?X: /usr/shlib is for OSF/1 systems. -?X: I don't know why the large & small libraries are in this order. -?INIT:glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large" -?INIT:glibpth="$glibpth /lib /usr/lib $xlibpth" -?INIT:glibpth="$glibpth /lib/large /usr/lib/small /lib/small" -?INIT:glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +?INIT:test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +?INIT:test -f /shlib/libc.so && glibpth="/shlib $glibpth" ?INIT: ?INIT:: Private path used by Configure to find libraries. Its value ?INIT:: is prepended to libpth. This variable takes care of special ?INIT:: machines, like the mips. Usually, it should be empty. ?INIT:plibpth='' ?INIT: -?LINT:describe xlibpth glibpth -?LINT:use mips usrinc : Set private lib path case "$plibpth" in '') if ./mips; then diff --git a/mcon/U/libs.U b/mcon/U/libs.U index 0a4932b..0a8feaa 100644 --- a/mcon/U/libs.U +++ b/mcon/U/libs.U @@ -1,12 +1,12 @@ -?RCS: $Id: libs.U,v 3.0.1.6 1997/02/28 16:09:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libs.U,v $ ?RCS: Revision 3.0.1.6 1997/02/28 16:09:11 ram @@ -32,15 +32,60 @@ ?RCS: Revision 3.0 1993/08/18 12:09:03 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:libs: test cat Myread Oldconfig Loc libpth package xlibpth so _a +?MAKE:libs libsfound libsfiles libsdirs libspath libscheck: \ + test cat Myread Oldconfig Loc libpth package xlibpth so _a \ + +usesocks sed +cc +ccflags +ldflags rm ?MAKE: -pick add $@ %< ?S:libs: ?S: This variable holds the additional libraries we want to use. -?S: It is up to the Makefile to deal with it. +?S: It is up to the Makefile to deal with it. The list can be empty. +?S:. +?S:libsfound: +?S: This variable holds the full pathnames of the libraries +?S: we found and accepted. +?S:. +?S:libsfiles: +?S: This variable holds the filenames aka basenames of the libraries +?S: we found and accepted. +?S:. +?S:libsdirs: +?S: This variable holds the directory names aka dirnames of the libraries +?S: we found and accepted, duplicates are removed. +?S:. +?S:libspath: +?S: This variable holds the directory names probed for libraries. +?S:. +?S:libscheck: +?S: This variable is intended to be set by hint files, if needed. +?S: It should contain shell code that will be eval'ed with $xxx holding +?S: some library file. It may change $xxx if needed. +?S: For instance, on an Irix platform, you may make sure the right +?S: library file is used depending on the cc command line, so that the +?S: correct library is used depending on the selected ABI (for 32 and +?S: 64-bit compilations). +?S: +?S: Here is an example of code that could be found in a hint file on Irix +?S: when the selected compiler was for 32-bit -- that code is put in the +?S: cc.cbu call-back unit to be invoked AFTER the C compiler and its +?S: flags have been chosen: +?S: +?S: libscheck='case "$xxx" in +?S: *.a) /bin/ar p $xxx `/bin/ar t $xxx | sed q` >$$.o; +?S: case "`/usr/bin/file $$.o`" in +?S: *N32*) rm -f $$.o ;; +?S: *) rm -f $$.o; xxx=/no/n32$xxx ;; +?S: esac ;; +?S: *) case "`/usr/bin/file $xxx`" in +?S: *N32*) ;; +?S: *) xxx=/no/n32$xxx ;; +?S: esac ;; +?S: esac' ?S:. -?T:xxx thislib libswanted ?D:libs='' -?X: +?LINT:extern libswanted +?LINT:change libswanted +?INIT:: default library list +?INIT:libswanted='' ?X: This order is chosen so that libraries -lndir, -ldir, -lucb, -lbsd, ?X: -lBSD, -lPW, and -lx only get used if there are unresolved ?X: routines at link time. Usually, these are backwards compatability @@ -58,12 +103,14 @@ ?X: Set proper libswanted in your private Myinit.U if needed. ?X: ?X:: default ordered library list -?X:libswanted='net socket inet nsl nm sdbm gdbm ndbm dbm malloc dl' +?X:libswanted='net socket inet bind nsl nm sdbm gdbm ndbm dbm malloc dl' ?X:libswanted="$libswanted dld sun m c_s c posix cposix ndir dir ucb" ?X:libswanted="$libswanted bsd BSD PW x" ?X: -?INIT:: default library list -?INIT:libswanted='' +?INIT:: should be set by hint files if needed +?INIT:libscheck='' +?T:xxx yyy thislib thisdir libstyle linkmsg +?F:lt.c lt : Looking for optional libraries echo " " echo "Checking for optional libraries..." >&4 @@ -74,53 +121,96 @@ esac case "$libswanted" in '') libswanted='c_s';; esac +?X: libsocks has nasty naming scheme. +?X: This does not work if somebody wants SOCKS 4. +case "$usesocks" in +"$define") libswanted="$libswanted socks5 socks5_sh" ;; +esac +?X: Used later for link checks +echo "extern char printf(); int main() { printf(); return 0; }" > lt.c +libsfound='' +libsfiles='' +libsdirs='' +libspath='' +for thisdir in $libpth $xlibpth; do + test -d $thisdir && libspath="$libspath $thisdir" +done for thislib in $libswanted; do - + for thisdir in $libspath; do + xxx='' + if $test ! -f "$xxx" ; then + xxx=`ls $thisdir/lib$thislib.$so.[0-9]* 2>/dev/null | $sed -n '1p'` + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=shared + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib.$so + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=shared + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=static + fi + if test ! -f "$xxx"; then + xxx=$thisdir/$thislib$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=static + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib${thislib}_s$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=static + $test -f "$xxx" && thislib=${thislib}_s + fi + if test ! -f "$xxx"; then + xxx=$thisdir/Slib$thislib$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle=static + fi + if $test -f "$xxx"; then ?X: -?X: Comparaisons via case statement use the string " $dflt " to ensure that -?X: each library is separated by a space. That way, by looking to something -?X: like *"-l$thislib "*, we ensure we find -lm and not -lmalloc (which was -?X: the case with the old looking pattern *-l$thislib*. +?X: It is not sufficient to find a .so on the disk. We must make sure +?X: that we can indeed supply the -lfoo line on the cc line to link against +?X: that library. On Linux for instance, a versionned .so will not be +?X: implicitly linked against, whereas it will work fine on Solaris 2.6. +?X: --RAM, 10/10/2003 ?X: - if xxx=`./loc lib$thislib.$so.[0-9]'*' X $libpth`; $test -f "$xxx"; then - echo "Found -l$thislib (shared)." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac - elif xxx=`./loc lib$thislib.$so X $libpth` ; $test -f "$xxx"; then - echo "Found -l$thislib (shared)." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac - elif xxx=`./loc lib$thislib$_a X $libpth`; $test -f "$xxx"; then - echo "Found -l$thislib." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac -?X: Don't forget about OS/2 where -lmalloc is spelled out malloc.a - elif xxx=`./loc $thislib$_a X $libpth`; $test -f "$xxx"; then - echo "Found -l$thislib." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac - elif xxx=`./loc lib${thislib}_s$_a X $libpth`; $test -f "$xxx"; then - echo "Found -l${thislib}_s." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l${thislib}_s";; - esac - elif xxx=`./loc Slib$thislib$_a X $xlibpth`; $test -f "$xxx"; then - echo "Found -l$thislib." - case " $dflt " in - *"-l$thislib "*);; - *) dflt="$dflt -l$thislib";; - esac - else - echo "No -l$thislib." + if $cc -o lt $ccflags $ldflags lt.c -l$thislib >/dev/null 2>&1; + then + linkmsg="" + else + linkmsg=" but I can't link against it" + fi + case "$libstyle" in + shared) echo "Found -l$thislib (shared)$linkmsg." ;; + static) echo "Found -l$thislib$linkmsg." ;; + *) echo "Found -l$thislib ($libstyle)$linkmsg." ;; + esac + case " $dflt " in + *"-l$thislib "*) ;; + *) + case "$linkmsg" in + '') + dflt="$dflt -l$thislib" + libsfound="$libsfound $xxx" + yyy=`basename $xxx` + libsfiles="$libsfiles $yyy" + yyy=`echo $xxx|$sed -e "s%/$yyy\\$%%"` + case " $libsdirs " in + *" $yyy "*) ;; + *) libsdirs="$libsdirs $yyy" ;; + esac + ;; + esac + ;; + esac + break + fi + done + if $test ! -f "$xxx"; then + echo "No -l$thislib." fi done set X $dflt @@ -133,22 +223,17 @@ esac case "$dflt" in ' '|'') dflt='none';; esac +$rm -f lt.c lt $cat <<EOM - -Some versions of Unix support shared libraries, which make executables smaller -but make load time slightly longer. -On some systems, mostly System V Release 3's, the shared library is included -by putting the option "-lc_s" as the last thing on the cc command line when -linking. Other systems use shared libraries by default. There may be other -libraries needed to compile $package on your machine as well. If your system -needs the "-lc_s" option, include it here. Include any other special libraries -here as well. Say "none" for none. +In order to compile $package on your machine, a number of libraries +are usually needed. Include any other special libraries here as well. +Say "none" for none. The default list is almost always right. EOM echo " " -rp="Any additional libraries?" +rp="Which libraries to use?" . ./myread case "$ans" in none) libs=' ';; diff --git a/mcon/U/libyacc.U b/mcon/U/libyacc.U index ab861f9..a5b0881 100644 --- a/mcon/U/libyacc.U +++ b/mcon/U/libyacc.U @@ -1,12 +1,12 @@ -?RCS: $Id: libyacc.U,v 3.0.1.4 1997/02/28 16:09:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: libyacc.U,v $ ?RCS: Revision 3.0.1.4 1997/02/28 16:09:19 ram diff --git a/mcon/U/lintlib.U b/mcon/U/lintlib.U index 2a1a181..09107a1 100644 --- a/mcon/U/lintlib.U +++ b/mcon/U/lintlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: lintlib.U,v 3.0 1993/08/18 12:09:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: lintlib.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:05 ram diff --git a/mcon/U/lns.U b/mcon/U/lns.U index 2c3bf26..6160bd4 100644 --- a/mcon/U/lns.U +++ b/mcon/U/lns.U @@ -1,12 +1,12 @@ -?RCS: $Id: lns.U,v 3.0.1.1 1994/06/20 07:05:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -19,7 +19,7 @@ ?X: We can't rely on d_symlink because that may be listed in the ?X: C library but unimplemented. ?X: -?MAKE:lns: ln rm touch +?MAKE:lns: ln rm touch test ?MAKE: -pick add $@ %< ?S:lns: ?S: This variable holds the name of the command to make @@ -29,7 +29,8 @@ : determine whether symbolic links are supported echo " " $touch blurfl -if $ln -s blurfl sym > /dev/null 2>&1 ; then +$rm -f sym +if $ln -s blurfl sym > /dev/null 2>&1 && $test -f sym; then echo "Symbolic links are supported." >&4 lns="$ln -s" else diff --git a/mcon/U/locdist.U b/mcon/U/locdist.U index 4ba6210..0975e6a 100644 --- a/mcon/U/locdist.U +++ b/mcon/U/locdist.U @@ -1,12 +1,12 @@ -?RCS: $Id: locdist.U,v 3.0.1.1 1994/05/06 15:09:20 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: locdist.U,v $ ?RCS: Revision 3.0.1.1 1994/05/06 15:09:20 ram diff --git a/mcon/U/longsize.U b/mcon/U/longsize.U index d0c1bab..1fe9df5 100644 --- a/mcon/U/longsize.U +++ b/mcon/U/longsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: longsize.U,v 3.0.1.2 1997/02/28 16:09:35 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: longsize.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:09:35 ram diff --git a/mcon/U/lseektype.U b/mcon/U/lseektype.U index 957fdc5..861395e 100644 --- a/mcon/U/lseektype.U +++ b/mcon/U/lseektype.U @@ -1,12 +1,12 @@ -?RCS: $Id: lseektype.U,v 3.0.1.1 1994/08/29 16:30:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: lseektype.U,v $ ?RCS: Revision 3.0.1.1 1994/08/29 16:30:10 ram diff --git a/mcon/U/maildir.U b/mcon/U/maildir.U index 0ecb06a..4c6499e 100644 --- a/mcon/U/maildir.U +++ b/mcon/U/maildir.U @@ -1,12 +1,12 @@ -?RCS: $Id: maildir.U,v 3.0.1.1 1993/12/15 08:21:56 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: maildir.U,v $ ?RCS: Revision 3.0.1.1 1993/12/15 08:21:56 ram diff --git a/mcon/U/mailer.U b/mcon/U/mailer.U index 45e17f0..1840ee7 100644 --- a/mcon/U/mailer.U +++ b/mcon/U/mailer.U @@ -1,12 +1,12 @@ -?RCS: $Id: mailer.U,v 3.0.1.3 1995/01/11 15:32:11 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mailer.U,v $ ?RCS: Revision 3.0.1.3 1995/01/11 15:32:11 ram diff --git a/mcon/U/mailfile.U b/mcon/U/mailfile.U index 7e389a1..ebe1535 100644 --- a/mcon/U/mailfile.U +++ b/mcon/U/mailfile.U @@ -1,12 +1,12 @@ -?RCS: $Id: mailfile.U,v 3.0.1.2 1994/10/29 16:24:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mailfile.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 16:24:57 ram diff --git a/mcon/U/make.U b/mcon/U/make.U index 607e9d3..98eb0a8 100644 --- a/mcon/U/make.U +++ b/mcon/U/make.U @@ -1,13 +1,13 @@ -?RCS: $Id: make.U,v 3.0.1.1 1997/02/28 16:09:40 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: make.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:09:40 ram @@ -20,18 +20,21 @@ ?S: This variable contains the string to be included in Makefile.SH ?S: so that MAKE is set if needed, and not if not needed. ?S: Possible values are: +?S: ?S: make_set_make='#' # If your make program handles this for you, +?S: ?S: make_set_make="MAKE=$make" # if it doesn't. -?S: I used a comment character so that we can distinguish a +?S: +?S: This uses a comment character so that we can distinguish a ?S: 'set' value (from a previous config.sh or Configure -D option) ?S: from an uncomputed value. ?S:. ?LINT: extern MAKE ?LINT: change MAKE -?T:maketemp ?X: This test is based on one from an autoconf-generated configure ?X: script. Autoconf stole a lot from Configure, but now it's our ?X: turn to do so... ;-) -- RAM, 21/02/97 +: check whether make sets MAKE echo " " echo "Checking if your $make program sets \$(MAKE)..." >&4 case "$make_set_make" in diff --git a/mcon/U/mallocsrc.U b/mcon/U/mallocsrc.U index b0f0d61..79da8a1 100644 --- a/mcon/U/mallocsrc.U +++ b/mcon/U/mallocsrc.U @@ -1,12 +1,12 @@ -?RCS: $Id: mallocsrc.U,v 3.0.1.2 1997/02/28 16:10:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mallocsrc.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:10:26 ram @@ -22,8 +22,11 @@ ?MAKE:mallocsrc mallocobj usemymalloc malloctype d_mymalloc \ freetype: Myread \ Oldconfig package Guess Setvar rm cat +cc +ccflags Findhdr \ - i_malloc i_stdlib sed libs _o + i_malloc i_stdlib sed libs _o ptrsize ?MAKE: -pick add $@ %< +?X: Put near top so that other tests don't erroneously include +?X: -lmalloc. --AD 22 June 1998 +?Y:TOP ?S:usemymalloc: ?S: This variable contains y if the malloc that comes with this package ?S: is desired over the system's version of malloc. People often include @@ -77,9 +80,14 @@ : determine which malloc to compile in echo " " case "$usemymalloc" in -''|y*|true) dflt='y' ;; -n*|false) dflt='n' ;; -*) dflt="$usemymalloc" ;; +[yY]*|true|$define) dflt='y' ;; +[nN]*|false|$undef) dflt='n' ;; +*) + case "$ptrsize" in + 4) dflt='y' ;; + *) dflt='n' ;; + esac + ;; esac rp="Do you wish to attempt to use the malloc that comes with $package?" . ./myread diff --git a/mcon/U/man1dir.U b/mcon/U/man1dir.U index e6f9e87..23b2765 100644 --- a/mcon/U/man1dir.U +++ b/mcon/U/man1dir.U @@ -1,13 +1,13 @@ -?RCS: $Id: man1dir.U,v 3.0.1.1 1997/02/28 16:10:29 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: man1dir.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:10:29 ram diff --git a/mcon/U/man3dir.U b/mcon/U/man3dir.U index 938ac1e..5017f2b 100644 --- a/mcon/U/man3dir.U +++ b/mcon/U/man3dir.U @@ -1,13 +1,13 @@ -?RCS: $Id: man3dir.U,v 3.0.1.1 1997/02/28 16:10:34 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: man3dir.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:10:34 ram diff --git a/mcon/U/manfmt.U b/mcon/U/manfmt.U index a4c27c5..d8f4d9a 100644 --- a/mcon/U/manfmt.U +++ b/mcon/U/manfmt.U @@ -1,12 +1,12 @@ -?RCS: $Id: manfmt.U,v 3.0.1.5 1997/02/28 16:11:57 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: manfmt.U,v $ ?RCS: Revision 3.0.1.5 1997/02/28 16:11:57 ram diff --git a/mcon/U/mansrc.U b/mcon/U/mansrc.U index fa2eb28..c5830da 100644 --- a/mcon/U/mansrc.U +++ b/mcon/U/mansrc.U @@ -1,12 +1,12 @@ -?RCS: $Id: mansrc.U,v 3.0.1.9 1997/02/28 16:12:03 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mansrc.U,v $ ?RCS: Revision 3.0.1.9 1997/02/28 16:12:03 ram @@ -83,9 +83,10 @@ esac echo "If you don't want the manual sources installed, answer 'none'." case "$mansrc" in '') - lookpath="$prefixexp/man/man1 $prefixexp/man/u_man/man1" - lookpath="$lookpath $prefixexp/man/l_man/man1" + lookpath="$prefixexp/share/man/man1 $prefixexp/man/man1" + lookpath="$lookpath $prefixexp/man/u_man/man1 $prefixexp/man/l_man/man1" lookpath="$lookpath /usr/local/man/man1 /opt/man/man1 /usr/man/manl" + lookpath="$lookpath /usr/share/man/man1 /usr/local/share/man/man1" lookpath="$lookpath /usr/man/local/man1 /usr/man/l_man/man1" lookpath="$lookpath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" lookpath="$lookpath /usr/man/man.L" diff --git a/mcon/U/mboxchar.U b/mcon/U/mboxchar.U index 997c854..ed33695 100644 --- a/mcon/U/mboxchar.U +++ b/mcon/U/mboxchar.U @@ -1,12 +1,12 @@ -?RCS: $Id: mboxchar.U,v 3.0.1.2 1995/07/25 14:13:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mboxchar.U,v $ ?RCS: Revision 3.0.1.2 1995/07/25 14:13:12 ram diff --git a/mcon/U/mkdep.U b/mcon/U/mkdep.U index 52d49c6..23d1a26 100644 --- a/mcon/U/mkdep.U +++ b/mcon/U/mkdep.U @@ -1,12 +1,12 @@ -?RCS: $Id: mkdep.U,v 3.0.1.4 1997/02/28 16:13:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: mkdep.U,v $ ?RCS: Revision 3.0.1.4 1997/02/28 16:13:07 ram @@ -30,7 +30,7 @@ ?X: generation (usage: 'mkdep [cppflags] -- *.c'). ?X: ?MAKE:mkdep: spitshell startsh cpp +cppflags grep contains rm sed sort uniq \ - Getfile Oldconfig eunicefix cat +cc cppminus test _o + Getfile Oldconfig eunicefix cat +cc cppminus test pkgsrc _o ?MAKE: -pick add $@ %< ?S:mkdep: ?S: This variable holds the name of a command to generate makefile @@ -67,11 +67,27 @@ case "$mkdep" in '') ;; *) - if test -x "$mkdep" && + if test -f "$mkdep" && $mkdep dep.c >dep.out 2>/dev/null && $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1 then echo "$mkdep works." +?X: If they copied a config.sh from some other place, they'll have a working +?X: mkdep script probably, but not located at the top of the sources. And +?X: the Makefiles generated by jmake expect an mkdep script in the top dir. + case "$mkdep" in + "$pkgsrc/mkdep");; + *) echo "(copying it to $pkgsrc)" + cp $mkdep $pkgsrc/mkdep 2>/dev/null + if $pkgsrc/mkdep dep.c >dep.out 2>/dev/null && + $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1; then + mkdep=$pkgsrc/mkdep + else + echo "Hmm... The copy failed or something... Guessing again..." + mkdep= + fi + ;; + esac else mkdep= fi @@ -86,7 +102,7 @@ $startsh $takeflags for srcfile do - $cpp -M -I. $cppflags \$flags \$srcfile 2>/dev/null + $cpp -M $cppflags \$flags \$srcfile 2>/dev/null done exit 0 EOM @@ -112,7 +128,7 @@ $startsh $takeflags for srcfile do - $cc -MM -I. $cppflags \$flags \$srcfile 2>/dev/null + $cc -MM $cppflags \$flags \$srcfile 2>/dev/null done exit 0 EOM @@ -143,7 +159,7 @@ do *.l) c='.l';; esac filebase=\`basename \$srcfile \$c\` - <\$srcfile $cpp $cppminus $cppflags -I. \$flags 2>/dev/null | \\ + <\$srcfile $cpp $cppminus $cppflags \$flags 2>/dev/null | \\ $sed -e '/^# *[0-9]/!d' \\ -e 's/^.*"\(.*\)".*\$/'\$filebase'$_o: \1/' \\ -e 's|: \./|: |' \\ @@ -242,6 +258,7 @@ EOM fi fi esac +echo " " dflt="$mkdep" fn=f~/ rp="Name of program to make makefile dependencies?" diff --git a/mcon/U/models.U b/mcon/U/models.U index 6398503..8887a16 100644 --- a/mcon/U/models.U +++ b/mcon/U/models.U @@ -1,12 +1,12 @@ -?RCS: $Id: models.U,v 3.0.1.2 1997/02/28 16:13:17 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: models.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:13:17 ram @@ -19,7 +19,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:models split small medium large huge: test cat Myread sysman Oldconfig \ - Loc contains + Loc Warn contains rm ?MAKE: -pick add $@ %< ?S:models: ?S: This variable contains the list of memory models supported by this @@ -54,16 +54,17 @@ ?S: huge model is not supported, contains the flag to produce large ?S: model programs. It is up to the Makefile to use this. ?S:. -?T:unsplit tans +?T:unsplit tans modelcc ?F:!pdp11 ?D:large='' +?LINT:extern cc : see what memory models we can support case "$models" in '') ?X: We may not use Cppsym or we get a circular dependency through cc. ?X: But this should work regardless of which cc we eventually use. $cat >pdp11.c <<'EOP' -main() { +int main() { #ifdef pdp11 exit(0); #else @@ -71,8 +72,14 @@ main() { #endif } EOP - cc -o pdp11 pdp11.c >/dev/null 2>&1 - if ./pdp11 2>/dev/null; then +?X: Run cc in a subshell in case they don't have a 'cc' command. +?X: Presumably they do have gcc or something. + case "$cc" in + '') modelcc="$cc" ;; + *) modelcc="cc" ;; + esac + ( $modelcc -o pdp11 pdp11.c ) >/dev/null 2>&1 + if $test -f pdp11 && ./pdp11 2>/dev/null; then dflt='unsplit split' else tans=`./loc . X /lib/small /lib/large /usr/lib/small /usr/lib/large /lib/medium /usr/lib/medium /lib/huge` @@ -106,6 +113,8 @@ put the appropriate flags later when it asks you for other cc and ld flags. Venix systems may wish to put "none" and let the compiler figure things out. (In the following question multiple model names should be space separated.) +The default for most systems is "none". + EOM rp="Which memory models are supported?" . ./myread @@ -198,7 +207,8 @@ none) esac ;; *) - echo "Unrecognized memory models--you may have to edit Makefile.SH" >&4 + ./warn "Unrecognized memory models--you may have to edit Makefile.SH" ;; esac +$rm -f pdp11.* pdp11 diff --git a/mcon/U/modetype.U b/mcon/U/modetype.U index 9168322..efdebf2 100644 --- a/mcon/U/modetype.U +++ b/mcon/U/modetype.U @@ -1,12 +1,12 @@ -?RCS: $Id: modetype.U,v 3.0.1.1 1994/10/29 16:25:07 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/myhostname.U b/mcon/U/myhostname.U index 4edb7b3..3e33f70 100644 --- a/mcon/U/myhostname.U +++ b/mcon/U/myhostname.U @@ -1,12 +1,12 @@ -?RCS: $Id: myhostname.U,v 3.0.1.3 1997/02/28 16:15:55 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: myhostname.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 16:15:55 ram @@ -23,7 +23,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:myhostname phostname mydomain: contains sed test Myread Oldconfig \ - Guess Loc awk echo sort uniq +usrinc rm hostcat Tr + Guess Loc awk echo sort uniq +usrinc rm hostcat Tr osname ?MAKE: -pick add $@ %< ?S:myhostname (hostname): ?S: This variable contains the eventual value of the MYHOSTNAME symbol, @@ -60,7 +60,7 @@ ?H:#define MYHOSTNAME "$myhostname" /**/ ?H:#define MYDOMAIN "$mydomain" /**/ ?H:. -?T:cont i tans tmp_re +?T:cont i tans tmp_re file : now get the host name echo " " echo "Figuring out host name..." >&4 @@ -115,6 +115,9 @@ if $test "$cont"; then fi fi fi +case "$myhostname" in +'') myhostname=noname ;; +esac : you do not want to know about this set $myhostname myhostname=$1 @@ -178,14 +181,21 @@ case "$myhostname" in tmp_re="[ . ]" $test x`$awk "/[0-9].*[ ]$myhostname$tmp_re/ { sum++ } END { print sum }" hosts` = x1 || tmp_re="[ ]" - dflt=.`$awk "/[0-9].*[ ]$myhostname$tmp_re/ {for(i=2; i<=NF;i++) print \\\$i}" \ + dflt=.`$awk \ + "/[0-9].*[ ]$myhostname$tmp_re/ {for(i=2; i<=NF;i++) print \\\$i}" \ hosts | $sort | $uniq | \ $sed -n -e "s/$myhostname\.\([-a-zA-Z0-9_.]\)/\1/p"` case `$echo X$dflt` in X*\ *) echo "(Several hosts in /etc/hosts matched hostname)" dflt=. ;; - X.) echo "(You do not have fully-qualified names in /etc/hosts)" +?X: There is no /etc/hosts on os390 + X.) + if $test -f /etc/hosts; then + echo "(You do not have fully-qualified names in /etc/hosts)" + else + echo "(I cannot locate a hosts database anywhere)" + fi ;; esac case "$dflt" in @@ -215,9 +225,16 @@ case "$myhostname" in esac ;; esac + case "$dflt$osname" in + .os390) + file="//'SYS1.TCPPARMS(TCPDATA)'" + echo "(Attempting domain name extraction from $file)" + dflt=.`awk '/^DOMAINORIGIN/ {print $2}' "$file" 2>/dev/null` + ;; + esac case "$dflt" in .) echo "(Lost all hope -- silly guess then)" - dflt='.uucp' + dflt='.nonet' ;; esac $rm -f hosts @@ -1,12 +1,12 @@ -?RCS: $Id: n.U,v 3.0 1993/08/18 12:09:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: n.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:19 ram diff --git a/mcon/U/nametype.U b/mcon/U/nametype.U index 9e446ad..49bc8a2 100644 --- a/mcon/U/nametype.U +++ b/mcon/U/nametype.U @@ -1,12 +1,12 @@ -?RCS: $Id: nametype.U,v 3.0.1.3 1994/10/29 16:26:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: nametype.U,v $ ?RCS: Revision 3.0.1.3 1994/10/29 16:26:09 ram diff --git a/mcon/U/nblock_io.U b/mcon/U/nblock_io.U index 6beb9c4..5c488de 100644 --- a/mcon/U/nblock_io.U +++ b/mcon/U/nblock_io.U @@ -1,12 +1,12 @@ -?RCS: $Id: nblock_io.U,v 3.0.1.2 1997/02/28 16:17:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: nblock_io.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:17:14 ram @@ -22,7 +22,7 @@ ?X: (Problem reported on FreeBSD; it's unclear if this helps.) --AD ?X: ?MAKE:o_nonblock eagain rd_nodata d_eofnblk: cat rm +cc +ccflags +ldflags \ - d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar startsh + d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar startsh Warn ?MAKE: -pick add $@ %< ?S:o_nonblock: ?S: This variable bears the symbol value to be used during open() or fcntl() @@ -72,7 +72,7 @@ ?H:#define RD_NODATA $rd_nodata ?H:#$d_eofnblk EOF_NONBLOCK ?H:. -?F:!try !try.out !try.ret !try.err +?F:!try !try.out !try.ret !try.err !mtry ?T:status ?LINT:use d_open3 : check for non-blocking I/O stuff @@ -91,7 +91,7 @@ case "$o_nonblock" in '') $cat head.c > try.c $cat >>try.c <<'EOCP' -main() { +int main() { #ifdef O_NONBLOCK printf("O_NONBLOCK\n"); exit(0); @@ -109,7 +109,7 @@ main() { exit(0); } EOCP - if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then + if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then o_nonblock=`./try` case "$o_nonblock" in '') echo "I can't figure it out, assuming O_NONBLOCK will do.";; @@ -137,7 +137,7 @@ extern int errno; $signal_t blech(x) int x; { exit(3); } EOCP $cat >> try.c <<'EOCP' -main() +int main() { int pd[2]; int pu[2]; @@ -187,7 +187,7 @@ main() exit(0); /* Bye bye, thank you for playing! */ } EOCP - if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then + if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then ?X: Use script to avoid the possible 'alarm call' message echo "$startsh" >mtry echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry @@ -226,7 +226,7 @@ EOCP esac val="$define" if test "$status" = "$rd_nodata"; then - echo "WARNING: you can't distinguish between EOF and no data!" + ./warn "your read() can't distinguish between EOF and no data!" val="$undef" fi else diff --git a/mcon/U/newslevel.U b/mcon/U/newslevel.U index d495498..763995e 100644 --- a/mcon/U/newslevel.U +++ b/mcon/U/newslevel.U @@ -1,12 +1,12 @@ -?RCS: $Id: newslevel.U,v 3.0 1993/08/18 12:09:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: newslevel.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:21 ram diff --git a/mcon/U/newslib.U b/mcon/U/newslib.U index 0538e92..1c7ee7e 100644 --- a/mcon/U/newslib.U +++ b/mcon/U/newslib.U @@ -1,12 +1,12 @@ -?RCS: $Id: newslib.U,v 3.0 1993/08/18 12:09:23 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: newslib.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:23 ram diff --git a/mcon/U/newsspool.U b/mcon/U/newsspool.U index 2c574c4..8e17b97 100644 --- a/mcon/U/newsspool.U +++ b/mcon/U/newsspool.U @@ -1,12 +1,12 @@ -?RCS: $Id: newsspool.U,v 3.0 1993/08/18 12:09:24 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: newsspool.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:24 ram diff --git a/mcon/U/nis.U b/mcon/U/nis.U index f8c82ab..1ee73dd 100644 --- a/mcon/U/nis.U +++ b/mcon/U/nis.U @@ -1,12 +1,12 @@ -?RCS: $Id: nis.U,v 3.0.1.3 1997/02/28 16:17:38 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: nis.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 16:17:38 ram @@ -42,7 +42,7 @@ ?X: NeXT gives us some fun here, as always, by having both NIS (former YP) ?X: and NetInfo. But since it has both, it's ok to put the test inside the if. ?X: Contributed by Thomas Neumann <tom@smart.bo.open.de>. -if $test -d /usr/etc/yp || $test -d /etc/yp; then +if $test -d /usr/etc/yp || $test -d /etc/yp || $test -d /usr/lib/yp; then if $test -f /usr/etc/nibindd; then echo " " echo "I'm fairly confident you're on a NeXT." @@ -154,13 +154,16 @@ if $test -d /usr/etc/yp || $test -d /etc/yp; then fi ?X: Ensure suitable default -- Manoj Srivastava case "$hostcat" in -'') hostcat='cat /etc/hosts';; +'') hostcat=':' + $test -f /etc/hosts && hostcat='cat /etc/hosts';; esac case "$groupcat" in -'') groupcat='cat /etc/group';; +'') groupcat=':' + $test -f /etc/group && groupcat='cat /etc/group';; esac case "$passcat" in -'') passcat='cat /etc/passwd';; +'') passcat=':' + $test -f /etc/passwd && passcat='cat /etc/passwd';; esac case "$hostcat" in '') hostcat='cat /etc/hosts';; diff --git a/mcon/U/nlist_pfx.U b/mcon/U/nlist_pfx.U index c00b106..55a4658 100644 --- a/mcon/U/nlist_pfx.U +++ b/mcon/U/nlist_pfx.U @@ -1,12 +1,12 @@ -?RCS: $Id: nlist_pfx.U,v 3.0.1.1 1994/10/29 16:26:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: nlist_pfx.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:26:18 ram diff --git a/mcon/U/orderlib.U b/mcon/U/orderlib.U index 2f9435c..0c77e54 100644 --- a/mcon/U/orderlib.U +++ b/mcon/U/orderlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: orderlib.U,v 3.0.1.4 1997/02/28 16:18:18 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: orderlib.U,v $ ?RCS: Revision 3.0.1.4 1997/02/28 16:18:18 ram @@ -38,6 +38,7 @@ ?S: needed to generate random libraries. Set to ":" if ar can generate ?S: random libraries or if random libraries are not supported ?S:. +?F:!foobar : see if ar generates random libraries by itself echo " " echo "Checking how to generate random libraries on your machine..." >&4 @@ -50,7 +51,7 @@ echo "Checking how to generate random libraries on your machine..." >&4 echo 'int bar1() { return bar2(); }' > bar1.c echo 'int bar2() { return 2; }' > bar2.c $cat > foo.c <<'EOP' -main() { printf("%d\n", bar1()); exit(0); } +int main() { printf("%d\n", bar1()); exit(0); } EOP $cc $ccflags -c bar1.c >/dev/null 2>&1 $cc $ccflags -c bar2.c >/dev/null 2>&1 diff --git a/mcon/U/orgname.U b/mcon/U/orgname.U index e31f7f5..b00e895 100644 --- a/mcon/U/orgname.U +++ b/mcon/U/orgname.U @@ -1,12 +1,12 @@ -?RCS: $Id: orgname.U,v 3.0.1.1 1993/09/13 16:10:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: orgname.U,v $ ?RCS: Revision 3.0.1.1 1993/09/13 16:10:25 ram diff --git a/mcon/U/packadmin.U b/mcon/U/packadmin.U index 469bd8a..dfffa3e 100644 --- a/mcon/U/packadmin.U +++ b/mcon/U/packadmin.U @@ -1,13 +1,13 @@ -?RCS: $Id: packadmin.U,v 3.0.1.1 1997/02/28 16:18:32 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?MAKE:packadmin: cf_email Oldconfig Myread cat spackage package ?MAKE: -pick add $@ %< @@ -15,6 +15,7 @@ ?S:packadmin: ?S: Electronic mail address of the package administrator. ?S:. +: check wehther they will act as local admin for the package $cat <<EOM If you or somebody else will be maintaining $package at your site, please diff --git a/mcon/U/package.U b/mcon/U/package.U index f92e15f..32a4398 100644 --- a/mcon/U/package.U +++ b/mcon/U/package.U @@ -1,12 +1,12 @@ -?RCS: $Id: package.U,v 3.0.1.3 1994/10/29 16:27:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: package.U,v $ ?RCS: Revision 3.0.1.3 1994/10/29 16:27:21 ram @@ -21,7 +21,7 @@ ?RCS: Revision 3.0 1993/08/18 12:09:28 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:package spackage: Null +?MAKE:package spackage: Nothing ?MAKE: -pick wipe $@ %< ?S:package: ?S: This variable contains the name of the package being constructed. @@ -32,9 +32,14 @@ ?S: with the first letter uppercased, i.e. suitable for starting ?S: sentences. ?S:. +?C:PACKAGE: +?C: This variable contains the name of the package being built. +?C:. +?H:#define PACKAGE "$package" +?H:. ?T:first last : set package name -package=<PACKAGENAME> +package='<PACKAGENAME>' @if spackage first=`echo $package | sed -e 's/^\(.\).*/\1/'` last=`echo $package | sed -e 's/^.\(.*\)/\1/'` diff --git a/mcon/U/pager.U b/mcon/U/pager.U index bd6b94e..514259e 100644 --- a/mcon/U/pager.U +++ b/mcon/U/pager.U @@ -1,12 +1,12 @@ -?RCS: $Id: pager.U,v 3.0.1.2 1995/01/30 14:41:26 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: pager.U,v $ ?RCS: Revision 3.0.1.2 1995/01/30 14:41:26 ram @@ -25,26 +25,34 @@ ?S: Usual values are (the full pathnames of) more, less, pg, or cat. ?S:. : locate the preferred pager for this system +fn=f/ case "$pager" in '') dflt='' case "$pg" in /*) dflt=$pg;; + [a-zA-Z]:/*) dflt=$pg;; esac case "$more" in /*) dflt=$more;; + [a-zA-Z]:/*) dflt=$more;; esac case "$less" in /*) dflt=$less;; + [a-zA-Z]:/*) dflt=$less;; esac case "$dflt" in '') dflt=/usr/ucb/more;; esac ;; -*) dflt="$pager";; +*) dflt="$pager" +?X: Instruct ./getfile to trust the hinted or previous pager value, +?X: even if it does not begin with a slash. For example, on os2, +?X: pager might be cmd /c more. See comments in Getfile.U. + fn="f/($pager)" + ;; esac echo " " -fn=f/ rp='What pager is used on your system?' . ./getfile pager="$ans" diff --git a/mcon/U/patchlevel.U b/mcon/U/patchlevel.U index 2550016..18a3f98 100644 --- a/mcon/U/patchlevel.U +++ b/mcon/U/patchlevel.U @@ -1,12 +1,12 @@ -?RCS: $Id: patchlevel.U,v 3.0.1.1 1997/02/28 16:18:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: patchlevel.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:18:41 ram @@ -15,19 +15,41 @@ ?RCS: Revision 3.0 1993/08/18 12:09:31 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:patchlevel: package baserev test rsrc +?MAKE:patchlevel revision: package baserev test rsrc ?MAKE: -pick add $@ %< ?S:patchlevel: ?S: The patchlevel level of this package. ?S: The value of patchlevel comes from the patchlevel.h file. ?S:. -: get the patchlevel +?S:revision: +?S: The revision / build of this package. +?S: The value is derived from the REVISION define in the revision.h file. +?S: When revision is defined, the patch level should be ignored if 0. +?S:. +: get the patchlevel / revision echo " " -echo "Getting the current patchlevel..." >&4 +echo "Getting the current patchlevel / revision..." >&4 if $test -r $rsrc/patchlevel.h;then - patchlevel=`awk '/PATCHLEVEL/ {print $3}' < $rsrc/patchlevel.h` + patchlevel=`awk \ + '/^#[ ]*define[ ][ ]*PATCHLEVEL/ {print $3}' \ + < $rsrc/patchlevel.h` else patchlevel=0 fi -echo "(You have $package $baserev PL$patchlevel.)" +if $test -r $rsrc/revision.h;then + revision=`awk \ + '/^#[ ]*define[ ][ ]*REVISION/ {print $3}' \ + < $rsrc/revision.h` +else + revision=0 +fi +case "$revision" in +0) echo "(You have $package $baserev PL$patchlevel.)" ;; +*) + case "$patchlevel" in + 0) echo "(You have $package $baserev-$revision)";; + *) echo "(You have $package $baserev-$revision PL$patchlevel)";; + esac + ;; +esac diff --git a/mcon/U/perlpath.U b/mcon/U/perlpath.U index 1c3637b..30334a8 100644 --- a/mcon/U/perlpath.U +++ b/mcon/U/perlpath.U @@ -1,12 +1,12 @@ -?RCS: $Id: perlpath.U,v 3.0.1.2 1995/09/25 09:17:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: perlpath.U,v $ ?RCS: Revision 3.0.1.2 1995/09/25 09:17:04 ram diff --git a/mcon/U/pidtype.U b/mcon/U/pidtype.U index 1e68a4f..e16bfa9 100644 --- a/mcon/U/pidtype.U +++ b/mcon/U/pidtype.U @@ -1,12 +1,12 @@ -?RCS: $Id: pidtype.U,v 3.0.1.1 1994/08/29 16:31:27 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: pidtype.U,v $ ?RCS: Revision 3.0.1.1 1994/08/29 16:31:27 ram diff --git a/mcon/U/pkgsrc.U b/mcon/U/pkgsrc.U new file mode 100644 index 0000000..6a61e80 --- /dev/null +++ b/mcon/U/pkgsrc.U @@ -0,0 +1,26 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:pkgsrc: src rsrc +?MAKE: -pick add $@ %< +?S:pkgsrc: +?S: This variable holds the absolute path of the package source. +?S:. +?C:PACKAGE_SOURCE_DIR: +?C: Holds the directory name holding the package source. +?C:. +?H:#define PACKAGE_SOURCE_DIR "$pkgsrc" +?H:. +: define absolute package source directory +case "$src" in +/*) pkgsrc=$src;; +*) pkgsrc=`cd $rsrc; pwd`;; +esac + diff --git a/mcon/U/prefix.U b/mcon/U/prefix.U index 7f977b8..b773ed0 100644 --- a/mcon/U/prefix.U +++ b/mcon/U/prefix.U @@ -1,12 +1,12 @@ -?RCS: $Id: prefix.U,v 3.0.1.2 1995/01/30 14:44:05 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/prefshell.U b/mcon/U/prefshell.U index 6813ae2..eb02c61 100644 --- a/mcon/U/prefshell.U +++ b/mcon/U/prefshell.U @@ -1,12 +1,12 @@ -?RCS: $Id: prefshell.U,v 3.0.1.2 1994/10/29 16:28:13 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: prefshell.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 16:28:13 ram diff --git a/mcon/U/privlib.U b/mcon/U/privlib.U index aeff887..256550c 100644 --- a/mcon/U/privlib.U +++ b/mcon/U/privlib.U @@ -1,12 +1,12 @@ -?RCS: $Id: privlib.U,v 3.0.1.4 1995/09/25 09:17:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: privlib.U,v $ ?RCS: Revision 3.0.1.4 1995/09/25 09:17:09 ram diff --git a/mcon/U/prototype.U b/mcon/U/prototype.U index 35558e8..ec65247 100644 --- a/mcon/U/prototype.U +++ b/mcon/U/prototype.U @@ -1,12 +1,12 @@ -?RCS: $Id: prototype.U,v 3.0.1.3 1994/05/06 15:11:49 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: prototype.U,v $ ?RCS: Revision 3.0.1.3 1994/05/06 15:11:49 ram @@ -102,7 +102,7 @@ echo " " echo "Checking out function prototypes..." >&4 $cat >prototype.c <<'EOCP' -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) { exit(0);} EOCP if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then diff --git a/mcon/U/ptrsize.U b/mcon/U/ptrsize.U index 14d2da3..7a903aa 100644 --- a/mcon/U/ptrsize.U +++ b/mcon/U/ptrsize.U @@ -1,12 +1,12 @@ -?RCS: $Id: ptrsize.U,v 3.0.1.1 1994/10/29 16:28:19 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: ptrsize.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:28:19 ram @@ -35,12 +35,12 @@ case "$ptrsize" in echo "Checking to see how big your pointers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(char *)); } EOCP - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then + if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then dflt=`./try` else dflt='4' diff --git a/mcon/U/randbits.U b/mcon/U/randbits.U index fb7be43..16d720d 100644 --- a/mcon/U/randbits.U +++ b/mcon/U/randbits.U @@ -1,12 +1,12 @@ -?RCS: $Id: randbits.U,v 3.0.1.1 1997/02/28 16:19:29 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: randbits.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:19:29 ram @@ -50,7 +50,7 @@ case "$randbits" in #endif EOCP $cat >>try.c <<'EOCP' -main() +int main() { register int i; register unsigned long tmp; @@ -65,7 +65,7 @@ main() printf("%d\n",i); } EOCP - if $cc try.c -o try >/dev/null 2>&1 ; then + if $cc -o try try.c >/dev/null 2>&1 ; then dflt=`try` else dflt='?' diff --git a/mcon/U/randfunc.U b/mcon/U/randfunc.U index c3e18b8..af3ba62 100644 --- a/mcon/U/randfunc.U +++ b/mcon/U/randfunc.U @@ -1,12 +1,12 @@ -?RCS: $Id: randfunc.U,v 3.0 1993/08/18 12:09:39 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: randfunc.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:39 ram @@ -50,6 +50,7 @@ ?H:#define seednrand(x) $seedfunc(x) /**/ ?H:. ?T:cont val +?LINT:nothere $nrandbits) : How can we generate normalized random numbers ? echo " " case "$randfunc" in @@ -107,7 +108,7 @@ while $test "$cont"; do echo "Checking to see how many bits your $randfunc() function produces..." >&4 $cat >try.c <<EOCP #include <stdio.h> -main() +int main() { register int i; register unsigned long tmp; @@ -123,7 +124,7 @@ main() printf("%d\n",i); } EOCP - if $cc try.c -o try >/dev/null 2>&1 ; then + if $cc -o try try.c >/dev/null 2>&1 ; then dflt=`try` else dflt='?' diff --git a/mcon/U/rcs_branch.U b/mcon/U/rcs_branch.U index 8ba3eb5..b53c1af 100644 --- a/mcon/U/rcs_branch.U +++ b/mcon/U/rcs_branch.U @@ -1,12 +1,12 @@ -?RCS: $Id: rcs_branch.U,v 3.0 1993/08/18 12:09:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: rcs_branch.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:40 ram diff --git a/mcon/U/registers.U b/mcon/U/registers.U index befd5f9..344ceed 100644 --- a/mcon/U/registers.U +++ b/mcon/U/registers.U @@ -1,12 +1,12 @@ -?RCS: $Id: registers.U,v 3.0.1.2 1997/02/28 16:19:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: registers.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:19:41 ram @@ -38,7 +38,7 @@ ?C: can freely declare register variables in sub-blocks of code and as ?C: function parameters. Do not use register<n> more than once per routine. ?C:. -?LINT:describe reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 +?LINT:describe reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 ?LINT:describe reg12 reg13 reg14 reg15 reg16 ?LINT:known register2 register3 register4 register5 register6 register7 ?LINT:known register8 register9 register10 register11 register12 register13 @@ -61,7 +61,6 @@ ?H:#define register16 $reg16 /**/ ?H:. ?F:!.foo -?T:i d : see how many register declarations we want to use case "$registers" in '') @@ -81,7 +80,7 @@ case "$registers" in fi;; *) dflt=$registers ;; esac -?LINT:set reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 +?LINT:set reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 ?LINT:set reg12 reg13 reg14 reg15 reg16 cat <<EOM diff --git a/mcon/U/rootid.U b/mcon/U/rootid.U index 716274e..4e15e9d 100644 --- a/mcon/U/rootid.U +++ b/mcon/U/rootid.U @@ -1,12 +1,12 @@ -?RCS: $Id: rootid.U,v 3.0.1.1 1995/01/30 14:45:36 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: rootid.U,v $ ?RCS: Revision 3.0.1.1 1995/01/30 14:45:36 ram diff --git a/mcon/U/sbrksmart.U b/mcon/U/sbrksmart.U index 54755aa..9b2bccb 100644 --- a/mcon/U/sbrksmart.U +++ b/mcon/U/sbrksmart.U @@ -1,12 +1,12 @@ -?RCS: $Id: sbrksmart.U,v 3.0.1.2 1995/01/11 15:35:41 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sbrksmart.U,v $ ?RCS: Revision 3.0.1.2 1995/01/11 15:35:41 ram @@ -31,7 +31,8 @@ ?H:#$sbrksmart HAS_SMART_SBRK /**/ ?H:. ?T:dumb -: see if sbrk can release core to the kernel +?F:!sbrk +: see whether sbrk can release core to the kernel echo " " case "$d_sbrk" in "$define") @@ -39,7 +40,7 @@ case "$d_sbrk" in $cat > sbrk.c <<'EOC' #define INC 256 /* Small enough to be less than a page size */ -main() +int main() { char *obrk = (char *) sbrk(0); char *nbrk; diff --git a/mcon/U/sbrktype.U b/mcon/U/sbrktype.U index f843d32..a32f1ca 100644 --- a/mcon/U/sbrktype.U +++ b/mcon/U/sbrktype.U @@ -1,12 +1,12 @@ -?RCS: $Id: sbrktype.U,v 3.0 1993/08/18 12:09:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sbrktype.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:43 ram diff --git a/mcon/U/scriptdir.U b/mcon/U/scriptdir.U index 121b1a9..fc1c857 100644 --- a/mcon/U/scriptdir.U +++ b/mcon/U/scriptdir.U @@ -1,12 +1,12 @@ -?RCS: $Id: scriptdir.U,v 3.0.1.3 1995/09/25 09:17:15 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: scriptdir.U,v $ ?RCS: Revision 3.0.1.3 1995/09/25 09:17:15 ram diff --git a/mcon/U/selecttype.U b/mcon/U/selecttype.U index 0d1aec8..4b1eefe 100644 --- a/mcon/U/selecttype.U +++ b/mcon/U/selecttype.U @@ -1,12 +1,12 @@ -?RCS: $Id: selecttype.U,v 3.0.1.3 1997/02/28 16:20:09 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -78,7 +78,7 @@ EOM #ifdef I_SYS_SELECT #include <sys/select.h> #endif -main() +int main() { int width; Select_fd_set_t readfds; diff --git a/mcon/U/sh.U b/mcon/U/sh.U index e66103a..f0b9965 100644 --- a/mcon/U/sh.U +++ b/mcon/U/sh.U @@ -1,13 +1,13 @@ -?RCS: $Id: sh.U,v 3.0.1.1 1997/02/28 16:20:13 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1997, Chip Salzenberg -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sh.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:20:13 ram @@ -63,10 +63,13 @@ case "$sh" in done for xxx in $try; do if test -f "$xxx"; then - sh="$xxx"; + sh="$xxx" + break + elif test -f "$xxx$_exe"; then + sh="$xxx" break elif test -f "$xxx.exe"; then - sh="$xxx"; + sh="$xxx" break fi done @@ -76,7 +79,7 @@ esac ?X: fd 4 isn't open yet... case "$sh" in -'') cat <<EOM >&2 +'') cat >&2 <<EOM $me: Fatal Error: I can't find a Bourne Shell anywhere. Usually it's in /bin/sh. How did you even get this far? diff --git a/mcon/U/shm_for.U b/mcon/U/shm_for.U index 7666088..922f742 100644 --- a/mcon/U/shm_for.U +++ b/mcon/U/shm_for.U @@ -1,12 +1,12 @@ -?RCS: $Id: shm_for.U,v 3.0.1.1 1994/10/29 16:28:37 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: shm_for.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:28:37 ram diff --git a/mcon/U/sig_name.U b/mcon/U/sig_name.U index 635da5a..b18e30b 100644 --- a/mcon/U/sig_name.U +++ b/mcon/U/sig_name.U @@ -1,12 +1,12 @@ -?RCS: $Id: sig_name.U,v 3.0.1.5 1997/02/28 16:21:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sig_name.U,v $ ?RCS: Revision 3.0.1.5 1997/02/28 16:21:25 ram @@ -27,16 +27,41 @@ ?RCS: Revision 3.0 1993/08/18 12:09:47 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:sig_name sig_num: awk Signal Oldconfig rm +?MAKE:sig_name sig_name_init sig_num sig_num_init sig_count sig_size: \ + awk Signal Oldconfig rm ?MAKE: -pick add $@ %< ?S:sig_name: ?S: This variable holds the signal names, space separated. The leading -?S: SIG in signals name is removed. See sig_num. +?S: SIG in signal name is removed. A ZERO is prepended to the +?S: list. This is currently not used. +?S:. +?S:sig_name_init: +?S: This variable holds the signal names, enclosed in double quotes and +?S: separated by commas, suitable for use in the SIG_NAME definition +?S: below. A "ZERO" is prepended to the list, and the list is +?S: terminated with a plain 0. The leading SIG in signal names +?S: is removed. See sig_num. ?S:. ?S:sig_num: -?S: This variable holds the signal numbers, space separated. Those numbers -?S: correspond to the value of the signal listed in the same place within -?S: the sig_name list. +?S: This variable holds the signal numbers, space separated. A ZERO is +?S: prepended to the list (corresponding to the fake SIGZERO), and +?S: the list is terminated with a 0. Those numbers correspond to +?S: the value of the signal listed in the same place within the +?S: sig_name list. +?S:. +?S:sig_num_init: +?S: This variable holds the signal numbers, enclosed in double quotes and +?S: separated by commas, suitable for use in the SIG_NUM definition +?S: below. A "ZERO" is prepended to the list, and the list is +?S: terminated with a plain 0. +?S:. +?S:sig_count (sig_name.U): +?S: This variable holds a number larger than the largest valid +?S: signal number. This is usually the same as the NSIG macro. +?S:. +?S:sig_size: +?S: This variable contains the number of elements of the sig_name +?S: and sig_num arrays, excluding the final NULL entry. ?S:. ?C:SIG_NAME: ?C: This symbol contains a list of signal names in order of @@ -66,10 +91,21 @@ ?C: The last element is 0, corresponding to the 0 at the end of ?C: the sig_name list. ?C:. -?H:#define SIG_NAME "`echo $sig_name | sed 's/ /","/g'`",0 /**/ -?H:#define SIG_NUM `echo $sig_num 0 | sed 's/ /,/g'` /**/ +?C:SIG_COUNT: +?C: This variable contains a number larger than the largest +?C: signal number. This is usually the same as the NSIG macro. +?C:. +?C:SIG_SIZE: +?C: This variable contains the number of elements of the sig_name +?C: and sig_num arrays, excluding the final NULL entry. +?C:. +?H:#define SIG_NAME $sig_name_init /**/ +?H:#define SIG_NUM $sig_num_init /**/ +?H:#define SIG_COUNT $sig_count /**/ +?H:#define SIG_SIZE $sig_size /**/ ?H:. -?T:i +?T:i doinit +?F:!= !signal_cmd ?X: signal.cmd creates a file signal.lst which has two columns: ?X: NAME number, e.g. ?X: HUP 1 @@ -77,27 +113,30 @@ ?X: the end.. : generate list of signal names echo " " -?X: Previous versions used a different algorithm to get sig_name, -?X: and didn't get sig_num at all. If either sig_name or sig_num -?X: is empty, compute both all over again. If both are set, it -?X: could be a hint file or a previous value, so let it stay. -case "$sig_name" in -'') sig_num='' ;; -esac -case "$sig_num" in -'') sig_name='' ;; +case "$sig_name_init" in +'') doinit=yes ;; +*) case "$sig_num_init" in + ''|*,*) doinit=yes ;; + esac ;; esac -case "$sig_name" in -'') +case "$doinit" in +yes) echo "Generating a list of signal names and numbers..." >&4 - ./signal_cmd - sig_name=`$awk '{printf "%s ", $1}' signal.lst` - sig_name="ZERO $sig_name" - sig_num=`$awk '{printf "%d ", $2}' signal.lst` - sig_num="0 $sig_num" + . ./signal_cmd + sig_count=`$awk '/^NSIG/ { printf "%d", $2 }' signal.lst` + sig_name=`$awk 'BEGIN { printf "ZERO " } + !/^NSIG/ { printf "%s ", $1 }' signal.lst` + sig_num=`$awk 'BEGIN { printf "0 " } + !/^NSIG/ { printf "%d ", $2 }' signal.lst` + sig_name_init=`$awk 'BEGIN { printf "\"ZERO\", " } + !/^NSIG/ { printf "\"%s\", ", $1 } + END { printf "0\n" }' signal.lst` + sig_num_init=`$awk 'BEGIN { printf "0, " } + !/^NSIG/ { printf "%d, ", $2} + END { printf "0\n"}' signal.lst` ;; esac -echo "The following signals are available:" +echo "The following $sig_count signals are available:" echo " " echo $sig_name | $awk \ 'BEGIN { linelen = 0 } @@ -113,5 +152,6 @@ echo $sig_name | $awk \ } printf "\n" }' +sig_size=`echo $sig_name | awk '{print NF}'` $rm -f signal signal.c signal.awk signal.lst signal_cmd diff --git a/mcon/U/sitearch.U b/mcon/U/sitearch.U index 89e1296..47116dc 100644 --- a/mcon/U/sitearch.U +++ b/mcon/U/sitearch.U @@ -1,13 +1,13 @@ -?RCS: $Id: sitearch.U,v 3.0.1.1 1997/02/28 16:21:30 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sitearch.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:21:30 ram diff --git a/mcon/U/sitelib.U b/mcon/U/sitelib.U index 07afd50..f2ba295 100644 --- a/mcon/U/sitelib.U +++ b/mcon/U/sitelib.U @@ -1,13 +1,13 @@ -?RCS: $Id: sitelib.U,v 3.0.1.1 1997/02/28 16:21:35 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Andy Dougherty -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sitelib.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:21:35 ram diff --git a/mcon/U/sizetype.U b/mcon/U/sizetype.U index db8cd21..2556023 100644 --- a/mcon/U/sizetype.U +++ b/mcon/U/sizetype.U @@ -1,12 +1,12 @@ -?RCS: $Id: sizetype.U,v 3.0.1.1 1994/08/29 16:32:10 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: diff --git a/mcon/U/so.U b/mcon/U/so.U index 60fc2e0..38121d6 100644 --- a/mcon/U/so.U +++ b/mcon/U/so.U @@ -1,12 +1,12 @@ -?RCS: $Id: so.U,v 3.0.1.2 1994/10/29 16:30:04 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: so.U,v $ ?RCS: Revision 3.0.1.2 1994/10/29 16:30:04 ram @@ -40,7 +40,7 @@ esac $cat <<EOM On some systems, shared libraries may be available. Answer 'none' if -you want to suppress searching of shared libraries for the remaining +you want to suppress searching of shared libraries for the remainder of this configuration. EOM diff --git a/mcon/U/sockopt.U b/mcon/U/sockopt.U index 8217c92..1a6fc35 100644 --- a/mcon/U/sockopt.U +++ b/mcon/U/sockopt.U @@ -1,12 +1,12 @@ -?RCS: $Id: sockopt.U,v 3.0.1.1 1995/07/25 14:16:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sockopt.U,v $ ?RCS: Revision 3.0.1.1 1995/07/25 14:16:14 ram @@ -28,6 +28,7 @@ ?C:. ?H:#$d_keepalive CAN_KEEPALIVE /**/ ?H:. +?F:!socket ?LINT:set d_keepalive : see if setsockopt with SO_KEEPALIVE works as advertised echo " " @@ -43,7 +44,7 @@ case "$d_oldsock" in #include <netinet/in.h> #include <netdb.h> -main() +int main() { int s = socket(AF_INET, SOCK_STREAM, 0); if (s == -1) @@ -53,7 +54,7 @@ main() exit(0); } EOP - if $cc $ccflags $sockethdr socket.c -o socket $libs \ + if $cc $ccflags $sockethdr -o socket socket.c $libs \ $socketlib >/dev/null 2>&1; then ./socket >/dev/null 2>&1 case $? in diff --git a/mcon/U/spitshell.U b/mcon/U/spitshell.U index d6e056a..1692b52 100644 --- a/mcon/U/spitshell.U +++ b/mcon/U/spitshell.U @@ -1,12 +1,12 @@ -?RCS: $Id: spitshell.U,v 3.0.1.4 1997/02/28 16:22:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: spitshell.U,v $ ?RCS: Revision 3.0.1.4 1997/02/28 16:22:12 ram @@ -26,7 +26,7 @@ ?RCS: Revision 3.0 1993/08/18 12:09:49 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:spitshell shsharp sharpbang: eunicefix sh +?MAKE:spitshell shsharp sharpbang: eunicefix sh Head ?MAKE: -pick add $@ %< ?S:spitshell: ?S: This variable contains the command necessary to spit out a runnable @@ -40,7 +40,10 @@ ?S: This variable contains the string #! if this system supports that ?S: construct. ?S:. -?T:xcat +?F:!sharp +?T:xcat p +?X: "paths" comes from Head +?LINT:extern paths _exe : see if sh knows # comments ?X: This is loaded up early, so avoid being chatty. ?X: echo " " @@ -52,19 +55,31 @@ if `$sh -c '#' >/dev/null 2>&1`; then ?X: echo " " ?X: echo "Okay, let's see if #! works on this system..." xcat=/bin/cat - test -f $xcat || xcat=/usr/bin/cat - echo "#!$xcat" >try - $eunicefix try - chmod +x try - ./try > today + test -f $xcat$_exe || xcat=/usr/bin/cat + if test ! -f $xcat$_exe; then + for p in `echo $PATH | sed -e "s/$p_/ /g"` $paths; do + if test -f $p/cat$_exe; then + xcat=$p/cat + break + fi + done + if test ! -f $xcat$_exe; then + echo "Can't find cat anywhere!" + exit 1 + fi + fi + echo "#!$xcat" >sharp + $eunicefix sharp + chmod +x sharp + ./sharp > today 2>/dev/null if test -s today; then ?X: echo "It does." sharpbang='#!' else - echo "#! $xcat" > try - $eunicefix try - chmod +x try - ./try > today + echo "#! $xcat" > sharp + $eunicefix sharp + chmod +x sharp + ./sharp > today 2>/dev/null if test -s today; then ?X: echo "It does." sharpbang='#! ' @@ -88,5 +103,5 @@ else echo "I presume that if # doesn't work, #! won't work either!" sharpbang=': use ' fi -rm -f try today +rm -f sharp today diff --git a/mcon/U/src.U b/mcon/U/src.U index 5bd4155..e939a4c 100644 --- a/mcon/U/src.U +++ b/mcon/U/src.U @@ -1,13 +1,13 @@ -?RCS: $Id: src.U,v 3.0.1.1 1997/02/28 16:23:54 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1996, Cygnus Support -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Tom Tromey <tromey@cygnus.com> ?RCS: @@ -15,32 +15,35 @@ ?RCS: Revision 3.0.1.1 1997/02/28 16:23:54 ram ?RCS: patch61: created ?RCS: -?MAKE:src +rsrc: Options Myread package contains +?MAKE:src +rsrc: Options package contains ?MAKE: -pick add $@ %< ?Y:TOP ?S:src (srcdir): -?S: This variable holds the path to the package source. It is up to -?S: the Makefile to use this variable and set VPATH accordingly to -?S: find the sources remotely. +?S: This variable holds the (possibly relative) path of the package source. +?S: It is up to the Makefile to use this variable and set VPATH accordingly +?S: to find the sources remotely. Use $pkgsrc to have an absolute path. ?S:. ?S:rsrc (relsrcdir): -?S: This variable holds the relative path to the package source. -?S: The contents are correct for the configuration environment, -?S: i.e. there is an extra .. either appended or prepended. +?S: This variable holds a potentially relative path to the package +?S: source. The contents are correct for the configuration environment, +?S: i.e. there might be an extra .. prepended to get out of the UU dir. ?S: Configure units should use this, not the src variable. ?S:. -?LINT:change package : Find the path to the source tree case "$src" in -'') src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`;; +'') case "$0" in + */*) + src=`echo $0 | sed -e 's%/[^/][^/]*$%%'` + ;; + *) src='.';; + esac;; esac case "$src" in -'') - src=. - rsrc=.. +'') src=/ + rsrc=/ ;; -/*) rsrc="$src/..";; -*) rsrc="../$src";; +/*) rsrc="$src";; +*) rsrc="../$src";; esac ?X: ?X: Now check whether we have found the right source tree (i.e. the one for the @@ -52,7 +55,7 @@ esac ?X: If it matches, we know we found the right source tree. -- RAM, 15/03/96 ?X: if test -f $rsrc/Configure && \ - $contains "^package=$package" $rsrc/Configure >/dev/null 2>&1 + $contains "^package='$package'\$" $rsrc/Configure >/dev/null 2>&1 then : found it, so we are ok. else @@ -61,7 +64,7 @@ else rsrc='' for src in . .. ../.. ../../.. ../../../..; do if test -f ../$src/Configure && \ - $contains "^package=$package" ../$src/Configure >/dev/null 2>&1 + $contains "^package=$package$" ../$src/Configure >/dev/null 2>&1 then rsrc=../$src break @@ -70,28 +73,20 @@ else fi case "$rsrc" in '') -?X: It's too early to use Getfile.U (would stack too much units before this) - echo " " - dflt= - rp="Directory where sources for $package are located?" - . ./myread - src="$ans" - rsrc="$src" - if test -f $rsrc/Configure && \ - $contains "^package=$package" $rsrc/Configure >/dev/null 2>&1 - then - echo "Ok, I've found them under $src" - else - echo "Sorry, I can't seem to be able to locate $package sources." >&4 - exit 1 - fi + cat <<EOM >&4 + +Sorry, I can't seem to locate the source dir for $package. Please start +Configure with an explicit path -- i.e. /some/path/Configure. + +EOM + exit 1 ;; ?X: Don't echo anything if the sources are in . -- they should know already ;-) ?X: In that case, rsrc is ../. since we lookup from within UU -../.) ;; +../.) rsrc='..';; *) echo " " - echo "Sources for $package found in $src" >&4 + echo "Sources for $package found in \"$src\"." >&4 ;; esac diff --git a/mcon/U/ssizetype.U b/mcon/U/ssizetype.U index 8b68ba2..70dcc69 100644 --- a/mcon/U/ssizetype.U +++ b/mcon/U/ssizetype.U @@ -1,12 +1,12 @@ -?RCS: $Id: ssizetype.U,v 3.0.1.3 1997/02/28 16:24:21 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: @@ -40,7 +40,7 @@ ?C:. ?H:#define SSize_t $ssizetype /* signed count of bytes */ ?H:. -?F:!ssize.out +?F:!ssize.out !ssize : see what type is used for signed size_t set ssize_t ssizetype int stdio.h sys/types.h eval $typedef @@ -51,7 +51,7 @@ $cat > ssize.c <<EOM #include <sys/types.h> #define Size_t $sizetype #define SSize_t $dflt -main() +int main() { if (sizeof(Size_t) == sizeof(SSize_t)) printf("$dflt\n"); diff --git a/mcon/U/startperl.U b/mcon/U/startperl.U index 64abb7d..dbc6dfb 100644 --- a/mcon/U/startperl.U +++ b/mcon/U/startperl.U @@ -1,12 +1,12 @@ -?RCS: $Id: startperl.U,v 3.0.1.1 1997/02/28 16:25:06 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: startperl.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:25:06 ram @@ -82,6 +82,7 @@ EOH "$define") dflt=n;; *) dflt=$pdflt;; esac;; + *) dflt=n;; esac rp='Shall I use #! to start up perl?' . ./myread diff --git a/mcon/U/startsh.U b/mcon/U/startsh.U index dbcd8d6..b118449 100644 --- a/mcon/U/startsh.U +++ b/mcon/U/startsh.U @@ -1,12 +1,12 @@ -?RCS: $Id: startsh.U,v 3.0.1.1 1997/02/28 16:25:31 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: startsh.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:25:31 ram @@ -22,7 +22,7 @@ ?S: script to make sure (hopefully) that it runs with sh and not some ?S: other shell. ?S:. -?F:!try +?F:!sharp : figure out how to guarantee sh startup ?X: Avoid needless chatter since this is now done very early. ?X: echo " " @@ -32,19 +32,19 @@ case "$startsh" in *) ?X: echo "Let's see if '$startsh' works..." ;; esac -cat >try <<EOSS +cat >sharp <<EOSS $startsh set abc test "$?abc" != 1 EOSS -chmod +x try -$eunicefix try -if ./try; then +chmod +x sharp +$eunicefix sharp +if ./sharp; then : echo "Yup, it does." else echo "Hmm... '$startsh' does not guarantee sh startup..." echo "You may have to fix up the shell scripts to make sure $sh runs them." fi -rm -f try +rm -f sharp diff --git a/mcon/U/stdchar.U b/mcon/U/stdchar.U index e85d869..d2328a0 100644 --- a/mcon/U/stdchar.U +++ b/mcon/U/stdchar.U @@ -1,18 +1,18 @@ -?RCS: $Id: stdchar.U,v 3.0 1993/08/18 12:09:52 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: stdchar.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:52 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:stdchar: contains Findhdr +?MAKE:stdchar: contains Findhdr cppstdin cppminus rm ?MAKE: -pick add $@ %< ?S:stdchar: ?S: This variable conditionally defines STDCHAR to be the type of char @@ -24,13 +24,17 @@ ?C:. ?H:#define STDCHAR $stdchar /**/ ?H:. +?F:!stdioh : see what type of char stdio uses. echo " " -if $contains 'unsigned.*char.*_ptr;' `./findhdr stdio.h` >/dev/null 2>&1 ; then +?X: untangle the #include nest +echo '#include <stdio.h>' | $cppstdin $cppminus > stdioh +if $contains 'unsigned.*char.*_ptr;' stdioh >/dev/null 2>&1 ; then echo "Your stdio uses unsigned chars." >&4 stdchar="unsigned char" else echo "Your stdio uses signed chars." >&4 stdchar="char" fi +$rm -f stdioh diff --git a/mcon/U/sunscanf.U b/mcon/U/sunscanf.U index 7b78f6d..a16fdaa 100644 --- a/mcon/U/sunscanf.U +++ b/mcon/U/sunscanf.U @@ -1,12 +1,12 @@ -?RCS: $Id: sunscanf.U,v 3.0 1993/08/18 12:09:54 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sunscanf.U,v $ ?RCS: Revision 3.0 1993/08/18 12:09:54 ram @@ -29,7 +29,7 @@ echo " " echo "Checking to see what flavor of scanf you have..." >&4 $cat >scanf.c <<'EOCP' -main() +int main() { float value; @@ -37,7 +37,7 @@ main() printf("%d\n", value == 4.5); } EOCP -if $cc $ccflags scanf.c -o scanf >/dev/null 2>&1 ; then +if $cc $ccflags -o scanf scanf.c >/dev/null 2>&1 ; then if $test `scanf` = 0; then echo "Hmm.. seems your not running the USG flavor.." val="$undef" diff --git a/mcon/U/sysman.U b/mcon/U/sysman.U index 461e273..6f50e5d 100644 --- a/mcon/U/sysman.U +++ b/mcon/U/sysman.U @@ -1,12 +1,12 @@ -?RCS: $Id: sysman.U,v 3.0.1.2 1994/06/20 07:08:43 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sysman.U,v $ ?RCS: Revision 3.0.1.2 1994/06/20 07:08:43 ram @@ -33,7 +33,8 @@ echo " " case "$sysman" in '') - syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1' + syspath='/usr/share/man/man1 /usr/man/man1' + syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1" syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" diff --git a/mcon/U/trnl.U b/mcon/U/trnl.U new file mode 100644 index 0000000..cfdda60 --- /dev/null +++ b/mcon/U/trnl.U @@ -0,0 +1,59 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 1998 Andy Dougherty +?RCS: +?RCS: Original author Jarkko Hietaniemi <jhi@iki.fi> +?RCS: Merged into dist by Andy Dougherty July 13, 1998 +?RCS: +?MAKE:trnl: Nothing +?MAKE: -pick add $@ %< +?S:trnl: +?S: This variable contains the value to be passed to the tr(1) +?S: command to transliterate a newline. Typical values are +?S: '\012' and '\n'. This is needed for EBCDIC systems where +?S: newline is not necessarily '\012'. +?S:. +?T: DJGPP +: Find the appropriate value for a newline for tr +echo " " +?X: We can't use $tr since that would cause a circular dependency via Myread +?X: dos djgpp uses '\015\012', but reportedly is happy with '\012' in the +?X: tr command. I don't know why it passes the '\n' test but later +?X: refuses to work correctly with it. --AD 6/14/98 +if test -n "$DJGPP"; then + trnl='\012' +fi +if test X"$trnl" = X; then + case "`echo foo | tr '\n' x 2>/dev/null`" in + foox) trnl='\n' ;; + esac +fi +if test X"$trnl" = X; then + case "`echo foo | tr '\012' x 2>/dev/null`" in + foox) trnl='\012' ;; + esac +fi +if test X"$trnl" = X; then + case "`echo foo | tr '\r\n' xy 2>/dev/null`" in + fooxy) trnl='\n\r' ;; + esac +fi +if test X"$trnl" = X; then + cat <<EOM >&2 + +$me: Fatal Error: cannot figure out how to translate newlines with 'tr'. + +EOM + exit 1 +else + echo "We'll use '$trnl' to transliterate a newline." +fi + diff --git a/mcon/U/uidtype.U b/mcon/U/uidtype.U index 632f4a2..6ac2aeb 100644 --- a/mcon/U/uidtype.U +++ b/mcon/U/uidtype.U @@ -1,12 +1,12 @@ -?RCS: $Id: uidtype.U,v 3.0.1.3 1994/08/29 16:33:25 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: uidtype.U,v $ ?RCS: Revision 3.0.1.3 1994/08/29 16:33:25 ram diff --git a/mcon/U/usenm.U b/mcon/U/usenm.U index a5c8766..a868af5 100644 --- a/mcon/U/usenm.U +++ b/mcon/U/usenm.U @@ -1,12 +1,12 @@ -?RCS: $Id: usenm.U,v 3.0.1.1 1997/02/28 16:26:40 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: usenm.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:26:40 ram @@ -16,8 +16,8 @@ ?RCS: Revision 3.0 1993/08/18 12:09:57 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:usenm runnm nm_opt nm_so_opt: cat test Myread Oldconfig myuname grep \ - d_gnulibc +?MAKE:usenm runnm nm_opt nm_so_opt: cat test Myread Oldconfig grep \ + d_gnulibc nm egrep rsrc osname Guess ?MAKE: -pick add $@ %< ?S:usenm: ?S: This variable contains 'true' or 'false' depending whether the @@ -46,42 +46,63 @@ ?X: Don't bother if we're using GNU libc -- skimo case "$usenm" in '') + dflt='' case "$d_gnulibc" in - $define) + "$define") + echo " " + echo "$nm probably won't work on the GNU C Library." >&4 dflt=n ;; - *) - dflt=`egrep 'inlibc|csym' ../Configure | wc -l 2>/dev/null` - if $test $dflt -gt 20; then - dflt=y - else + esac + case "$dflt" in + '') + if $test "$osname" = aix -a ! -f /lib/syscalls.exp; then + echo " " + echo "Whoops! This is an AIX system without /lib/syscalls.exp!" >&4 + echo "'nm' won't be sufficient on this system." >&4 + dflt=n + fi + ;; + esac + case "$dflt" in + '') + if ./gnu; then + echo " " + echo "Hmm... A GNU system without a GNU C Library? Weird..." >&4 dflt=n + else + dflt=`$egrep 'inlibc|csym' $rsrc/Configure | wc -l 2>/dev/null` + if $test $dflt -gt 20; then + dflt=y + else + dflt=n + fi fi ;; esac ;; *) case "$usenm" in - true) dflt=y;; + true|$define) dflt=y;; *) dflt=n;; esac ;; esac $cat <<EOM -I can use 'nm' to extract the symbols from your C libraries. This is a time -consuming task which may generate huge output on the disk (up to 3 megabytes) -but that should make the symbols extraction faster. The alternative is to skip -the 'nm' extraction part and to compile a small test program instead to -determine whether each symbol is present. If you have a fast C compiler and/or -if your 'nm' output cannot be parsed, this may be the best solution. -You shouldn't let me use 'nm' if you have the GNU C Library. +I can use $nm to extract the symbols from your C libraries. This +is a time consuming task which may generate huge output on the disk (up +to 3 megabytes) but that should make the symbols extraction faster. The +alternative is to skip the 'nm' extraction part and to compile a small +test program instead to determine whether each symbol is present. If +you have a fast C compiler and/or if your 'nm' output cannot be parsed, +this may be the best solution. EOM rp='Shall I use nm to extract C symbols from the libraries?' . ./myread case "$ans" in -n|N) usenm=false;; +[Nn]*) usenm=false;; *) usenm=true;; esac @@ -96,22 +117,24 @@ esac : nm options which may be necessary case "$nm_opt" in '') if $test -f /mach_boot; then - nm_opt='' + nm_opt='' # Mach elif $test -d /usr/ccs/lib; then - nm_opt='-p' + nm_opt='-p' # Solaris (and SunOS?) elif $test -f /dgux; then - nm_opt='-p' + nm_opt='-p' # DG-UX + elif $test -f /lib64/rld; then + nm_opt='-p' # 64-bit Irix else nm_opt='' fi;; esac -: nm options which may be necessary for shared libraries but illegal -: for archive libraries. Thank you, Linux. +?X: nm options which may be necessary for shared libraries but illegal +?X: for archive libraries. Thank you, Linux. case "$nm_so_opt" in -'') case "$myuname" in +'') case "$osname" in *linux*) - if nm --help | $grep 'dynamic' > /dev/null 2>&1; then + if $nm --help | $grep 'dynamic' > /dev/null 2>&1; then nm_so_opt='--dynamic' fi ;; diff --git a/mcon/U/usesocks.U b/mcon/U/usesocks.U new file mode 100644 index 0000000..cd30e4d --- /dev/null +++ b/mcon/U/usesocks.U @@ -0,0 +1,46 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?RCS: Copyright (c) 1999 Jarkko Hietaniemi +?RCS: +?MAKE:usesocks: Myread Oldconfig Setvar spackage package +?MAKE: -pick add $@ %< +?Y:TOP +?S:usesocks: +?S: This variable conditionally defines the USE_SOCKS symbol, +?S: and indicates that Perl should be built to use SOCKS. +?S:. +?C:USE_SOCKS: +?C: This symbol, if defined, indicates that Perl should +?C: be built to use socks. +?C:. +?H:?%<:#$usesocks USE_SOCKS /**/ +?H:. +?D:usesocks='' +?LINT:set usesocks +: check for requested SOCKS support +case "$usesocks" in +$define|true|[yY]*) dflt='y';; +*) dflt='n';; +esac +cat <<EOM + +$spackage can be built to use the SOCKS proxy protocol library. +If this doesn't make any sense to you, just accept the default '$dflt'. +EOM +rp="Build $package for SOCKS?" +. ./myread +case "$ans" in +y|Y) val="$define" ;; +*) val="$undef" ;; +esac +set usesocks +eval $setvar + diff --git a/mcon/U/usrinc.U b/mcon/U/usrinc.U index 9fa6064..4db8078 100644 --- a/mcon/U/usrinc.U +++ b/mcon/U/usrinc.U @@ -1,12 +1,12 @@ -?RCS: $Id: usrinc.U,v 3.0.1.3 1997/02/28 16:27:12 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: usrinc.U,v $ ?RCS: Revision 3.0.1.3 1997/02/28 16:27:12 ram @@ -21,7 +21,7 @@ ?RCS: Revision 3.0 1993/08/18 12:09:58 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:usrinc mips incpath mips_type: test cat echo n c +cc Getfile Guess \ +?MAKE:usrinc incpath mips_type: test cat echo n c Getfile Guess \ Oldconfig eunicefix contains rm ?MAKE: -pick add $@ %< ?S:usrinc: @@ -38,8 +38,6 @@ ?S: Possible values are "BSD 4.3" and "System V". ?S:. ?D:usrinc='/usr/include' -?LINT:describe mips -?LINT:set mips ?LINT:create mips ?T:xxx_prompt ?F:./mips @@ -60,7 +58,7 @@ if $test -f /bin/mips && /bin/mips; then /bsd43 #endif EOCP - if $cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then + if cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then dflt='/bsd43/usr/include' incpath='/bsd43' mips_type='BSD 4.3' diff --git a/mcon/U/vaproto.U b/mcon/U/vaproto.U index 0f57b9f..8ae9674 100644 --- a/mcon/U/vaproto.U +++ b/mcon/U/vaproto.U @@ -1,12 +1,12 @@ -?RCS: $Id: vaproto.U,v 3.0.1.1 1994/01/24 14:17:16 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Orginal Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: diff --git a/mcon/U/voidflags.U b/mcon/U/voidflags.U index 4983c24..6ca70fe 100644 --- a/mcon/U/voidflags.U +++ b/mcon/U/voidflags.U @@ -1,12 +1,12 @@ -?RCS: $Id: voidflags.U,v 3.0.1.2 1997/02/28 16:27:58 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: voidflags.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:27:58 ram @@ -18,7 +18,7 @@ ?RCS: Revision 3.0 1993/08/18 12:10:01 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:voidflags defvoidused: cat rm contains +cc +ccflags package \ +?MAKE:voidflags defvoidused: cat sed rm contains +cc +ccflags package \ Oldconfig Myread ?MAKE: -pick add $@ %< ?S:voidflags: @@ -26,6 +26,9 @@ ?S: which indicates how much support of the void type is given by this ?S: compiler. See VOIDFLAGS for more info. ?S:. +?S:defvoidused: +?S: This variable contains the default value of the VOIDUSED symbol (15). +?S:. ?X: Exceptionally, we have to explicitely alias the symbol name for ?X: config_h.SH, otherwise the comment would not appear. ?C:VOIDFLAGS ~ %<: @@ -54,23 +57,24 @@ ?H:?%<:#endif ?H:. ?W:%<:void +?F:!.out !try.c !flags +?LINT:usefile .out flags try.c ?INIT:: full support for void wanted by default ?INIT:defvoidused=15 ?INIT: -?LINT:describe defvoidused ?LINT:known void M_VOID VOIDUSED : check for void type echo " " echo "Checking to see how well your C compiler groks the void type..." >&4 -echo " " -$cat >&4 <<EOM +$cat >flags <<EOM + Support flag bits are: 1: basic void declarations. 2: arrays of pointers to functions returning void. 4: operations between pointers to and addresses of void functions. 8: generic void pointers. + EOM -echo " " case "$voidflags" in '') $cat >try.c <<'EOCP' @@ -95,19 +99,21 @@ sub() { #endif exit(0); } -main() { sub(); } +int main() { sub(); } EOCP ?X: This unit used to use cc -S in those tests to try to speed up things, but ?X: unfortunately, AIX 3.2 does not support this option. if $cc $ccflags -c -DTRY=$defvoidused try.c >.out 2>&1 ; then voidflags=$defvoidused - echo "It appears to support void to the level $package wants ($defvoidused)." + echo "Good. It appears to support void to the level $package wants." if $contains warning .out >/dev/null 2>&1; then echo "However, you might get some warnings that look like this:" - $cat .out + $sed -e 's/^/ /' .out fi else echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4 + $cat >&4 flags + $rm -f flags if $cc $ccflags -c -DTRY=1 try.c >/dev/null 2>&1; then echo "It supports 1..." if $cc $ccflags -c -DTRY=3 try.c >/dev/null 2>&1; then @@ -147,13 +153,16 @@ echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4 esac ?X: Only prompt user if support does not match the level we want case "$voidflags" in -"$defvoidused") ;; +"$defvoidused") + echo "Good. I already know it supports void to the level $package wants." + ;; *) dflt="$voidflags"; + test -f flags && $cat flags rp="Your void support flags add up to what?" . ./myread voidflags="$ans" ;; esac -$rm -f try.* .out +$rm -f try.* .out flags diff --git a/mcon/U/warnflags.U b/mcon/U/warnflags.U index 547bd3e..0f36821 100644 --- a/mcon/U/warnflags.U +++ b/mcon/U/warnflags.U @@ -1,12 +1,12 @@ -?RCS: $Id: warnflags.U,v 3.0 1993/08/18 12:10:02 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Orginal Author: Graham Stoney <greyham@research.canon.oz.au> ?RCS: @@ -20,6 +20,7 @@ ?S: This variable contains any additional C compiler flags to generate ?S: warnings from the compiler. It is up to the Makefile to use this. ?S:. +: offer additional warning flags for compilation $cat <<EOH You may wish to compile with extra compiler warnings enabled. diff --git a/mcon/U/yacc.U b/mcon/U/yacc.U index a9fe85b..4447b0b 100644 --- a/mcon/U/yacc.U +++ b/mcon/U/yacc.U @@ -1,12 +1,12 @@ -?RCS: $Id: yacc.U,v 3.0.1.1 1994/05/13 15:28:48 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: yacc.U,v $ ?RCS: Revision 3.0.1.1 1994/05/13 15:28:48 ram @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:10:03 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:yacc yaccflags: Guess Myread Oldconfig byacc bison cat test +?MAKE:yacc yaccflags: Guess Myread Loc Oldconfig byacc bison cat test ?MAKE: -pick add $@ %< ?S:yacc: ?S: This variable holds the name of the compiler compiler we @@ -27,21 +27,29 @@ ?S:. ?T:comp : determine compiler compiler -case "$yacc" in -'') - dflt=yacc;; -*) - dflt="$yacc";; -esac echo " " comp='yacc' -if $test -f "$byacc"; then - dflt="$byacc" +if $test -f "$byacc$_exe"; then comp="byacc or $comp" fi -if $test -f "$bison"; then +if $test -f "$bison$_exe"; then comp="$comp or bison -y" fi +case "$yacc" in +'') + yacc=`./loc yacc yacc $pth` + if $test -f "$yacc$_exe"; then + dflt='yacc' + elif $test -f "$byacc$_exe"; then + dflt='byacc' + elif $test -f "$bison$_exe"; then + dflt='bison' + else + dflt='' + fi + ;; +*) dflt="$yacc";; +esac rp="Which compiler compiler ($comp) shall I use?" . ./myread yacc="$ans" |