From 75fc14b57930d21a6380f85fe39a2d6e470e404f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20B=C3=BCrgmann?= Date: Tue, 7 Mar 2023 00:00:00 +0000 Subject: [PATCH] bvi-1.4.2.src.tar.gz 4bba16c2b496963a9b939336c0abcc8d488664492080ae43a86da18cf4ce94f2 bvi-1.4.2.src.tar.gz https://bvi.sourceforge.net/download.html --- CHANGES | 19 + CREDITS | 4 + Makefile.in | 5 +- README | 6 +- acconfig.h | 2 + bmore.1 | 2 +- bmore.c | 7 +- bmore.h | 44 +- bvi.1 | 2 +- bvi.c | 15 +- bvi.h | 23 +- comm.c | 7 +- config.guess | 1213 +++++++++++++++++++++++++++----------------------- config.h.in | 105 ++++- config.sub | 676 ++++++++++++++++------------ configure | 839 +++++++++++++++++++--------------- configure.ac | 19 +- io.c | 24 +- macro.m4 | 59 +++ patchlevel.h | 2 +- re.c | 7 +- tags | 939 +++++++++++++++++++------------------- test.txt | 209 +++++++++ tmp | 15 - 24 files changed, 2482 insertions(+), 1761 deletions(-) create mode 100644 macro.m4 create mode 100644 test.txt delete mode 100644 tmp diff --git a/CHANGES b/CHANGES index c81b958..f68748e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +New in release 1.4.2 +==================== +This release is dedicated to Sven Guckes (*1967-04-06 +2022-02-20). +Sven was an enthusiastic Linux explainer, his particular passion was the console tools. +I met Sven a couple of times. He always showed interest in the further development of +the bvi and liked to discuss new ideas. +R.I.P. Sven + +* :wq bug fixed +* Error-message if input no terminal +* Mixed licenses (SF bug #10) +* Segmentation fault occurs on undo (SF bug #11) +* Segmentation fault occurs on substitution in 32-bit systems (SF bug #12) +* ncursesw support +* Handling inputs larger than 2^31 bytes (SF bug #13) +* Some incorrect function prototypes in ANSI mode fixed (SF bug #14) +* Minor fixes + + New in release 1.4.1 ==================== diff --git a/CREDITS b/CREDITS index 1a90751..da1582b 100644 --- a/CREDITS +++ b/CREDITS @@ -22,6 +22,10 @@ Josef Hinteregger ZZ write bug, lfs Richard Yao Buffer overflow at terminals > 255, ncurses with tinfo, configure fixed ~ operator dumps core Dave Keaton ASCII_DEL patch +Udo Hertrich-Jeromin ncursesw for tinycorelinux +Takashi Yano Segmentation fault occurs on undo, Segmentation fault occurs on substitution in 32-bit systems +Dominik Köppl Handling inputs larger than 2^31 bytes +Christopher Head Some incorrect function prototypes in ANSI mode Packages: diff --git a/Makefile.in b/Makefile.in index ebf25a6..5f67d29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# Copyright (c) 1996-2019 by Gerhard Buergmann +# Copyright (c) 1996-2022 by Gerhard Buergmann # gerhard@puon.at # # 1996-01-18 V 1.0.0 @@ -18,6 +18,7 @@ # 2003-07-03 V 1.3.2 # 2014-10-01 V 1.4.0 # 2019-01-30 V 1.4.1 +# 2022-02-08 V 1.4.2 # ############################################### @@ -55,7 +56,7 @@ all: bvi bmore bvi: $(OBJS) $(HEADER) $(CC) $(LDFLAGS) -o bvi $(OBJS) $(LIBS) -bmore: $(BMOBJ) +bmore: $(BMOBJ) bmore.h $(CC) $(LDFLAGS) -o bmore $(BMOBJ) $(LIBS) %.o: %.c $(INCLUDES) diff --git a/README b/README index 03c60c1..4a63d35 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ BVI - Binary visual editor ========================== -http://bvi.sourceforge.net/ +https/bvi.sourceforge.net/ This editor for binary files was written by Gerhard Buergmann and is distributed under the GPL (GNU Public License). @@ -13,8 +13,8 @@ How to compile https://www.cyberciti.biz/faq/linux-install-ncurses-library-headers-on-debian-ubuntu-centos-fedora/ - gunzip -c bvi-1.4.1.src.tar.gz | tar xvf - - cd bvi-1.4.1 + gunzip -c bvi-1.4.2.src.tar.gz | tar xvf - + cd bvi-1.4.2 ./configure make make install diff --git a/acconfig.h b/acconfig.h index 8941d4c..7589674 100644 --- a/acconfig.h +++ b/acconfig.h @@ -4,6 +4,8 @@ #undef HAVE_CURSES_H +#undef HAVE_NCURSESW_CURSES_H + #undef NO_SYSERRL #undef NEED_PUTC_CHAR diff --git a/bmore.1 b/bmore.1 index 94d0dc4..fb82611 100644 --- a/bmore.1 +++ b/bmore.1 @@ -1,4 +1,4 @@ -.TH BMORE 1 "30 Jan 2019" +.TH BMORE 1 "8 Feb 2022" .SH NAME bmore \- browse through a binary file .SH SYNOPSIS diff --git a/bmore.c b/bmore.c index 0a577cc..fa6b809 100644 --- a/bmore.c +++ b/bmore.c @@ -8,8 +8,9 @@ * 2004-01-09 V 1.3.2 * 2013-08-23 V 1.4.0 * 2019-01-22 V 1.4.1 + * 2023-03-06 V 1.4.2 * - * Copyright 1990-2019 by Gerhard Buergmann + * Copyright 1990-2023 by Gerhard Buergmann * gerhard@puon.at * * NOTE: Edit this file with tabstop=4 ! @@ -49,7 +50,7 @@ #include "bmore.h" -char *copyright = "GPL (C) 1990-2019 by Gerhard Buergmann"; +char *copyright = "GPL (C) 1990-2022 by Gerhard Buergmann"; int maxx, maxy; int mymaxx = 0, mymaxy = 0; @@ -85,7 +86,7 @@ int prompt = 1; char helppath[MAXCMD]; static char progname[10]; -static char cmdbuf[MAXCMD]; +static char cmdbuf[2 * MAXCMD]; static int cnt = 0; static int icnt = 0; static int smode; diff --git a/bmore.h b/bmore.h index bb51745..2ebd4bf 100644 --- a/bmore.h +++ b/bmore.h @@ -11,10 +11,11 @@ * 2003-02-20 V 1.3.2 * 2010-03-28 V 1.3.4 * 2019-01-22 V 1.4.1 + * 2022-03-07 V 1.4.2 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2023 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -49,20 +50,23 @@ # include "patchlevel.h" # include "config.h" # include -# if HAVE_NCURSES_H -# include -# else -# include -# endif -# if HAVE_TERM_H -# include -# else -# if HAVE_NCURSES_TERM_H -# include -# else -# include -# endif -# endif +# if defined HAVE_NCURSESW_CURSES_H +# include +# include +# elif defined HAVE_NCURSESW_H +# include +# elif defined HAVE_NCURSES_CURSES_H +# include +# elif defined HAVE_NCURSES_H +# include +# elif defined HAVE_CURSES_H +# include +# else +# error "SysV or X/Open-compatible Curses header file required" +# endif +# if HAVE_TERM_H +# include +# endif #endif @@ -135,17 +139,17 @@ extern int no_tty, no_intty; #ifdef ANSI void initterm(void), set_tty(void), reset_tty(void); void cleartoeol(void), clearscreen(void), highlight(void); - void normal(void), bmbeep(void), home(void), sig(void); + void normal(void), bmbeep(void), home(void), sig(int); void doshell(char *), emsg(char *); void do_next(int); void bmsearch(int); void pushback(int, char *); - int open_file(void); - int printout(int), rdline(int, char *); - int nextchar(void), vgetc(void); + int open_file(char *); + int printout(int), rdline(int, char *); + int nextchar(void), vgetc(void); int sbracket(int, char *, int); int bmregexec(char *); - int ascii_comp(char *, char *), hex_comp(char *, char *); + int ascii_comp(char *, char *), hex_comp(char *, char *); void putline(char *, int); #else void initterm(), set_tty(), reset_tty(); diff --git a/bvi.1 b/bvi.1 index b0e7f33..3c3b00f 100644 --- a/bvi.1 +++ b/bvi.1 @@ -93,7 +93,7 @@ .nr % 0 .rr F .\} -.TH BVI 1 "BVI Version 1.4.1" "30/Jan/2019" "User Commands" +.TH BVI 1 "BVI Version 1.4.2" "8/Feb/2022" "User Commands" .IX Title "BVI 1" .UC .IX Name "bvi, bview - visual display editor for binary files" diff --git a/bvi.c b/bvi.c index dcc1f85..9c5e443 100644 --- a/bvi.c +++ b/bvi.c @@ -13,10 +13,11 @@ * 2013-08-23 V 1.4.0alpha * 2014-10-07 V 1.4.0 * 2019-10-12 V 1.4.1 + * 2023-03-06 V 1.4.2 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2023 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -33,6 +34,7 @@ */ #include +#include #include "bvi.h" #include "set.h" @@ -42,7 +44,7 @@ #endif -char *copyright = "(C) GPL 1996-2019 by Gerhard Buergmann"; +char *copyright = "(C) GPL 1996-2023 by Gerhard Buergmann"; jmp_buf env; /* context for `longjmp' function */ @@ -145,6 +147,13 @@ main(argc, argv) /* This should be the beginners version */ } + if (isatty(fileno(stdin)) == 0) { + // Guckes + fprintf(stderr, "Input is not from a terminal\n"); + exit(1); + } + + while (n < argc) { switch (argv[n][0]) { case '-': @@ -918,7 +927,7 @@ do_put(loc, n, buf) emsg(nobytes); return; } - if (loc > maxpos) { + if (loc >= maxpos) { beep(); return; } diff --git a/bvi.h b/bvi.h index 0881ce7..bc96547 100644 --- a/bvi.h +++ b/bvi.h @@ -12,10 +12,11 @@ * 2010-08-04 V 1.3.4 * 2014-10-01 V 1.4.0 * 2019-01-28 V 1.4.1 + * 2023-03-07 V 1.4.2 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2023 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -50,11 +51,19 @@ #else # include "patchlevel.h" # include "config.h" -#if HAVE_NCURSES_H -# include -#else -# include -#endif +#if defined HAVE_NCURSESW_CURSES_H + # include + #elif defined HAVE_NCURSESW_H + # include + #elif defined HAVE_NCURSES_CURSES_H + # include + #elif defined HAVE_NCURSES_H + # include + #elif defined HAVE_CURSES_H + # include + #else + # error "SysV or X/Open-compatible Curses header file required" + #endif #endif /* defines for filemode */ @@ -215,7 +224,7 @@ extern off_t block_begin, block_end, block_size; void docmdline(char *), do_over(PTR, off_t, PTR), do_put(PTR, off_t, PTR); void jmpproc(int), printline(PTR, int); int addfile(char *); - int bregexec(PTR, char *); + PTR bregexec(PTR, char *); int chk_comm(int); int doecmd(char *, int); int do_append(off_t, char *), do_logic(int, char *); diff --git a/comm.c b/comm.c index 6e0d884..72c0a47 100644 --- a/comm.c +++ b/comm.c @@ -14,10 +14,11 @@ * 2010-06-02 V 1.3.4 * 2014-01-28 V 1.4.0 * 2019-01-27 V 1.4.1 + * 2023-03-06 V 1.4.2 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2023 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -87,7 +88,7 @@ extern char **files; /* used for "next" and "rewind" */ extern int numfiles, curfile; extern int errno; -static char oldbuf[CMDSZ]; /** for :!! command **/ +static char oldbuf[CMDSZ + 3]; /** for :!! command **/ /* @@ -308,7 +309,7 @@ docmdline(cmdline) else ok = save(c_argv[0], start_addr, end_addr, saveflag); } else { if (c_argc == 0) { - save_chk(name, start_addr, end_addr, saveflag); + ok = save_chk(name, start_addr, end_addr, saveflag); } else { if (!stat(c_argv[0], &buf)) { if (saveflag == WRITE) { diff --git a/config.guess b/config.guess index 7f9ebbe..69188da 100644 --- a/config.guess +++ b/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. -timestamp='2019-09-10' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-01-01' # 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 +# 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 @@ -27,11 +29,19 @@ timestamp='2019-09-10' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -50,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2023 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." @@ -84,6 +94,9 @@ if test $# != 0; then exit 1 fi +# Just in case it came from the environment. +GUESS= + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -99,8 +112,10 @@ tmp= trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 + # shellcheck disable=SC2039,SC3028 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || @@ -110,7 +125,7 @@ set_cc_for_build() { ,,) echo "int x;" > "$dummy.c" for driver in cc gcc c89 c99 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" + CC_FOR_BUILD=$driver break fi done @@ -131,14 +146,12 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -147,24 +160,37 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -176,12 +202,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -190,13 +216,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; @@ -217,7 +243,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -228,7 +254,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -239,51 +265,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; *:OS108:*:*) - echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; *:Twizzler:*:*) - echo "$UNAME_MACHINE"-unknown-twizzler - exit ;; + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -297,7 +329,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -334,117 +366,121 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -454,41 +490,41 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -516,75 +552,76 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then set_cc_for_build @@ -601,16 +638,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -618,56 +655,56 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + 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 + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -706,7 +743,7 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -727,12 +764,12 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -762,36 +799,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -799,17 +836,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -817,114 +855,135 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf fi - exit ;; + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-pc-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix - exit ;; + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -935,60 +994,63 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build IS_GLIBC=0 @@ -1033,113 +1095,135 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1147,12 +1231,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1162,11 +1246,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1174,31 +1258,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1223,113 +1307,119 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in @@ -1344,7 +1434,7 @@ EOF else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$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 @@ -1365,109 +1455,119 @@ EOF # uname -m returns i386 or x86_64 UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; *:Unleashed:*:*) - echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + # No uname command or uname output not recognized. set_cc_for_build cat > "$dummy.c" </dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1607,7 +1707,7 @@ test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 < header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define if you have the header file. */ +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define if you have the `memmove' function. */ +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_NCURSES_TERM_H -/* Define if you have the header file. */ +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if you have the `strdup' function. */ +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the `strerror' function. */ +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have the `strtol' function. */ +/* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL -/* Define if you have the header file. */ +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERMCAP_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERMIO_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TERM_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* The size of a `int', as computed by sizeof. */ +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `void *', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + +/* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +#undef _LARGEFILE_SOURCE + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + /* Define to `int' if does not define. */ #undef off_t +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + /* Define to `unsigned int' if does not define. */ #undef size_t diff --git a/config.sub b/config.sub index 0f2234c..de4259e 100644 --- a/config.sub +++ b/config.sub @@ -1,12 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. -timestamp='2019-06-30' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-01-21' # 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 +# 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 @@ -33,7 +35,7 @@ timestamp='2019-06-30' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,6 +52,13 @@ timestamp='2019-06-30' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -67,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2023 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." @@ -112,9 +121,11 @@ esac # Split fields of configuration type # shellcheck disable=SC2162 +saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1528,6 +1531,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1539,7 +1543,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1705,84 +1710,193 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + kernel* ) + # Restricted further below + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) + ;; + uclinux-uclibc* ) + ;; + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) vendor=ibm ;; - os400*) + *-os400*) vendor=ibm ;; - ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/configure b/configure index af7d930..12d2990 100755 --- a/configure +++ b/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -89,6 +87,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -133,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -166,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -211,14 +236,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -316,10 +352,18 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -356,19 +400,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -441,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -475,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -496,28 +544,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -530,7 +558,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -633,6 +661,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -705,6 +734,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -729,8 +759,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -775,7 +806,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -801,7 +832,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -956,6 +987,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1005,7 +1045,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1021,7 +1061,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1051,8 +1091,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1060,7 +1100,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1070,7 +1110,7 @@ Try \`$0 --help' for more information." $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1078,13 +1118,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1093,7 +1133,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1107,7 +1147,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1121,8 +1161,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1137,9 +1175,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1178,11 +1216,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1222,7 +1260,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1248,6 +1286,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1363,9 +1402,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1409,7 +1448,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1451,7 +1490,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1473,7 +1512,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1489,7 +1529,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1515,7 +1556,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1531,7 +1573,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1565,7 +1608,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1629,7 +1673,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -1655,7 +1699,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1666,7 +1710,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1680,7 +1724,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1698,7 +1742,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1711,7 +1755,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1752,7 +1796,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1764,10 +1808,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1803,7 +1847,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1830,7 +1874,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1839,7 +1883,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1870,7 +1914,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1884,7 +1928,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1897,7 +1941,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1952,7 +1996,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -1960,7 +2004,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2070,11 +2114,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2108,11 +2150,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2125,11 +2165,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2143,11 +2181,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2202,7 +2238,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2217,7 +2258,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2293,7 +2338,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2319,7 +2364,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2331,7 +2376,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2359,7 +2404,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2371,7 +2416,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2412,7 +2457,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2424,7 +2469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2452,7 +2497,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2465,7 +2510,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2511,7 +2556,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2523,7 +2568,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2555,7 +2600,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2567,7 +2612,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2609,8 +2654,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2724,9 +2769,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2768,8 +2812,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2826,9 +2870,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2839,7 +2883,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2879,8 +2923,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2890,7 +2934,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2927,7 +2971,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3005,7 +3049,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3014,8 +3058,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3110,7 +3153,7 @@ if test "$enable_largefile" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : +if ${ac_cv_sys_largefile_CC+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -3126,7 +3169,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3161,7 +3204,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3172,7 +3215,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3196,7 +3239,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3230,7 +3273,7 @@ rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3241,7 +3284,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3265,7 +3308,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3297,21 +3340,29 @@ _ACEOF esac rm -rf conftest* fi + + fi ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3325,27 +3376,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3363,14 +3414,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3378,7 +3429,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3414,7 +3465,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3426,7 +3477,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3454,7 +3505,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3466,7 +3517,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3507,7 +3558,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3519,7 +3570,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3547,7 +3598,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3560,7 +3611,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3606,7 +3657,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3618,7 +3669,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3650,7 +3701,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3662,7 +3713,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3704,8 +3755,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3734,7 +3785,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3771,7 +3822,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3849,7 +3900,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3858,8 +3909,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3976,7 +4026,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3996,7 +4046,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4065,7 +4115,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4095,7 +4145,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4111,11 +4161,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4154,7 +4204,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4170,18 +4220,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4193,7 +4243,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4207,7 +4257,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4242,7 +4292,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4256,7 +4306,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4273,7 +4323,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4308,7 +4358,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4323,7 +4373,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4440,8 +4490,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4457,7 +4506,7 @@ done # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : @@ -4466,9 +4515,8 @@ else if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -4491,7 +4539,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 $as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : +if ${ac_cv_sizeof_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : @@ -4500,9 +4548,8 @@ else if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -4525,7 +4572,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 $as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : @@ -4534,9 +4581,8 @@ else if test "$ac_cv_type_long_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -4559,7 +4605,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 $as_echo_n "checking size of void *... " >&6; } -if test "${ac_cv_sizeof_void_p+set}" = set; then : +if ${ac_cv_sizeof_void_p+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : @@ -4568,9 +4614,8 @@ else if test "$ac_cv_type_void_p" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (void *) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (void *) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_void_p=0 fi @@ -4589,7 +4634,7 @@ _ACEOF ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : else @@ -4600,7 +4645,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : +if test "x$ac_cv_type_off_t" = xyes; then : else @@ -4613,7 +4658,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4727,8 +4772,7 @@ for ac_header in fcntl.h termcap.h termio.h termios.h unistd.h term.h ncurses/te do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4754,11 +4798,11 @@ fi ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncurses_h" = x""yes; then : +if test "x$ac_cv_header_ncurses_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 $as_echo_n "checking for library containing initscr... " >&6; } -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4792,11 +4836,11 @@ for ac_lib in '' ncurses; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_initscr+set}" = set; then : + if ${ac_cv_search_initscr+:} false; then : break fi done -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : else ac_cv_search_initscr=no @@ -4810,11 +4854,11 @@ ac_res=$ac_cv_search_initscr if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - $as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h + $as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 $as_echo_n "checking for library containing tputs... " >&6; } -if test "${ac_cv_search_tputs+set}" = set; then : +if ${ac_cv_search_tputs+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4848,11 +4892,11 @@ for ac_lib in '' tinfo; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_tputs+set}" = set; then : + if ${ac_cv_search_tputs+:} false; then : break fi done -if test "${ac_cv_search_tputs+set}" = set; then : +if ${ac_cv_search_tputs+:} false; then : else ac_cv_search_tputs=no @@ -4872,7 +4916,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 $as_echo_n "checking for library containing initscr... " >&6; } -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4906,11 +4950,11 @@ for ac_lib in '' curses; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_initscr+set}" = set; then : + if ${ac_cv_search_initscr+:} false; then : break fi done -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : else ac_cv_search_initscr=no @@ -4928,7 +4972,7 @@ if test "$ac_res" != no; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 $as_echo_n "checking for library containing tputs... " >&6; } -if test "${ac_cv_search_tputs+set}" = set; then : +if ${ac_cv_search_tputs+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4962,11 +5006,11 @@ for ac_lib in '' tinfo; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_tputs+set}" = set; then : + if ${ac_cv_search_tputs+:} false; then : break fi done -if test "${ac_cv_search_tputs+set}" = set; then : +if ${ac_cv_search_tputs+:} false; then : else ac_cv_search_tputs=no @@ -4984,19 +5028,20 @@ fi else - as_fn_error "bvi requires the curses library" "$LINENO" 5 + as_fn_error $? "bvi requires a curses library" "$LINENO" 5 fi fi + else ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" -if test "x$ac_cv_header_curses_h" = x""yes; then : +if test "x$ac_cv_header_curses_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 $as_echo_n "checking for library containing initscr... " >&6; } -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -5030,11 +5075,11 @@ for ac_lib in '' curses; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_initscr+set}" = set; then : + if ${ac_cv_search_initscr+:} false; then : break fi done -if test "${ac_cv_search_initscr+set}" = set; then : +if ${ac_cv_search_initscr+:} false; then : else ac_cv_search_initscr=no @@ -5048,16 +5093,85 @@ ac_res=$ac_cv_search_initscr if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - $as_echo "#define HAVE_CURSES_H 1" >>confdefs.h + $as_echo "#define HAVE_CURSES_H 1" >>confdefs.h else - as_fn_error "bvi requires the curses library" "$LINENO" 5 + as_fn_error $? "bvi requires a curses library" "$LINENO" 5 fi else - as_fn_error "bvi requires the curses library" "$LINENO" 5 + ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/curses.h" "ac_cv_header_ncursesw_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_ncursesw_curses_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 +$as_echo_n "checking for library containing initscr... " >&6; } +if ${ac_cv_search_initscr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ncursesw; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_initscr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_initscr+:} false; then : + break +fi +done +if ${ac_cv_search_initscr+:} false; then : + +else + ac_cv_search_initscr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5 +$as_echo "$ac_cv_search_initscr" >&6; } +ac_res=$ac_cv_search_initscr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + $as_echo "#define HAVE_NCURSESW_CURSES_H 1" >>confdefs.h + +else + + as_fn_error $? "bvi requires a curses library" "$LINENO" 5 +fi + +else + + as_fn_error $? "bvi requires a curses library" "$LINENO" 5 +fi + + fi @@ -5070,8 +5184,7 @@ for ac_func in strdup strtol strtoll strerror memmove do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5081,7 +5194,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then : +if ${ac_cv_sys_largefile_source+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -5150,7 +5263,7 @@ fi for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDLIB_H 1 _ACEOF @@ -5161,7 +5274,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : +if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -5217,7 +5330,7 @@ fi for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDLIB_H 1 _ACEOF @@ -5228,7 +5341,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 $as_echo_n "checking for GNU libc compatible realloc... " >&6; } -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then : +if ${ac_cv_func_realloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -5350,10 +5463,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -5369,6 +5493,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -5384,7 +5509,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -5485,6 +5610,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5530,19 +5656,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5680,16 +5806,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -5738,7 +5864,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5749,28 +5875,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -5792,7 +5906,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5854,10 +5968,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5873,11 +5987,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -5899,6 +6018,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -5911,7 +6031,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -5920,7 +6040,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -5940,7 +6060,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -5972,7 +6092,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -5994,9 +6114,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -6004,12 +6125,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -6026,12 +6148,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -6040,18 +6162,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6059,7 +6181,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -6107,7 +6229,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -6139,21 +6261,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -6165,7 +6295,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -6177,11 +6307,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6266,7 +6396,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -6279,7 +6409,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6298,7 +6428,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -6307,7 +6437,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6333,8 +6463,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6464,23 +6594,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -6489,21 +6620,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; @@ -6518,7 +6649,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6539,7 +6670,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index dd12369..be763c7 100644 --- a/configure.ac +++ b/configure.ac @@ -63,18 +63,23 @@ AC_ARG_WITH(ncurses, ]) AC_CHECK_HEADER([ncurses.h],[ - AC_SEARCH_LIBS([initscr], [ncurses],[ - AC_DEFINE(HAVE_NCURSES_H) - AC_SEARCH_LIBS([tputs], [tinfo])], [ + AC_SEARCH_LIBS([initscr], [ncurses], [ + AC_DEFINE(HAVE_NCURSES_H) + AC_SEARCH_LIBS([tputs], [tinfo])],[ AC_SEARCH_LIBS([initscr], [curses],[ AC_DEFINE(HAVE_CURSES_H) AC_SEARCH_LIBS([tputs], [tinfo])],[ - AC_MSG_ERROR([bvi requires the curses library])])])],[ + AC_MSG_ERROR([bvi requires a curses library])])]) + ],[ AC_CHECK_HEADER([curses.h],[ AC_SEARCH_LIBS([initscr], [curses], [ - AC_DEFINE(HAVE_CURSES_H)],[ - AC_MSG_ERROR([bvi requires the curses library])])],[ - AC_MSG_ERROR([bvi requires the curses library])])]) + AC_DEFINE(HAVE_CURSES_H)],[ + AC_MSG_ERROR([bvi requires a curses library])])],[ + AC_CHECK_HEADER([ncursesw/curses.h], [ + AC_SEARCH_LIBS([initscr], [ncursesw], [ + AC_DEFINE(HAVE_NCURSESW_CURSES_H)],[ + AC_MSG_ERROR([bvi requires a curses library])])],[ + AC_MSG_ERROR([bvi requires a curses library])])])]) dnl Checks for typedefs, structures, and compiler characteristics. dnl AC_TYPE_SIZE_T diff --git a/io.c b/io.c index 1a0eda4..a34d8fc 100644 --- a/io.c +++ b/io.c @@ -11,10 +11,11 @@ * 2010-06-02 V 1.3.4 * 2014-05-03 V 1.4.0 * 2019-01-27 V 1.4.1 + * 2022-03-09 V 1.4.2 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2022 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -55,6 +56,20 @@ # include #endif + +//@ read on linux has a limit of 0x7ffff000 bytes (see `man read`) +//@ this function calls recursively read until all `count` characters are read. +static ssize_t +read_to_end(int fd, void *buf, size_t count) { + size_t read_bytes = 0; + while(read_bytes < count) { + const ssize_t ret = read(fd, ((char*)buf)+read_bytes, count-read_bytes); + if(ret <= 0) return ret; + read_bytes += ret; + } + return read_bytes; +} + int filemode; static struct stat buf; static off_t block_read; @@ -261,7 +276,7 @@ load(fname) sysemsg(fname); filemode = ERROR; } else { - if ((filesize = read(fd, mem, block_size)) == 0) { + if ((filesize = read_to_end(fd, mem, block_size)) == 0) { sprintf(fname_buf, "\"%s\" Empty file", fname); filemode = ERROR; } else { @@ -278,7 +293,7 @@ load(fname) } } else if ((filemode == REGULAR) || (filemode == DIRECTORY)) { filesize = buf.st_size; - if (read(fd, mem, filesize) != filesize) { + if (read_to_end(fd, mem, filesize) != filesize) { sysemsg(fname); filemode = ERROR; } @@ -478,7 +493,7 @@ addfile(fname) } oldsize = filesize; if (enlarge(buf.st_size)) return 1; - if (read(fd, mem + filesize, buf.st_size) == -1) { + if (read_to_end(fd, mem + filesize, buf.st_size) == -1) { sysemsg(fname); return 1; } @@ -488,3 +503,4 @@ addfile(fname) setpage(mem + oldsize); return 0; } + diff --git a/macro.m4 b/macro.m4 new file mode 100644 index 0000000..c28ed01 --- /dev/null +++ b/macro.m4 @@ -0,0 +1,59 @@ +AC_CHECK_HEADER +( + [ncurses.h], + [ + AC_SEARCH_LIBS + ([initscr], [ncurses], + [ + AC_DEFINE(HAVE_NCURSES_H) + AC_SEARCH_LIBS([tputs], [tinfo]) + ],[ + AC_SEARCH_LIBS + ( + [initscr], [curses], + [ + AC_DEFINE(HAVE_CURSES_H) + AC_SEARCH_LIBS([tputs], [tinfo]) + ],[ + AC_MSG_ERROR([bvi requires a curses library]) + ] + ) + ] + ) + ],[ + AC_CHECK_HEADER + ( + [curses.h], + [ + AC_SEARCH_LIBS + ( + [initscr], [curses], + [ + AC_DEFINE(HAVE_CURSES_H) + ],[ + AC_MSG_ERROR([bvi requires a curses library]) + ] + ) + ],[ +# statt: AC_MSG_ERROR([bvi requires a curses library]) + AC_CHECK_HEADER + ( + [ncursesw/curses.h], + [ + AC_SEARCH_LIBS + ( + [initscr], [curses], + [ + AC_DEFINE(HAVE_NCURSESW_CURSES_H) + ],[ + AC_MSG_ERROR([bvi requires a curses library]) + ] + ) + ],[ + AC_MSG_ERROR([bvi requires a curses library]) + ] + ) + ] + ) + ] +) diff --git a/patchlevel.h b/patchlevel.h index 276f7ba..af30db7 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -1 +1 @@ -#define VERSION "1.4.1" +#define VERSION "1.4.2" diff --git a/re.c b/re.c index bc5cdd8..df6f9c2 100644 --- a/re.c +++ b/re.c @@ -11,8 +11,9 @@ * 2010-06-02 V 1.3.4 * 2013-08-24 V 1.4.0 * 2019-01-28 V 1.4.1 + * 2023-03-07 V 1.4.2 * - * Copyright 1996-2019 by Gerhard Buergmann + * Copyright 1996-2023 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -312,7 +313,7 @@ do_substitution(delim, line, startpos, endpos) refresh(); if (global) { - if ((undo_count = alloc_buf(endpos - startpos, &undo_buf))) { + if ((undo_count = alloc_buf((off_t)(endpos - startpos), &undo_buf))) { memcpy(undo_buf, startpos + 1, undo_count); } undo_start = startpos + 1; @@ -350,7 +351,7 @@ AGAIN: repl_count++; current_start = pagepos + y * Anzahl + xpos(); if (!global) { - if ((undo_count = alloc_buf(pat_len, &undo_buf))) { + if ((undo_count = alloc_buf((off_t)pat_len, &undo_buf))) { memcpy(undo_buf, current_start, undo_count); } undo_start = current_start; diff --git a/tags b/tags index 771ed94..2f52151 100644 --- a/tags +++ b/tags @@ -1,566 +1,551 @@ !_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ !_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ -!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/ -!_TAG_PROGRAM_NAME Exuberant Ctags // -!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ -!_TAG_PROGRAM_VERSION 5.9~svn20110310 // -AND bvi.h 90;" d -ANSI bmore.h 104;" d -ANSI bvi.h 120;" d -APPEND comm.c 51;" d file: -APPEND comm.c 54;" d file: -ASCII bmore.h 83;" d -ASCII bvi.h 97;" d -ASCII_DEL bvi.h 106;" d -A_ATTRIBUTES doscur.h 56;" d -A_BLINK doscur.h 54;" d -A_BOLD doscur.h 52;" d -A_CHARTEXT doscur.h 55;" d -A_NORMAL doscur.h 50;" d -A_REVERSE doscur.h 53;" d -A_STANDOUT doscur.h 51;" d -AnzAdd bmore.c /^int AnzAdd;$/;" v -AnzAdd bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v -Anzahl bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v -Anzahl3 bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v -Ausgabe_Datei bvi.c /^FILE *Ausgabe_Datei;$/;" v -BACKWARD bmore.h 85;" d -BACKWARD bvi.h 99;" d +!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ +!_TAG_OUTPUT_FILESEP slash /slash or backslash/ +!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ +!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ +!_TAG_PROC_CWD /home/bg/src/bvi/bvi/ // +!_TAG_PROGRAM_AUTHOR Universal Ctags Team // +!_TAG_PROGRAM_NAME Universal Ctags /Derived from Exuberant Ctags/ +!_TAG_PROGRAM_URL https://ctags.io/ /official site/ +!_TAG_PROGRAM_VERSION 5.9.0 // +AND bvi.h /^#define AND /;" d +ANSI bmore.h /^# define ANSI$/;" d +ANSI bvi.h /^# define ANSI$/;" d +APPEND comm.c /^# define APPEND /;" d file: +ASCII bmore.h /^#define ASCII /;" d +ASCII bvi.h /^#define ASCII /;" d +ASCII_DEL bvi.h /^#define ASCII_DEL /;" d +A_ATTRIBUTES doscur.h /^#define A_ATTRIBUTES /;" d +A_BLINK doscur.h /^#define A_BLINK /;" d +A_BOLD doscur.h /^#define A_BOLD /;" d +A_CHARTEXT doscur.h /^#define A_CHARTEXT /;" d +A_NORMAL doscur.h /^#define A_NORMAL /;" d +A_REVERSE doscur.h /^#define A_REVERSE /;" d +A_STANDOUT doscur.h /^#define A_STANDOUT /;" d +AnzAdd bmore.c /^int AnzAdd;$/;" v typeref:typename:int +AnzAdd bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v typeref:typename:int +Anzahl bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v typeref:typename:int +Anzahl3 bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v typeref:typename:int +Ausgabe_Datei bvi.c /^FILE *Ausgabe_Datei;$/;" v typeref:typename:FILE * +BACKWARD bmore.h /^#define BACKWARD /;" d +BACKWARD bvi.h /^#define BACKWARD /;" d BLOCK_BEGIN bvi.h /^ BLOCK_BEGIN = 1,$/;" e enum:_block_datum BLOCK_END bvi.h /^ BLOCK_END = 2,$/;" e enum:_block_datum BLOCK_LEN bvi.h /^ BLOCK_LEN = 4$/;" e enum:_block_datum -BLOCK_SPECIAL bmore.h 75;" d -BLOCK_SPECIAL bvi.h 66;" d -BS bmore.h 88;" d -BS bvi.h 102;" d -BUFFER bmore.h 116;" d -BUFFER bvi.h 134;" d -BVICTRL bmore.h 92;" d -BVICTRL bvi.h 105;" d -CHARACTER_SPECIAL bmore.h 74;" d -CHARACTER_SPECIAL bvi.h 65;" d -CMDLNG bvi.h 108;" d -CMDSZ comm.c 57;" d file: -COLS dosio.c /^int COLS = 80;$/;" v -CR bmore.h 86;" d -CR bvi.h 100;" d -DELIM bmore.h 107;" d -DELIM bmore.h 112;" d -DELIM bvi.h 123;" d -DELIM bvi.h 130;" d -DIRECTORY bmore.h 73;" d -DIRECTORY bvi.h 64;" d -ECHO dosio.c /^int ECHO = TRUE;$/;" v -END bmore.h 79;" d -END bvi.h 70;" d -ERR doscur.h 147;" d -ERROR bmore.h 70;" d -ERROR bvi.h 61;" d -ESC bmore.h 89;" d -ESC bvi.h 103;" d -ESC doscur.h 31;" d -FALSE bmore.h 100;" d -FALSE bvi.h 116;" d -FALSE doscur.h 29;" d -FORWARD bmore.h 84;" d -FORWARD bvi.h 98;" d -HAVE_CURSES_H acconfig.h 5;" d -HAVE_FCNTL_H dosconf.h 40;" d -HAVE_LOCALE_H dosconf.h 44;" d -HAVE_MEMMOVE dosconf.h 31;" d -HAVE_NCURSES_H acconfig.h 3;" d -HAVE_NCURSES_TERM_H acconfig.h 11;" d -HAVE_STRDUP dosconf.h 34;" d -HAVE_STRTOL dosconf.h 37;" d -HELPFILE bmore.c 43;" d file: -HELPFILE bmore.c 45;" d file: -HEX bvi.h 96;" d -Home bm_unix.c /^char *Home; \/* go to home *\/$/;" v -JOEHTG bvi.h 43;" d -KEY_BACKSPACE doscur.h 42;" d -KEY_DC doscur.h 45;" d -KEY_DOWN doscur.h 34;" d -KEY_ENTER doscur.h 41;" d -KEY_F doscur.h 33;" d -KEY_F0 doscur.h 32;" d -KEY_HOME doscur.h 43;" d -KEY_IC doscur.h 46;" d -KEY_LEFT doscur.h 36;" d -KEY_LL doscur.h 44;" d -KEY_NPAGE doscur.h 38;" d -KEY_PPAGE doscur.h 39;" d -KEY_RETURN doscur.h 40;" d -KEY_RIGHT doscur.h 37;" d -KEY_UP doscur.h 35;" d -LINES dosio.c /^int LINES = 25;$/;" v -LROTATE bvi.h 88;" d -LSHIFT bvi.h 86;" d -MAXCMD bmore.h 115;" d -MAXCMD bvi.h 133;" d -MAXNAME comm.c 58;" d file: -MAX_ONE_ARG comm.c 63;" d file: -MAX_ONE_FILE comm.c 65;" d file: -NEED_PUTC_CHAR acconfig.h 9;" d -NEED_PUTC_CHAR bm_unix.c 52;" d file: -NEG bvi.h 93;" d -NEW bmore.h 72;" d -NEW bvi.h 63;" d -NL bmore.h 87;" d -NL bvi.h 101;" d -NODEL dosio.c /^int NODEL = FALSE;$/;" v -NOT bvi.h 94;" d -NO_ADDR comm.c 60;" d file: -NO_ARG comm.c 61;" d file: -NO_SYSERRL acconfig.h 7;" d -NULL bmore.h 95;" d -NULL bvi.h 111;" d -OFF_T_MAX io.c 47;" d file: -ONE bmore.h 80;" d -ONE bvi.h 71;" d -ONE_ARG comm.c 62;" d file: -ONE_FILE comm.c 64;" d file: -OR bvi.h 91;" d -P set.h 77;" d -PARTIAL bmore.h 76;" d -PARTIAL bvi.h 67;" d -PRINTF bmore.c 38;" d file: -PRINTF bmore.c 40;" d file: -PTR bmore.h 105;" d -PTR bmore.h 111;" d -PTR bvi.h 121;" d -PTR bvi.h 129;" d -P_AW set.h 54;" d -P_BOOL set.h 42;" d -P_CHANGED set.h 45;" d -P_CM set.h 55;" d -P_CO set.h 72;" d -P_EB set.h 56;" d -P_HL set.h 70;" d -P_IC set.h 57;" d -P_LI set.h 67;" d -P_MA set.h 58;" d -P_MM set.h 59;" d -P_MO set.h 63;" d -P_NUM set.h 43;" d -P_OF set.h 60;" d -P_RE set.h 71;" d -P_RO set.h 61;" d -P_SS set.h 62;" d -P_TE set.h 65;" d -P_TEXT set.h 44;" d -P_TT set.h 64;" d -P_US set.h 66;" d -P_WL set.h 68;" d -P_WS set.h 69;" d -REGULAR bmore.h 71;" d -REGULAR bvi.h 62;" d -REPLACE bmore.h 91;" d -RROTATE bvi.h 89;" d -RSHIFT bvi.h 87;" d -SEARCH bmore.h 90;" d -SEARCH bvi.h 104;" d -SKIP_WHITE bvi.h 136;" d -STAR bmore.h 81;" d -STAR bvi.h 72;" d -STDC_HEADERS dosconf.h 28;" d -S_GLOBAL bvi.h 83;" d -S_ISBLK bvi.h 198;" d -S_ISCHR bvi.h 197;" d -S_ISDIR bvi.h 196;" d -S_ISFIFO bvi.h 200;" d -S_ISREG bvi.h 199;" d -TBUFSIZ bm_dos.c 32;" d file: -TBUFSIZ bm_unix.c 32;" d file: -TRUE bmore.h 99;" d -TRUE bvi.h 115;" d -TRUE doscur.h 28;" d -U_APPEND bvi.h 80;" d -U_BACK bvi.h 79;" d -U_DELETE bvi.h 78;" d -U_EDIT bvi.h 75;" d -U_INSERT bvi.h 77;" d -U_TILDE bvi.h 81;" d -U_TRUNC bvi.h 76;" d -VERSION patchlevel.h 1;" d -WINDOW doscur.h 60;" d -WRITE comm.c 50;" d file: -WRITE comm.c 53;" d file: -XOR bvi.h 92;" d +BLOCK_SPECIAL bmore.h /^#define BLOCK_SPECIAL /;" d +BLOCK_SPECIAL bvi.h /^#define BLOCK_SPECIAL /;" d +BS bmore.h /^#define BS /;" d +BS bvi.h /^#define BS /;" d +BUFFER bmore.h /^#define BUFFER /;" d +BUFFER bvi.h /^#define BUFFER /;" d +BVICTRL bmore.h /^#define BVICTRL(/;" d +BVICTRL bvi.h /^#define BVICTRL(/;" d +CHARACTER_SPECIAL bmore.h /^#define CHARACTER_SPECIAL /;" d +CHARACTER_SPECIAL bvi.h /^#define CHARACTER_SPECIAL /;" d +CMDLNG bvi.h /^#define CMDLNG(/;" d +CMDSZ comm.c /^#define CMDSZ /;" d file: +COLS dosio.c /^int COLS = 80;$/;" v typeref:typename:int +CR bmore.h /^#define CR /;" d +CR bvi.h /^#define CR /;" d +DELIM bmore.h /^# define DELIM /;" d +DELIM bvi.h /^# define DELIM /;" d +DIRECTORY bmore.h /^#define DIRECTORY /;" d +DIRECTORY bvi.h /^#define DIRECTORY /;" d +ECHO dosio.c /^int ECHO = TRUE;$/;" v typeref:typename:int +END bmore.h /^#define END /;" d +END bvi.h /^#define END /;" d +ERR doscur.h /^#define ERR /;" d +ERROR bmore.h /^#define ERROR /;" d +ERROR bvi.h /^#define ERROR /;" d +ESC bmore.h /^#define ESC /;" d +ESC bvi.h /^#define ESC /;" d +ESC doscur.h /^#define ESC /;" d +FALSE bmore.h /^# define FALSE /;" d +FALSE bvi.h /^# define FALSE /;" d +FALSE doscur.h /^#define FALSE /;" d +FORWARD bmore.h /^#define FORWARD /;" d +FORWARD bvi.h /^#define FORWARD /;" d +HAVE_FCNTL_H dosconf.h /^#define HAVE_FCNTL_H /;" d +HAVE_LOCALE_H dosconf.h /^# define HAVE_LOCALE_H /;" d +HAVE_MEMMOVE dosconf.h /^#define HAVE_MEMMOVE /;" d +HAVE_STRDUP dosconf.h /^#define HAVE_STRDUP /;" d +HAVE_STRTOL dosconf.h /^#define HAVE_STRTOL /;" d +HELPFILE bmore.c /^# define HELPFILE /;" d file: +HEX bvi.h /^#define HEX /;" d +Home bm_unix.c /^char *Home; \/* go to home *\/$/;" v typeref:typename:char * +JOEHTG bvi.h /^#define JOEHTG$/;" d +KEY_BACKSPACE doscur.h /^#define KEY_BACKSPACE /;" d +KEY_DC doscur.h /^#define KEY_DC /;" d +KEY_DOWN doscur.h /^#define KEY_DOWN /;" d +KEY_ENTER doscur.h /^#define KEY_ENTER /;" d +KEY_F doscur.h /^#define KEY_F(/;" d +KEY_F0 doscur.h /^#define KEY_F0 /;" d +KEY_HOME doscur.h /^#define KEY_HOME /;" d +KEY_IC doscur.h /^#define KEY_IC /;" d +KEY_LEFT doscur.h /^#define KEY_LEFT /;" d +KEY_LL doscur.h /^#define KEY_LL /;" d +KEY_NPAGE doscur.h /^#define KEY_NPAGE /;" d +KEY_PPAGE doscur.h /^#define KEY_PPAGE /;" d +KEY_RETURN doscur.h /^#define KEY_RETURN /;" d +KEY_RIGHT doscur.h /^#define KEY_RIGHT /;" d +KEY_UP doscur.h /^#define KEY_UP /;" d +LINES dosio.c /^int LINES = 25;$/;" v typeref:typename:int +LROTATE bvi.h /^#define LROTATE /;" d +LSHIFT bvi.h /^#define LSHIFT /;" d +MAXCMD bmore.h /^#define MAXCMD /;" d +MAXCMD bvi.h /^#define MAXCMD /;" d +MAXNAME comm.c /^#define MAXNAME /;" d file: +MAX_ONE_ARG comm.c /^#define MAX_ONE_ARG /;" d file: +MAX_ONE_FILE comm.c /^#define MAX_ONE_FILE /;" d file: +NEG bvi.h /^#define NEG /;" d +NEW bmore.h /^#define NEW /;" d +NEW bvi.h /^#define NEW /;" d +NL bmore.h /^#define NL /;" d +NL bvi.h /^#define NL /;" d +NODEL dosio.c /^int NODEL = FALSE;$/;" v typeref:typename:int +NOT bvi.h /^#define NOT /;" d +NO_ADDR comm.c /^#define NO_ADDR /;" d file: +NO_ARG comm.c /^#define NO_ARG /;" d file: +NULL bmore.h /^# define NULL /;" d +NULL bvi.h /^# define NULL /;" d +OFF_T_MAX io.c /^# define OFF_T_MAX /;" d file: +ONE bmore.h /^#define ONE /;" d +ONE bvi.h /^#define ONE /;" d +ONE_ARG comm.c /^#define ONE_ARG /;" d file: +ONE_FILE comm.c /^#define ONE_FILE /;" d file: +OR bvi.h /^#define OR /;" d +P set.h /^#define P(/;" d +PARTIAL bmore.h /^#define PARTIAL /;" d +PARTIAL bvi.h /^#define PARTIAL /;" d +PRINTF bmore.c /^# define PRINTF /;" d file: +PTR bmore.h /^# define PTR /;" d +PTR bvi.h /^# define PTR /;" d +P_AW set.h /^#define P_AW /;" d +P_BOOL set.h /^#define P_BOOL /;" d +P_CHANGED set.h /^#define P_CHANGED /;" d +P_CM set.h /^#define P_CM /;" d +P_CO set.h /^#define P_CO /;" d +P_EB set.h /^#define P_EB /;" d +P_HL set.h /^#define P_HL /;" d +P_IC set.h /^#define P_IC /;" d +P_LI set.h /^#define P_LI /;" d +P_MA set.h /^#define P_MA /;" d +P_MM set.h /^#define P_MM /;" d +P_MO set.h /^#define P_MO /;" d +P_NUM set.h /^#define P_NUM /;" d +P_OF set.h /^#define P_OF /;" d +P_RE set.h /^#define P_RE /;" d +P_RO set.h /^#define P_RO /;" d +P_SS set.h /^#define P_SS /;" d +P_TE set.h /^#define P_TE /;" d +P_TEXT set.h /^#define P_TEXT /;" d +P_TT set.h /^#define P_TT /;" d +P_US set.h /^#define P_US /;" d +P_WL set.h /^#define P_WL /;" d +P_WS set.h /^#define P_WS /;" d +REGULAR bmore.h /^#define REGULAR /;" d +REGULAR bvi.h /^#define REGULAR /;" d +REPLACE bmore.h /^#define REPLACE /;" d +RROTATE bvi.h /^#define RROTATE /;" d +RSHIFT bvi.h /^#define RSHIFT /;" d +SEARCH bmore.h /^#define SEARCH /;" d +SEARCH bvi.h /^#define SEARCH /;" d +SKIP_WHITE bvi.h /^#define SKIP_WHITE /;" d +STAR bmore.h /^#define STAR /;" d +STAR bvi.h /^#define STAR /;" d +STDC_HEADERS dosconf.h /^#define STDC_HEADERS /;" d +S_GLOBAL bvi.h /^#define S_GLOBAL /;" d +S_ISBLK bvi.h /^#define S_ISBLK(/;" d +S_ISCHR bvi.h /^#define S_ISCHR(/;" d +S_ISDIR bvi.h /^#define S_ISDIR(/;" d +S_ISFIFO bvi.h /^#define S_ISFIFO(/;" d +S_ISREG bvi.h /^#define S_ISREG(/;" d +TBUFSIZ bm_dos.c /^#define TBUFSIZ /;" d file: +TBUFSIZ bm_unix.c /^#define TBUFSIZ /;" d file: +TRUE bmore.h /^# define TRUE /;" d +TRUE bvi.h /^# define TRUE /;" d +TRUE doscur.h /^#define TRUE /;" d +U_APPEND bvi.h /^#define U_APPEND /;" d +U_BACK bvi.h /^#define U_BACK /;" d +U_DELETE bvi.h /^#define U_DELETE /;" d +U_EDIT bvi.h /^#define U_EDIT /;" d +U_INSERT bvi.h /^#define U_INSERT /;" d +U_TILDE bvi.h /^#define U_TILDE /;" d +U_TRUNC bvi.h /^#define U_TRUNC /;" d +VERSION patchlevel.h /^#define VERSION /;" d +WINDOW doscur.h /^#define WINDOW /;" d +WRITE comm.c /^# define WRITE /;" d file: +XOR bvi.h /^#define XOR /;" d _block_datum bvi.h /^typedef enum _block_datum {$/;" g -act_pat re.c /^char act_pat[MAXCMD]; \/* found pattern *\/$/;" v -addch doscur.h 95;" d -addfile dosio.c /^addfile(char *fname)$/;" f +act_pat re.c /^char act_pat[MAXCMD]; \/* found pattern *\/$/;" v typeref:typename:char[] +addch doscur.h /^#define addch(/;" d addfile io.c /^addfile(fname)$/;" f -addr_flag comm.c /^int addr_flag;$/;" v -addr_form bmore.c /^char addr_form[15];$/;" v -addr_form bvi.c /^char addr_form[15];$/;" v -addstr doscur.h 99;" d -again recomp.c /^int again = 0;$/;" v -alloc_buf dosio.c /^alloc_buf(off_t n, char **buffer)$/;" f +addr_flag comm.c /^int addr_flag;$/;" v typeref:typename:int +addr_form bmore.c /^char addr_form[15];$/;" v typeref:typename:char[15] +addr_form bvi.c /^char addr_form[15];$/;" v typeref:typename:char[15] +addstr doscur.h /^#define addstr(/;" d +again recomp.c /^int again = 0;$/;" v typeref:typename:int alloc_buf io.c /^alloc_buf(n, buffer)$/;" f -altfile comm.c /^static char *altfile = NULL; \/* alternate file *\/$/;" v file: -ambigous comm.c /^char *ambigous = "Ambigous|Too many file names";$/;" v -ambvalue comm.c /^char *ambvalue = "Ambigous|Too many values";$/;" v -arrnum bmore.c /^int arrnum = 0;$/;" v -arrnum bvi.c /^int arrnum = 0;$/;" v +altfile comm.c /^static char *altfile = NULL; \/* alternate file *\/$/;" v typeref:typename:char * file: +ambigous comm.c /^char *ambigous = "Ambigous|Too many file names";$/;" v typeref:typename:char * +ambvalue comm.c /^char *ambvalue = "Ambigous|Too many values";$/;" v typeref:typename:char * +arrnum bmore.c /^int arrnum = 0;$/;" v typeref:typename:int +arrnum bvi.c /^int arrnum = 0;$/;" v typeref:typename:int ascii_comp recomp.c /^ascii_comp(smem, pattern)$/;" f -ascii_flag bmore.c /^int ascii_flag = 0;$/;" v -attrset dosio.c /^attrset(int attr)$/;" f +ascii_flag bmore.c /^int ascii_flag = 0;$/;" v typeref:typename:int +attrset dosio.c /^attrset(int attr)$/;" f typeref:typename:void backsearch re.c /^backsearch(start, mode)$/;" f -beep doscur.h 76;" d -block_begin bvi.c /^off_t block_begin, block_end, block_size;$/;" v +beep doscur.h /^#define beep(/;" d +block_begin bvi.c /^off_t block_begin, block_end, block_size;$/;" v typeref:typename:off_t block_datum bvi.h /^} block_datum;$/;" t typeref:enum:_block_datum -block_end bvi.c /^off_t block_begin, block_end, block_size;$/;" v -block_flag bvi.c /^int block_flag = 0;$/;" v -block_read io.c /^static off_t block_read;$/;" v file: -block_size bvi.c /^off_t block_begin, block_end, block_size;$/;" v -bmbeep bmore.c /^bmbeep() {$/;" f -bmore_search_pat bmore.c /^char bmore_search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v +block_end bvi.c /^off_t block_begin, block_end, block_size;$/;" v typeref:typename:off_t +block_flag bvi.c /^int block_flag = 0;$/;" v typeref:typename:int +block_read io.c /^static off_t block_read;$/;" v typeref:typename:off_t file: +block_size bvi.c /^off_t block_begin, block_end, block_size;$/;" v typeref:typename:off_t +bmbeep bmore.c /^bmbeep() {$/;" f typeref:typename:void +bmore_search_pat bmore.c /^char bmore_search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v typeref:typename:char[] bmregexec bmore.c /^bmregexec(scan)$/;" f bmsearch bmore.c /^bmsearch(ch)$/;" f bregexec re.c /^bregexec(start, scan)$/;" f buf comm.c /^static struct stat buf;$/;" v typeref:struct:stat file: buf dosio.c /^static struct stat buf;$/;" v typeref:struct:stat file: buf io.c /^static struct stat buf;$/;" v typeref:struct:stat file: -buf set.c /^static char buf[MAXCMD+1];$/;" v file: -buffer1 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v -buffer2 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v -bvi_init dosio.c /^bvi_init(char *dir)$/;" f +buf set.c /^static char buf[MAXCMD+1];$/;" v typeref:typename:char[] file: +buffer1 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v typeref:typename:char[] +buffer2 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v typeref:typename:char[] bvi_init io.c /^bvi_init(dir)$/;" f -bytepos bmore.c /^off_t bytepos, oldpos;$/;" v -c_argc comm.c /^static int c_argc = 0;$/;" v file: -c_argv comm.c /^static char *c_argv[9];$/;" v file: -c_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v +bytepos bmore.c /^off_t bytepos, oldpos;$/;" v typeref:typename:off_t +c_argc comm.c /^static int c_argc = 0;$/;" v typeref:typename:int file: +c_argv comm.c /^static char *c_argv[9];$/;" v typeref:typename:char * [9] file: +c_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v typeref:typename:int calc_addr re.c /^calc_addr(pointer, def_addr)$/;" f calc_size bvi.c /^calc_size(arg)$/;" f -cbreak doscur.h 136;" d +cbreak doscur.h /^#define cbreak(/;" d chk_comm comm.c /^chk_comm(flag)$/;" f -chtype doscur.h 58;" d -clear doscur.h 83;" d -clear_marks edit.c /^clear_marks()$/;" f -clear_sc bm_unix.c /^char *clear_sc; \/* clear screen *\/$/;" v -clearscreen bm_dos.c /^clearscreen()$/;" f -clearscreen bm_unix.c /^clearscreen()$/;" f -clearstr comm.c /^clearstr()$/;" f +chtype doscur.h /^#define chtype /;" d +clear doscur.h /^#define clear(/;" d +clear_marks edit.c /^clear_marks()$/;" f typeref:typename:void +clear_sc bm_unix.c /^char *clear_sc; \/* clear screen *\/$/;" v typeref:typename:char * +clearscreen bm_dos.c /^clearscreen()$/;" f typeref:typename:void +clearscreen bm_unix.c /^clearscreen()$/;" f typeref:typename:void +clearstr comm.c /^clearstr()$/;" f typeref:typename:void cleartoeol bm_dos.c /^cleartoeol()$/;" f -cleartoeol bm_unix.c /^cleartoeol()$/;" f -clrtoeol doscur.h 79;" d -cmdbuf bmore.c /^static char cmdbuf[MAXCMD];$/;" v file: -cmdstr bvi.c /^char cmdstr[MAXCMD+1] = "";$/;" v -cnt bmore.c /^static int cnt = 0;$/;" v file: -contrd edit.c /^char contrd[][4] = {"NUL", " ^A", " ^B", " ^C", " ^D", " ^E", " ^F", "BEL",$/;" v -contru edit.c /^char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",$/;" v -copyright bmore.c /^char *copyright = "GPL (C) 1990-2019 by Gerhard Buergmann";$/;" v -copyright bvi.c /^char *copyright = "(C) GPL 1996-2019 by Gerhard Buergmann";$/;" v -corr bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v -cur_back edit.c /^cur_back()$/;" f +cleartoeol bm_unix.c /^cleartoeol()$/;" f typeref:typename:void +clrtoeol doscur.h /^#define clrtoeol(/;" d +cmdbuf bmore.c /^static char cmdbuf[2 * MAXCMD];$/;" v typeref:typename:char[] file: +cmdstr bvi.c /^char cmdstr[MAXCMD+1] = "";$/;" v typeref:typename:char[] +cnt bmore.c /^static int cnt = 0;$/;" v typeref:typename:int file: +contrd edit.c /^char contrd[][4] = {"NUL", " ^A", " ^B", " ^C", " ^D", " ^E", " ^F", "BEL",$/;" v typeref:typename:char[][4] +contru edit.c /^char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",$/;" v typeref:typename:char[][4] +copyright bmore.c /^char *copyright = "GPL (C) 1990-2022 by Gerhard Buergmann";$/;" v typeref:typename:char * +copyright bvi.c /^char *copyright = "(C) GPL 1996-2023 by Gerhard Buergmann";$/;" v typeref:typename:char * +corr bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v typeref:typename:int +cur_back edit.c /^cur_back()$/;" f typeref:typename:int cur_forw edit.c /^cur_forw(check)$/;" f -curfile bvi.c /^int curfile; \/* number of the current file *\/$/;" v -curpos bvi.c /^PTR curpos;$/;" v -curr_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v -current bvi.c /^PTR current;$/;" v -current_start bvi.c /^PTR current_start;$/;" v -d_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v -d_memcpy dosio.c /^d_memcpy(PTR dest, PTR src, off_t n)$/;" f -d_memmove dosio.c /^d_memmove(PTR dest, PTR src, off_t n)$/;" f -dbug bm_dos.c /^FILE *dbug;$/;" v -delch dosio.c /^delch()$/;" f -deleteln doscur.h 110;" d -dlines bm_unix.c /^int dum_opt, dlines;$/;" v +curfile bvi.c /^int curfile; \/* number of the current file *\/$/;" v typeref:typename:int +curpos bvi.c /^PTR curpos;$/;" v typeref:typename:PTR +curr_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v typeref:typename:FILE * +current bvi.c /^PTR current;$/;" v typeref:typename:PTR +current_start bvi.c /^PTR current_start;$/;" v typeref:typename:PTR +d_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v typeref:typename:int +dbug bm_dos.c /^FILE *dbug;$/;" v typeref:typename:FILE * +delch dosio.c /^delch()$/;" f typeref:typename:void +deleteln doscur.h /^#define deleteln(/;" d +dlines bm_unix.c /^int dum_opt, dlines;$/;" v typeref:typename:int do_append bvi.c /^do_append(count, buf)$/;" f do_back edit.c /^do_back(n, start)$/;" f do_delete edit.c /^do_delete(n, start)$/;" f -do_exit comm.c /^do_exit()$/;" f +do_exit comm.c /^do_exit()$/;" f typeref:typename:void do_ft edit.c /^do_ft(ch, flag)$/;" f -do_header bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v +do_header bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v typeref:typename:int do_ins_chg edit.c /^do_ins_chg(start, arg, mode)$/;" f do_logic set.c /^do_logic(mode, str)$/;" f do_mark edit.c /^do_mark(mark, addr)$/;" f do_next bmore.c /^do_next(n)$/;" f do_over bvi.c /^do_over(loc, n, buf)$/;" f do_put bvi.c /^do_put(loc, n, buf)$/;" f -do_shell dosio.c /^do_shell()$/;" f -do_shell io.c /^do_shell()$/;" f +do_shell io.c /^do_shell()$/;" f typeref:typename:void do_substitution re.c /^do_substitution(delim, line, startpos, endpos)$/;" f do_tilde bvi.c /^do_tilde(count)$/;" f -do_undo bvi.c /^do_undo()$/;" f +do_undo bvi.c /^do_undo()$/;" f typeref:typename:void do_z edit.c /^do_z(mode)$/;" f docmdline comm.c /^docmdline(cmdline)$/;" f doecmd comm.c /^doecmd(arg, force)$/;" f doset set.c /^doset(arg)$/;" f doshell bm_dos.c /^doshell(cmd)$/;" f doshell bm_unix.c /^doshell(cmd)$/;" f -doupdate doscur.h 143;" d -dum_opt bm_unix.c /^int dum_opt, dlines;$/;" v -dup_print_flag bmore.c /^int dup_print_flag = 0;$/;" v -echo doscur.h 128;" d +doupdate doscur.h /^#define doupdate(/;" d +dum_opt bm_unix.c /^int dum_opt, dlines;$/;" v typeref:typename:int +dup_print_flag bmore.c /^int dup_print_flag = 0;$/;" v typeref:typename:int +echo doscur.h /^#define echo(/;" d edit edit.c /^edit(mode)$/;" f -edits bvi.c /^int edits = 0;$/;" v -emptyclass bmore.c /^char *emptyclass = "Empty byte class '[]' or '[^]'";$/;" v -emptyclass re.c /^char *emptyclass = "Bad character class|Empty byte class '[]' or '[^]' cannot match";$/;" v +edits bvi.c /^int edits = 0;$/;" v typeref:typename:int +emptyclass bmore.c /^char *emptyclass = "Empty byte class '[]' or '[^]'";$/;" v typeref:typename:char * +emptyclass re.c /^char *emptyclass = "Bad character class|Empty byte class '[]' or '[^]' cannot match";$/;" v typeref:typename:char * emsg bmore.c /^emsg(s)$/;" f emsg comm.c /^emsg(s)$/;" f -end_addr comm.c /^PTR end_addr;$/;" v +end_addr comm.c /^PTR end_addr;$/;" v typeref:typename:PTR end_word re.c /^end_word(start)$/;" f -endwin doscur.h 137;" d -enlarge dosio.c /^enlarge(off_t add)$/;" f +endwin doscur.h /^#define endwin(/;" d enlarge io.c /^enlarge(add)$/;" f -env bvi.c /^jmp_buf env; \/* context for `longjmp' function *\/$/;" v -erase doscur.h 81;" d -erase_ln bm_unix.c /^char *erase_ln; \/* erase line *\/$/;" v -erasechar doscur.h 75;" d -estring bmore.c /^char estring[MAXCMD] = ""; \/* string for shell escape *\/$/;" v -extra comm.c /^char *extra = "Extra chars|Extra characters at end of command";$/;" v -exval bmore.c /^int exval = 0;$/;" v -fbuf set.c /^static char fbuf[MAXCMD+1];$/;" v file: -ffp set.c /^static FILE *ffp;$/;" v file: -file_nr bmore.c /^int file_nr = 0; \/* number of current input file *\/$/;" v +env bvi.c /^jmp_buf env; \/* context for `longjmp' function *\/$/;" v typeref:typename:jmp_buf +erase doscur.h /^#define erase(/;" d +erase_ln bm_unix.c /^char *erase_ln; \/* erase line *\/$/;" v typeref:typename:char * +erasechar doscur.h /^#define erasechar(/;" d +estring bmore.c /^char estring[MAXCMD] = ""; \/* string for shell escape *\/$/;" v typeref:typename:char[] +extra comm.c /^char *extra = "Extra chars|Extra characters at end of command";$/;" v typeref:typename:char * +exval bmore.c /^int exval = 0;$/;" v typeref:typename:int +fbuf set.c /^static char fbuf[MAXCMD+1];$/;" v typeref:typename:char[] file: +ffp set.c /^static FILE *ffp;$/;" v typeref:typename:FILE * file: +file_nr bmore.c /^int file_nr = 0; \/* number of current input file *\/$/;" v typeref:typename:int fileinfo edit.c /^fileinfo(fname)$/;" f -filemode dosio.c /^int filemode;$/;" v -filemode io.c /^int filemode;$/;" v -files bmore.c /^char **files; \/* list of input files *\/$/;" v -files bvi.c /^char **files; \/* list of input files *\/$/;" v -filesize bmore.c /^off_t screen_home, filesize;$/;" v -filesize bvi.c /^off_t filesize, memsize, undosize;$/;" v -flags set.h /^ int flags;$/;" m struct:param -flash doscur.h 77;" d -flushinp doscur.h 120;" d -fname_buf bvi.c /^char *fname_buf = NULL;$/;" v -fnum bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v -from_file set.c /^static int from_file = 0;$/;" v file: +filemode dosio.c /^int filemode;$/;" v typeref:typename:int +filemode io.c /^int filemode;$/;" v typeref:typename:int +files bmore.c /^char **files; \/* list of input files *\/$/;" v typeref:typename:char ** +files bvi.c /^char **files; \/* list of input files *\/$/;" v typeref:typename:char ** +filesize bmore.c /^off_t screen_home, filesize;$/;" v typeref:typename:off_t +filesize bvi.c /^off_t filesize, memsize, undosize;$/;" v typeref:typename:off_t +flags set.h /^ int flags;$/;" m struct:param typeref:typename:int +flash doscur.h /^#define flash(/;" d +flushinp doscur.h /^#define flushinp(/;" d +fname_buf bvi.c /^char *fname_buf = NULL;$/;" v typeref:typename:char * +fnum bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v typeref:typename:int +from_file set.c /^static int from_file = 0;$/;" v typeref:typename:int file: fsearch re.c /^fsearch(start, end, smem)$/;" f fsearch_end re.c /^fsearch_end(start, end, smem, s_end)$/;" f -fullname set.h /^ char *fullname; \/* full parameter name *\/$/;" m struct:param -getbegyx doscur.h 105;" d -getcbuff edit.c /^static char getcbuff[BUFFER];$/;" v file: -getch dosio.c /^getch()$/;" f +fullname set.h /^ char *fullname; \/* full parameter name *\/$/;" m struct:param typeref:typename:char * +getbegyx doscur.h /^#define getbegyx(/;" d +getcbuff edit.c /^static char getcbuff[BUFFER];$/;" v typeref:typename:char[] file: +getch dosio.c /^getch()$/;" f typeref:typename:int getcmdstr set.c /^getcmdstr(p, x)$/;" f -getcnext edit.c /^static char *getcnext = NULL;$/;" v file: -getmaxyx doscur.h 106;" d -getyx doscur.h 104;" d -got_int bm_dos.c /^int got_int;$/;" v -got_int bm_unix.c /^int got_int;$/;" v -help_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v -helppath bmore.c /^char helppath[MAXCMD];$/;" v +getcnext edit.c /^static char *getcnext = NULL;$/;" v typeref:typename:char * file: +getmaxyx doscur.h /^#define getmaxyx(/;" d +getyx doscur.h /^#define getyx(/;" d +got_int bm_dos.c /^int got_int;$/;" v typeref:typename:int +got_int bm_unix.c /^int got_int;$/;" v typeref:typename:int +help_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v typeref:typename:FILE * +helppath bmore.c /^char helppath[MAXCMD];$/;" v typeref:typename:char[] hex_comp recomp.c /^hex_comp(smem, pattern)$/;" f -hexchar recomp.c /^hexchar()$/;" f -highlight bm_dos.c /^highlight()$/;" f -highlight bm_unix.c /^highlight()$/;" f -hl_spat edit.c /^long hl_spat = 0;$/;" v -home bm_dos.c /^home()$/;" f -home bm_unix.c /^home()$/;" f -icnt bmore.c /^static int icnt = 0;$/;" v file: -idlok doscur.h 141;" d -ignore_case recomp.c /^int ignore_case = 0;$/;" v -inch dosio.c /^inch()$/;" f -init_byte bmore.c /^off_t init_byte = 0;$/;" v -init_search bmore.c /^int init_search = 0;$/;" v -initscr doscur.h 73;" d -initterm bm_dos.c /^initterm()$/;" f -initterm bm_unix.c /^initterm()$/;" f -insch dosio.c /^insch(int c)$/;" f -insertln doscur.h 108;" d +hexchar recomp.c /^hexchar()$/;" f typeref:typename:int +highlight bm_dos.c /^highlight()$/;" f typeref:typename:void +highlight bm_unix.c /^highlight()$/;" f typeref:typename:void +hl_spat edit.c /^long hl_spat = 0;$/;" v typeref:typename:long +home bm_dos.c /^home()$/;" f typeref:typename:void +home bm_unix.c /^home()$/;" f typeref:typename:void +icnt bmore.c /^static int icnt = 0;$/;" v typeref:typename:int file: +idlok doscur.h /^#define idlok(/;" d +ignore_case recomp.c /^int ignore_case = 0;$/;" v typeref:typename:int +inch dosio.c /^inch()$/;" f typeref:typename:int +init_byte bmore.c /^off_t init_byte = 0;$/;" v typeref:typename:off_t +init_search bmore.c /^int init_search = 0;$/;" v typeref:typename:int +initscr doscur.h /^#define initscr(/;" d +initterm bm_dos.c /^initterm()$/;" f typeref:typename:void +initterm bm_unix.c /^initterm()$/;" f typeref:typename:void +insch dosio.c /^insch(int c)$/;" f typeref:typename:void +insertln doscur.h /^#define insertln(/;" d jmpproc bvi.c /^jmpproc(sig)$/;" f -keypad doscur.h 133;" d -last_motion bvi.c /^PTR last_motion;$/;" v -last_search bmore.c /^off_t last_search = 0;$/;" v -linbuf edit.c /^char linbuf[16384];$/;" v -line bvi.c /^static char line[MAXCMD+1];$/;" v file: -lineout edit.c /^lineout()$/;" f -load dosio.c /^load(char *fname)$/;" f +keypad doscur.h /^#define keypad(/;" d +last_motion bvi.c /^PTR last_motion;$/;" v typeref:typename:PTR +last_search bmore.c /^off_t last_search = 0;$/;" v typeref:typename:off_t +linbuf edit.c /^char linbuf[16384];$/;" v typeref:typename:char[16384] +line bvi.c /^static char line[MAXCMD+1];$/;" v typeref:typename:char[] file: +lineout edit.c /^lineout()$/;" f typeref:typename:int +load dosio.c /^load(char *fname)$/;" f typeref:typename:off_t load io.c /^load(fname)$/;" f -loc bvi.c /^int loc;$/;" v -magic recomp.c /^int magic = 1;$/;" v +loc bvi.c /^int loc;$/;" v typeref:typename:int +magic recomp.c /^int magic = 1;$/;" v typeref:typename:int main bmore.c /^main(argc, argv)$/;" f main bvi.c /^main(argc, argv)$/;" f -mark bvi.c /^static int mark;$/;" v file: -markbuf bvi.c /^PTR markbuf[26];$/;" v -maxpos bvi.c /^PTR maxpos;$/;" v -maxx bmore.c /^int maxx, maxy;$/;" v -maxx bvi.c /^int maxx, maxy, x, xx, y;$/;" v -maxy bmore.c /^int maxx, maxy;$/;" v -maxy bvi.c /^int maxx, maxy, x, xx, y;$/;" v -mem bvi.c /^PTR mem = NULL;$/;" v -memcpy bvi.h 126;" d +mark bvi.c /^static int mark;$/;" v typeref:typename:int file: +markbuf bvi.c /^PTR markbuf[26];$/;" v typeref:typename:PTR[26] +maxpos bvi.c /^PTR maxpos;$/;" v typeref:typename:PTR +maxx bmore.c /^int maxx, maxy;$/;" v typeref:typename:int +maxx bvi.c /^int maxx, maxy, x, xx, y;$/;" v typeref:typename:int +maxy bmore.c /^int maxx, maxy;$/;" v typeref:typename:int +maxy bvi.c /^int maxx, maxy, x, xx, y;$/;" v typeref:typename:int +mem bvi.c /^PTR mem = NULL;$/;" v typeref:typename:PTR +memcpy bvi.h /^# define memcpy /;" d memmove bm_unix.c /^memmove(s1, s2, n)$/;" f -memmove bvi.h 127;" d +memmove bvi.h /^# define memmove /;" d memmove io.c /^memmove(s1, s2, n)$/;" f -memsize bvi.c /^off_t filesize, memsize, undosize;$/;" v -morefiles comm.c /^char *morefiles = "more files@to edit";$/;" v -move doscur.h 91;" d -movebyte edit.c /^movebyte()$/;" f +memsize bvi.c /^off_t filesize, memsize, undosize;$/;" v typeref:typename:off_t +morefiles comm.c /^char *morefiles = "more files@to edit";$/;" v typeref:typename:char * +move doscur.h /^#define move(/;" d +movebyte edit.c /^movebyte()$/;" f typeref:typename:void msg comm.c /^msg(s)$/;" f -mvaddch doscur.h 93;" d -mvaddstr doscur.h 97;" d -mvgetch doscur.h 112;" d -mvgetstr doscur.h 115;" d -mvinch dosio.c /^mvinch(int y, int x)$/;" f -mvinsch doscur.h 125;" d -mvprintw doscur.h 101;" d -mvscanw doscur.h 122;" d -mvwaddch doscur.h 92;" d -mvwaddstr doscur.h 96;" d -mvwgetch doscur.h 111;" d -mvwgetstr doscur.h 114;" d -mvwprintw doscur.h 100;" d -mvwscanw doscur.h 121;" d -mymaxx bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v -mymaxy bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v -name bmore.c /^char *name = NULL;$/;" v -name bvi.c /^char *name = NULL;$/;" v -new_screen edit.c /^new_screen()$/;" f -newwin doscur.h 74;" d -nextchar bmore.c /^nextchar()$/;" f -nl doscur.h 131;" d -no_intty bm_dos.c /^int no_intty, no_tty;$/;" v -no_intty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v -no_tty bm_dos.c /^int no_intty, no_tty;$/;" v -no_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v -noaddr comm.c /^char *noaddr = "No address allowed@on this command";$/;" v -nobytes bvi.c /^char *nobytes = "No bytes@in the buffer";$/;" v -nodelay doscur.h 127;" d -noecho doscur.h 129;" d -nonl doscur.h 132;" d -noprev re.c /^char *noprev = "No previous expression";$/;" v -noraw doscur.h 139;" d -normal bm_dos.c /^normal()$/;" f -normal bm_unix.c /^normal()$/;" f -notfound re.c /^char *notfound = "Fail|Pattern not found";$/;" v -notimeout doscur.h 140;" d -noval comm.c /^char *noval = "No value@for binary operation";$/;" v -nowrtmsg comm.c /^char *nowrtmsg = "No write@since last change (:%s! overrides)";$/;" v -nstate bm_unix.c /^struct termios ostate, nstate;$/;" v typeref:struct: -numarr bmore.c /^char numarr[64]; \/* string for collecting number *\/$/;" v -numarr bvi.c /^char numarr[MAXCMD+1]; \/* string for collecting number *\/$/;" v -numfiles bmore.c /^int numfiles; \/* number of input files *\/$/;" v -numfiles bvi.c /^int numfiles; \/* number of input files *\/$/;" v -nvalue set.h /^ off_t nvalue;$/;" m struct:param -off_t bmore.h 106;" d -off_t bvi.h 122;" d -oldbuf comm.c /^static char oldbuf[CMDSZ]; \/** for :!! command **\/$/;" v file: -oldpos bmore.c /^off_t bytepos, oldpos;$/;" v +mvaddch doscur.h /^#define mvaddch(/;" d +mvaddstr doscur.h /^#define mvaddstr(/;" d +mvgetch doscur.h /^#define mvgetch(/;" d +mvgetstr doscur.h /^#define mvgetstr(/;" d +mvinch dosio.c /^mvinch(int y, int x)$/;" f typeref:typename:int +mvinsch doscur.h /^#define mvinsch(/;" d +mvprintw doscur.h /^#define mvprintw(/;" d +mvscanw doscur.h /^#define mvscanw(/;" d +mvwaddch doscur.h /^#define mvwaddch(/;" d +mvwaddstr doscur.h /^#define mvwaddstr(/;" d +mvwgetch doscur.h /^#define mvwgetch(/;" d +mvwgetstr doscur.h /^#define mvwgetstr(/;" d +mvwprintw doscur.h /^#define mvwprintw(/;" d +mvwscanw doscur.h /^#define mvwscanw(/;" d +mymaxx bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v typeref:typename:int +mymaxy bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v typeref:typename:int +name bmore.c /^char *name = NULL;$/;" v typeref:typename:char * +name bvi.c /^char *name = NULL;$/;" v typeref:typename:char * +new_screen edit.c /^new_screen()$/;" f typeref:typename:void +newwin doscur.h /^#define newwin(/;" d +nextchar bmore.c /^nextchar()$/;" f typeref:typename:int +nl doscur.h /^#define nl(/;" d +no_intty bm_dos.c /^int no_intty, no_tty;$/;" v typeref:typename:int +no_intty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v typeref:typename:int +no_tty bm_dos.c /^int no_intty, no_tty;$/;" v typeref:typename:int +no_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v typeref:typename:int +noaddr comm.c /^char *noaddr = "No address allowed@on this command";$/;" v typeref:typename:char * +nobytes bvi.c /^char *nobytes = "No bytes@in the buffer";$/;" v typeref:typename:char * +nodelay doscur.h /^#define nodelay(/;" d +noecho doscur.h /^#define noecho(/;" d +nonl doscur.h /^#define nonl(/;" d +noprev re.c /^char *noprev = "No previous expression";$/;" v typeref:typename:char * +noraw doscur.h /^#define noraw(/;" d +normal bm_dos.c /^normal()$/;" f typeref:typename:void +normal bm_unix.c /^normal()$/;" f typeref:typename:void +notfound re.c /^char *notfound = "Fail|Pattern not found";$/;" v typeref:typename:char * +notimeout doscur.h /^#define notimeout(/;" d +noval comm.c /^char *noval = "No value@for binary operation";$/;" v typeref:typename:char * +nowrtmsg comm.c /^char *nowrtmsg = "No write@since last change (:%s! overrides)";$/;" v typeref:typename:char * +nstate bm_unix.c /^struct termios ostate, nstate;$/;" v typeref:struct:termios +numarr bmore.c /^char numarr[64]; \/* string for collecting number *\/$/;" v typeref:typename:char[64] +numarr bvi.c /^char numarr[MAXCMD+1]; \/* string for collecting number *\/$/;" v typeref:typename:char[] +numfiles bmore.c /^int numfiles; \/* number of input files *\/$/;" v typeref:typename:int +numfiles bvi.c /^int numfiles; \/* number of input files *\/$/;" v typeref:typename:int +nvalue set.h /^ off_t nvalue;$/;" m struct:param typeref:typename:off_t +off_t bmore.h /^# define off_t /;" d +off_t bvi.h /^# define off_t /;" d +oldbuf comm.c /^static char oldbuf[CMDSZ + 3]; \/** for :!! command **\/$/;" v typeref:typename:char[] file: +oldpos bmore.c /^off_t bytepos, oldpos;$/;" v typeref:typename:off_t open_file bmore.c /^open_file(name)$/;" f ostate bm_unix.c /^struct termios ostate, nstate;$/;" v typeref:struct:termios -out_len bmore.c /^int out_len;$/;" v +out_len bmore.c /^int out_len;$/;" v typeref:typename:int outmsg comm.c /^outmsg(s)$/;" f -pagepos bvi.c /^PTR pagepos;$/;" v +pagepos bvi.c /^PTR pagepos;$/;" v typeref:typename:PTR param set.h /^struct param {$/;" s -params set.c /^struct param params[] = {$/;" v typeref:struct:param +params set.c /^struct param params[] = {$/;" v typeref:struct:param[] patcpy re.c /^patcpy(s1, s2, delim)$/;" f -pattern re.c /^char pattern[MAXCMD + 1];$/;" v -poi recomp.c /^char *poi;$/;" v -precount bmore.c /^long precount = -1; \/* number preceding command *\/$/;" v -precount bvi.c /^long precount = -1;$/;" v +pattern re.c /^char pattern[MAXCMD + 1];$/;" v typeref:typename:char[] +poi recomp.c /^char *poi;$/;" v typeref:typename:char * +precount bmore.c /^long precount = -1; \/* number preceding command *\/$/;" v typeref:typename:long +precount bvi.c /^long precount = -1;$/;" v typeref:typename:long printline edit.c /^printline(mempos, scpos)$/;" f printout bmore.c /^printout(lns)$/;" f -printw doscur.h 103;" d -progname bmore.c /^static char progname[10];$/;" v file: -progname bvi.c /^static char progname[8];$/;" v file: -prompt bmore.c /^int prompt = 1;$/;" v +printw doscur.h /^#define printw /;" d +progname bmore.c /^static char progname[10];$/;" v typeref:typename:char[10] file: +progname bvi.c /^static char progname[8];$/;" v typeref:typename:char[8] file: +prompt bmore.c /^int prompt = 1;$/;" v typeref:typename:int pushback bmore.c /^pushback(n, where)$/;" f putchr bm_unix.c /^putchr(ch)$/;" f -putchr bm_unix.c /^putchr(char ch)$/;" f +putchr bm_unix.c /^putchr(char ch)$/;" f typeref:typename:int putline bmore.c /^putline(buf, num)$/;" f -quit edit.c /^quit()$/;" f -r_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v +quit edit.c /^quit()$/;" f typeref:typename:void +r_flag bmore.c /^int c_flag = 0, d_flag = 0, r_flag = 0;$/;" v typeref:typename:int range bvi.c /^range(ch)$/;" f -raw doscur.h 138;" d +raw doscur.h /^#define raw(/;" d rdline bmore.c /^rdline(ch, sstring)$/;" f read_rc set.c /^read_rc(fn)$/;" f -refresh doscur.h 134;" d -rep_buf bvi.c /^char rep_buf[BUFFER];$/;" v -repaint edit.c /^repaint() \/***** redraw screen *********************\/$/;" f -repl_count comm.c /^int repl_count = -1;$/;" v -reset_tty bm_dos.c /^reset_tty ()$/;" f -reset_tty bm_unix.c /^reset_tty()$/;" f -resetty doscur.h 145;" d -rev_end bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v -rev_start bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v +read_to_end io.c /^read_to_end(int fd, void *buf, size_t count) {$/;" f typeref:typename:ssize_t file: +refresh doscur.h /^#define refresh(/;" d +rep_buf bvi.c /^char rep_buf[BUFFER];$/;" v typeref:typename:char[] +repaint edit.c /^repaint() \/***** redraw screen *********************\/$/;" f typeref:typename:void +repl_count comm.c /^int repl_count = -1;$/;" v typeref:typename:int +reset_tty bm_dos.c /^reset_tty ()$/;" f typeref:typename:void +reset_tty bm_unix.c /^reset_tty()$/;" f typeref:typename:void +resetty doscur.h /^#define resetty(/;" d +rev_end bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v typeref:typename:char * +rev_start bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v typeref:typename:char * rsearch re.c /^rsearch(start, end, smem)$/;" f -save dosio.c /^save(char *fname, PTR start, PTR end, int flags)$/;" f +save dosio.c /^save(char *fname, PTR start, PTR end, int flags)$/;" f typeref:typename:int save io.c /^save(fname, start, end, flags)$/;" f save_chk comm.c /^save_chk(fname, start, end, flags)$/;" f -savetty doscur.h 144;" d +savetty doscur.h /^#define savetty(/;" d sbracket bmore.c /^sbracket(start, scan, count)$/;" f sbracket re.c /^sbracket(start, scan, count)$/;" f file: -scanw doscur.h 124;" d +scanw doscur.h /^#define scanw /;" d scr dosio.c /^struct WINDOW scr;$/;" v typeref:struct:WINDOW -screen bvi.c /^int screen, status, statsize;$/;" v -screen_home bmore.c /^off_t screen_home, filesize;$/;" v +screen bvi.c /^int screen, status, statsize;$/;" v typeref:typename:int +screen_home bmore.c /^off_t screen_home, filesize;$/;" v typeref:typename:off_t scrolldown edit.c /^scrolldown(lns)$/;" f -scrollok doscur.h 142;" d +scrollok doscur.h /^#define scrollok(/;" d scrollup edit.c /^scrollup(lns)$/;" f -search_pat re.c /^char search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v +search_pat re.c /^char search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v typeref:typename:char[] searching re.c /^searching(ch, line, startpos, endpos, flag)$/;" f -set_tty bm_dos.c /^set_tty ()$/;" f -set_tty bm_unix.c /^set_tty()$/;" f -setcur edit.c /^setcur()$/;" f +set_tty bm_dos.c /^set_tty ()$/;" f typeref:typename:void +set_tty bm_unix.c /^set_tty()$/;" f typeref:typename:void +setcur edit.c /^setcur()$/;" f typeref:typename:void setpage edit.c /^setpage(addr)$/;" f -shell bvi.c /^char *shell;$/;" v -shortname set.h /^ char *shortname; \/* permissible abbreviation *\/$/;" m struct:param +shell bvi.c /^char *shell;$/;" v typeref:typename:char * +shortname set.h /^ char *shortname; \/* permissible abbreviation *\/$/;" m struct:param typeref:typename:char * showparms set.c /^showparms(all)$/;" f -sig bm_dos.c /^sig()$/;" f +sig bm_dos.c /^sig()$/;" f typeref:typename:void sig bm_unix.c /^sig(sig)$/;" f -size bvi.c /^off_t size;$/;" v -slow_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v -smode bmore.c /^static int smode;$/;" v file: -smode recomp.c /^int smode;$/;" v +size bvi.c /^off_t size;$/;" v typeref:typename:off_t +slow_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v typeref:typename:int +smode bmore.c /^static int smode;$/;" v typeref:typename:int file: +smode recomp.c /^int smode;$/;" v typeref:typename:int smsg comm.c /^smsg(s)$/;" f -spos bvi.c /^PTR spos;$/;" v -sstring bmore.c /^char sstring[MAXCMD] = ""; \/* string for search *\/$/;" v -standend doscur.h 89;" d -standout doscur.h 88;" d -start_addr comm.c /^PTR start_addr;$/;" v -statpos edit.c /^statpos()$/;" f -statsize bvi.c /^int screen, status, statsize;$/;" v -status bvi.c /^int screen, status, statsize;$/;" v -stdscr dosio.c /^int stdscr = 0;$/;" v -strcasecmp bmore.h 109;" d -strcasecmp bvi.h 125;" d +spos bvi.c /^PTR spos;$/;" v typeref:typename:PTR +sstring bmore.c /^char sstring[MAXCMD] = ""; \/* string for search *\/$/;" v typeref:typename:char[] +standend doscur.h /^#define standend(/;" d +standout doscur.h /^#define standout(/;" d +start_addr comm.c /^PTR start_addr;$/;" v typeref:typename:PTR +statpos edit.c /^statpos()$/;" f typeref:typename:void +statsize bvi.c /^int screen, status, statsize;$/;" v typeref:typename:int +status bvi.c /^int screen, status, statsize;$/;" v typeref:typename:int +stdscr dosio.c /^int stdscr = 0;$/;" v typeref:typename:int +strcasecmp bmore.h /^# define strcasecmp /;" d +strcasecmp bvi.h /^# define strcasecmp /;" d strdup io.c /^strdup(s)$/;" f -string bmore.c /^char string[MAXCMD];$/;" v -string bvi.c /^char string[MAXCMD+1];$/;" v -strncasecmp bmore.h 108;" d -strncasecmp bvi.h 124;" d -stty bm_unix.c 34;" d file: +string bmore.c /^char string[MAXCMD];$/;" v typeref:typename:char[] +string bvi.c /^char string[MAXCMD+1];$/;" v typeref:typename:char[] +strncasecmp bmore.h /^# define strncasecmp /;" d +strncasecmp bvi.h /^# define strncasecmp /;" d +stty bm_unix.c /^#define stty(/;" d file: stuffin edit.c /^stuffin(s)$/;" f -svalue set.h /^ char *svalue;$/;" m struct:param +svalue set.h /^ char *svalue;$/;" m struct:param typeref:typename:char * sysemsg comm.c /^sysemsg(s)$/;" f -terminal dosio.c /^char *terminal = "ansi";$/;" v -terminal io.c /^char *terminal;$/;" v -tmpbuf edit.c /^char tmpbuf[10];$/;" v -to_print bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v -toggle edit.c /^toggle()$/;" f -trunc_cur bvi.c /^trunc_cur()$/;" f -undo_buf bvi.c /^char *undo_buf = NULL;$/;" v -undo_count bvi.c /^off_t undo_count;$/;" v -undo_start bvi.c /^PTR undo_start;$/;" v -undosize bvi.c /^off_t filesize, memsize, undosize;$/;" v -usage bmore.c /^usage()$/;" f -usage bvi.c /^usage()$/;" f -vgetc bm_dos.c /^vgetc()$/;" f -vgetc bm_unix.c /^vgetc()$/;" f -vgetc edit.c /^vgetc()$/;" f -waddch doscur.h 94;" d -waddstr doscur.h 98;" d +terminal dosio.c /^char *terminal = "ansi";$/;" v typeref:typename:char * +terminal io.c /^char *terminal;$/;" v typeref:typename:char * +tmpbuf edit.c /^char tmpbuf[10];$/;" v typeref:typename:char[10] +to_print bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v typeref:typename:int +toggle edit.c /^toggle()$/;" f typeref:typename:void +trunc_cur bvi.c /^trunc_cur()$/;" f typeref:typename:void +undo_buf bvi.c /^char *undo_buf = NULL;$/;" v typeref:typename:char * +undo_count bvi.c /^off_t undo_count;$/;" v typeref:typename:off_t +undo_start bvi.c /^PTR undo_start;$/;" v typeref:typename:PTR +undosize bvi.c /^off_t filesize, memsize, undosize;$/;" v typeref:typename:off_t +usage bmore.c /^usage()$/;" f typeref:typename:void +usage bvi.c /^usage()$/;" f typeref:typename:void +vgetc bm_dos.c /^vgetc()$/;" f typeref:typename:int +vgetc bm_unix.c /^vgetc()$/;" f typeref:typename:int +vgetc edit.c /^vgetc()$/;" f typeref:typename:int +waddch doscur.h /^#define waddch(/;" d +waddstr doscur.h /^#define waddstr(/;" d wait_return comm.c /^wait_return(flag)$/;" f -wclear doscur.h 82;" d -wclrtoeol doscur.h 78;" d -wdeleteln doscur.h 109;" d -werase doscur.h 80;" d -wgetch doscur.h 113;" d -wgetstr doscur.h 116;" d -winsertln doscur.h 107;" d -wmove doscur.h 90;" d +wclear doscur.h /^#define wclear(/;" d +wclrtoeol doscur.h /^#define wclrtoeol(/;" d +wdeleteln doscur.h /^#define wdeleteln(/;" d +werase doscur.h /^#define werase(/;" d +wgetch doscur.h /^#define wgetch(/;" d +wgetstr doscur.h /^#define wgetstr(/;" d +winsertln doscur.h /^#define winsertln(/;" d +wmove doscur.h /^#define wmove(/;" d wordsearch re.c /^wordsearch(start, mode)$/;" f -wprintw doscur.h 102;" d -wrefresh doscur.h 135;" d -wrstat bvi.c /^static int wrstat = 1;$/;" v file: -wscanw doscur.h 123;" d -x bvi.c /^int maxx, maxy, x, xx, y;$/;" v -xpos edit.c /^xpos()$/;" f -xx bvi.c /^int maxx, maxy, x, xx, y;$/;" v -y bvi.c /^int maxx, maxy, x, xx, y;$/;" v -yank_buf bvi.c /^char *yank_buf = NULL;$/;" v -yanked bvi.c /^off_t yanked = 0L;$/;" v -yd_addr comm.c /^yd_addr()$/;" f +wprintw doscur.h /^#define wprintw(/;" d +wrefresh doscur.h /^#define wrefresh(/;" d +wrstat bvi.c /^static int wrstat = 1;$/;" v typeref:typename:int file: +wscanw doscur.h /^#define wscanw(/;" d +x bvi.c /^int maxx, maxy, x, xx, y;$/;" v typeref:typename:int +xpos edit.c /^xpos()$/;" f typeref:typename:int +xx bvi.c /^int maxx, maxy, x, xx, y;$/;" v typeref:typename:int +y bvi.c /^int maxx, maxy, x, xx, y;$/;" v typeref:typename:int +yank_buf bvi.c /^char *yank_buf = NULL;$/;" v typeref:typename:char * +yanked bvi.c /^off_t yanked = 0L;$/;" v typeref:typename:off_t +yd_addr comm.c /^yd_addr()$/;" f typeref:typename:off_t diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..23e1062 --- /dev/null +++ b/test.txt @@ -0,0 +1,209 @@ +AAAAAAAAAAAAAAAAAAAAAAA +BBBBBBBBBBBBBBBBBBBBBBB +CCCCCCCCCCCCCCCCCCCCCCC +DDDDDDDDDDDDDDDDDDDDDDD +EEEEEEEEEEEEEEEEEEEEEEE +FFFFFFFFFFFFFFFFFFFFFFF +GGGGGGGGGGGGGGGGGGGGGGG +HHHHHHHHHHHHHHHHHHHHHHH +IIIIIIIIIIIIIIIIIIIIIII +JJJJJJJJJJJJJJJJJJJJJJJ +KKKKKKKKKKKKKKKKKKKKKKK +LLLLLLLLLLLLLLLLLLLLLLL +MMMMMMMMMMMMMMMMMMMMMMM +NNNNNNNNNNNNNNNNNNNNNNN +OOOOOOOOOOOOOOOOOOOOOOO +PPPPPPPPPPPPPPPPPPPPPPP +QQQQQQQQQQQQQQQQQQQQQQQ +RRRRRRRRRRRRRRRRRRRRRRR +SSSSSSSSSSSSSSSSSSSSSSS +TTTTTTTTTTTTTTTTTTTTTTT +UUUUUUUUUUUUUUUUUUUUUUU +VVVVVVVVVVVVVVVVVVVVVVV +WWWWWWWWWWWWWWWWWWWWWWW +XXXXXXXXXXXXXXXXXXXXXXX +YYYYYYYYYYYYYYYYYYYYYYY +ZZZZZZZZZZZZZZZZZZZZZZZ +aaaaaaaaaaaaaaaaaaaaaaa +bbbbbbbbbbbbbbbbbbbbbbb +ccccccccccccccccccccccc +ddddddddddddddddddddddd +eeeeeeeeeeeeeeeeeeeeeee +fffffffffffffffffffffff +ggggggggggggggggggggggg +hhhhhhhhhhhhhhhhhhhhhhh +iiiiiiiiiiiiiiiiiiiiiii +jjjjjjjjjjjjjjjjjjjjjjj +kkkkkkkkkkkkkkkkkkkkkkk +lllllllllllllllllllllll +mmmmmmmmmmmmmmmmmmmmmmm +nnnnnnnnnnnnnnnnnnnnnnn +ooooooooooooooooooooooo +ppppppppppppppppppppppp +qqqqqqqqqqqqqqqqqqqqqqq +rrrrrrrrrrrrrrrrrrrrrrr +sssssssssssssssssssssss +ttttttttttttttttttttttt +uuuuuuuuuuuuuuuuuuuuuuu +vvvvvvvvvvvvvvvvvvvvvvv +wwwwwwwwwwwwwwwwwwwwwww +xxxxxxxxxxxxxxxxxxxxxxx +AAAAAAAAAAAAAAAAAAAAAAA +BBBBBBBBBBBBBBBBBBBBBBB +CCCCCCCCCCCCCCCCCCCCCCC +DDDDDDDDDDDDDDDDDDDDDDD +EEEEEEEEEEEEEEEEEEEEEEE +FFFFFFFFFFFFFFFFFFFFFFF +GGGGGGGGGGGGGGGGGGGGGGG +HHHHHHHHHHHHHHHHHHHHHHH +IIIIIIIIIIIIIIIIIIIIIII +JJJJJJJJJJJJJJJJJJJJJJJ +KKKKKKKKKKKKKKKKKKKKKKK +LLLLLLLLLLLLLLLLLLLLLLL +MMMMMMMMMMMMMMMMMMMMMMM +NNNNNNNNNNNNNNNNNNNNNNN +OOOOOOOOOOOOOOOOOOOOOOO +PPPPPPPPPPPPPPPPPPPPPPP +QQQQQQQQQQQQQQQQQQQQQQQ +RRRRRRRRRRRRRRRRRRRRRRR +SSSSSSSSSSSSSSSSSSSSSSS +TTTTTTTTTTTTTTTTTTTTTTT +UUUUUUUUUUUUUUUUUUUUUUU +VVVVVVVVVVVVVVVVVVVVVVV +WWWWWWWWWWWWWWWWWWWWWWW +XXXXXXXXXXXXXXXXXXXXXXX +YYYYYYYYYYYYYYYYYYYYYYY +ZZZZZZZZZZZZZZZZZZZZZZZ +aaaaaaaaaaaaaaaaaaaaaaa +bbbbbbbbbbbbbbbbbbbbbbb +ccccccccccccccccccccccc +ddddddddddddddddddddddd +eeeeeeeeeeeeeeeeeeeeeee +fffffffffffffffffffffff +ggggggggggggggggggggggg +hhhhhhhhhhhhhhhhhhhhhhh +iiiiiiiiiiiiiiiiiiiiiii +jjjjjjjjjjjjjjjjjjjjjjj +kkkkkkkkkkkkkkkkkkkkkkk +lllllllllllllllllllllll +mmmmmmmmmmmmmmmmmmmmmmm +nnnnnnnnnnnnnnnnnnnnnnn +ooooooooooooooooooooooo +ppppppppppppppppppppppp +qqqqqqqqqqqqqqqqqqqqqqq +rrrrrrrrrrrrrrrrrrrrrrr +sssssssssssssssssssssss +ttttttttttttttttttttttt +uuuuuuuuuuuuuuuuuuuuuuu +vvvvvvvvvvvvvvvvvvvvvvv +wwwwwwwwwwwwwwwwwwwwwww +xxxxxxxxxxxxxxxxxxxxxxx +yyyyyyyyyyyyyyyyyyyyyyy +zzzzzzzzzzzzzzzzzzzzzzz +yyyyyyyyyyyyyyyyyyyyyyy +AAAAAAAAAAAAAAAAAAAAAAA +BBBBBBBBBBBBBBBBBBBBBBB +CCCCCCCCCCCCCCCCCCCCCCC +DDDDDDDDDDDDDDDDDDDDDDD +EEEEEEEEEEEEEEEEEEEEEEE +FFFFFFFFFFFFFFFFFFFFFFF +GGGGGGGGGGGGGGGGGGGGGGG +HHHHHHHHHHHHHHHHHHHHHHH +IIIIIIIIIIIIIIIIIIIIIII +JJJJJJJJJJJJJJJJJJJJJJJ +KKKKKKKKKKKKKKKKKKKKKKK +LLLLLLLLLLLLLLLLLLLLLLL +MMMMMMMMMMMMMMMMMMMMMMM +NNNNNNNNNNNNNNNNNNNNNNN +OOOOOOOOOOOOOOOOOOOOOOO +PPPPPPPPPPPPPPPPPPPPPPP +QQQQQQQQQQQQQQQQQQQQQQQ +RRRRRRRRRRRRRRRRRRRRRRR +SSSSSSSSSSSSSSSSSSSSSSS +TTTTTTTTTTTTTTTTTTTTTTT +UUUUUUUUUUUUUUUUUUUUUUU +VVVVVVVVVVVVVVVVVVVVVVV +WWWWWWWWWWWWWWWWWWWWWWW +XXXXXXXXXXXXXXXXXXXXXXX +YYYYYYYYYYYYYYYYYYYYYYY +ZZZZZZZZZZZZZZZZZZZZZZZ +aaaaaaaaaaaaaaaaaaaaaaa +bbbbbbbbbbbbbbbbbbbbbbb +ccccccccccccccccccccccc +ddddddddddddddddddddddd +eeeeeeeeeeeeeeeeeeeeeee +fffffffffffffffffffffff +ggggggggggggggggggggggg +hhhhhhhhhhhhhhhhhhhhhhh +iiiiiiiiiiiiiiiiiiiiiii +jjjjjjjjjjjjjjjjjjjjjjj +kkkkkkkkkkkkkkkkkkkkkkk +lllllllllllllllllllllll +mmmmmmmmmmmmmmmmmmmmmmm +nnnnnnnnnnnnnnnnnnnnnnn +ooooooooooooooooooooooo +ppppppppppppppppppppppp +qqqqqqqqqqqqqqqqqqqqqqq +rrrrrrrrrrrrrrrrrrrrrrr +sssssssssssssssssssssss +ttttttttttttttttttttttt +uuuuuuuuuuuuuuuuuuuuuuu +vvvvvvvvvvvvvvvvvvvvvvv +wwwwwwwwwwwwwwwwwwwwwww +xxxxxxxxxxxxxxxxxxxxxxx +yyyyyyyyyyyyyyyyyyyyyyy +zzzzzzzzzzzzzzzzzzzzzzz +zzzzzzzzzzzzzzzzzzzzzzz +AAAAAAAAAAAAAAAAAAAAAAA +BBBBBBBBBBBBBBBBBBBBBBB +CCCCCCCCCCCCCCCCCCCCCCC +DDDDDDDDDDDDDDDDDDDDDDD +EEEEEEEEEEEEEEEEEEEEEEE +FFFFFFFFFFFFFFFFFFFFFFF +GGGGGGGGGGGGGGGGGGGGGGG +HHHHHHHHHHHHHHHHHHHHHHH +IIIIIIIIIIIIIIIIIIIIIII +JJJJJJJJJJJJJJJJJJJJJJJ +KKKKKKKKKKKKKKKKKKKKKKK +LLLLLLLLLLLLLLLLLLLLLLL +MMMMMMMMMMMMMMMMMMMMMMM +NNNNNNNNNNNNNNNNNNNNNNN +OOOOOOOOOOOOOOOOOOOOOOO +PPPPPPPPPPPPPPPPPPPPPPP +QQQQQQQQQQQQQQQQQQQQQQQ +RRRRRRRRRRRRRRRRRRRRRRR +SSSSSSSSSSSSSSSSSSSSSSS +TTTTTTTTTTTTTTTTTTTTTTT +UUUUUUUUUUUUUUUUUUUUUUU +VVVVVVVVVVVVVVVVVVVVVVV +WWWWWWWWWWWWWWWWWWWWWWW +XXXXXXXXXXXXXXXXXXXXXXX +YYYYYYYYYYYYYYYYYYYYYYY +ZZZZZZZZZZZZZZZZZZZZZZZ +aaaaaaaaaaaaaaaaaaaaaaa +bbbbbbbbbbbbbbbbbbbbbbb +ccccccccccccccccccccccc +ddddddddddddddddddddddd +eeeeeeeeeeeeeeeeeeeeeee +fffffffffffffffffffffff +ggggggggggggggggggggggg +hhhhhhhhhhhhhhhhhhhhhhh +iiiiiiiiiiiiiiiiiiiiiii +jjjjjjjjjjjjjjjjjjjjjjj +kkkkkkkkkkkkkkkkkkkkkkk +lllllllllllllllllllllll +mmmmmmmmmmmmmmmmmmmmmmm +nnnnnnnnnnnnnnnnnnnnnnn +ooooooooooooooooooooooo +ppppppppppppppppppppppp +qqqqqqqqqqqqqqqqqqqqqqq +rrrrrrrrrrrrrrrrrrrrrrr +sssssssssssssssssssssss +ttttttttttttttttttttttt +uuuuuuuuuuuuuuuuuuuuuuu +vvvvvvvvvvvvvvvvvvvvvvv +wwwwwwwwwwwwwwwwwwwwwww +xxxxxxxxxxxxxxxxxxxxxxx +yyyyyyyyyyyyyyyyyyyyyyy +zzzzzzzzzzzzzzzzzzzzzzz + diff --git a/tmp b/tmp deleted file mode 100644 index 4083215..0000000 --- a/tmp +++ /dev/null @@ -1,15 +0,0 @@ - if ((ch > 31) && (ch < 127)) { - PRINTF("%c", ch); - } else { - if (r_flag) { - if ((ch & 128) && ((ch > 159) && (ch < 255))) { - if (!no_tty) highlight(); - PRINTF("%c", ch & 127); - if (!no_tty) normal(); - } else { - PRINTF("."); - } - } else { - PRINTF("."); - } - }