From d8d3e4d17b26164a550ca481fd27778d1db7fdf7 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Tue, 13 Dec 2011 23:07:58 +0400 Subject: [PATCH 01/12] config option --- CHANGES.fidoman | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CHANGES.fidoman diff --git a/CHANGES.fidoman b/CHANGES.fidoman new file mode 100644 index 0000000..7ea1a89 --- /dev/null +++ b/CHANGES.fidoman @@ -0,0 +1,5 @@ +=== 2011-12-13 === + +Split inbound feature have added. +Received files from different links are placed in separate folders in inbound. +Use option "split_inbound" to enable this feature. From 47267a1af6b3bb66f664997c70068688133384a3 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Tue, 13 Dec 2011 23:10:02 +0400 Subject: [PATCH 02/12] config option --- examples/bforce.conf | 2 + source/bforce/bforce.c | 2 + source/bforce/conf_proc.c | 1 + source/config.guess | 1568 +++++++++++++++++++++++++------------ source/config.sub | 1031 +++++++++++++++++++++--- source/include/confread.h | 1 + 6 files changed, 1991 insertions(+), 614 deletions(-) diff --git a/examples/bforce.conf b/examples/bforce.conf index fff4798..c890b86 100644 --- a/examples/bforce.conf +++ b/examples/bforce.conf @@ -106,6 +106,8 @@ nodial_flag /etc/nodial inbound_directory (Protected) /var/spool/fido/bt/pin inbound_directory /var/spool/fido/bt/in +split_inbound yes + # # Path to your 4D outbound (use zone as extension) # diff --git a/source/bforce/bforce.c b/source/bforce/bforce.c index 6713abc..b24673b 100644 --- a/source/bforce/bforce.c +++ b/source/bforce/bforce.c @@ -449,6 +449,8 @@ int main(int argc, char *argv[], char *envp[]) (void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG)); #endif + printf("split_inb: %s\n", conf_boolean(cf_split_inbound)?"yes":"no"); + if( opts.daemon ) rc = bforce_daemon(&opts); else if( role ) diff --git a/source/bforce/conf_proc.c b/source/bforce/conf_proc.c index 95b8c4a..26c257b 100644 --- a/source/bforce/conf_proc.c +++ b/source/bforce/conf_proc.c @@ -174,6 +174,7 @@ s_conf_entry bforce_config[BFORCE_NUMBER_OF_KEYWORDS+1] = { #ifdef DEBUG CONF_KEY(debug_file, CT_STRING), CONF_KEY(debug_level, CT_DEBLEVEL), + CONF_KEY(split_inbound, CT_BOOLEAN), #endif CONF_END() }; diff --git a/source/config.guess b/source/config.guess index 2960d6e..40eaed4 100755 --- a/source/config.guess +++ b/source/config.guess @@ -1,7 +1,11 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. + +timestamp='2011-05-11' + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -14,160 +18,350 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <dummy.s - .globl main - .ent main -main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null - if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-sysv4 + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd fi - exit 0 ;; - NILE:*:*:dcosx) + exit ;; + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -176,12 +370,12 @@ EOF esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -191,55 +385,63 @@ EOF echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:*) + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -254,62 +456,83 @@ EOF exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include main() @@ -320,18 +543,21 @@ EOF exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:4) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` - if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -339,75 +565,120 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 ) - sed 's/^ //' << EOF >dummy.c - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF - (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy` - rm -f dummy.c dummy + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -432,341 +703,440 @@ EOF exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) + exit ;; + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} - exit 0 ;; + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - exit 0 ;; + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} - exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; - F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - arm* | sa110*) UNAME_MACHINE="arm" ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; esac - - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ - | sed -ne '/supported emulations:/!d - s/[ ][ ]*/ /g - s/.*supported emulations: *// - s/ .*// - p'` - case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; - esac - - if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null - if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - - objdump --private-headers dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu else - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; - i?86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i?86:*:3.2:*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} - exit 0 ;; + exit ;; pc:*:*:*) - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; - i?86:LynxOS:2.*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + exit ;; + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -774,48 +1144,184 @@ EOF else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:*:6*) + exit ;; + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -831,16 +1337,16 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -853,7 +1359,10 @@ main () #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -898,11 +1407,24 @@ main () #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -913,12 +1435,12 @@ main () } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -927,25 +1449,69 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/source/config.sub b/source/config.sub index 00bea6e..30fdca8 100755 --- a/source/config.sub +++ b/source/config.sub @@ -1,6 +1,11 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. + +timestamp='2011-03-23' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -17,19 +22,26 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + +# Please send patches to . Submit a context +# diff and a properly formatted GNU ChangeLog entry. +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -45,30 +57,78 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +154,40 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -117,10 +202,17 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -143,26 +235,113 @@ case $os in -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \ - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ - | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ + | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[34567]86) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,27 +350,101 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ - | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ - | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ - | f301-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -202,25 +455,39 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -229,6 +496,35 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -249,27 +545,45 @@ case $basic_machine in basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [ctj]90-cray) - basic_machine=c90-cray - os=-unicos + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -278,6 +592,14 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -297,6 +619,10 @@ case $basic_machine in encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -307,6 +633,10 @@ case $basic_machine in basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -315,6 +645,14 @@ case $basic_machine in basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -330,13 +668,30 @@ case $basic_machine in basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -345,27 +700,42 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34567]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[34567]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[34567]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[34567]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -380,6 +750,14 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -391,16 +769,23 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` @@ -408,10 +793,37 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -424,6 +836,10 @@ case $basic_machine in basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -449,9 +865,45 @@ case $basic_machine in basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -460,57 +912,124 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentium4) basic_machine=i786-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentium4-*) basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -518,6 +1037,16 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -525,6 +1054,16 @@ case $basic_machine in spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -565,19 +1104,48 @@ case $basic_machine in sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -586,6 +1154,10 @@ case $basic_machine in basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -595,8 +1167,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -609,13 +1181,36 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; - xmp) - basic_machine=xmp-cray - os=-unicos + w65*) + basic_machine=w65-wdc + os=-none ;; - xps | xps100) + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -623,32 +1218,44 @@ case $basic_machine in # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sparc) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -657,6 +1264,15 @@ case $basic_machine in orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -680,9 +1296,12 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -703,20 +1322,57 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos*) + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -726,6 +1382,15 @@ case $os in -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -741,11 +1406,26 @@ case $os in -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) @@ -754,6 +1434,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -772,9 +1455,32 @@ case $os in # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -797,13 +1503,38 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; - pdp11-*) + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) os=-none ;; *-dec | vax-*) @@ -821,6 +1552,21 @@ case $basic_machine in # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -830,9 +1576,24 @@ case $basic_machine in *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -875,27 +1636,39 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -914,12 +1687,18 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -935,21 +1714,47 @@ case $basic_machine in -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/source/include/confread.h b/source/include/confread.h index 99827c8..a8bcf62 100644 --- a/source/include/confread.h +++ b/source/include/confread.h @@ -270,6 +270,7 @@ typedef enum { cf_debug_file, cf_debug_level, #endif + cf_split_inbound, BFORCE_NUMBER_OF_KEYWORDS } bforce_config_keyword; From 1b16ad995937d0b3d87072e7192dd2f96b76b472 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Wed, 14 Dec 2011 21:56:39 +0400 Subject: [PATCH 03/12] body --- source/bforce/sess_common.c | 7 ++++++- source/bforce/sess_main.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/source/bforce/sess_common.c b/source/bforce/sess_common.c index 028f617..0fd32f1 100644 --- a/source/bforce/sess_common.c +++ b/source/bforce/sess_common.c @@ -36,7 +36,8 @@ * $INBOUND * $CONNECT, * $CALLERID, - * $RC + * $RC, + * $PEERNAME */ int session_run_command(const char *execstr) { @@ -111,6 +112,10 @@ int session_run_command(const char *execstr) if( state.cidstr && *state.cidstr ) exec_env_add(&eopts, "CALLERID", state.cidstr); + + if( state.peername && *state.peername ) + exec_env_add(&eopts, "PEERNAME", state.peername); + if( state.session_rc >= 0 ) { diff --git a/source/bforce/sess_main.c b/source/bforce/sess_main.c index 309c8cc..59b5d2c 100644 --- a/source/bforce/sess_main.c +++ b/source/bforce/sess_main.c @@ -311,14 +311,36 @@ int session_set_inbound(void) struct stat st; char *p_inb; - if( (p_inb = conf_string(cf_inbound_directory)) ) - { - state.inbound = (char*)xstrcpy(p_inb); + p_inb = conf_string(cf_inbound_directory); + if( !p_inb ) { + log("no inbound specified, assume current directory"); + p_inb = "./"; } - else - { - log("no inbound specified, assume \"./\""); - state.inbound = (char*)xstrcpy("./"); + + if( conf_boolean(cf_split_inbound) ) { + char buf[500]; + if( state.node.addr.point ) { + sprintf( buf, "%s%d:%d/%d.%d/%s-in/", + p_inb, + state.node.addr.zone, + state.node.addr.net, + state.node.addr.node, + state.node.addr.point, + state.protected? "pwd": "unchecked" ); + } else { + sprintf( buf, "%s%d:%d/%d/%s-in/", + p_inb, + state.node.addr.zone, + state.node.addr.net, + state.node.addr.node, + state.protected? "pwd": "unchecked" ); + } + log("inbound: %s", buf); + state.inbound = (char*)xstrcpy(buf); + sprintf( buf, "/bin/mkdir -p %s -m 700", state.inbound ); + system( buf ); + } else { + state.inbound = (char*)xstrcpy(p_inb); } state.tinbound = (char*)xstrcpy(state.inbound); From 959e991c674f73a85c3016679f975b09958b0754 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Thu, 15 Dec 2011 22:09:57 +0400 Subject: [PATCH 04/12] cleanup --- source/bforce/bforce.c | 2 -- source/bforce/sess_main.c | 15 +++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/bforce/bforce.c b/source/bforce/bforce.c index b24673b..6713abc 100644 --- a/source/bforce/bforce.c +++ b/source/bforce/bforce.c @@ -449,8 +449,6 @@ int main(int argc, char *argv[], char *envp[]) (void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG)); #endif - printf("split_inb: %s\n", conf_boolean(cf_split_inbound)?"yes":"no"); - if( opts.daemon ) rc = bforce_daemon(&opts); else if( role ) diff --git a/source/bforce/sess_main.c b/source/bforce/sess_main.c index 59b5d2c..8410a54 100644 --- a/source/bforce/sess_main.c +++ b/source/bforce/sess_main.c @@ -317,10 +317,11 @@ int session_set_inbound(void) p_inb = "./"; } - if( conf_boolean(cf_split_inbound) ) { - char buf[500]; + if( conf_boolean(cf_split_inbound) ) + { + char buf[PATH_MAX+31]; if( state.node.addr.point ) { - sprintf( buf, "%s%d:%d/%d.%d/%s-in/", + snprintf( buf, PATH_MAX, "%s%d:%d/%d.%d/%s-in/", p_inb, state.node.addr.zone, state.node.addr.net, @@ -328,7 +329,7 @@ int session_set_inbound(void) state.node.addr.point, state.protected? "pwd": "unchecked" ); } else { - sprintf( buf, "%s%d:%d/%d/%s-in/", + snprintf( buf, PATH_MAX, "%s%d:%d/%d/%s-in/", p_inb, state.node.addr.zone, state.node.addr.net, @@ -337,9 +338,11 @@ int session_set_inbound(void) } log("inbound: %s", buf); state.inbound = (char*)xstrcpy(buf); - sprintf( buf, "/bin/mkdir -p %s -m 700", state.inbound ); + snprintf( buf, PATH_MAX+30, "/bin/mkdir -p %s -m 700", state.inbound ); /* 30 additional chars allowed */ system( buf ); - } else { + } + else + { state.inbound = (char*)xstrcpy(p_inb); } From b7d8c716ac6f4131500c8aad2044447b84bf0a22 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Thu, 15 Dec 2011 22:41:49 +0400 Subject: [PATCH 05/12] TIO/telnet patch --- CHANGES.fidoman | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.fidoman b/CHANGES.fidoman index 7ea1a89..16856e8 100644 --- a/CHANGES.fidoman +++ b/CHANGES.fidoman @@ -1,3 +1,7 @@ +=== 2011-12-15 === + +Patch io_unix_tio.diff for OpenBSD systems running telnetted serial modem. + === 2011-12-13 === Split inbound feature have added. From 463e7a6eaaf85b3b6cae756846281e1aef1e9873 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Fri, 16 Dec 2011 20:58:22 +0400 Subject: [PATCH 06/12] progress --- source/bforce/sess_answ.c | 6 ++++++ source/bforce/sess_call.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/source/bforce/sess_answ.c b/source/bforce/sess_answ.c index 5ac45d9..c8095e1 100644 --- a/source/bforce/sess_answ.c +++ b/source/bforce/sess_answ.c @@ -81,8 +81,14 @@ int answ_system(e_session type, char *connstr, int inetd) logerr("can't get client address"); else { +#ifdef IPV6 + >char addr_str[INET6_ADDRSTRLEN+1]; + state.peername = (char*)xstrcpy(inet_ntop(AF_INET6, client.sin6_addr, addr_str, INET6_ADDRSTRLEN)); + state.peerport = (long)ntohs(client.sin6_port); +#else state.peername = (char*)xstrcpy(inet_ntoa(client.sin_addr)); state.peerport = (long)ntohs(client.sin_port); +#endif } } diff --git a/source/bforce/sess_call.c b/source/bforce/sess_call.c index 62538ed..930d9c4 100644 --- a/source/bforce/sess_call.c +++ b/source/bforce/sess_call.c @@ -254,8 +254,14 @@ int call_system_quiet(const char *connstr, bool inet) logerr("can't get client address"); else { +#ifdef IPV6 + char addr_str[INET6_ADDRSTRLEN+1]; + state.peername = (char*)xstrcpy(inet_ntop(AF_INET6, client.sin6_addr, addr_str, INET6_ADDRSTRLEN)); + state.peerport = (long)ntohs(client.sin6_port); +#else state.peername = (char*)xstrcpy(inet_ntoa(client.sin_addr)); state.peerport = (long)ntohs(client.sin_port); +#endif } } From e6e23fa895bd509be5ce3d475b9e2ccb54508be9 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Fri, 16 Dec 2011 20:59:09 +0400 Subject: [PATCH 07/12] TIO patch --- io_unix_tio.diff | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 io_unix_tio.diff diff --git a/io_unix_tio.diff b/io_unix_tio.diff new file mode 100644 index 0000000..f34c710 --- /dev/null +++ b/io_unix_tio.diff @@ -0,0 +1,11 @@ +--- /home/sergey/nas/fido/src/bforce-0.22.8orig/source/bforce/io_unix_tio.c 2011-09-19 12:57:52.000000000 +0400 ++++ io_unix_tio.c 2011-09-19 13:01:36.000000000 +0400 +@@ -233,7 +233,7 @@ + tio->c_iflag = TIO_FLOW_SOFT; + tio->c_oflag = 0; + tio->c_lflag = 0; +- tio->c_cc[VMIN] = 128; ++ tio->c_cc[VMIN] = 1; + tio->c_cc[VTIME] = 1; + #endif + } From 08ca6de0a4d91fd98b22689f7e76bd5218a3118c Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Sun, 25 Dec 2011 20:15:55 +0400 Subject: [PATCH 08/12] New features added. Maybe it should change version to 0.23 --- CHANGES.fidoman | 10 + source/bforce/bforce.c | 245 +++++++++++++------------ source/bforce/conf_proc.c | 2 +- source/bforce/daemon_call.c | 83 ++------- source/bforce/io_modem.c | 3 + source/bforce/nodelist.c | 68 ++++++- source/bforce/prot_binkp.c | 4 + source/bforce/prot_common.c | 3 + source/bforce/sess_call.c | 351 +++++++++++++++++++++++++----------- source/bforce/sess_init.c | 101 ++++++++--- source/bforce/sess_main.c | 16 +- source/include/bforce.h | 17 +- source/include/config.h | 151 ++++++++++++++++ source/include/nodelist.h | 7 +- source/include/session.h | 6 +- source/openwrt-conf | 14 ++ 16 files changed, 752 insertions(+), 329 deletions(-) create mode 100644 source/include/config.h create mode 100644 source/openwrt-conf diff --git a/CHANGES.fidoman b/CHANGES.fidoman index 16856e8..9d66e5f 100644 --- a/CHANGES.fidoman +++ b/CHANGES.fidoman @@ -1,3 +1,13 @@ +=== 2011-12-25 === + +Cmdline processing code is partially rewritten. +New key -u for selection proto for IP session. +Added code to get node IP address from nodelist (INA flag). +Some maybe noisy messages in log added. +Some code rearrangements in session_call. +Added feature to try all available connection ways if not specified one +on calls from command line (IP methods then modem). + === 2011-12-15 === Patch io_unix_tio.diff for OpenBSD systems running telnetted serial modem. diff --git a/source/bforce/bforce.c b/source/bforce/bforce.c index 6713abc..57b0642 100644 --- a/source/bforce/bforce.c +++ b/source/bforce/bforce.c @@ -70,26 +70,39 @@ static void print_compiled_configuration(void) static void usage(void) { printf_usage(NULL, - "usage: bforce [-fmh] [-I] [-n] [-l]\n" - " [-a] [-S] [-p] \n" - " bforce [-ih] [-I] [-S]\n" - " (this implies slave mode)\n" - " bforce [-dh] [-C] [-I]\n" + "call:\n" + " use nodelist and config overrides\n" + " bforce [-f] [-I] [-p] \n" + " use modem\n" + " bforce [-f] [-I] -n [-l] \n" + " [-p] \n" + " use TCP/IP\n" + " bforce [-I] [-a] -u proto \n" + " start on stdio\n" + " bforce [-f] [-I] -o \n" + "\n" + "answer:\n" + " bforce [-i] [-I] [-S]\n" + " \n" + "\n" + "start daemon:\n" + " bforce -d [-C] [-I]\n" + "\n" + "stop daemon:\n" + " bforce -q [-C] [-I]\n" "\n" "options:\n" - " -d run as daemon\n" - " -q terminate daemon\n" - " -i run from inetd (for slave mode only)\n" - " -f ignore system's work time\n" - " -o starts outgoing session on stdin/stdout\n" - " -C main config file name (\"%s\")\n" - " -I additional config file name\n" - " -n override phone number\n" - " -l call on this hidden line (default is 0) \n" - " -a override internet address\n" - " -S connect string (for slave mode only)\n" - " -p override modem port (must be defined in config)\n" - " -h show this help message\n" + " -i run from inetd (for slave mode only)\n" + " -f ignore system's work time\n" + " -C main config file name (\"%s\")\n" + " -I additional config file name (one allowed)\n" + " -n override phone number\n" + " -l call on this hidden line (default is 0) \n" + " -a override internet address\n" + " -S connect string (for slave mode only)\n" + " -p override modem port (must be defined in config)\n" + " -u binkp|ifcico|telnet protocol to use over TCP/IP\n" + " -h show this help message\n" "\n", conf_getconfname() ); @@ -194,7 +207,7 @@ static int bforce_master(const s_bforce_opts *opts) { int callopt = 0; - if( opts->iaddr ) callopt |= CALLOPT_INET; + if( opts->runmode == MODE_CALL_IP ) callopt |= CALLOPT_INET; if( opts->force ) callopt |= CALLOPT_FORCE; rc = call_system(tmpl->addr, opts); @@ -232,105 +245,88 @@ static int bforce_daemon(const s_bforce_opts *opts) return daemon_run(opts->confname, opts->incname, opts->quit); } - + int main(int argc, char *argv[], char *envp[]) { s_bforce_opts opts; int rc = 0; int ch = 0; - int role = 0; + opts.runmode = MODE_UNDEFINED; memset(&opts, '\0', sizeof(s_bforce_opts)); - while( (ch=getopt(argc, argv, "hodqr:ifC:I:n:l:a:S:p:")) != EOF ) + // parsing + + while( (ch=getopt(argc, argv, "hfI:p:n:l:a:u:oiC:S:dq")) != EOF ) { switch( ch ) { case 'h': usage(); exit(BFERR_NOERROR); - case 'd': - if( opts.inetd || opts.force || opts.phone - || opts.hiddline || opts.iaddr || opts.connect - || opts.device || opts.quit ) - { usage(); exit(BFERR_FATALERROR); } - else - { opts.daemon = 1; } - break; - case 'q': - if( opts.inetd || opts.force || opts.phone - || opts.hiddline || opts.iaddr || opts.connect - || opts.device || opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { opts.daemon = 1; opts.quit = 1; } - break; - case 'i': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { opts.inetd = 1; } - break; case 'f': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { opts.force = 1; } - break; - case 'o': - if( opts.dontcall ) - { usage(); exit(BFERR_FATALERROR); } - else - { opts.dontcall = TRUE; } - break; - case 'C': - if( opts.confname ) free(opts.confname); - if( optarg ) opts.confname = (char *)xstrcpy(optarg); + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_MODEM; + if( opts.runmode != MODE_CALL_MODEM || opts.force ) { usage(); exit(BFERR_FATALERROR); } + opts.force = 1; break; case 'I': - if( opts.incname ) free(opts.incname); - if( optarg ) opts.incname = (char *)xstrcpy(optarg); + if( opts.incname || !optarg ) { usage(); exit(BFERR_FATALERROR); } //free(opts.incname); + opts.incname = (char *)xstrcpy(optarg); + break; + case 'p': + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_MODEM; + if( opts.runmode != MODE_CALL_MODEM || opts.device || !optarg ) { usage(); exit(BFERR_FATALERROR); } + opts.device = (char *)xstrcpy(optarg); break; case 'n': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { - if( opts.phone ) free(opts.phone); - if( optarg ) opts.phone = (char *)xstrcpy(optarg); - } + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_MODEM; + if( opts.runmode != MODE_CALL_MODEM || opts.phone || !optarg ) { usage(); exit(BFERR_FATALERROR); } + //if( opts.phone ) free(opts.phone); + opts.phone = (char *)xstrcpy(optarg); break; case 'l': - if( ISDEC(optarg) && opts.daemon == 0 ) - opts.hiddline = atoi(optarg); - else - { usage(); exit(BFERR_FATALERROR); } + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_MODEM; + if( opts.runmode != MODE_CALL_MODEM || opts.hiddline || !optarg || ISDEC(optarg) ) { usage(); exit(BFERR_FATALERROR); } + opts.hiddline = atoi(optarg); break; case 'a': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { - if( opts.iaddr ) free(opts.iaddr); - if( optarg ) opts.iaddr = (char *)xstrcpy(optarg); - } + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_IP; + if( opts.runmode != MODE_CALL_IP || opts.iphost || !optarg ) { usage(); exit(BFERR_FATALERROR); } + opts.iphost = (char *)xstrcpy(optarg); + break; + case 'u': + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_IP; + if( opts.runmode != MODE_CALL_IP || opts.ipproto || !optarg ) { usage(); exit(BFERR_FATALERROR); } + opts.ipproto = (char *)xstrcpy(optarg); + break; + case 'o': + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_STDIO; + if( opts.runmode != MODE_CALL_STDIO || opts.usestdio ) { usage(); exit(BFERR_FATALERROR); } + opts.usestdio = TRUE; + break; + case 'i': + //if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + //if( opts.runmode != MODE_ANSWER || opts.inetd ) { usage(); exit(BFERR_FATALERROR); } + opts.inetd = 1; + break; + case 'C': + if( opts.confname || !optarg ) { usage(); exit(BFERR_FATALERROR); } + opts.confname = (char *)xstrcpy(optarg); break; case 'S': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { - if( opts.connect ) free(opts.connect); - if( optarg ) opts.connect = (char *)xstrcpy(optarg); - } + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.connect || !optarg ) { usage(); exit(BFERR_FATALERROR); } + opts.connect = (char *)xstrcpy(optarg); break; - case 'p': - if( opts.daemon ) - { usage(); exit(BFERR_FATALERROR); } - else - { - if( opts.device ) free(opts.device); - if( optarg ) opts.device = (char *)xstrcpy(optarg); - } + case 'd': + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_DAEMON; + if( opts.runmode != MODE_DAEMON || opts.daemon || opts.quit ) { usage(); exit(BFERR_FATALERROR); } + opts.daemon = 1; + break; + case 'q': + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_DAEMON; + if( opts.runmode != MODE_DAEMON || opts.quit ) { usage(); exit(BFERR_FATALERROR); } + opts.quit = 1; + opts.daemon = 1; break; default : usage(); @@ -338,6 +334,12 @@ int main(int argc, char *argv[], char *envp[]) } } + if( opts.inetd && opts.runmode != MODE_ANSWER && opts.runmode != MODE_CALL_STDIO ) + { + usage(); + exit(BFERR_FATALERROR); + } + /* Expression checker use it, so init first */ init_state(&state); @@ -368,37 +370,45 @@ int main(int argc, char *argv[], char *envp[]) if( strcasecmp(p, "tsync") == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_FTSC; } else if( strcasecmp(p, "yoohoo") == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_YOOHOO; } else if( strcasecmp(p, "**EMSI_INQC816") == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_EMSI; } else if( strncasecmp(p, "emsi", 4) == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_EMSI; } else if( strcasecmp(p, "binkp") == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_BINKP; } else if( strcasecmp(p, "auto") == 0 ) { - role = 0; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_ANSWER; + if( opts.runmode != MODE_ANSWER || opts.stype ) { usage(); exit(BFERR_FATALERROR); } opts.stype = SESSION_UNKNOWN; } else if( ftn_addrparse(&addr, p, FALSE) == 0 ) { - role = 1; + if( opts.runmode == MODE_UNDEFINED ) opts.runmode = MODE_CALL_DEFAULT; + if( opts.runmode != MODE_CALL_DEFAULT && opts.runmode != MODE_CALL_IP && + opts.runmode != MODE_CALL_MODEM && opts.runmode != MODE_CALL_STDIO ) { usage(); exit(BFERR_FATALERROR); } (*alist) = (s_falist*)xmalloc(sizeof(s_falist)); memset(*alist, '\0', sizeof(s_falist)); (*alist)->addr = addr; @@ -411,12 +421,6 @@ int main(int argc, char *argv[], char *envp[]) exit(BFERR_FATALERROR); } } - - if( opts.dontcall && role == 0 ) - { - usage(); - exit(BFERR_FATALERROR); - } } /* if( (rc = log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL)) ) @@ -449,13 +453,31 @@ int main(int argc, char *argv[], char *envp[]) (void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG)); #endif - if( opts.daemon ) + //char runmode_str[21]; + //snprintf(runmode_str, 20, "Run mode: %d", opts.runmode); + //log(runmode_str); + + switch( opts.runmode ) + { +case MODE_DAEMON: + log("Daemon mode"); rc = bforce_daemon(&opts); - else if( role ) + break; +case MODE_CALL_DEFAULT: +case MODE_CALL_IP: +case MODE_CALL_MODEM: +case MODE_CALL_STDIO: + log("Outgoing call"); rc = bforce_master(&opts); - else + break; +case MODE_ANSWER: + log("Start answer"); rc = bforce_slave(&opts); - + break; +default: + log("Could not determine run mode"); + } + exit: deinit_conf(); @@ -475,7 +497,8 @@ static void deinit_opts(s_bforce_opts *opts) if( opts->confname ) free(opts->confname); if( opts->incname ) free(opts->incname); if( opts->phone ) free(opts->phone); - if( opts->iaddr ) free(opts->iaddr); + if( opts->iphost ) free(opts->iphost); + if( opts->ipproto ) free(opts->ipproto); if( opts->connect ) free(opts->connect); if( opts->device ) free(opts->device); if( opts->addrlist ) deinit_falist(opts->addrlist); diff --git a/source/bforce/conf_proc.c b/source/bforce/conf_proc.c index 26c257b..83b7278 100644 --- a/source/bforce/conf_proc.c +++ b/source/bforce/conf_proc.c @@ -174,8 +174,8 @@ s_conf_entry bforce_config[BFORCE_NUMBER_OF_KEYWORDS+1] = { #ifdef DEBUG CONF_KEY(debug_file, CT_STRING), CONF_KEY(debug_level, CT_DEBLEVEL), - CONF_KEY(split_inbound, CT_BOOLEAN), #endif + CONF_KEY(split_inbound, CT_BOOLEAN), CONF_END() }; diff --git a/source/bforce/daemon_call.c b/source/bforce/daemon_call.c index 8949e80..a8a3778 100644 --- a/source/bforce/daemon_call.c +++ b/source/bforce/daemon_call.c @@ -52,78 +52,19 @@ static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport signal(SIGUSR1, SIG_DFL); signal(SIGUSR2, SIG_DFL); - /* - * Initialise ``state'' information structure - */ - init_state(&state); - state.caller = TRUE; - state.valid = TRUE; - state.node = syst->node; - state.listed = syst->node.listed; - state.modemport = (!syst->tcpip) ? port : NULL; - if( syst->lineptr ) - state.override = *syst->lineptr; - if( *state.node.addr.domain ) - *state.node.addr.domain = '\0'; - - /* - * Apply overrides to the node information - */ - if( state.override.sFlags ) - { - strnxcat(state.node.flags, ",", sizeof(state.node.flags)); - strnxcat(state.node.flags, state.override.sFlags, sizeof(state.node.flags)); - } - - if( !syst->tcpip && state.override.sPhone ) - (void)strnxcpy(state.node.phone, state.override.sPhone, sizeof(state.node.phone)); - else if( syst->tcpip && state.override.sIpaddr ) - (void)strnxcpy(state.node.phone, state.override.sIpaddr, sizeof(state.node.phone)); - - /* - * Try to lock address of system we are going to call - */ -#ifdef BFORCE_USE_CSY - if( out_bsy_lock(state.node.addr, TRUE) ) -#else - if( out_bsy_lock(state.node.addr) ) -#endif - gotoexit(BFERR_SYSTEM_LOCKED); - - setproctitle("bforce calling %s, %s", - ftn_addrstr(abuf, state.node.addr), state.node.phone); - -/* if( ( syst->tcpip ) || (strcmp(state.node.phone,NO_PSTN_PHONE)== 0) ) */ - if( syst->tcpip ) - { - rc = call_system_tcpip(); - } - else /* via Modem */ - { - state.modemport = port; - if( port_lock(lockdir, state.modemport) ) - { - log("cannot lock modem port"); - rc = BFERR_PORTBUSY; - } - else /* Locked port */ - { - rc = call_system_modem(); - port_unlock(lockdir, state.modemport); - } - } - -exit: - out_bsy_unlockall(); + s_bforce_opts opts; + // TODO: add hiddenline round-robin + opts.hiddline=0; + opts.runmode = MODE_CALL_DEFAULT; + opts.ipproto = NULL; + opts.phone = NULL; + opts.force = 0; + opts.inetd = 0; + opts.connect = NULL; + opts.device = NULL; - log("session rc = %d (\"%s\")", rc, BFERR_NAME(rc)); - - (void)session_stat_update(&state.node.addr, - &state.sess_stat, TRUE, rc); - - deinit_state(&state); - - return rc; +// log("doing call_system"); + return call_system(syst->node.addr, &opts); } int daemon_call(s_sysentry *syst) diff --git a/source/bforce/io_modem.c b/source/bforce/io_modem.c index 5209239..c5860e4 100644 --- a/source/bforce/io_modem.c +++ b/source/bforce/io_modem.c @@ -59,6 +59,9 @@ bool modem_isgood_phone(const char *str) if( string_casestr(str, "none") ) return FALSE; + if( string_casestr(str, "00-00-000000") ) + return FALSE; + return TRUE; } diff --git a/source/bforce/nodelist.c b/source/bforce/nodelist.c index 17958e7..8357dad 100644 --- a/source/bforce/nodelist.c +++ b/source/bforce/nodelist.c @@ -11,6 +11,9 @@ * $Id$ */ +#define _GNU_SOURCE +#include + #include "includes.h" #include "confread.h" #include "logger.h" @@ -49,20 +52,73 @@ struct keyword { */ int nodelist_checkflag(const char *nodeflags, const char *flag) { - char *p, *q; + char *p; + const char *searchbase = nodeflags; + char *q; - if( (p = strstr(nodeflags, flag)) ) + while( p = strstr(searchbase, flag) ) { - if( p == nodeflags || *(p-1) == ',' ) + if( p == searchbase || *(p-1) == ',' ) { if( (q = strchr(p, ',')) == NULL || (q - p) == strlen(flag) ) return 0; + if( (strchrnul(p, ':') - p) == strlen(flag) ) + return 0; } + + searchbase = p + 1; // avoid finding again the same } return 1; } +/***************************************************************************** + * Get value from flag (e.g. INA:host.domain.ru) + * + * Arguments: + * nodeflags pointer to the node's nodelist flags string + * flag pointer to the flag that we want to check + * value pointer to string buffer for result. please allocate + * max possible value of strlen(nodeflags) bytes + * + * Return value: + * zero value if flag is presented in flags, and non-zero if not + * res is zero lengh string if no flag or flag is empty + */ + +int nodelist_flagvalue(const char *nodeflags, const char *flag, char *res) +{ + char *p, *q; + const char *searchbase = nodeflags; + int flaglen = strlen(flag); + + while( p = strstr(searchbase, flag) ) + { + if( p == nodeflags || *(p-1) == ',' ) // match flag + { + if( *(p+flaglen) == 0 || *(p+flaglen) == ',' ) + { + // empty flag + res[0]=0; + return 0; + } + else + { + if( *(p+flaglen) == ':' ) { + // flag has data + p += flaglen + 1; // start of data + q = strchrnul(p, ','); // end of data: comma or EOS + strncpy(res, p, q-p); + return 0; + } + } + } + searchbase = p + 1; + } + res[0] = 0; + return 1; +} + /***************************************************************************** * Get nodelist keyword (e.g. Host, Hub, Point, etc.) value * (e.g. KEYWORD_HOST, KEYWORD_HUB, etc.) @@ -231,6 +287,12 @@ int nodelist_parsestring(s_node *node, char *str) } } + node->do_binkp = nodelist_checkflag(node->flags, "IBN") == 0; + node->do_ifcico = nodelist_checkflag(node->flags, "IFC") == 0; + node->do_telnet = nodelist_checkflag(node->flags, "ITN") == 0; + + nodelist_flagvalue(node->flags, "INA", node->host); + return 0; } diff --git a/source/bforce/prot_binkp.c b/source/bforce/prot_binkp.c index ec71d3c..f687a63 100644 --- a/source/bforce/prot_binkp.c +++ b/source/bforce/prot_binkp.c @@ -425,7 +425,9 @@ int binkp_transfer(s_protinfo *pi) { BPT_EOB } binkp_send_state = BPT_Start_Send_File; remote = (s_binkp_sysinfo *) state.handshake->remote_data; + binkp_init_bpinfo(&bpi); + while (1) { if (binkp_send_state == BPT_Start_Send_File) { if (p_tx_fopen (pi)) { @@ -699,10 +701,12 @@ int binkp_transfer(s_protinfo *pi) { } } /* end of while( !sent_EOB || !rcvd_EOB ) */ + FinishSession: if( binkp_flush_queue(&bpi, bpi.timeout) && rc == PRC_NOERROR ) rc = PRC_ERROR; + exit: if( pi->send && pi->send->fp ) p_tx_fclose(pi); if( pi->recv && pi->recv->fp ) p_rx_fclose(pi); diff --git a/source/bforce/prot_common.c b/source/bforce/prot_common.c index f47ba56..fe36cb9 100644 --- a/source/bforce/prot_common.c +++ b/source/bforce/prot_common.c @@ -1453,11 +1453,13 @@ void init_protinfo(s_protinfo *pi, bool caller) { long tmp; long sesslimit; + memset(pi, '\0', sizeof(s_protinfo)); pi->start_time = time(NULL); + if( (pi->buflen = conf_number(cf_recv_buffer_size)) > 0 ) pi->buflen = (pi->buflen / 2048) * 2048; else @@ -1471,6 +1473,7 @@ void init_protinfo(s_protinfo *pi, bool caller) else pi->min_cps_time = 60; + /* * Set abort time if session limit was specified */ diff --git a/source/bforce/sess_call.c b/source/bforce/sess_call.c index 930d9c4..a378616 100644 --- a/source/bforce/sess_call.c +++ b/source/bforce/sess_call.c @@ -19,6 +19,13 @@ #include "io.h" #include "session.h" +#define CALL_STDIO (1) +#define CALL_MODEM (2) +#define CALL_TCPIP_BINKP (4) +#define CALL_TCPIP_IFCICO (8) +#define CALL_TCPIP_TELNET (16) +#define CALL_TCPIP_ANY (CALL_TCPIP_BINKP | CALL_TCPIP_IFCICO | CALL_TCPIP_TELNET) + #ifdef XXXX /* Unused */ int call_system_modem_init(TIO *old_tio_settings) @@ -326,6 +333,9 @@ int call_system_modem(void) const char *p_hangstr = NULL; /* Modem hangup string */ const char *p_statstr = NULL; /* Modem statistic string */ + // automatically determine session type + state.session = SESSION_UNKNOWN; + /* * Set verbal line name to the modem device name */ @@ -474,7 +484,7 @@ int call_system_modem(void) return rc; } -int call_system_tcpip(void) +int call_system_tcpip(int callwith) // only TCPIP values { char abuf[BF_MAXADDRSTR+1]; int rc = BFERR_NOERROR; @@ -482,8 +492,8 @@ int call_system_tcpip(void) /* * Set verbal line name to "tcpip" value */ - state.linename = xstrcpy("tcpip"); + state.linename = xstrcpy("tcpip"); state.inet = TRUE; /* @@ -500,34 +510,30 @@ int call_system_tcpip(void) (void)debug_setfilename(log_getfilename(LOG_FILE_DEBUG)); #endif - if( nodelist_checkflag(state.node.flags, "BINKP") == 0 - || nodelist_checkflag(state.node.flags, "IBN") == 0 ) - { + switch( callwith ) { +case CALL_TCPIP_BINKP: state.tcpmode = TCPMODE_BINKP; state.session = SESSION_BINKP; - } - else if( nodelist_checkflag(state.node.flags, "TELN") == 0 ) - { - state.tcpmode = TCPMODE_TELNET; - state.session = SESSION_UNKNOWN; - } - else if( nodelist_checkflag(state.node.flags, "IFC") == 0 ) - { + break; +case CALL_TCPIP_IFCICO: state.tcpmode = TCPMODE_RAW; state.session = SESSION_UNKNOWN; - } - else /* Default is "raw" mode */ - { - state.tcpmode = TCPMODE_RAW; + break; +case CALL_TCPIP_TELNET: + state.tcpmode = TCPMODE_TELNET; state.session = SESSION_UNKNOWN; + break; +defalt: + log("invalid protocol for TCP/IP module"); + return BFERR_FATALERROR; } log("calling %s (%s, %s)", ftn_addrstr(abuf, state.node.addr), (state.node.name && *state.node.name ) ? state.node.name : "", - (state.node.phone && *state.node.phone) ? state.node.phone : ""); + (state.node.host && *state.node.host) ? state.node.host : ""); - if( (rc = tcpip_connect(state.node.phone, state.tcpmode)) == 0 + if( (rc = tcpip_connect(state.node.host, state.tcpmode)) == 0 && (rc = tcpip_init() == 0) ) { TTYSTATUS(1); @@ -544,117 +550,229 @@ int call_system_tcpip(void) int call_system(s_faddr addr, const s_bforce_opts *opts) { + // if added new opts check daemon_call + + char s[300]; + snprintf(s, 299, "bforce calling system %d:%d/%d.%d", addr.zone, addr.net, addr.node, addr.point ); + log(s); + + // find suitable way of connection and try to make session + int rc = 0; int runrc = 0; char abuf[BF_MAXADDRSTR+1]; char *p_lockdir = NULL; char *errmsg = NULL; - bool inet = FALSE; + int call_mustuse = 0; + int call_mayuse = 0; init_state(&state); state.caller = TRUE; state.valid = TRUE; state.node.addr = addr; + nodelist_lookup(&state.node, addr); - state.listed = state.node.listed; - state.node.addr.domain[0] = '\0'; /* Discard domain for node address */ - - if( opts->dontcall ) - goto do_session; - - /* - * Get node overrides - */ if( override_get(&state.override, state.node.addr, opts->hiddline) ) { errmsg = "incorrect hidden line number"; gotoexit(BFERR_PHONE_UNKNOWN); } - - /* - * Apply overrides to the node information - */ - if( state.override.sFlags ) - { - strnxcat(state.node.flags, ",", sizeof(state.node.flags)); - strnxcat(state.node.flags, state.override.sFlags, sizeof(state.node.flags)); - } - if( opts->iaddr && *opts->iaddr ) - { - inet = TRUE; - (void)strnxcpy(state.node.phone, - opts->iaddr, sizeof(state.node.phone)); - } - else if( opts->phone && *opts->phone ) + state.listed = state.node.listed; + state.node.addr.domain[0] = '\0'; /* Discard domain for node address */ + + // 1. If call method specified in cmdline, do use it + // 2. If not, use nodelist data and overrides and call all available methods + // If override contains Phone or IP flags, ignore nodelist connect methods (but save INA if not overrided) + + // 1st - get all allowed call ways + // 2nd - gather information reqired to call and remove unavailable ways (no info, node does not support) + + call_mayuse = 0; + + if( opts->runmode == MODE_CALL_DEFAULT ) { - (void)strnxcpy(state.node.phone, - opts->phone, sizeof(state.node.phone)); + call_mayuse = CALL_MODEM | CALL_TCPIP_ANY; } - else if( state.override.sIpaddr ) + else if( opts->runmode == MODE_CALL_STDIO ) { - inet = TRUE; - (void)strnxcpy(state.node.phone, - state.override.sIpaddr, sizeof(state.node.phone)); + call_mustuse = CALL_STDIO; } - else if( state.override.sPhone ) + else if( opts->runmode == MODE_CALL_MODEM ) { - (void)strnxcpy(state.node.phone, - state.override.sPhone, sizeof(state.node.phone)); + call_mustuse = CALL_MODEM; } - - if( !inet ) + else if( opts->runmode == MODE_CALL_IP ) { - if( !modem_isgood_phone(state.node.phone) ) - errmsg = "don't know phone number"; + if( strcasecmp(opts->ipproto, "binkp") == 0 ) + { + call_mustuse = CALL_TCPIP_BINKP; + } + else if ( strcasecmp(opts->ipproto, "ifcico") == 0 ) + { + call_mustuse = CALL_TCPIP_IFCICO; + } + else if( strcasecmp(opts->ipproto, "telnet") == 0 ) + { + call_mustuse = CALL_TCPIP_TELNET; + } + else if( opts->ipproto == NULL ) // determine from nodelist/override + { + call_mayuse = CALL_TCPIP_ANY; + call_mustuse = 0; + } + else + { + log("Unknown protocol"); + return -1; + } } else { - if( !tcpip_isgood_host(state.node.phone) ) - errmsg = "don't know host name"; + log("Unknown protocol"); + return -1; } - if( errmsg ) - gotoexit(BFERR_PHONE_UNKNOWN); + call_mayuse |= call_mustuse; // it simplifies logics: all required is allowed + + //char s[300]; + //snprintf(s, 299, "initial: may use %d must use %d", call_mayuse, call_mustuse); + //log(s); + + + if( call_mayuse & CALL_MODEM ) + { + // 1. use phone from opts + // 2. use overrides + // 3. use nodelist + + if( opts->phone && *opts->phone ) + { + (void)strnxcpy(state.node.phone, opts->phone, sizeof(state.node.phone)); + //log("phone from options"); + } + else if( state.override.sPhone ) + { + (void)strnxcpy(state.node.phone, state.override.sPhone, sizeof(state.node.phone)); + //log("phone from override"); + } + if( !modem_isgood_phone(state.node.phone) ) + { + log("bad phone, excluding modem"); + call_mayuse &= ~CALL_MODEM; + if( call_mustuse & CALL_MODEM ) + { + errmsg = "don't know phone number"; + gotoexit(BFERR_PHONE_UNKNOWN); + } + } /* * Is now a working time for that node/line */ - if( !inet && !opts->force) - { - time_t unixtime = time(NULL); - struct tm *now = localtime(&unixtime); - bool goodtime; - - if( !opts->hiddline ) + if( !opts->force) { - if( state.override.sFlags && !nodelist_checkflag(state.override.sFlags, "CM") ) - goodtime = TRUE; - else + time_t unixtime = time(NULL); + struct tm *now = localtime(&unixtime); + bool goodtime = FALSE; + + if( timevec_isdefined(&state.override.worktime) ) + { + goodtime = timevec_isnow(&state.override.worktime, now); + } + else if( state.override.sFlags ) + { + goodtime = !nodelist_checkflag(state.override.sFlags, "CM"); + } + else if( !opts->hiddline ) { - if( timevec_isdefined(&state.override.worktime) ) - goodtime = timevec_isnow(&state.override.worktime, now); + if( !nodelist_checkflag(state.node.flags, "CM") ) + goodtime = TRUE; else + goodtime = timevec_isnow(&state.node.worktime, now); + } + if( !goodtime ) + { + call_mayuse &= ~CALL_MODEM; + log("bad worktime, excluding modem"); + if( call_mustuse & CALL_MODEM ) { - if( !nodelist_checkflag(state.node.flags, "CM") ) - goodtime = TRUE; - else - goodtime = timevec_isnow(&state.node.worktime, now); + errmsg = "not works now, try later"; + gotoexit(BFERR_NOTWORKING); } } } - else - goodtime = timevec_isnow(&state.override.worktime, now); - - if( !goodtime ) + } + +// snprintf(s, 299, "after phone check: may use %d must use %d", call_mayuse, call_mustuse); +// log(s); + + /* + * Apply overrides to the node information + */ + + if( state.override.sFlags ) + { + strnxcat(state.node.flags, ",", sizeof(state.node.flags)); + strnxcat(state.node.flags, state.override.sFlags, sizeof(state.node.flags)); + } + + // state.node nodelist + // state.override config + // opts cmdline + + // filter unavailable protos if not obligated to use it + + if( !(call_mustuse & CALL_TCPIP_BINKP) && (call_mayuse & CALL_TCPIP_BINKP) ) + { + if( nodelist_checkflag(state.node.flags, "BINKP") != 0 && nodelist_checkflag(state.node.flags, "IBN") != 0 ) + { + call_mayuse &= ~CALL_TCPIP_BINKP; + } + } + + if( !(call_mustuse & CALL_TCPIP_IFCICO) && (call_mayuse & CALL_TCPIP_IFCICO) ) + { + if( nodelist_checkflag(state.node.flags, "IFC") != 0 && nodelist_checkflag(state.node.flags, "IFC") != 0 ) + { + call_mayuse &= ~CALL_TCPIP_IFCICO; + } + } + + if( !(call_mustuse & CALL_TCPIP_TELNET) && (call_mayuse & CALL_TCPIP_TELNET) ) + { + if( nodelist_checkflag(state.node.flags, "TELN") != 0 && nodelist_checkflag(state.node.flags, "TLN") != 0 ) + { + call_mayuse &= ~CALL_TCPIP_TELNET; + } + } + + if( opts->iphost && *opts->iphost ) + { + (void)strnxcpy(state.node.host, opts->iphost, sizeof(state.node.host)); + } + else if( state.override.sIpaddr ) + { + (void)strnxcpy(state.node.host, + state.override.sIpaddr, sizeof(state.node.host)); + } + + if( call_mayuse & CALL_TCPIP_ANY && !tcpip_isgood_host(state.node.host) ) + { + call_mayuse &= ~CALL_TCPIP_ANY; + log("bad host, exclude IP"); + if( call_mustuse & CALL_TCPIP_ANY ) { - errmsg = "not works now, try later"; - gotoexit(BFERR_NOTWORKING); + errmsg = "don't know host name"; + gotoexit(BFERR_PHONE_UNKNOWN); } } + +// snprintf(s, 299, "after IP check: may use %d must use %d", call_mayuse, call_mustuse); +// log(s); -do_session: +//do_session: /* * It's easier to ignore than handle! After connect * new handlers must be installed, don't worry. @@ -683,48 +801,69 @@ do_session: } } - setproctitle("bforce calling %.32s, %.32s", - ftn_addrstr(abuf, state.node.addr), state.node.phone); - if( opts->dontcall ) + // try allowed methods and break if rc == 0 + rc = -1; + + if( rc && call_mayuse & CALL_STDIO ) { rc = call_system_quiet(opts->connect, opts->inetd); } - else if( !inet ) + + if( rc && call_mayuse & CALL_TCPIP_BINKP ) + { + rc = call_system_tcpip(CALL_TCPIP_BINKP); + } + + if( rc && call_mayuse & CALL_TCPIP_IFCICO ) + { + rc = call_system_tcpip(CALL_TCPIP_IFCICO); + } + + if( rc && call_mayuse & CALL_TCPIP_TELNET ) + { + rc = call_system_tcpip(CALL_TCPIP_TELNET); + } + + if( rc && call_mayuse & CALL_MODEM ) { + setproctitle("bforce calling %.32s, %.32s", + ftn_addrstr(abuf, state.node.addr), state.node.phone); + rc = -1; if( (p_lockdir = conf_string(cf_uucp_lock_directory)) == NULL ) p_lockdir = BFORCE_LOCK_DIR; if( opts->device && *opts->device ) { - if( (state.modemport = - modem_getmatch_port(opts->device)) == NULL ) - { - errmsg = "unknown port name"; - gotoexit(BFERR_PORTBUSY); - } + state.modemport = modem_getmatch_port(opts->device); } - else if( (state.modemport = - modem_getfree_port(p_lockdir)) == NULL ) + else { - errmsg = "no free matching ports"; - gotoexit(BFERR_PORTBUSY); + state.modemport = modem_getfree_port(p_lockdir); } - if( port_lock(p_lockdir, state.modemport) ) + if( state.modemport ) { + + if( port_lock(p_lockdir, state.modemport) == 0 ) /* Successfuly locked port */ + { + rc = call_system_modem(); + port_unlock(p_lockdir, state.modemport); + } + else + { errmsg = "cannot lock modem port"; - gotoexit(BFERR_PORTBUSY); + } } - else /* Successfuly locked port */ + else { - rc = call_system_modem(); - port_unlock(p_lockdir, state.modemport); + errmsg = "unable to get modem port"; } } - else + + if( rc ) { - rc = call_system_tcpip(); + log("no connection effort was successful"); } exit: diff --git a/source/bforce/sess_init.c b/source/bforce/sess_init.c index 1a99185..eb049e6 100644 --- a/source/bforce/sess_init.c +++ b/source/bforce/sess_init.c @@ -31,7 +31,7 @@ /* On success: zero (state.session is handshake type) */ /* On error: non-zero (state.session set to UNKNOWN) */ /* ------------------------------------------------------------------------- */ -int session_init_outgoing(void) +int session_init_outgoing() { int c = 0; int tries = 0; @@ -72,8 +72,10 @@ int session_init_outgoing(void) /* * Put CR until any character received */ - if( PUTCHAR('\r') < 0 || FLUSHOUT() < 0 ) + if( PUTCHAR('\r') < 0 || FLUSHOUT() < 0 ) { + log("error: output"); return 1; + } while( !CHARWAIT(1) ) { @@ -83,8 +85,10 @@ int session_init_outgoing(void) return 1; } - if( PUTCHAR('\r') < 0 || FLUSHOUT() < 0 ) + if( PUTCHAR('\r') < 0 || FLUSHOUT() < 0 ) { + log("error: output"); return 1; + } } #ifdef DEBUG @@ -122,17 +126,27 @@ int session_init_outgoing(void) { DEB((D_HSHAKE, "tx_sendsync: resyncing")); - if( canemsi && PUTSTR("**EMSI_INQC816**EMSI_INQC816") < 0 ) + if( canemsi && PUTSTR("**EMSI_INQC816**EMSI_INQC816") < 0 ) { + log("error: output"); return 1; - if( canyoohoo && PUTCHAR(YOOHOO) < 0 ) + } + if( canyoohoo && PUTCHAR(YOOHOO) < 0 ) { + log("error: output"); return 1; - if( canftsc && PUTCHAR(TSYNC) < 0 ) + } + if( canftsc && PUTCHAR(TSYNC) < 0 ) { + log("error: output"); return 1; - if( canemsi && PUTCHAR('\r') < 0 ) + } + if( canemsi && PUTCHAR('\r') < 0 ) { + log("error: output"); return 1; + } - if( FLUSHOUT() < 0 ) + if( FLUSHOUT() < 0 ) { + log("error: flush"); return 1; + } timer_set(&sync_timer, OUTGOING_SYNC_TIMER); } @@ -260,10 +274,14 @@ int session_init_outgoing(void) state.session = SESSION_EMSI; if( PUTSTR("**EMSI_INQC816\r") < 0 - || PUTSTR("**EMSI_INQC816\r") < 0 ) + || PUTSTR("**EMSI_INQC816\r") < 0 ) { + log("error: output"); return 1; - if( FLUSHOUT() < 0 ) + } + if( FLUSHOUT() < 0 ) { + log("error: output"); return 1; + } return 0; } @@ -281,15 +299,19 @@ int session_init_outgoing(void) sleep(3); if( PUTSTR("**EMSI_INQC816\r") < 0 - || FLUSHOUT() < 0 ) + || FLUSHOUT() < 0 ) { + log("error: flush"); return 1; + } /* Wait for a password prompt */ sleep(2); if( PUTSTR("**EMSI_INQC816\r") < 0 - || FLUSHOUT() < 0 ) + || FLUSHOUT() < 0 ) { + log("error: output"); return 1; + } timer_set(&sync_timer, OUTGOING_SYNC_TIMER); } @@ -314,6 +336,7 @@ int session_init_outgoing(void) c, string_printable(buf_emsi))); } } + log("session_init_outgoing: end loop"); return 1; } @@ -325,7 +348,7 @@ int session_init_outgoing(void) /* */ /* TODO: It is not working yet, it only reports about EMSI requests.. (1) */ /* ------------------------------------------------------------------------- */ -int session_init_incoming(void) +int session_init_incoming() { int c = 0; int pos = 0; @@ -345,42 +368,64 @@ int session_init_incoming(void) state.session = SESSION_UNKNOWN; - if( (options & OPTIONS_NO_EMSI) != OPTIONS_NO_EMSI ) + log("init"); + + if( (options & OPTIONS_NO_EMSI) != OPTIONS_NO_EMSI ) { + log("can emsi"); canemsi = TRUE; - if( (options & OPTIONS_NO_YOOHOO) != OPTIONS_NO_YOOHOO ) + } + if( (options & OPTIONS_NO_YOOHOO) != OPTIONS_NO_YOOHOO ) { + log("can yahoo"); canyoohoo = TRUE; - if( (options & OPTIONS_NO_FTS1) != OPTIONS_NO_FTS1 ) + } + if( (options & OPTIONS_NO_FTS1) != OPTIONS_NO_FTS1 ) { + log("can ftsc"); canftsc = TRUE; + } yoohoo_need = canemsi ? 2 : 1; tsync_need = (canemsi || canyoohoo) ? 2 : 1; - if( PUTCHAR('\r') < 0 ) + if( PUTCHAR('\r') < 0 ) { + log("error: cannot put char"); return 1; + } /* * Output banner */ - if( canemsi && PUTSTR("**EMSI_REQA77E\r") < 0 ) + if( canemsi && PUTSTR("**EMSI_REQA77E\r") < 0 ) { + log("error: cannot put banner"); return 1; + } if( state.connstr ) { /* Show connect string */ - if( PUTCHAR('[') < 0 ) + if( PUTCHAR('[') < 0 ) { + log("error: cannot put ']'"); return 1; - if( PUTSTR(state.connstr) < 0 ) + } + if( PUTSTR(state.connstr) < 0 ) { + log("error: cannot put connstr"); return 1; - if( PUTSTR("]\n") < 0 ) + } + if( PUTSTR("]\n") < 0 ) { + log("error: cannot put ']'"); return 1; + } } if( PUTSTR(BF_BANNERVER) < 0 || PUTCHAR(' ') < 0 - || PUTSTR(BF_COPYRIGHT) < 0 || PUTCHAR('\n') < 0 ) + || PUTSTR(BF_COPYRIGHT) < 0 || PUTCHAR('\n') < 0 ) { + log("session_init_incoming error: output"); return 1; + } - if( FLUSHOUT() < 0 ) + if( FLUSHOUT() < 0 ) { + log("session_init_incoming error: flush"); return 1; + } /* Start timers */ timer_set(&mast_timer, INCOMING_MAST_TIMER); @@ -390,6 +435,8 @@ int session_init_incoming(void) * Determine supported handshakes on called system * (support for FTS-1, YooHoo, EMSI) */ + + log("begin loop"); while(1) { if( timer_expired(mast_timer) ) @@ -404,11 +451,15 @@ int session_init_incoming(void) { DEB((D_HSHAKE, "rx_init: resyncing")); - if( canemsi && PUTSTR("**EMSI_REQA77E\r") < 0 ) + if( canemsi && PUTSTR("**EMSI_REQA77E\r") < 0 ) { + log("session_init_incoming error: output"); return 1; + } - if( FLUSHOUT() < 0 ) + if( FLUSHOUT() < 0 ) { + log("session_init_incoming error: flush"); return 1; + } timer_set(&sync_timer, INCOMING_SYNC_TIMER); } diff --git a/source/bforce/sess_main.c b/source/bforce/sess_main.c index 8410a54..a0ed39d 100644 --- a/source/bforce/sess_main.c +++ b/source/bforce/sess_main.c @@ -320,22 +320,24 @@ int session_set_inbound(void) if( conf_boolean(cf_split_inbound) ) { char buf[PATH_MAX+31]; - if( state.node.addr.point ) { - snprintf( buf, PATH_MAX, "%s%d:%d/%d.%d/%s-in/", + //if( state.node.addr.point ) { +// snprintf( buf, PATH_MAX, "%s%d:%d/%d.%d/%s-in/", + snprintf( buf, PATH_MAX, "%s%d.%d.%d.%d/%s-in/", p_inb, state.node.addr.zone, state.node.addr.net, state.node.addr.node, state.node.addr.point, state.protected? "pwd": "unchecked" ); - } else { - snprintf( buf, PATH_MAX, "%s%d:%d/%d/%s-in/", + /*} else { +// snprintf( buf, PATH_MAX, "%s%d:%d/%d/%s-in/", + snprintf( buf, PATH_MAX, "%s%d.%d.%d/%s-in/", p_inb, state.node.addr.zone, state.node.addr.net, state.node.addr.node, state.protected? "pwd": "unchecked" ); - } + } */ log("inbound: %s", buf); state.inbound = (char*)xstrcpy(buf); snprintf( buf, PATH_MAX+30, "/bin/mkdir -p %s -m 700", state.inbound ); /* 30 additional chars allowed */ @@ -804,6 +806,7 @@ int session(void) /* * Log expected traffic */ + session_traffic(); init_protinfo(&pi, state.caller); @@ -854,6 +857,7 @@ int session(void) /* * Do session clenup (remove temp. files, etc.) */ + (void)p_session_cleanup(&pi, (rc == BFERR_NOERROR)); if( rc == BFERR_NOERROR ) @@ -898,9 +902,11 @@ int session(void) */ if( (p = conf_string(cf_run_after_session)) ) session_run_command(p); + } exit: + state.session_rc = rc; session_update_history(&traff_send, &traff_recv, rc); diff --git a/source/include/bforce.h b/source/include/bforce.h index ce3e014..b4c607e 100644 --- a/source/include/bforce.h +++ b/source/include/bforce.h @@ -170,20 +170,31 @@ typedef signed char SINT8; typedef struct { bool daemon; /* Run as daemon? */ bool quit; /* Quit from daemon */ - bool dontcall; /* -m key */ + bool usestdio; /* Session on stdin and stdout */ int inetd; /* Called from inetd? */ int force; /* Force call? */ int hiddline; /* Hidden line number (0,1..) */ char *confname; /* Use this config instead def. */ char *incname; /* Include this config */ char *phone; /* Forced phone number */ - char *iaddr; /* Forced IP address */ char *connect; /* Connect string */ char *device; /* Forced device name */ - int stype; /* Handshake type in slave mode */ + char *iphost; /* Forced IP address */ + char *ipproto; /* proto to use over TCP/IP */ + int stype; /* Handshake type in slave (answer) mode */ + int runmode; /* concluded runmode */ s_falist *addrlist; } s_bforce_opts; +#define MODE_UNDEFINED (0) +#define MODE_CALL_DEFAULT (1) +#define MODE_CALL_MODEM (2) +#define MODE_CALL_IP (3) +#define MODE_CALL_STDIO (4) +#define MODE_ANSWER (5) +#define MODE_DAEMON (6) + + /* * Global variables */ diff --git a/source/include/config.h b/source/include/config.h new file mode 100644 index 0000000..433a9c6 --- /dev/null +++ b/source/include/config.h @@ -0,0 +1,151 @@ +/* include/config.h. Generated by configure. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if the `getpgrp' function takes no argument. */ +#define GETPGRP_VOID 1 + +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ + +/* Define if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 + +/* Define to `int' if doesn't define. */ +/* #undef mode_t */ + +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ + +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void + +/* Define if the setvbuf function takes the buffering type as its second + argument and the buffer pointer as the third, as on System V + before release 3. */ +/* #undef SETVBUF_REVERSED */ + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define if your declares struct tm. */ +/* #undef TM_IN_SYS_TIME */ + +/* Do you want debug code to be compiled? */ +#define DEBUG 1 + +/* Do you want use DCD line control? */ +#define MODEM_WATCH_CARRIER 1 + +/* Do you want hangup to watch for modem DCD line? */ +#define MODEM_HANGUP_WATCH_CARRIER 1 + +/* Version string */ +#define RELEASE_VERSION "0.22.9" + +/* Disable passwords logging? */ +#define BFORCE_LOG_PASSWD 1 + +/* Path to the UUCP lock files directory */ +#define BFORCE_LOCK_DIR "/var/lock/" + +/* Do you want to use syslog? */ +/* #undef USE_SYSLOG */ + +/* Do you want use .csy locks? */ +#define BFORCE_USE_CSY 1 + +/* Define if you have the mkdir function. */ +#define HAVE_MKDIR 1 + +/* Define if you have the mktime function. */ +#define HAVE_MKTIME 1 + +/* Define if you have the rename function. */ +#define HAVE_RENAME 1 + +/* Define if you have the select function. */ +#define HAVE_SELECT 1 + +/* Define if you have the setproctitle function. */ +/* #undef HAVE_SETPROCTITLE */ + +/* Define if you have the socket function. */ +#define HAVE_SOCKET 1 + +/* Define if you have the statfs function. */ +#define HAVE_STATFS 1 + +/* Define if you have the statvfs function. */ +#define HAVE_STATVFS 1 + +/* Define if you have the strcasecmp function. */ +#define HAVE_STRCASECMP 1 + +/* Define if you have the strspn function. */ +#define HAVE_STRSPN 1 + +/* Define if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_NDIR_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STATFS_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STATVFS_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_TERMIOX_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_VFS_H 1 + +/* Define if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you want buggy emsi :) */ +#define BUGGY_EMSI 0 diff --git a/source/include/nodelist.h b/source/include/nodelist.h index 5c60bda..e214c50 100644 --- a/source/include/nodelist.h +++ b/source/include/nodelist.h @@ -82,7 +82,8 @@ enum nodelist_limit BNI_MAXLOCATION = 48, BNI_MAXSYSOP = 48, BNI_MAXPHONE = 48, - BNI_MAXFLAGS = 120 + BNI_MAXHOST = 200, + BNI_MAXFLAGS = 200 }; /* @@ -148,6 +149,10 @@ typedef struct node char phone[BNI_MAXPHONE+1]; long speed; char flags[BNI_MAXFLAGS+1]; + bool do_binkp; + bool do_ifcico; + bool do_telnet; + char host[BNI_MAXHOST+1]; s_timevec worktime; } s_node; diff --git a/source/include/session.h b/source/include/session.h index 594427c..f67d1fb 100644 --- a/source/include/session.h +++ b/source/include/session.h @@ -176,8 +176,8 @@ void init_state(s_state *pstate); void deinit_state(s_state *pstate); /* s_init.c */ -int session_init_outgoing(void); -int session_init_incoming(void); +int session_init_outgoing(); +int session_init_incoming(); /* s_main.c */ extern s_state state; @@ -209,7 +209,7 @@ int session(void); /* sess_call.c */ int call_system(s_faddr addr, const s_bforce_opts *opts); int call_system_modem(void); -int call_system_tcpip(void); +int call_system_tcpip(int callwith); /* sess_answ.c */ int answ_system(e_session type, char *connstr, int inetd); diff --git a/source/openwrt-conf b/source/openwrt-conf new file mode 100644 index 0000000..2425633 --- /dev/null +++ b/source/openwrt-conf @@ -0,0 +1,14 @@ +#!/bin/sh + +TOOLCHAIN=$HOME/OpenWRT/OpenWrt-Toolchain-ar71xx-for-mips_r2-gcc-4.3.3+cs_uClibc-0.9.30.1/toolchain-mips_r2_gcc-4.3.3+cs_uClibc-0.9.30.1 + +PATH=$PATH:$TOOLCHAIN/usr/bin +PREFIX=mips-openwrt-linux + +CPP=$PREFIX-cpp +CC=$PREFIX-gcc +#CFLAGS= + +export PATH CC CPP + +#./configure --prefix=/opt/bforce --host=mips-openwrt-linux --disable-syslog From 14f27c03d381e57795eb75b4d5b279752f87fc15 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Sun, 25 Dec 2011 20:18:25 +0400 Subject: [PATCH 09/12] README.OpenWRT --- README.OpenWRT | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.OpenWRT diff --git a/README.OpenWRT b/README.OpenWRT new file mode 100644 index 0000000..b6af185 --- /dev/null +++ b/README.OpenWRT @@ -0,0 +1 @@ +To run fido under user not root, do `chmod +x /bin' and manually update group/passwd files (add uucp group and fido user) From 581e324561a0e396e0f27d691ec51552d562346e Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Sun, 25 Dec 2011 20:34:44 +0400 Subject: [PATCH 10/12] extra file --- source/include/config.h | 151 ---------------------------------------- 1 file changed, 151 deletions(-) delete mode 100644 source/include/config.h diff --git a/source/include/config.h b/source/include/config.h deleted file mode 100644 index 433a9c6..0000000 --- a/source/include/config.h +++ /dev/null @@ -1,151 +0,0 @@ -/* include/config.h. Generated by configure. */ -/* include/config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define if the `getpgrp' function takes no argument. */ -#define GETPGRP_VOID 1 - -/* Define if you don't have vprintf but do have _doprnt. */ -/* #undef HAVE_DOPRNT */ - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 - -/* Define to `int' if doesn't define. */ -/* #undef mode_t */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define if the setvbuf function takes the buffering type as its second - argument and the buffer pointer as the third, as on System V - before release 3. */ -/* #undef SETVBUF_REVERSED */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define if your declares struct tm. */ -/* #undef TM_IN_SYS_TIME */ - -/* Do you want debug code to be compiled? */ -#define DEBUG 1 - -/* Do you want use DCD line control? */ -#define MODEM_WATCH_CARRIER 1 - -/* Do you want hangup to watch for modem DCD line? */ -#define MODEM_HANGUP_WATCH_CARRIER 1 - -/* Version string */ -#define RELEASE_VERSION "0.22.9" - -/* Disable passwords logging? */ -#define BFORCE_LOG_PASSWD 1 - -/* Path to the UUCP lock files directory */ -#define BFORCE_LOCK_DIR "/var/lock/" - -/* Do you want to use syslog? */ -/* #undef USE_SYSLOG */ - -/* Do you want use .csy locks? */ -#define BFORCE_USE_CSY 1 - -/* Define if you have the mkdir function. */ -#define HAVE_MKDIR 1 - -/* Define if you have the mktime function. */ -#define HAVE_MKTIME 1 - -/* Define if you have the rename function. */ -#define HAVE_RENAME 1 - -/* Define if you have the select function. */ -#define HAVE_SELECT 1 - -/* Define if you have the setproctitle function. */ -/* #undef HAVE_SETPROCTITLE */ - -/* Define if you have the socket function. */ -#define HAVE_SOCKET 1 - -/* Define if you have the statfs function. */ -#define HAVE_STATFS 1 - -/* Define if you have the statvfs function. */ -#define HAVE_STATVFS 1 - -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the strspn function. */ -#define HAVE_STRSPN 1 - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define if you have the header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_MOUNT_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_STATFS_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_STATVFS_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_TERMIOX_H */ - -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_VFS_H 1 - -/* Define if you have the header file. */ -#define HAVE_TERMIOS_H 1 - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you want buggy emsi :) */ -#define BUGGY_EMSI 0 From 3462a39050ed19a7088f4265a47580f42afdbef0 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Sun, 25 Dec 2011 21:52:00 +0400 Subject: [PATCH 11/12] Modem availability checking minor fix (don't check worktime if phone is bad) --- source/bforce/sess_call.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/bforce/sess_call.c b/source/bforce/sess_call.c index a378616..ebfec47 100644 --- a/source/bforce/sess_call.c +++ b/source/bforce/sess_call.c @@ -667,12 +667,12 @@ int call_system(s_faddr addr, const s_bforce_opts *opts) errmsg = "don't know phone number"; gotoexit(BFERR_PHONE_UNKNOWN); } - } + } else + if( !opts->force) + { /* * Is now a working time for that node/line */ - if( !opts->force) - { time_t unixtime = time(NULL); struct tm *now = localtime(&unixtime); bool goodtime = FALSE; From 3b5964bb20f95a338183103dbce86fec5bb1abe6 Mon Sep 17 00:00:00 2001 From: Sergey Dorofeev Date: Sun, 25 Dec 2011 23:23:07 +0400 Subject: [PATCH 12/12] logging cleanup --- source/bforce/sess_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/bforce/sess_init.c b/source/bforce/sess_init.c index eb049e6..531af9d 100644 --- a/source/bforce/sess_init.c +++ b/source/bforce/sess_init.c @@ -336,7 +336,7 @@ int session_init_outgoing() c, string_printable(buf_emsi))); } } - log("session_init_outgoing: end loop"); + //log("session_init_outgoing: end loop"); return 1; } @@ -368,18 +368,18 @@ int session_init_incoming() state.session = SESSION_UNKNOWN; - log("init"); + //log("init"); if( (options & OPTIONS_NO_EMSI) != OPTIONS_NO_EMSI ) { - log("can emsi"); + //log("can emsi"); canemsi = TRUE; } if( (options & OPTIONS_NO_YOOHOO) != OPTIONS_NO_YOOHOO ) { - log("can yahoo"); + //log("can yahoo"); canyoohoo = TRUE; } if( (options & OPTIONS_NO_FTS1) != OPTIONS_NO_FTS1 ) { - log("can ftsc"); + //log("can ftsc"); canftsc = TRUE; } @@ -436,7 +436,7 @@ int session_init_incoming() * (support for FTS-1, YooHoo, EMSI) */ - log("begin loop"); + //log("begin loop"); while(1) { if( timer_expired(mast_timer) )