diff options
-rw-r--r-- | CHANGES | 34 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | aclocal.m4 | 27 | ||||
-rwxr-xr-x | config.guess | 224 | ||||
-rwxr-xr-x | config.sub | 169 | ||||
-rwxr-xr-x | configure | 346 | ||||
-rw-r--r-- | output.c | 20 | ||||
-rw-r--r-- | package/byacc.spec | 4 | ||||
-rw-r--r-- | package/debian/changelog | 6 | ||||
-rw-r--r-- | skeleton.c | 4 | ||||
-rw-r--r-- | test/calc.tab.c | 2 | ||||
-rw-r--r-- | test/calc1.tab.c | 4 | ||||
-rw-r--r-- | test/calc1.y | 2 | ||||
-rw-r--r-- | test/calc2.tab.c | 2 | ||||
-rw-r--r-- | test/calc3.tab.c | 2 | ||||
-rw-r--r-- | test/code_calc.code.c | 2 | ||||
-rw-r--r-- | test/code_error.code.c | 2 | ||||
-rw-r--r-- | test/error.tab.c | 2 | ||||
-rw-r--r-- | test/ftp.output | 18 | ||||
-rw-r--r-- | test/ftp.tab.c | 603 | ||||
-rw-r--r-- | test/ftp.tab.h | 47 | ||||
-rw-r--r-- | test/ftp.y | 74 | ||||
-rw-r--r-- | test/grammar.tab.c | 2 | ||||
-rw-r--r-- | test/pure_calc.tab.c | 2 | ||||
-rw-r--r-- | test/pure_error.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc-s.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc2-s.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc2.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc3-s.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc3.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc4-s.tab.c | 2 | ||||
-rw-r--r-- | test/quote_calc4.tab.c | 2 |
33 files changed, 884 insertions, 734 deletions
@@ -1,3 +1,37 @@ +2013-03-04 Thomas E. Dickey <tom@invisible-island.net> + + * package/debian/changelog, VERSION, package/byacc.spec: bump + + * aclocal.m4: + adapt tweak from Dave Becket to work around long-ago breakage in "new" autoconf. + + * output.c: + fix bogus #include if "-i" is given but not "-d" (report by Richard Mitton). + also while testing that, found a case where the union_file is unused; added + a check for address that. + + * test/ftp.output, test/ftp.tab.c, test/ftp.tab.h: regen + + * test/ftp.y: fix most compiler warnings for "make check_make" + + * test/calc1.tab.c: regen + + * test/calc1.y: fix most compiler warnings for "make check_make" + + * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c: + regen + + * skeleton.c: quiet a gcc conversion-warning in yygrowstack() + + * configure: regen + + * aclocal.m4: + another fix for CF_GCC_VERSION to handle Debian's modification of gcc message. + +2013-02-10 Thomas E. Dickey <tom@invisible-island.net> + + * config.sub, config.guess: 2013-02-04 + 2012-10-03 Thomas E. Dickey <tom@invisible-island.net> * package/debian/changelog, package/byacc.spec, VERSION: bump @@ -1 +1 @@ -20121003 +20130304 @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.28 2012/10/03 23:40:04 tom Exp $ +dnl $Id: aclocal.m4,v 1.30 2013/03/05 01:13:39 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- -dnl Copyright 2004-2011,2012 Thomas E. Dickey +dnl Copyright 2004-2012,2013 Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -28,7 +28,7 @@ dnl sale, use or other dealings in this Software without prior written dnl authorization. dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 dnl ------------------ dnl Conditionally generate script according to whether we're using a given autoconf. dnl @@ -37,6 +37,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as $1. dnl $3 = code to use if AC_ACVERSION is older than $1. define([CF_ACVERSION_CHECK], [ +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl ifdef([m4_version_compare], [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], [CF_ACVERSION_COMPARE( @@ -264,7 +265,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" fi ]) dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 +dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28 dnl --------------- dnl You can always use "make -n" to see the actual options, but it's hard to dnl pick out/analyze warning messages when the compile-line is long. @@ -279,7 +280,7 @@ dnl AC_DEFUN([CF_DISABLE_ECHO],[ AC_MSG_CHECKING(if you want to see long compiling messages) CF_ARG_DISABLE(echo, - [ --disable-echo display "compiling" commands], + [ --disable-echo do not display "compiling" commands], [ ECHO_LT='--silent' ECHO_LD='@echo linking [$]@;' @@ -434,7 +435,7 @@ rm -rf conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31 +dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 dnl -------------- dnl Find version of gcc AC_DEFUN([CF_GCC_VERSION],[ @@ -442,7 +443,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -595,7 +596,7 @@ make an error test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42 +dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -609,6 +610,7 @@ dnl $1 = GCC (default) or GXX dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_CANONICAL_HOST]) ifelse([$2],,INTEL_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then @@ -861,11 +863,13 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC version: 2 updated: 2012/10/03 18:53:04 +dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55 dnl ---------- dnl standard check for CC, plus followup sanity checks +dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name AC_DEFUN([CF_PROG_CC],[ -AC_PROG_CC +ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)]) +CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -1014,7 +1018,7 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 +dnl CF_XOPEN_SOURCE version: 43 updated: 2013/02/10 10:41:05 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -1024,6 +1028,7 @@ dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ +AC_REQUIRE([AC_CANONICAL_HOST]) cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) diff --git a/config.guess b/config.guess index e4b6966..6ea3454 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2911 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2011-01-01' +timestamp='2013-02-04' # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2011-01-01' # General Public License for more details. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <config-patches@gnu.org> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# 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. +# Originally written by Per Bothner. # # 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 +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +50,7 @@ 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. +Copyright 1992-2013 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." @@ -145,7 +137,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown 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*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -202,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -220,10 +216,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in - *4.0) + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; - *5.*) + *5.*) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac @@ -304,7 +300,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -600,50 +596,50 @@ EOF 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" ;; + 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 + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + 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); - } + 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 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -792,21 +788,26 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,15 +862,22 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + 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 ;; + 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 objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -877,30 +885,39 @@ EOF exit ;; arm*:Linux:*:*) eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \ - grep -q __ARM_EABI__ + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + 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 + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #ifdef __dietlibc__ LIBC=dietlibc #endif @@ -937,7 +954,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -972,13 +989,13 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1096,7 +1113,7 @@ EOF && { 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; } ;; + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1139,8 +1156,8 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 exit ;; *:UNIX_System_V:4*:FTX*) @@ -1168,9 +1185,9 @@ EOF 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 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1185,6 +1202,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1215,12 +1235,12 @@ EOF 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 + 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 @@ -1229,8 +1249,8 @@ EOF *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit ;; @@ -1240,7 +1260,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1309,11 +1329,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <<EOF #ifdef _SEQUENT_ @@ -1331,11 +1351,11 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif @@ -1,38 +1,31 @@ #! /bin/sh # 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. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2011-04-01' +timestamp='2013-02-04' -# 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. -# -# 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 +# 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 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." 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. +Copyright 1992-2013 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." @@ -125,13 +116,17 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | 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/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -154,7 +149,7 @@ 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 | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -223,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | 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 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -278,20 +286,21 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | 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 \ @@ -300,7 +309,7 @@ case $basic_machine in | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -325,21 +333,28 @@ case $basic_machine in ms1) basic_machine=mt-unknown ;; + strongarm | thumb | xscale) basic_machine=arm-unknown ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; 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*86 | x86_64) - basic_machine=$basic_machine-pc - ;; + basic_machine=$basic_machine-pc + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -348,11 +363,13 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | 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-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -361,12 +378,15 @@ case $basic_machine in | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -384,19 +404,20 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | 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-* \ @@ -404,10 +425,11 @@ case $basic_machine in | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -707,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -765,9 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -804,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -836,10 +869,10 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next) + next | m*-next ) basic_machine=m68k-next case $os in - -nextstep*) + -nextstep* ) ;; -ns2*) os=-nextstep2 @@ -958,11 +991,9 @@ case $basic_machine in pn) basic_machine=pn-gould ;; - power) - basic_machine=power-ibm + power) basic_machine=power-ibm ;; - ppc | ppcbe) - basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` @@ -973,11 +1004,9 @@ case $basic_machine in ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64) - basic_machine=powerpc64-unknown + ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) - basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -992,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1120,13 +1153,8 @@ case $basic_machine in 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 + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1324,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -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* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1421,7 +1449,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2) + -ns2 ) os=-nextstep2 ;; -nsk*) @@ -1470,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1521,6 +1546,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1548,9 +1576,6 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout @@ -1618,7 +1643,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next) + *-next ) os=-nextstep ;; *-sequent) @@ -653,7 +653,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --with-warnings test: turn on gcc warnings - --disable-echo display "compiling" commands + --disable-echo do not display "compiling" commands --with-dmalloc test: use Gray Watson's dmalloc library --with-dbmalloc test: use Conor Cahill's dbmalloc library --with-valgrind test: use valgrind @@ -1802,7 +1802,17 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:1805: checking for $CC option to accept ANSI C" >&5 +GCC_VERSION=none +if test "$GCC" = yes ; then + echo "$as_me:1807: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown + echo "$as_me:1811: result: $GCC_VERSION" >&5 +echo "${ECHO_T}$GCC_VERSION" >&6 +fi + +echo "$as_me:1815: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1810,7 +1820,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1813 "configure" +#line 1823 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -1859,16 +1869,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:1862: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1872: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1865: \$? = $ac_status" >&5 + echo "$as_me:1875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1868: \"$ac_try\"") >&5 + { (eval echo "$as_me:1878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1871: \$? = $ac_status" >&5 + echo "$as_me:1881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1885,10 +1895,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1888: result: none needed" >&5 + echo "$as_me:1898: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1891: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:1901: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -1896,13 +1906,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:1899: checking \$CC variable" >&5 +echo "$as_me:1909: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:1903: result: broken" >&5 + echo "$as_me:1913: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1905: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:1915: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -1988,12 +1998,12 @@ fi ;; *) - echo "$as_me:1991: result: ok" >&5 + echo "$as_me:2001: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:1996: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2006: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2013,11 +2023,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2016: result: yes" >&5 + echo "$as_me:2026: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2020: result: no" >&5 + echo "$as_me:2030: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2034,7 +2044,7 @@ fi # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2037: checking for a BSD compatible install" >&5 +echo "$as_me:2047: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2083,7 +2093,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2086: result: $INSTALL" >&5 +echo "$as_me:2096: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2094,7 +2104,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2097: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2107: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2121,7 +2131,7 @@ else fi fi -echo "$as_me:2124: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2134: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2132,7 +2142,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2135: checking for $ac_word" >&5 +echo "$as_me:2145: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2147,7 +2157,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:2150: found $ac_dir/$ac_word" >&5 +echo "$as_me:2160: found $ac_dir/$ac_word" >&5 break done @@ -2155,10 +2165,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2158: result: $CTAGS" >&5 + echo "$as_me:2168: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2161: result: no" >&5 + echo "$as_me:2171: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2169,7 +2179,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2172: checking for $ac_word" >&5 +echo "$as_me:2182: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2184,7 +2194,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:2187: found $ac_dir/$ac_word" >&5 +echo "$as_me:2197: found $ac_dir/$ac_word" >&5 break done @@ -2192,10 +2202,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2195: result: $ETAGS" >&5 + echo "$as_me:2205: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2198: result: no" >&5 + echo "$as_me:2208: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2204,7 +2214,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2207: checking for $ac_word" >&5 +echo "$as_me:2217: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2219,7 +2229,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:2222: found $ac_dir/$ac_word" >&5 +echo "$as_me:2232: found $ac_dir/$ac_word" >&5 break done @@ -2228,17 +2238,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2231: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2241: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2234: result: no" >&5 + echo "$as_me:2244: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2241: checking for $ac_word" >&5 +echo "$as_me:2251: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2253,7 +2263,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:2256: found $ac_dir/$ac_word" >&5 +echo "$as_me:2266: found $ac_dir/$ac_word" >&5 break done @@ -2262,10 +2272,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2265: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2275: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2268: result: no" >&5 + echo "$as_me:2278: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2289,7 +2299,7 @@ for ac_prog in tdlint lint alint splint lclint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2292: checking for $ac_word" >&5 +echo "$as_me:2302: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2304,7 +2314,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2307: found $ac_dir/$ac_word" >&5 +echo "$as_me:2317: found $ac_dir/$ac_word" >&5 break done @@ -2312,10 +2322,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2315: result: $LINT" >&5 + echo "$as_me:2325: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2318: result: no" >&5 + echo "$as_me:2328: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2360,14 +2370,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:2363: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2373: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2370 "configure" +#line 2380 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2382,16 +2392,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2385: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2395: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2388: \$? = $ac_status" >&5 + echo "$as_me:2398: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2391: \"$ac_try\"") >&5 + { (eval echo "$as_me:2401: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2394: \$? = $ac_status" >&5 + echo "$as_me:2404: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2400,7 +2410,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2403 "configure" +#line 2413 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2415,16 +2425,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2418: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2428: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2421: \$? = $ac_status" >&5 + echo "$as_me:2431: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2424: \"$ac_try\"") >&5 + { (eval echo "$as_me:2434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2427: \$? = $ac_status" >&5 + echo "$as_me:2437: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2439,7 +2449,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2442: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2452: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -2461,16 +2471,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2464: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2474: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2470: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2480: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2473 "configure" +#line 2483 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2485,16 +2495,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2488: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2498: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2491: \$? = $ac_status" >&5 + echo "$as_me:2501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2494: \"$ac_try\"") >&5 + { (eval echo "$as_me:2504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2497: \$? = $ac_status" >&5 + echo "$as_me:2507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -2515,7 +2525,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 2518 "configure" +#line 2528 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2530,16 +2540,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2533: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2543: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2536: \$? = $ac_status" >&5 + echo "$as_me:2546: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2539: \"$ac_try\"") >&5 + { (eval echo "$as_me:2549: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2542: \$? = $ac_status" >&5 + echo "$as_me:2552: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2550,15 +2560,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:2553: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2563: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:2558: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:2568: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2561 "configure" +#line 2571 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2573,16 +2583,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2576: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2586: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2579: \$? = $ac_status" >&5 + echo "$as_me:2589: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2582: \"$ac_try\"") >&5 + { (eval echo "$as_me:2592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2585: \$? = $ac_status" >&5 + echo "$as_me:2595: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2598,7 +2608,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2601: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:2611: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -2711,14 +2721,14 @@ solaris2.*) #(vi ;; *) -echo "$as_me:2714: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:2724: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2721 "configure" +#line 2731 "configure" #include "confdefs.h" #include <stdlib.h> @@ -2737,16 +2747,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2743: \$? = $ac_status" >&5 + echo "$as_me:2753: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2746: \"$ac_try\"") >&5 + { (eval echo "$as_me:2756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2749: \$? = $ac_status" >&5 + echo "$as_me:2759: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2755,7 +2765,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2758 "configure" +#line 2768 "configure" #include "confdefs.h" #include <stdlib.h> @@ -2774,16 +2784,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2777: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2787: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2780: \$? = $ac_status" >&5 + echo "$as_me:2790: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2783: \"$ac_try\"") >&5 + { (eval echo "$as_me:2793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2786: \$? = $ac_status" >&5 + echo "$as_me:2796: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2798,7 +2808,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2801: result: $cf_cv_xopen_source" >&5 +echo "$as_me:2811: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -2906,16 +2916,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2909: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2919: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2915: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2925: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2918 "configure" +#line 2928 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2930,16 +2940,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2933: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2936: \$? = $ac_status" >&5 + echo "$as_me:2946: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2939: \"$ac_try\"") >&5 + { (eval echo "$as_me:2949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2942: \$? = $ac_status" >&5 + echo "$as_me:2952: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -2960,7 +2970,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 2963 "configure" +#line 2973 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2975,16 +2985,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2978: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2981: \$? = $ac_status" >&5 + echo "$as_me:2991: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2984: \"$ac_try\"") >&5 + { (eval echo "$as_me:2994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2987: \$? = $ac_status" >&5 + echo "$as_me:2997: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2995,15 +3005,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:2998: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3008: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3003: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3013: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3006 "configure" +#line 3016 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3018,16 +3028,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3021: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3031: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3024: \$? = $ac_status" >&5 + echo "$as_me:3034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3027: \"$ac_try\"") >&5 + { (eval echo "$as_me:3037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3030: \$? = $ac_status" >&5 + echo "$as_me:3040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3043,7 +3053,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3046: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3056: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3216,10 +3226,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:3219: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:3229: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3222 "configure" +#line 3232 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -3234,16 +3244,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3240: \$? = $ac_status" >&5 + echo "$as_me:3250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3243: \"$ac_try\"") >&5 + { (eval echo "$as_me:3253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3246: \$? = $ac_status" >&5 + echo "$as_me:3256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -3252,12 +3262,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3255: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:3265: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 3260 "configure" +#line 3270 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -3272,16 +3282,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3275: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3285: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3278: \$? = $ac_status" >&5 + echo "$as_me:3288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3281: \"$ac_try\"") >&5 + { (eval echo "$as_me:3291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3284: \$? = $ac_status" >&5 + echo "$as_me:3294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -3292,19 +3302,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:3295: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:3305: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:3300: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3310: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3307 "configure" +#line 3317 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3323,16 +3333,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3326: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3336: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3329: \$? = $ac_status" >&5 + echo "$as_me:3339: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3332: \"$ac_try\"") >&5 + { (eval echo "$as_me:3342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3335: \$? = $ac_status" >&5 + echo "$as_me:3345: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3341,7 +3351,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3344 "configure" +#line 3354 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3360,16 +3370,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3363: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3373: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3366: \$? = $ac_status" >&5 + echo "$as_me:3376: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3369: \"$ac_try\"") >&5 + { (eval echo "$as_me:3379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3372: \$? = $ac_status" >&5 + echo "$as_me:3382: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3384,7 +3394,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3387: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3397: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3488,7 +3498,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:3491: checking how to run the C preprocessor" >&5 +echo "$as_me:3501: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -3509,18 +3519,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 3512 "configure" +#line 3522 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:3517: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3527: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3523: \$? = $ac_status" >&5 + echo "$as_me:3533: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3543,17 +3553,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 3546 "configure" +#line 3556 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:3550: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3560: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3556: \$? = $ac_status" >&5 + echo "$as_me:3566: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3590,7 +3600,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:3593: result: $CPP" >&5 +echo "$as_me:3603: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3600,18 +3610,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 3603 "configure" +#line 3613 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:3608: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3618: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3614: \$? = $ac_status" >&5 + echo "$as_me:3624: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3634,17 +3644,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 3637 "configure" +#line 3647 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:3641: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3651: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3647: \$? = $ac_status" >&5 + echo "$as_me:3657: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3672,7 +3682,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:3675: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:3685: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -3687,23 +3697,23 @@ ac_main_return=return for ac_header in fcntl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3690: checking for $ac_header" >&5 +echo "$as_me:3700: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3696 "configure" +#line 3706 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3700: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3710: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3706: \$? = $ac_status" >&5 + echo "$as_me:3716: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3722,7 +3732,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3725: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3735: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -3732,7 +3742,7 @@ EOF fi done -echo "$as_me:3735: checking for working mkstemp" >&5 +echo "$as_me:3745: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3743,7 +3753,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 3746 "configure" +#line 3756 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3781,15 +3791,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3784: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3787: \$? = $ac_status" >&5 + echo "$as_me:3797: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3789: \"$ac_try\"") >&5 + { (eval echo "$as_me:3799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3792: \$? = $ac_status" >&5 + echo "$as_me:3802: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -3804,16 +3814,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:3807: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:3817: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:3810: checking for mkstemp" >&5 + echo "$as_me:3820: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3816 "configure" +#line 3826 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -3844,16 +3854,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3857: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3850: \$? = $ac_status" >&5 + echo "$as_me:3860: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3853: \"$ac_try\"") >&5 + { (eval echo "$as_me:3863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3856: \$? = $ac_status" >&5 + echo "$as_me:3866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -3863,7 +3873,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3866: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:3876: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -3875,16 +3885,6 @@ EOF fi -GCC_VERSION=none -if test "$GCC" = yes ; then - echo "$as_me:3880: checking version of $CC" >&5 -echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:3884: result: $GCC_VERSION" >&5 -echo "${ECHO_T}$GCC_VERSION" >&6 -fi - if ( test "$GCC" = yes || test "$GXX" = yes ) then echo "$as_me:3890: checking if you want to check for gcc warnings" >&5 @@ -1,4 +1,4 @@ -/* $Id: output.c,v 1.44 2012/05/26 01:13:02 tom Exp $ */ +/* $Id: output.c,v 1.45 2013/03/05 00:29:17 tom Exp $ */ #include "defs.h" @@ -861,9 +861,12 @@ output_defines(FILE * fp) { if (unionized) { - rewind(union_file); - while ((c = getc(union_file)) != EOF) - putc(c, fp); + if (union_file != 0) + { + rewind(union_file); + while ((c = getc(union_file)) != EOF) + putc(c, fp); + } fprintf(fp, "extern YYSTYPE %slval;\n", symbol_prefix); } } @@ -1446,9 +1449,12 @@ output(void) if (iflag) { - ++outline; - fprintf(code_file, "#include \"%s\"\n", defines_file_name); - if (!dflag) + if (dflag) + { + ++outline; + fprintf(code_file, "#include \"%s\"\n", defines_file_name); + } + else output_defines(externs_file); } else diff --git a/package/byacc.spec b/package/byacc.spec index 245a9ba..bddf72f 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,8 +1,8 @@ Summary: byacc - public domain Berkeley LALR Yacc parser generator %define AppProgram byacc -%define AppVersion 20121003 +%define AppVersion 20130304 %define UseProgram yacc -# $XTermId: byacc.spec,v 1.15 2012/10/03 23:47:54 tom Exp $ +# $XTermId: byacc.spec,v 1.16 2013/03/05 01:17:35 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff --git a/package/debian/changelog b/package/debian/changelog index 262af20..c5a5ec1 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +byacc (20130304) unstable; urgency=low + + * changes prompted by Richard Mitton bug-report + + -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 04 Mar 2013 20:17:32 -0500 + byacc (20121003) unstable; urgency=low * changes from or prompted by Adrian Bunk. @@ -1,4 +1,4 @@ -/* $Id: skeleton.c,v 1.31 2011/09/07 09:37:59 tom Exp $ */ +/* $Id: skeleton.c,v 1.32 2013/03/04 23:19:39 tom Exp $ */ #include "defs.h" @@ -152,7 +152,7 @@ const char *const body_1[] = " else if ((newsize *= 2) > YYMAXDEPTH)", " newsize = YYMAXDEPTH;", "", - " i = data->s_mark - data->s_base;", + " i = (int) (data->s_mark - data->s_base);", " newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));", " if (newss == 0)", " return -1;", diff --git a/test/calc.tab.c b/test/calc.tab.c index de039ec..085c1f3 100644 --- a/test/calc.tab.c +++ b/test/calc.tab.c @@ -367,7 +367,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/calc1.tab.c b/test/calc1.tab.c index 65551e8..7db7c30 100644 --- a/test/calc1.tab.c +++ b/test/calc1.tab.c @@ -393,7 +393,7 @@ yylex(void) for (; (cp - buf) < BSZ; ++cp, c = getchar()) { - *cp = c; + *cp = (char) c; if (isdigit(c)) continue; if (c == '.') @@ -506,7 +506,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/calc1.y b/test/calc1.y index ec89736..1f42e1f 100644 --- a/test/calc1.y +++ b/test/calc1.y @@ -214,7 +214,7 @@ yylex(void) for (; (cp - buf) < BSZ; ++cp, c = getchar()) { - *cp = c; + *cp = (char) c; if (isdigit(c)) continue; if (c == '.') diff --git a/test/calc2.tab.c b/test/calc2.tab.c index 1eb9548..4e988e7 100644 --- a/test/calc2.tab.c +++ b/test/calc2.tab.c @@ -376,7 +376,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/calc3.tab.c b/test/calc3.tab.c index 9c38899..eff5a31 100644 --- a/test/calc3.tab.c +++ b/test/calc3.tab.c @@ -374,7 +374,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/code_calc.code.c b/test/code_calc.code.c index a3cf368..1c1fea1 100644 --- a/test/code_calc.code.c +++ b/test/code_calc.code.c @@ -274,7 +274,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/code_error.code.c b/test/code_error.code.c index db50bbc..43ce409 100644 --- a/test/code_error.code.c +++ b/test/code_error.code.c @@ -246,7 +246,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/error.tab.c b/test/error.tab.c index 9113629..0cb6fb3 100644 --- a/test/error.tab.c +++ b/test/error.tab.c @@ -256,7 +256,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/ftp.output b/test/ftp.output index f1ab4b2..c8931a5 100644 --- a/test/ftp.output +++ b/test/ftp.output @@ -759,8 +759,8 @@ state 79 type_code : L . SP byte_size (62) type_code : L . byte_size (63) - SP shift 123 - NUMBER shift 124 + NUMBER shift 123 + SP shift 124 CRLF reduce 61 byte_size goto 125 @@ -1110,18 +1110,18 @@ state 122 state 123 - type_code : L SP . byte_size (62) - - NUMBER shift 124 - . error + byte_size : NUMBER . (51) - byte_size goto 159 + . reduce 51 state 124 - byte_size : NUMBER . (51) + type_code : L SP . byte_size (62) - . reduce 51 + NUMBER shift 123 + . error + + byte_size goto 159 state 125 diff --git a/test/ftp.tab.c b/test/ftp.tab.c index c450766..6f32cb4 100644 --- a/test/ftp.tab.c +++ b/test/ftp.tab.c @@ -194,11 +194,20 @@ yyerror(const char *msg) { perror(msg); } -#line 198 "ftp.tab.c" - -#ifndef YYSTYPE -typedef int YYSTYPE; +#line 126 "ftp.y" +#ifdef YYSTYPE +#undef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 #endif +#ifndef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 +typedef union +{ + int ival; + char *sval; +} YYSTYPE; +#endif /* !YYSTYPE_IS_DECLARED */ +#line 211 "ftp.tab.c" /* compatibility with bison */ #ifdef YYPARSE_PARAM @@ -231,23 +240,23 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); -#define A 257 -#define B 258 -#define C 259 -#define E 260 -#define F 261 -#define I 262 -#define L 263 -#define N 264 -#define P 265 -#define R 266 -#define S 267 -#define T 268 -#define SP 269 -#define CRLF 270 -#define COMMA 271 -#define STRING 272 -#define NUMBER 273 +#define NUMBER 257 +#define STRING 258 +#define A 259 +#define B 260 +#define C 261 +#define E 262 +#define F 263 +#define I 264 +#define L 265 +#define N 266 +#define P 267 +#define R 268 +#define S 269 +#define T 270 +#define SP 271 +#define CRLF 272 +#define COMMA 273 #define USER 274 #define PASS 275 #define ACCT 276 @@ -296,14 +305,14 @@ extern int YYPARSE_DECL(); #define LEXERR 319 #define YYERRCODE 256 static const short ftp_lhs[] = { -1, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, - 12, 5, 13, 13, 13, 6, 6, 6, 6, 6, - 6, 6, 6, 7, 7, 7, 8, 8, 8, 10, - 14, 11, 9, + 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 12, 10, 7, 7, + 1, 13, 3, 3, 3, 14, 14, 14, 14, 14, + 14, 14, 14, 6, 6, 6, 4, 4, 4, 8, + 9, 5, 2, }; static const short ftp_len[] = { 2, 0, 2, 2, 4, 4, 4, 2, 4, 4, 4, @@ -328,7 +337,7 @@ static const short ftp_defred[] = { 1, 0, 0, 0, 71, 0, 70, 0, 0, 25, 0, 18, 0, 16, 0, 73, 0, 73, 0, 0, 0, 0, 32, 33, 0, 0, 0, 4, 5, 0, 6, - 0, 0, 0, 51, 63, 8, 9, 10, 0, 0, + 0, 0, 51, 0, 63, 8, 9, 10, 0, 0, 0, 0, 11, 0, 23, 0, 0, 0, 0, 0, 34, 0, 0, 39, 0, 0, 28, 0, 0, 0, 0, 0, 0, 55, 53, 54, 57, 59, 62, 13, @@ -338,40 +347,40 @@ static const short ftp_defred[] = { 1, 0, 12, 0, 0, 38, 0, 0, 0, 52, }; static const short ftp_dgoto[] = { 1, - 34, 35, 71, 73, 75, 80, 84, 88, 45, 95, - 184, 125, 157, 96, + 125, 45, 157, 88, 184, 84, 73, 95, 96, 71, + 34, 35, 75, 80, }; static const short ftp_sindex[] = { 0, - -224, -247, -239, -236, -232, -222, -204, -200, -181, -177, - 0, 0, 0, -166, 0, -161, -199, 0, 0, 0, - 0, -160, -159, -264, -158, 0, 0, 0, 0, 0, - -157, 0, 0, 0, 0, 0, -167, -162, 0, -156, - 0, -250, -198, -165, -155, -154, -153, -151, -150, -152, - 0, -145, -252, -229, -217, -302, 0, -144, -146, 0, - 0, -142, -141, -140, -139, -137, 0, -136, -135, 0, - -134, 0, -133, -132, -130, -131, -128, 0, -249, -127, - 0, 0, 0, -126, 0, 0, 0, -125, -152, -152, - -152, -205, -152, 0, -124, 0, -152, -152, 0, -152, - 0, -143, 0, -173, 0, -171, 0, -152, -123, -152, - -152, 0, 0, -152, -152, -152, 0, 0, -138, 0, - -164, -164, -122, 0, 0, 0, 0, 0, -121, -120, - -118, -148, 0, -117, 0, -116, -115, -114, -113, -112, - 0, -163, -111, 0, -110, -109, 0, -107, -106, -105, - -104, -103, -129, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -101, 0, 0, 0, 0, 0, -100, -102, - 0, -98, -102, 0, 0, 0, 0, 0, 0, -99, - -97, 0, 0, -95, 0, -96, -94, -92, 0, -152, - -93, 0, -91, -90, 0, -88, -87, -86, 0, + -224, -256, -248, -241, -239, -233, -225, -218, -200, -165, + 0, 0, 0, -164, 0, -163, -176, 0, 0, 0, + 0, -162, -161, -231, -160, 0, 0, 0, 0, 0, + -159, 0, 0, 0, 0, 0, -240, -148, 0, -143, + 0, -252, -175, -255, -156, -155, -154, -139, -152, -138, + 0, -149, -205, -203, -177, -253, 0, -147, -133, 0, + 0, -145, -144, -142, -141, -137, 0, -136, -135, 0, + -140, 0, -134, -132, -130, -131, -128, 0, -254, -127, + 0, 0, 0, -126, 0, 0, 0, -125, -138, -138, + -138, -174, -138, 0, -124, 0, -138, -138, 0, -138, + 0, -129, 0, -172, 0, -169, 0, -138, -123, -138, + -138, 0, 0, -138, -138, -138, 0, 0, -120, 0, + -246, -246, 0, -118, 0, 0, 0, 0, -122, -121, + -119, -116, 0, -117, 0, -115, -114, -113, -112, -104, + 0, -167, -101, 0, -110, -109, 0, -108, -107, -106, + -105, -103, -111, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -100, 0, 0, 0, 0, 0, -102, -85, + 0, -99, -85, 0, 0, 0, 0, 0, 0, -83, + -82, 0, 0, -96, 0, -94, -95, -93, 0, -138, + -77, 0, -91, -90, 0, -75, -88, -73, 0, }; static const short ftp_rindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -83, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -82, 0, 0, + 0, 0, -84, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -81, -80, 0, -158, 0, + 0, 0, 0, 0, 0, -81, -80, 0, -160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -386,51 +395,53 @@ static const short ftp_rindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; static const short ftp_gindex[] = { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 16, -89, - -25, 35, 47, 0, + 4, 16, 11, 0, -29, 0, 0, -89, 0, 0, + 0, 0, 0, 0, }; -#define YYTABLESIZE 190 +#define YYTABLESIZE 192 static const short ftp_table[] = { 129, - 130, 131, 104, 134, 59, 60, 76, 136, 137, 77, - 138, 78, 79, 105, 106, 107, 98, 99, 146, 123, - 148, 149, 36, 124, 150, 151, 152, 46, 47, 37, - 49, 2, 38, 52, 53, 54, 55, 39, 58, 100, - 101, 62, 63, 64, 65, 66, 40, 68, 69, 3, - 4, 102, 103, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 81, 132, 133, 41, 82, 83, 42, 14, - 51, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 43, 31, 32, - 33, 44, 85, 86, 154, 140, 141, 143, 144, 155, - 193, 87, 48, 156, 70, 170, 171, 50, 56, 72, - 57, 61, 67, 89, 90, 91, 74, 163, 93, 94, - 142, 92, 145, 97, 108, 109, 110, 111, 139, 112, - 113, 114, 115, 116, 153, 117, 118, 121, 119, 120, - 122, 180, 126, 127, 128, 135, 147, 186, 160, 161, - 124, 162, 164, 165, 166, 167, 168, 159, 173, 169, - 174, 172, 175, 176, 177, 178, 179, 181, 158, 182, - 183, 185, 190, 187, 189, 188, 191, 192, 195, 194, - 196, 0, 0, 198, 197, 73, 199, 49, 56, 58, + 130, 131, 123, 134, 85, 86, 76, 136, 137, 77, + 138, 78, 79, 87, 154, 36, 124, 70, 146, 155, + 148, 149, 37, 156, 150, 151, 152, 46, 47, 38, + 49, 2, 39, 52, 53, 54, 55, 40, 58, 59, + 60, 62, 63, 64, 65, 66, 41, 68, 69, 3, + 4, 104, 42, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 105, 106, 107, 98, 99, 100, 101, 14, + 43, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 81, 31, 32, + 33, 82, 83, 102, 103, 51, 132, 133, 140, 141, + 193, 143, 144, 170, 171, 44, 48, 50, 56, 72, + 57, 61, 67, 74, 89, 90, 91, 92, 93, 94, + 142, 97, 145, 108, 109, 110, 111, 159, 139, 112, + 113, 117, 158, 114, 115, 116, 153, 118, 123, 121, + 119, 120, 122, 186, 126, 127, 128, 135, 147, 160, + 161, 163, 162, 169, 164, 172, 165, 166, 167, 168, + 173, 180, 174, 175, 176, 177, 178, 0, 179, 182, + 181, 183, 185, 187, 188, 189, 190, 191, 192, 194, + 195, 197, 196, 199, 198, 49, 73, 0, 0, 0, + 56, 58, }; static const short ftp_check[] = { 89, - 90, 91, 305, 93, 269, 270, 257, 97, 98, 260, - 100, 262, 263, 316, 317, 318, 269, 270, 108, 269, - 110, 111, 270, 273, 114, 115, 116, 12, 13, 269, - 15, 256, 269, 18, 19, 20, 21, 270, 23, 269, - 270, 26, 27, 28, 29, 30, 269, 32, 33, 274, - 275, 269, 270, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 261, 269, 270, 270, 265, 266, 269, 294, - 270, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 269, 313, 314, - 315, 269, 258, 259, 259, 269, 270, 269, 270, 264, - 190, 267, 269, 268, 272, 269, 270, 269, 269, 272, - 270, 270, 270, 269, 269, 269, 273, 266, 269, 272, - 105, 273, 107, 269, 269, 272, 269, 269, 272, 270, - 270, 269, 269, 269, 273, 270, 270, 269, 271, 270, - 269, 271, 270, 270, 270, 270, 270, 173, 270, 270, - 273, 270, 270, 270, 270, 270, 270, 123, 269, 272, - 270, 273, 270, 270, 270, 270, 270, 269, 122, 270, - 273, 270, 269, 273, 270, 273, 271, 270, 270, 273, - 271, -1, -1, 271, 273, 269, 273, 270, 270, 270, + 90, 91, 257, 93, 260, 261, 259, 97, 98, 262, + 100, 264, 265, 269, 261, 272, 271, 258, 108, 266, + 110, 111, 271, 270, 114, 115, 116, 12, 13, 271, + 15, 256, 272, 18, 19, 20, 21, 271, 23, 271, + 272, 26, 27, 28, 29, 30, 272, 32, 33, 274, + 275, 305, 271, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 316, 317, 318, 271, 272, 271, 272, 294, + 271, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 263, 313, 314, + 315, 267, 268, 271, 272, 272, 271, 272, 271, 272, + 190, 271, 272, 271, 272, 271, 271, 271, 271, 258, + 272, 272, 272, 257, 271, 271, 271, 257, 271, 258, + 105, 271, 107, 271, 258, 271, 271, 124, 258, 272, + 272, 272, 122, 271, 271, 271, 257, 272, 257, 271, + 273, 272, 271, 173, 272, 272, 272, 272, 272, 272, + 272, 268, 272, 258, 272, 257, 272, 272, 272, 272, + 271, 273, 272, 272, 272, 272, 272, -1, 272, 272, + 271, 257, 272, 257, 257, 272, 271, 273, 272, 257, + 272, 257, 273, 257, 273, 272, 271, -1, -1, -1, + 272, 272, }; #define YYFINAL 1 #ifndef YYDEBUG @@ -446,12 +457,12 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"A","B","C","E","F","I","L","N", -"P","R","S","T","SP","CRLF","COMMA","STRING","NUMBER","USER","PASS","ACCT", -"REIN","QUIT","PORT","PASV","TYPE","STRU","MODE","RETR","STOR","APPE","MLFL", -"MAIL","MSND","MSOM","MSAM","MRSQ","MRCP","ALLO","REST","RNFR","RNTO","ABOR", -"DELE","CWD","LIST","NLST","SITE","STAT","HELP","NOOP","MKD","RMD","PWD","CDUP", -"STOU","SMNT","SYST","SIZE","MDTM","UMASK","IDLE","CHMOD","LEXERR", +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"NUMBER","STRING","A","B","C","E", +"F","I","L","N","P","R","S","T","SP","CRLF","COMMA","USER","PASS","ACCT","REIN", +"QUIT","PORT","PASV","TYPE","STRU","MODE","RETR","STOR","APPE","MLFL","MAIL", +"MSND","MSOM","MSAM","MRSQ","MRCP","ALLO","REST","RNFR","RNTO","ABOR","DELE", +"CWD","LIST","NLST","SITE","STAT","HELP","NOOP","MKD","RMD","PWD","CDUP","STOU", +"SMNT","SYST","SIZE","MDTM","UMASK","IDLE","CHMOD","LEXERR", }; static const char *yyrule[] = { "$accept : cmd_list", @@ -565,7 +576,7 @@ typedef struct { } YYSTACKDATA; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 707 "ftp.y" +#line 733 "ftp.y" #ifdef YYBYACC extern int YYLEX_DECL(); @@ -704,7 +715,7 @@ get_line(char *s, int n, FILE *iop) } } } - *cs++ = c; + *cs++ = (char) c; if (--n <= 0 || c == '\n') break; } @@ -762,7 +773,7 @@ yylex(void) *cp = '\0'; } if ((cp = strpbrk(cbuf, " \n"))) - cpos = cp - cbuf; + cpos = (int) (cp - cbuf); if (cpos == 0) cpos = 4; c = cbuf[cpos]; @@ -789,7 +800,7 @@ yylex(void) } cp = &cbuf[cpos]; if ((cp2 = strpbrk(cp, " \n"))) - cpos = cp2 - cbuf; + cpos = (int) (cp2 - cbuf); c = cbuf[cpos]; cbuf[cpos] = '\0'; upper(cp); @@ -838,7 +849,7 @@ yylex(void) case STR2: cp = &cbuf[cpos]; - n = strlen(cp); + n = (int) strlen(cp); cpos += n - 1; /* * Make sure the string is nonempty and \n terminated. @@ -863,7 +874,7 @@ yylex(void) ; c = cbuf[cpos]; cbuf[cpos] = '\0'; - yylval = atoi(cp); + yylval.ival = atoi(cp); cbuf[cpos] = c; state = STR1; return (NUMBER); @@ -878,7 +889,7 @@ yylex(void) ; c = cbuf[cpos]; cbuf[cpos] = '\0'; - yylval = atoi(cp); + yylval.ival = atoi(cp); cbuf[cpos] = c; return (NUMBER); } @@ -990,7 +1001,7 @@ help(struct tab *ctab, char *s) help_type = ""; width = 0, NCMDS = 0; for (c = ctab; c->name != 0; c++) { - int len = strlen(c->name); + int len = (int) strlen(c->name); if (len > width) width = len; @@ -1016,7 +1027,7 @@ help(struct tab *ctab, char *s) c->implemented ? ' ' : '*'); if (c + lines >= &ctab[NCMDS]) break; - w = strlen(c->name) + 1; + w = (int) strlen(c->name) + 1; while (w < width) { putchar(' '); w++; @@ -1088,7 +1099,7 @@ sizecmd(char *filename) reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]); } } -#line 1092 "ftp.tab.c" +#line 1103 "ftp.tab.c" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -1112,7 +1123,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -1295,27 +1306,27 @@ yyreduce: switch (yyn) { case 2: -#line 150 "ftp.y" +#line 172 "ftp.y" { fromname = (char *) 0; } break; case 4: -#line 157 "ftp.y" +#line 179 "ftp.y" { - user((char *) yystack.l_mark[-1]); - free((char *) yystack.l_mark[-1]); + user(yystack.l_mark[-1].sval); + free(yystack.l_mark[-1].sval); } break; case 5: -#line 162 "ftp.y" +#line 184 "ftp.y" { - pass((char *) yystack.l_mark[-1]); - free((char *) yystack.l_mark[-1]); + pass(yystack.l_mark[-1].sval); + free(yystack.l_mark[-1].sval); } break; case 6: -#line 167 "ftp.y" +#line 189 "ftp.y" { usedefault = 0; if (pdata >= 0) { @@ -1326,13 +1337,13 @@ case 6: } break; case 7: -#line 176 "ftp.y" +#line 198 "ftp.y" { passive(); } break; case 8: -#line 180 "ftp.y" +#line 202 "ftp.y" { switch (cmd_type) { @@ -1369,9 +1380,9 @@ case 8: } break; case 9: -#line 215 "ftp.y" +#line 237 "ftp.y" { - switch (yystack.l_mark[-1]) { + switch (yystack.l_mark[-1].ival) { case STRU_F: reply(200, "STRU F ok."); @@ -1383,9 +1394,9 @@ case 9: } break; case 10: -#line 227 "ftp.y" +#line 249 "ftp.y" { - switch (yystack.l_mark[-1]) { + switch (yystack.l_mark[-1].ival) { case MODE_S: reply(200, "MODE S ok."); @@ -1397,148 +1408,148 @@ case 10: } break; case 11: -#line 239 "ftp.y" +#line 261 "ftp.y" { reply(202, "ALLO command ignored."); } break; case 12: -#line 243 "ftp.y" +#line 265 "ftp.y" { reply(202, "ALLO command ignored."); } break; case 13: -#line 247 "ftp.y" +#line 269 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - retrieve((char *) 0, (char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + retrieve((char *) 0, yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free(yystack.l_mark[-1].sval); } break; case 14: -#line 254 "ftp.y" +#line 276 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - store((char *) yystack.l_mark[-1], "w", 0); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + store(yystack.l_mark[-1].sval, "w", 0); + if (yystack.l_mark[-1].sval != 0) + free(yystack.l_mark[-1].sval); } break; case 15: -#line 261 "ftp.y" +#line 283 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - store((char *) yystack.l_mark[-1], "a", 0); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + store(yystack.l_mark[-1].sval, "a", 0); + if (yystack.l_mark[-1].sval != 0) + free(yystack.l_mark[-1].sval); } break; case 16: -#line 268 "ftp.y" +#line 290 "ftp.y" { - if (yystack.l_mark[-1]) + if (yystack.l_mark[-1].ival) send_file_list("."); } break; case 17: -#line 273 "ftp.y" +#line 295 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - send_file_list((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + send_file_list((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 18: -#line 280 "ftp.y" +#line 302 "ftp.y" { - if (yystack.l_mark[-1]) + if (yystack.l_mark[-1].ival) retrieve("/bin/ls -lgA", ""); } break; case 19: -#line 285 "ftp.y" +#line 307 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - retrieve("/bin/ls -lgA %s", (char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + retrieve("/bin/ls -lgA %s", yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free(yystack.l_mark[-1].sval); } break; case 20: -#line 292 "ftp.y" +#line 314 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - statfilecmd((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + statfilecmd(yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free(yystack.l_mark[-1].sval); } break; case 21: -#line 299 "ftp.y" +#line 321 "ftp.y" { statcmd(); } break; case 22: -#line 303 "ftp.y" +#line 325 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - remove((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + remove((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 23: -#line 310 "ftp.y" +#line 332 "ftp.y" { if (fromname) { - renamecmd(fromname, (char *) yystack.l_mark[-1]); + renamecmd(fromname, (char *) yystack.l_mark[-1].sval); free(fromname); fromname = (char *) 0; } else { reply(503, "Bad sequence of commands."); } - free((char *) yystack.l_mark[-1]); + free((char *) yystack.l_mark[-1].sval); } break; case 24: -#line 321 "ftp.y" +#line 343 "ftp.y" { reply(225, "ABOR command successful."); } break; case 25: -#line 325 "ftp.y" +#line 347 "ftp.y" { - if (yystack.l_mark[-1]) + if (yystack.l_mark[-1].ival) cwd(pw->pw_dir); } break; case 26: -#line 330 "ftp.y" +#line 352 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - cwd((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + cwd((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 27: -#line 337 "ftp.y" +#line 359 "ftp.y" { help(cmdtab, (char *) 0); } break; case 28: -#line 341 "ftp.y" +#line 363 "ftp.y" { - register char *cp = (char *)yystack.l_mark[-1]; + register char *cp = (char *)yystack.l_mark[-1].sval; if (strncasecmp(cp, "SITE", 4) == 0) { - cp = (char *)yystack.l_mark[-1] + 4; + cp = (char *)yystack.l_mark[-1].sval + 4; if (*cp == ' ') cp++; if (*cp) @@ -1546,65 +1557,65 @@ case 28: else help(sitetab, (char *) 0); } else - help(cmdtab, (char *) yystack.l_mark[-1]); + help(cmdtab, (char *) yystack.l_mark[-1].sval); } break; case 29: -#line 356 "ftp.y" +#line 378 "ftp.y" { reply(200, "NOOP command successful."); } break; case 30: -#line 360 "ftp.y" +#line 382 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - makedir((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + makedir((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 31: -#line 367 "ftp.y" +#line 389 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - removedir((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + removedir((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 32: -#line 374 "ftp.y" +#line 396 "ftp.y" { - if (yystack.l_mark[-1]) + if (yystack.l_mark[-1].ival) pwd(); } break; case 33: -#line 379 "ftp.y" +#line 401 "ftp.y" { - if (yystack.l_mark[-1]) + if (yystack.l_mark[-1].ival) cwd(".."); } break; case 34: -#line 384 "ftp.y" +#line 406 "ftp.y" { help(sitetab, (char *) 0); } break; case 35: -#line 388 "ftp.y" +#line 410 "ftp.y" { - help(sitetab, (char *) yystack.l_mark[-1]); + help(sitetab, (char *) yystack.l_mark[-1].sval); } break; case 36: -#line 392 "ftp.y" +#line 414 "ftp.y" { int oldmask; - if (yystack.l_mark[-1]) { + if (yystack.l_mark[-1].ival) { oldmask = umask(0); (void) umask(oldmask); reply(200, "Current UMASK is %03o", oldmask); @@ -1612,40 +1623,40 @@ case 36: } break; case 37: -#line 402 "ftp.y" +#line 424 "ftp.y" { int oldmask; - if (yystack.l_mark[-3]) { - if ((yystack.l_mark[-1] == -1) || (yystack.l_mark[-1] > 0777)) { + if (yystack.l_mark[-3].ival) { + if ((yystack.l_mark[-1].ival == -1) || (yystack.l_mark[-1].ival > 0777)) { reply(501, "Bad UMASK value"); } else { - oldmask = umask(yystack.l_mark[-1]); + oldmask = umask(yystack.l_mark[-1].ival); reply(200, "UMASK set to %03o (was %03o)", - yystack.l_mark[-1], oldmask); + yystack.l_mark[-1].ival, oldmask); } } } break; case 38: -#line 417 "ftp.y" +#line 439 "ftp.y" { - if (yystack.l_mark[-5] && (yystack.l_mark[-1] != 0)) { - if (yystack.l_mark[-3] > 0777) + if (yystack.l_mark[-5].ival && (yystack.l_mark[-1].sval != 0)) { + if (yystack.l_mark[-3].ival > 0777) reply(501, "CHMOD: Mode value must be between 0 and 0777"); - else if (chmod((char *) yystack.l_mark[-1], yystack.l_mark[-3]) < 0) - perror_reply(550, (char *) yystack.l_mark[-1]); + else if (chmod((char *) yystack.l_mark[-1].sval, yystack.l_mark[-3].ival) < 0) + perror_reply(550, (char *) yystack.l_mark[-1].sval); else reply(200, "CHMOD command successful."); } - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 39: -#line 431 "ftp.y" +#line 453 "ftp.y" { reply(200, "Current IDLE time limit is %d seconds; max %d", @@ -1653,14 +1664,14 @@ case 39: } break; case 40: -#line 437 "ftp.y" +#line 459 "ftp.y" { - if (yystack.l_mark[-1] < 30 || yystack.l_mark[-1] > maxtimeout) { + if (yystack.l_mark[-1].ival < 30 || yystack.l_mark[-1].ival > maxtimeout) { reply(501, "Maximum IDLE time must be between 30 and %d seconds", maxtimeout); } else { - timeout = yystack.l_mark[-1]; + timeout = yystack.l_mark[-1].ival; (void) alarm((unsigned) timeout); reply(200, "Maximum IDLE time set to %d seconds", @@ -1669,16 +1680,16 @@ case 40: } break; case 41: -#line 451 "ftp.y" +#line 473 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - store((char *) yystack.l_mark[-1], "w", 1); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + store((char *) yystack.l_mark[-1].sval, "w", 1); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 42: -#line 458 "ftp.y" +#line 480 "ftp.y" { #ifdef unix #ifdef BSD @@ -1693,24 +1704,24 @@ case 42: } break; case 43: -#line 479 "ftp.y" +#line 501 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) - sizecmd((char *) yystack.l_mark[-1]); - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) + sizecmd((char *) yystack.l_mark[-1].sval); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 44: -#line 496 "ftp.y" +#line 518 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) { + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval != 0) { struct stat stbuf; - if (stat((char *) yystack.l_mark[-1], &stbuf) < 0) - perror_reply(550, "%s", (char *) yystack.l_mark[-1]); + if (stat((char *) yystack.l_mark[-1].sval, &stbuf) < 0) + perror_reply(550, "%s", (char *) yystack.l_mark[-1].sval); else if ((stbuf.st_mode&S_IFMT) != S_IFREG) { reply(550, "%s: not a plain file.", - (char *) yystack.l_mark[-1]); + (char *) yystack.l_mark[-1].sval); } else { register struct tm *t; t = gmtime(&stbuf.st_mtime); @@ -1721,182 +1732,186 @@ case 44: t->tm_hour, t->tm_min, t->tm_sec); } } - if (yystack.l_mark[-1] != 0) - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-1].sval != 0) + free((char *) yystack.l_mark[-1].sval); } break; case 45: -#line 518 "ftp.y" +#line 540 "ftp.y" { reply(221, "Goodbye."); dologout(0); } break; case 46: -#line 523 "ftp.y" +#line 545 "ftp.y" { yyerrok; } break; case 47: -#line 528 "ftp.y" +#line 550 "ftp.y" { - if (yystack.l_mark[-3] && yystack.l_mark[-1]) { - fromname = renamefrom((char *) yystack.l_mark[-1]); - if (fromname == (char *) 0 && yystack.l_mark[-1]) { - free((char *) yystack.l_mark[-1]); + if (yystack.l_mark[-3].ival && yystack.l_mark[-1].sval) { + fromname = renamefrom((char *) yystack.l_mark[-1].sval); + if (fromname == (char *) 0 && yystack.l_mark[-1].sval) { + free((char *) yystack.l_mark[-1].sval); } } } break; case 49: -#line 542 "ftp.y" +#line 564 "ftp.y" { - *(const char **)(&(yyval)) = ""; + *(const char **)(&(yyval.sval)) = ""; } break; case 52: -#line 553 "ftp.y" +#line 575 "ftp.y" { register char *a, *p; a = (char *)&data_dest.sin_addr; - a[0] = yystack.l_mark[-10]; a[1] = yystack.l_mark[-8]; a[2] = yystack.l_mark[-6]; a[3] = yystack.l_mark[-4]; + a[0] = (char) yystack.l_mark[-10].ival; + a[1] = (char) yystack.l_mark[-8].ival; + a[2] = (char) yystack.l_mark[-6].ival; + a[3] = (char) yystack.l_mark[-4].ival; p = (char *)&data_dest.sin_port; - p[0] = yystack.l_mark[-2]; p[1] = yystack.l_mark[0]; + p[0] = (char) yystack.l_mark[-2].ival; + p[1] = (char) yystack.l_mark[0].ival; data_dest.sin_family = AF_INET; } break; case 53: -#line 565 "ftp.y" +#line 591 "ftp.y" { - yyval = FORM_N; + yyval.ival = FORM_N; } break; case 54: -#line 569 "ftp.y" +#line 595 "ftp.y" { - yyval = FORM_T; + yyval.ival = FORM_T; } break; case 55: -#line 573 "ftp.y" +#line 599 "ftp.y" { - yyval = FORM_C; + yyval.ival = FORM_C; } break; case 56: -#line 579 "ftp.y" +#line 605 "ftp.y" { cmd_type = TYPE_A; cmd_form = FORM_N; } break; case 57: -#line 584 "ftp.y" +#line 610 "ftp.y" { cmd_type = TYPE_A; - cmd_form = yystack.l_mark[0]; + cmd_form = yystack.l_mark[0].ival; } break; case 58: -#line 589 "ftp.y" +#line 615 "ftp.y" { cmd_type = TYPE_E; cmd_form = FORM_N; } break; case 59: -#line 594 "ftp.y" +#line 620 "ftp.y" { cmd_type = TYPE_E; - cmd_form = yystack.l_mark[0]; + cmd_form = yystack.l_mark[0].ival; } break; case 60: -#line 599 "ftp.y" +#line 625 "ftp.y" { cmd_type = TYPE_I; } break; case 61: -#line 603 "ftp.y" +#line 629 "ftp.y" { cmd_type = TYPE_L; cmd_bytesz = NBBY; } break; case 62: -#line 608 "ftp.y" +#line 634 "ftp.y" { cmd_type = TYPE_L; - cmd_bytesz = yystack.l_mark[0]; + cmd_bytesz = yystack.l_mark[0].ival; } break; case 63: -#line 614 "ftp.y" +#line 640 "ftp.y" { cmd_type = TYPE_L; - cmd_bytesz = yystack.l_mark[0]; + cmd_bytesz = yystack.l_mark[0].ival; } break; case 64: -#line 621 "ftp.y" +#line 647 "ftp.y" { - yyval = STRU_F; + yyval.ival = STRU_F; } break; case 65: -#line 625 "ftp.y" +#line 651 "ftp.y" { - yyval = STRU_R; + yyval.ival = STRU_R; } break; case 66: -#line 629 "ftp.y" +#line 655 "ftp.y" { - yyval = STRU_P; + yyval.ival = STRU_P; } break; case 67: -#line 635 "ftp.y" +#line 661 "ftp.y" { - yyval = MODE_S; + yyval.ival = MODE_S; } break; case 68: -#line 639 "ftp.y" +#line 665 "ftp.y" { - yyval = MODE_B; + yyval.ival = MODE_B; } break; case 69: -#line 643 "ftp.y" +#line 669 "ftp.y" { - yyval = MODE_C; + yyval.ival = MODE_C; } break; case 70: -#line 649 "ftp.y" +#line 675 "ftp.y" { /* * Problem: this production is used for all pathname * processing, but only gives a 550 error reply. * This is a valid reply in some cases but not in others. */ - if (logged_in && yystack.l_mark[0] && strncmp((char *) yystack.l_mark[0], "~", 1) == 0) { - *(char **)&(yyval) = *glob((char *) yystack.l_mark[0]); + if (logged_in && yystack.l_mark[0].sval && strncmp((char *) yystack.l_mark[0].sval, "~", 1) == 0) { + *(char **)&(yyval.sval) = *glob((char *) yystack.l_mark[0].sval); if (globerr != 0) { reply(550, globerr); - yyval = 0; + yyval.sval = 0; } - free((char *) yystack.l_mark[0]); + free((char *) yystack.l_mark[0].sval); } else - yyval = yystack.l_mark[0]; + yyval.sval = yystack.l_mark[0].sval; } break; case 72: -#line 671 "ftp.y" +#line 697 "ftp.y" { register int ret, dec, multby, digit; @@ -1904,7 +1919,7 @@ case 72: * Convert a number that was read as decimal number * to what it would be if it had been read as octal. */ - dec = yystack.l_mark[0]; + dec = yystack.l_mark[0].ival; multby = 1; ret = 0; while (dec) { @@ -1917,21 +1932,21 @@ case 72: multby *= 8; dec /= 10; } - yyval = ret; + yyval.ival = ret; } break; case 73: -#line 696 "ftp.y" +#line 722 "ftp.y" { if (logged_in) - yyval = 1; + yyval.ival = 1; else { reply(530, "Please login with USER and PASS."); - yyval = 0; + yyval.ival = 0; } } break; -#line 1935 "ftp.tab.c" +#line 1950 "ftp.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/ftp.tab.h b/test/ftp.tab.h index 24f0791..6e72663 100644 --- a/test/ftp.tab.h +++ b/test/ftp.tab.h @@ -1,20 +1,20 @@ -#define A 257 -#define B 258 -#define C 259 -#define E 260 -#define F 261 -#define I 262 -#define L 263 -#define N 264 -#define P 265 -#define R 266 -#define S 267 -#define T 268 -#define SP 269 -#define CRLF 270 -#define COMMA 271 -#define STRING 272 -#define NUMBER 273 +#define NUMBER 257 +#define STRING 258 +#define A 259 +#define B 260 +#define C 261 +#define E 262 +#define F 263 +#define I 264 +#define L 265 +#define N 266 +#define P 267 +#define R 268 +#define S 269 +#define T 270 +#define SP 271 +#define CRLF 272 +#define COMMA 273 #define USER 274 #define PASS 275 #define ACCT 276 @@ -61,3 +61,16 @@ #define IDLE 317 #define CHMOD 318 #define LEXERR 319 +#ifdef YYSTYPE +#undef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 +#endif +#ifndef YYSTYPE_IS_DECLARED +#define YYSTYPE_IS_DECLARED 1 +typedef union +{ + int ival; + char *sval; +} YYSTYPE; +#endif /* !YYSTYPE_IS_DECLARED */ +extern YYSTYPE ftp_lval; @@ -123,6 +123,28 @@ yyerror(const char *msg) } %} +%union +{ + int ival; + char *sval; +} +%token <ival> NUMBER +%token <sval> STRING + +%type <ival> + byte_size + check_login + form_code + mode_code + octal_number + struct_code + +%type <sval> + password + pathname + pathstring + username + %token A B C E F I L N P R S T @@ -155,13 +177,13 @@ cmd_list: /* empty */ cmd: USER SP username CRLF { - user((char *) $3); - free((char *) $3); + user($3); + free($3); } | PASS SP password CRLF { - pass((char *) $3); - free((char *) $3); + pass($3); + free($3); } | PORT SP host_port CRLF { @@ -246,23 +268,23 @@ cmd: USER SP username CRLF | RETR check_login SP pathname CRLF { if ($2 && $4 != 0) - retrieve((char *) 0, (char *) $4); + retrieve((char *) 0, $4); if ($4 != 0) - free((char *) $4); + free($4); } | STOR check_login SP pathname CRLF { if ($2 && $4 != 0) - store((char *) $4, "w", 0); + store($4, "w", 0); if ($4 != 0) - free((char *) $4); + free($4); } | APPE check_login SP pathname CRLF { if ($2 && $4 != 0) - store((char *) $4, "a", 0); + store($4, "a", 0); if ($4 != 0) - free((char *) $4); + free($4); } | NLST check_login CRLF { @@ -284,16 +306,16 @@ cmd: USER SP username CRLF | LIST check_login SP pathname CRLF { if ($2 && $4 != 0) - retrieve("/bin/ls -lgA %s", (char *) $4); + retrieve("/bin/ls -lgA %s", $4); if ($4 != 0) - free((char *) $4); + free($4); } | STAT check_login SP pathname CRLF { if ($2 && $4 != 0) - statfilecmd((char *) $4); + statfilecmd($4); if ($4 != 0) - free((char *) $4); + free($4); } | STAT CRLF { @@ -554,9 +576,13 @@ host_port: NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA register char *a, *p; a = (char *)&data_dest.sin_addr; - a[0] = $1; a[1] = $3; a[2] = $5; a[3] = $7; + a[0] = (char) $1; + a[1] = (char) $3; + a[2] = (char) $5; + a[3] = (char) $7; p = (char *)&data_dest.sin_port; - p[0] = $9; p[1] = $11; + p[0] = (char) $9; + p[1] = (char) $11; data_dest.sin_family = AF_INET; } ; @@ -842,7 +868,7 @@ get_line(char *s, int n, FILE *iop) } } } - *cs++ = c; + *cs++ = (char) c; if (--n <= 0 || c == '\n') break; } @@ -900,7 +926,7 @@ yylex(void) *cp = '\0'; } if ((cp = strpbrk(cbuf, " \n"))) - cpos = cp - cbuf; + cpos = (int) (cp - cbuf); if (cpos == 0) cpos = 4; c = cbuf[cpos]; @@ -927,7 +953,7 @@ yylex(void) } cp = &cbuf[cpos]; if ((cp2 = strpbrk(cp, " \n"))) - cpos = cp2 - cbuf; + cpos = (int) (cp2 - cbuf); c = cbuf[cpos]; cbuf[cpos] = '\0'; upper(cp); @@ -976,7 +1002,7 @@ yylex(void) case STR2: cp = &cbuf[cpos]; - n = strlen(cp); + n = (int) strlen(cp); cpos += n - 1; /* * Make sure the string is nonempty and \n terminated. @@ -1001,7 +1027,7 @@ yylex(void) ; c = cbuf[cpos]; cbuf[cpos] = '\0'; - yylval = atoi(cp); + yylval.ival = atoi(cp); cbuf[cpos] = c; state = STR1; return (NUMBER); @@ -1016,7 +1042,7 @@ yylex(void) ; c = cbuf[cpos]; cbuf[cpos] = '\0'; - yylval = atoi(cp); + yylval.ival = atoi(cp); cbuf[cpos] = c; return (NUMBER); } @@ -1128,7 +1154,7 @@ help(struct tab *ctab, char *s) help_type = ""; width = 0, NCMDS = 0; for (c = ctab; c->name != 0; c++) { - int len = strlen(c->name); + int len = (int) strlen(c->name); if (len > width) width = len; @@ -1154,7 +1180,7 @@ help(struct tab *ctab, char *s) c->implemented ? ' ' : '*'); if (c + lines >= &ctab[NCMDS]) break; - w = strlen(c->name) + 1; + w = (int) strlen(c->name) + 1; while (w < width) { putchar(' '); w++; diff --git a/test/grammar.tab.c b/test/grammar.tab.c index 64ffe1e..8065343 100644 --- a/test/grammar.tab.c +++ b/test/grammar.tab.c @@ -1105,7 +1105,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/pure_calc.tab.c b/test/pure_calc.tab.c index eb8c189..acba404 100644 --- a/test/pure_calc.tab.c +++ b/test/pure_calc.tab.c @@ -374,7 +374,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/pure_error.tab.c b/test/pure_error.tab.c index 98de3d8..55a7d7e 100644 --- a/test/pure_error.tab.c +++ b/test/pure_error.tab.c @@ -265,7 +265,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc-s.tab.c b/test/quote_calc-s.tab.c index 15346fd..ec4375d 100644 --- a/test/quote_calc-s.tab.c +++ b/test/quote_calc-s.tab.c @@ -381,7 +381,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc.tab.c b/test/quote_calc.tab.c index 9a45472..d900614 100644 --- a/test/quote_calc.tab.c +++ b/test/quote_calc.tab.c @@ -387,7 +387,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc2-s.tab.c b/test/quote_calc2-s.tab.c index 06c574b..4165df1 100644 --- a/test/quote_calc2-s.tab.c +++ b/test/quote_calc2-s.tab.c @@ -381,7 +381,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc2.tab.c b/test/quote_calc2.tab.c index 958a736..159954a 100644 --- a/test/quote_calc2.tab.c +++ b/test/quote_calc2.tab.c @@ -387,7 +387,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc3-s.tab.c b/test/quote_calc3-s.tab.c index 0953fbb..480224a 100644 --- a/test/quote_calc3-s.tab.c +++ b/test/quote_calc3-s.tab.c @@ -382,7 +382,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc3.tab.c b/test/quote_calc3.tab.c index 731b4ab..1ab2ef0 100644 --- a/test/quote_calc3.tab.c +++ b/test/quote_calc3.tab.c @@ -382,7 +382,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc4-s.tab.c b/test/quote_calc4-s.tab.c index 29e176a..3e522f2 100644 --- a/test/quote_calc4-s.tab.c +++ b/test/quote_calc4-s.tab.c @@ -382,7 +382,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; diff --git a/test/quote_calc4.tab.c b/test/quote_calc4.tab.c index da2f25e..ca08d77 100644 --- a/test/quote_calc4.tab.c +++ b/test/quote_calc4.tab.c @@ -382,7 +382,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; |