----------------------------------------------------------------------------- MANIFEST | 213 ++--- Makefile | 9 aclocal.m4 | 9 config.guess | 52 - config.sub | 26 configure | 1740 ++++++++++++++++++++++---------------------- configure.in | 16 doc/CHANGES | 45 + doc/CREDITS | 121 +-- doc/INSTALL | 12 doc/TODO | 59 + doc/tin.1 | 9 doc/tin.5 | 30 include/autoconf.hin | 4 include/extern.h | 5 include/keymap.h | 12 include/nntplib.h | 29 include/policy.h | 4 include/proto.h | 2 include/tin.h | 5 include/version.h | 8 pcre/ChangeLog | 84 ++ pcre/Makefile.in | 3 pcre/Makefile.in-old | 69 - pcre/NON-UNIX-USE | 2 pcre/README | 7 pcre/RunTest.in | 5 pcre/config.h | 2 pcre/configure.in | 75 + pcre/dftables.c | 2 pcre/doc/pcre.3 | 5 pcre/pcre.h.in | 258 ++++++ pcre/pcre.in | 258 ------ pcre/pcre_compile.c | 77 + pcre/pcre_config.c | 2 pcre/pcre_dfa_exec.c | 40 - pcre/pcre_exec.c | 34 pcre/pcre_fullinfo.c | 2 pcre/pcre_info.c | 2 pcre/pcre_internal.h | 19 pcre/pcre_ord2utf8.c | 2 pcre/pcre_printint.c | 451 ----------- pcre/pcre_printint.src | 454 +++++++++++ pcre/pcre_refcount.c | 2 pcre/pcre_study.c | 2 pcre/pcre_tables.c | 7 pcre/pcre_try_flipped.c | 2 pcre/pcre_ucp_findchar.c | 114 ++ pcre/pcre_valid_utf8.c | 2 pcre/pcre_version.c | 2 pcre/pcre_xclass.c | 4 pcre/pcregrep.c | 8 pcre/pcreposix.c | 8 pcre/pcretest.c | 77 + pcre/testdata/testinput2 | 21 pcre/testdata/testoutput1 | 2 pcre/testdata/testoutput2 | 225 +++++ pcre/testdata/testoutput3 | 2 pcre/testdata/testoutput4 | 2 pcre/testdata/testoutput5 | 2 pcre/testdata/testoutput6 | 2 pcre/testdata/testoutput7 | 2 pcre/testdata/testoutput8 | 2 pcre/testdata/testoutput9 | 2 pcre/ucp.h | 2 pcre/ucp_findchar.c | 160 ---- pcre/version.sh | 4 po/de.gmo |binary po/de.po | 225 ++--- po/en_GB.gmo |binary po/en_GB.po | 153 ++- po/et.gmo |binary po/et.po | 200 ++--- po/fr.gmo |binary po/fr.po | 160 ++-- po/ru.gmo |binary po/ru.po | 153 ++- po/rw.gmo |binary po/rw.po | 152 ++- po/tin.pot | 151 ++- po/tr.gmo |binary po/tr.po | 151 ++- src/Makefile.in | 8 src/art.c | 10 src/attrib.c | 11 src/auth.c | 30 src/config.c | 4 src/cook.c | 8 src/curses.c | 57 - src/feed.c | 10 src/filter.c | 11 src/global.c | 5 src/group.c | 6 src/header.c | 7 src/help.c | 7 src/init.c | 7 src/keymap.c | 720 ++++++++---------- src/list.c | 12 src/mail.c | 27 src/main.c | 7 src/memory.c | 6 src/misc.c | 40 - src/nntplib.c | 21 src/nrctbl.c | 10 src/options_menu.c | 9 src/page.c | 13 src/pgp.c | 5 src/post.c | 60 + src/prompt.c | 6 src/read.c | 5 src/refs.c | 4 src/rfc1524.c | 6 src/rfc2046.c | 12 src/rfc2047.c | 6 src/save.c | 8 src/screen.c | 2 src/search.c | 6 src/select.c | 6 src/thread.c | 8 src/version.c | 6 tin.spec | 2 tools/url_handler.sh | 27 122 files changed, 4079 insertions(+), 3400 deletions(-) ----------------------------------------------------------------------------- diff -Nurp tin-1.7.9/MANIFEST tin-1.7.10/MANIFEST --- tin-1.7.9/MANIFEST 2005-06-29 11:47:04.000000000 +0200 +++ tin-1.7.10/MANIFEST 2005-09-29 13:37:33.336664841 +0200 @@ -1,27 +1,27 @@ -MANIFEST for tin-1.7.9 (Wed Jun 29 11:47:03 CEST 2005) +MANIFEST for tin-1.7.10 (Thu Sep 29 13:37:31 CEST 2005) ---------------------------------------------------- - 13794 ./Makefile - 8324 ./MANIFEST + 13770 ./Makefile + 8299 ./MANIFEST 1440 ./README 564 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN - 146871 ./aclocal.m4 + 147008 ./aclocal.m4 882 ./conf-tin - 44272 ./config.guess - 31584 ./config.sub - 485952 ./configure - 30869 ./configure.in + 43400 ./config.guess + 31689 ./config.sub + 487329 ./configure + 31033 ./configure.in 7123 ./install.sh 838 ./mkdirs.sh - 1505 ./tin.spec + 1506 ./tin.spec 18847 ./doc/ABOUT-NLS - 23359 ./doc/CHANGES + 25013 ./doc/CHANGES 226345 ./doc/CHANGES.old - 4766 ./doc/CREDITS + 4814 ./doc/CREDITS 1469 ./doc/DEBUG_REFS - 29900 ./doc/INSTALL - 32278 ./doc/TODO + 30017 ./doc/INSTALL + 34052 ./doc/TODO 995 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1700 ./doc/article.txt @@ -48,8 +48,8 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 118332 ./doc/tin.1 - 72129 ./doc/tin.5 + 118453 ./doc/tin.1 + 72831 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover @@ -57,81 +57,81 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 2787 ./tools/opt-case.pl 1410 ./tools/tinlock 25041 ./tools/tinews.pl - 1561 ./tools/url_handler.sh + 1654 ./tools/url_handler.sh 3347 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2778 ./include/bool.h 2039 ./include/bugrep.h 9502 ./include/oldconfig.h - 58526 ./include/extern.h - 12950 ./include/keymap.h + 58603 ./include/extern.h + 12965 ./include/keymap.h 6340 ./include/newsrc.h - 8333 ./include/nntplib.h + 8397 ./include/nntplib.h 665 ./include/plp_snprintf.h - 12242 ./include/policy.h + 12247 ./include/policy.h 31052 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5756 ./include/tcurses.h - 63019 ./include/tin.h + 63099 ./include/tin.h 13398 ./include/tinrc.h 5670 ./include/tnntp.h 2264 ./include/trace.h - 2561 ./include/version.h + 2560 ./include/version.h 25899 ./src/active.c - 58372 ./src/art.c - 31930 ./src/attrib.c - 12354 ./src/auth.c + 58423 ./src/art.c + 32282 ./src/attrib.c + 12947 ./src/auth.c 13712 ./src/charset.c 8220 ./src/color.c - 58079 ./src/config.c - 20064 ./src/cook.c - 30471 ./src/curses.c + 58140 ./src/config.c + 19996 ./src/cook.c + 30433 ./src/curses.c 10378 ./src/debug.c 3408 ./src/envarg.c - 26435 ./src/feed.c - 56657 ./src/filter.c + 26308 ./src/feed.c + 56651 ./src/filter.c 18114 ./src/getline.c - 9002 ./src/global.c - 47367 ./src/group.c + 8941 ./src/global.c + 47307 ./src/group.c 3900 ./src/hashstr.c - 8763 ./src/header.c - 28794 ./src/help.c + 8764 ./src/header.c + 28753 ./src/help.c 13890 ./src/inews.c - 33844 ./src/init.c + 33763 ./src/init.c 2216 ./src/joinpath.c - 88879 ./src/keymap.c + 87594 ./src/keymap.c 117365 ./src/lang.c 4486 ./src/langinfo.c - 7033 ./src/list.c + 7102 ./src/list.c 6667 ./src/lock.c - 13352 ./src/mail.c - 21194 ./src/main.c + 13496 ./src/mail.c + 21303 ./src/main.c 10814 ./src/makecfg.c - 12319 ./src/memory.c + 12256 ./src/memory.c 5257 ./src/mimetypes.c - 89841 ./src/misc.c + 90399 ./src/misc.c 40030 ./src/newsrc.c - 43933 ./src/nntplib.c - 7125 ./src/nrctbl.c - 41967 ./src/options_menu.c - 58661 ./src/page.c + 44275 ./src/nntplib.c + 7192 ./src/nrctbl.c + 41832 ./src/options_menu.c + 58521 ./src/page.c 24138 ./src/parsdate.y 16966 ./src/plp_snprintf.c - 12777 ./src/pgp.c - 133229 ./src/post.c - 17135 ./src/prompt.c - 10627 ./src/read.c - 25566 ./src/refs.c + 12713 ./src/pgp.c + 133826 ./src/post.c + 17075 ./src/prompt.c + 10566 ./src/read.c + 25559 ./src/refs.c 5276 ./src/regex.c - 14538 ./src/rfc1524.c + 14475 ./src/rfc1524.c 15046 ./src/rfc2045.c - 29728 ./src/rfc2046.c - 32672 ./src/rfc2047.c - 37434 ./src/save.c - 11382 ./src/screen.c - 16593 ./src/search.c - 30871 ./src/select.c + 29853 ./src/rfc2046.c + 32609 ./src/rfc2047.c + 37303 ./src/save.c + 11358 ./src/screen.c + 16533 ./src/search.c + 30811 ./src/select.c 7590 ./src/sigfile.c 12667 ./src/signal.c 7215 ./src/strftime.c @@ -140,9 +140,9 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 16944 ./src/tcurses.c 3071 ./src/tmpfile.c 3364 ./src/my_tmpfile.c - 40429 ./src/thread.c + 40369 ./src/thread.c 2472 ./src/trace.c - 4407 ./src/version.c + 4347 ./src/version.c 5453 ./src/wildmat.c 7153 ./src/xface.c 7784 ./src/xref.c @@ -170,55 +170,54 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 389 ./vms/vmstimval.h 422 ./pcre/AUTHORS 2515 ./pcre/COPYING - 80365 ./pcre/ChangeLog + 84049 ./pcre/ChangeLog 8049 ./pcre/INSTALL 2515 ./pcre/LICENCE - 2938 ./pcre/Makefile.in - 24569 ./pcre/Makefile.in-old + 2924 ./pcre/Makefile.in + 24763 ./pcre/Makefile.in-old 9915 ./pcre/NEWS - 10767 ./pcre/NON-UNIX-USE - 22105 ./pcre/README - 5924 ./pcre/RunTest.in - 138 ./pcre/config.h - 7486 ./pcre/configure.in - 5875 ./pcre/dftables.c + 10772 ./pcre/NON-UNIX-USE + 22383 ./pcre/README + 5996 ./pcre/RunTest.in + 143 ./pcre/config.h + 8703 ./pcre/configure.in + 5876 ./pcre/dftables.c 1171 ./pcre/pcre-config.in - 10608 ./pcre/pcre.in - 159122 ./pcre/pcre_compile.c - 3391 ./pcre/pcre_config.c - 66541 ./pcre/pcre_dfa_exec.c - 110756 ./pcre/pcre_exec.c - 4924 ./pcre/pcre_fullinfo.c + 10608 ./pcre/pcre.h.in + 160094 ./pcre/pcre_compile.c + 3396 ./pcre/pcre_config.c + 66595 ./pcre/pcre_dfa_exec.c + 110857 ./pcre/pcre_exec.c + 4929 ./pcre/pcre_fullinfo.c 11915 ./pcre/pcre_get.c 3159 ./pcre/pcre_globals.c - 3836 ./pcre/pcre_info.c - 36859 ./pcre/pcre_internal.h + 3841 ./pcre/pcre_info.c + 36724 ./pcre/pcre_internal.h 5310 ./pcre/pcre_maketables.c - 2980 ./pcre/pcre_ord2utf8.c - 12105 ./pcre/pcre_printint.c - 3306 ./pcre/pcre_refcount.c - 14371 ./pcre/pcre_study.c - 4503 ./pcre/pcre_tables.c - 5343 ./pcre/pcre_try_flipped.c - 2468 ./pcre/pcre_ucp_findchar.c - 4477 ./pcre/pcre_valid_utf8.c - 2568 ./pcre/pcre_version.c - 4139 ./pcre/pcre_xclass.c + 2985 ./pcre/pcre_ord2utf8.c + 12388 ./pcre/pcre_printint.src + 3311 ./pcre/pcre_refcount.c + 14376 ./pcre/pcre_study.c + 4610 ./pcre/pcre_tables.c + 5348 ./pcre/pcre_try_flipped.c + 4598 ./pcre/pcre_ucp_findchar.c + 4482 ./pcre/pcre_valid_utf8.c + 2573 ./pcre/pcre_version.c + 4150 ./pcre/pcre_xclass.c 11707 ./pcre/pcredemo.c - 33424 ./pcre/pcregrep.c - 10356 ./pcre/pcreposix.c + 33516 ./pcre/pcregrep.c + 10376 ./pcre/pcreposix.c 4086 ./pcre/pcreposix.h - 52916 ./pcre/pcretest.c + 54545 ./pcre/pcretest.c 5234 ./pcre/perltest - 4389 ./pcre/ucp_findchar.c - 1663 ./pcre/ucp.h + 1612 ./pcre/ucp.h 3547 ./pcre/ucpinternal.h 453166 ./pcre/ucptable.c 395 ./pcre/version.sh - 9507 ./pcre/doc/pcre.3 + 9685 ./pcre/doc/pcre.3 63013 ./pcre/doc/pcrepattern.3 74037 ./pcre/testdata/testinput1 - 24750 ./pcre/testdata/testinput2 + 26948 ./pcre/testdata/testinput2 596 ./pcre/testdata/testinput3 8401 ./pcre/testdata/testinput4 3516 ./pcre/testdata/testinput5 @@ -227,7 +226,7 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 8795 ./pcre/testdata/testinput8 8762 ./pcre/testdata/testinput9 98443 ./pcre/testdata/testoutput1 - 117618 ./pcre/testdata/testoutput2 + 122705 ./pcre/testdata/testoutput2 1513 ./pcre/testdata/testoutput3 14738 ./pcre/testdata/testoutput4 22902 ./pcre/testdata/testoutput5 @@ -235,7 +234,7 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 103487 ./pcre/testdata/testoutput7 51419 ./pcre/testdata/testoutput8 24236 ./pcre/testdata/testoutput9 - 19899 ./include/autoconf.hin + 19937 ./include/autoconf.hin 5800 ./pcre/pcre.mms 21094 ./src/Makefile.in 7657 ./src/tincfg.tbl @@ -300,19 +299,19 @@ MANIFEST for tin-1.7.9 (Wed Jun 29 11:47 41 ./intl/VERSION 4962 ./po/Makefile.inn 847 ./po/POTFILES.in - 123015 ./po/tin.pot - 166483 ./po/de.gmo - 199247 ./po/de.po + 123131 ./po/tin.pot + 166596 ./po/de.gmo + 199467 ./po/de.po 7359 ./po/en_GB.gmo - 125599 ./po/en_GB.po - 155976 ./po/et.gmo - 189623 ./po/et.po - 162044 ./po/fr.gmo - 195993 ./po/fr.po + 125715 ./po/en_GB.po + 159087 ./po/et.gmo + 190767 ./po/et.po + 162233 ./po/fr.gmo + 196118 ./po/fr.po 72197 ./po/ru.gmo - 151996 ./po/ru.po + 152112 ./po/ru.po 2081 ./po/rw.gmo - 169224 ./po/rw.po + 169331 ./po/rw.po 5889 ./po/tr.gmo - 189990 ./po/tr.po -7844221 total + 190106 ./po/tr.po +7869369 total diff -Nurp tin-1.7.9/Makefile tin-1.7.10/Makefile --- tin-1.7.9/Makefile 2005-06-29 11:47:02.000000000 +0200 +++ tin-1.7.10/Makefile 2005-09-29 13:37:30.884126008 +0200 @@ -7,9 +7,9 @@ PROJECT = tin LVER = 1 PVER = 7 -SVER = 9 +SVER = 10 VER = $(LVER).$(PVER).$(SVER) -DVER = 20050629 +DVER = 20050929 EXE = tin # directory structure @@ -221,7 +221,7 @@ PCRE = \ $(PCREDIR)/configure.in \ $(PCREDIR)/dftables.c \ $(PCREDIR)/pcre-config.in \ - $(PCREDIR)/pcre.in \ + $(PCREDIR)/pcre.h.in \ $(PCREDIR)/pcre_compile.c \ $(PCREDIR)/pcre_config.c \ $(PCREDIR)/pcre_dfa_exec.c \ @@ -233,7 +233,7 @@ PCRE = \ $(PCREDIR)/pcre_internal.h \ $(PCREDIR)/pcre_maketables.c \ $(PCREDIR)/pcre_ord2utf8.c \ - $(PCREDIR)/pcre_printint.c \ + $(PCREDIR)/pcre_printint.src \ $(PCREDIR)/pcre_refcount.c \ $(PCREDIR)/pcre_study.c \ $(PCREDIR)/pcre_tables.c \ @@ -248,7 +248,6 @@ PCRE = \ $(PCREDIR)/pcreposix.h \ $(PCREDIR)/pcretest.c \ $(PCREDIR)/perltest \ - $(PCREDIR)/ucp_findchar.c \ $(PCREDIR)/ucp.h \ $(PCREDIR)/ucpinternal.h \ $(PCREDIR)/ucptable.c \ diff -Nurp tin-1.7.9/aclocal.m4 tin-1.7.10/aclocal.m4 --- tin-1.7.9/aclocal.m4 2005-06-29 11:18:14.000000000 +0200 +++ tin-1.7.10/aclocal.m4 2005-09-29 13:32:03.695668636 +0200 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2005-06-21 +dnl Updated : 2005-07-10 dnl Notes : dnl dnl Copyright (c) 1995-2005 Thomas E. Dickey @@ -1844,6 +1844,7 @@ dnl dash Debian Almquist Shell (sh based dnl jsh Job Control Bourne Shell (sh based) dnl keysh Key Shell (ksh based) dnl ksh Korn Shell (sh based) +dnl mksh MirBSD Korn shell (pdksh based) dnl pdksh Public-domain ksh dnl sh Bourne Shell or POSIX Shell dnl zsh Z Shell (sh, ksh based) @@ -1855,7 +1856,7 @@ AC_DEFUN([CF_DEFAULT_SHELL], AC_MSG_CHECKING(for the default shell program) cf_shell_progs="ifelse($1,,sh,[$1])" if test -z "$cf_shell_progs" ; then - cf_shell_progs="sh ksh bash zsh pdksh jsh keysh ash dash" + cf_shell_progs="sh ksh bash zsh pdksh mksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. AC_TRY_COMPILE([ #include ],[ @@ -4544,6 +4545,10 @@ sco*) #(vi solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; +## dennis should test this: +#sunos4.1.*) #(vi +# CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" +# ;; *) AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ AC_TRY_COMPILE([#include ],[ diff -Nurp tin-1.7.9/config.guess tin-1.7.10/config.guess --- tin-1.7.9/config.guess 2005-06-29 11:20:30.000000000 +0200 +++ tin-1.7.10/config.guess 2005-09-19 17:00:59.661452346 +0200 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-05-27' +timestamp='2005-09-19' # 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 @@ -125,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -199,44 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} @@ -658,8 +623,7 @@ EOF esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + eval $set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -830,7 +794,7 @@ EOF i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -909,6 +873,9 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -1218,7 +1185,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nurp tin-1.7.9/config.sub tin-1.7.10/config.sub --- tin-1.7.9/config.sub 2005-06-28 10:31:19.000000000 +0200 +++ tin-1.7.10/config.sub 2005-07-09 12:46:58.000000000 +0200 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-06-02' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -248,6 +248,7 @@ case $basic_machine in | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -259,11 +260,11 @@ case $basic_machine in | ms1 \ | msp430 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b \ @@ -326,6 +327,7 @@ case $basic_machine in | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -342,7 +344,7 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ @@ -769,9 +771,8 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1097,12 +1098,9 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1189,7 +1187,8 @@ case $os in | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1207,7 +1206,7 @@ case $os in os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1396,6 +1395,9 @@ case $basic_machine in *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; diff -Nurp tin-1.7.9/configure tin-1.7.10/configure --- tin-1.7.9/configure 2005-06-29 11:47:03.000000000 +0200 +++ tin-1.7.10/configure 2005-09-29 13:37:31.319044227 +0200 @@ -230,8 +230,8 @@ cat <<\EOF --with-curses-dir=DIR directory in which (n)curses is installed EOF cat <<\EOF - --with-ncurses link with ncurses if available - --enable-curses use curses interface + --with-ncurses link with ncurses if available (depriciated) + --enable-curses use curses interface (depriciated) --with-pcre=PATH use installed pcre versus bundled --with-dbmalloc use Conor Cahill's dbmalloc library --with-dmalloc use Gray Watson's dmalloc library @@ -863,7 +863,7 @@ fi PACKAGE=tin -VERSION=1.7.9 +VERSION=1.7.10 cat >> confdefs.h <&6 -echo "configure:1749: checking if we should define _XOPEN_SOURCE" >&5 +echo "configure:1753: checking if we should define _XOPEN_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1761,7 +1765,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1771,7 +1775,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1781,7 +1785,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1803,16 +1807,16 @@ test "$cf_cv_xopen_source" != no && CPPF cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:1807: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:1811: checking if we should define _POSIX_C_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 1813) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 1817) testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1822,7 +1826,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -1844,7 +1848,7 @@ else esac if test "$cf_want_posix_source" = yes ; then cat > conftest.$ac_ext < int main() { @@ -1854,7 +1858,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1865,15 +1869,15 @@ fi rm -f conftest* fi -echo "(line 1869) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 1873) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" -echo "(line 1874) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 1878) testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1883,7 +1887,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1907,7 +1911,7 @@ esac echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1911: checking for strerror in -lcposix" >&5 +echo "configure:1915: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1915,7 +1919,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1950,7 +1954,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1954: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1958: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2046,7 +2050,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -2170,12 +2174,12 @@ You have the following choices: fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2174: checking for Cygwin environment" >&5 +echo "configure:2178: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2203,19 +2207,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2207: checking for mingw32 environment" >&5 +echo "configure:2211: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2247,7 +2251,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2251: checking for executable suffix" >&5 +echo "configure:2255: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2257,7 +2261,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2278,13 +2282,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2282: checking for object suffix" >&5 +echo "configure:2286: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2319,7 +2323,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2323: checking whether ln -s works" >&5 +echo "configure:2327: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2363,7 +2367,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2367: checking for $ac_word" >&5 +echo "configure:2371: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2462,7 +2466,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2466: checking build system type" >&5 +echo "configure:2470: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2488,7 +2492,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2492: checking for $ac_word" >&5 +echo "configure:2496: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2520,7 +2524,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2524: checking for $ac_word" >&5 +echo "configure:2528: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2555,7 +2559,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2559: checking for $ac_word" >&5 +echo "configure:2563: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2587,7 +2591,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2591: checking for $ac_word" >&5 +echo "configure:2595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2622,7 +2626,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2626: checking for $ac_word" >&5 +echo "configure:2630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2654,7 +2658,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2658: checking for $ac_word" >&5 +echo "configure:2662: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2691,7 +2695,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_ else echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:2695: checking for archiver options (symbol AR_OPTS)" >&5 +echo "configure:2699: checking for archiver options (symbol AR_OPTS)" >&5 test -z "$AR_OPTS" && AR_OPTS=rv echo "$ac_t""$AR_OPTS" 1>&6 @@ -2737,7 +2741,7 @@ if test "${with_ispell+set}" = set; then *) # user supplied option-value for "--with-ispell=path" echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:2741: checking for ispell" >&5 +echo "configure:2745: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:2758: checking for $ac_word" >&5 +echo "configure:2762: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2811,7 +2815,7 @@ if test "${with_metamail+set}" = set; th *) # user supplied option-value for "--with-metamail=path" echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:2815: checking for metamail" >&5 +echo "configure:2819: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:2832: checking for $ac_word" >&5 +echo "configure:2836: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2885,7 +2889,7 @@ if test "${with_sum+set}" = set; then *) # user supplied option-value for "--with-sum=path" echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:2889: checking for sum" >&5 +echo "configure:2893: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:2906: checking for $ac_word" >&5 +echo "configure:2910: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2949,12 +2953,12 @@ fi if test $ac_cv_path_PATH_SUM then echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6 -echo "configure:2953: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:2957: checking if $ac_cv_path_PATH_SUM takes -r" >&5 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -2984,7 +2988,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:2988: checking for default editor" >&5 +echo "configure:2992: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -3012,7 +3016,7 @@ if test -z "$DEFAULT_EDITOR" ; then # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3016: checking for $ac_word" >&5 +echo "configure:3020: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3057,7 +3061,7 @@ EOF # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3061: checking for $ac_word" >&5 +echo "configure:3065: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3111,7 +3115,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mailx", so it can be a program name with args. set dummy mailx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3115: checking for $ac_word" >&5 +echo "configure:3119: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3148,7 +3152,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mail", so it can be a program name with args. set dummy mail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3152: checking for $ac_word" >&5 +echo "configure:3156: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3182,7 +3186,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:3186: checking for default mailer" >&5 +echo "configure:3190: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -3209,7 +3213,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:3213: checking for incoming-mail directory" >&5 +echo "configure:3217: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -3255,7 +3259,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6 ## PGP Support echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:3259: checking if you want PGP/GPG-Support" >&5 +echo "configure:3263: checking if you want PGP/GPG-Support" >&5 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then @@ -3287,7 +3291,7 @@ if test "${with_pgp+set}" = set; then *) # user supplied option-value for "--with-pgp=path" echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:3291: checking for pgp" >&5 +echo "configure:3295: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:3308: checking for $ac_word" >&5 +echo "configure:3312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3362,7 +3366,7 @@ if test "${with_pgpk+set}" = set; then *) # user supplied option-value for "--with-pgpk=path" echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:3366: checking for pgpk" >&5 +echo "configure:3370: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:3383: checking for $ac_word" >&5 +echo "configure:3387: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3437,7 +3441,7 @@ if test "${with_gpg+set}" = set; then *) # user supplied option-value for "--with-gpg=path" echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:3441: checking for gpg" >&5 +echo "configure:3445: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:3458: checking for $ac_word" >&5 +echo "configure:3462: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3511,13 +3515,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:3515: checking for the default shell program" >&5 +echo "configure:3519: checking for the default shell program" >&5 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then - cf_shell_progs="sh ksh bash zsh pdksh jsh keysh ash dash" + cf_shell_progs="sh ksh bash zsh pdksh mksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. cat > conftest.$ac_ext < @@ -3530,7 +3534,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:3534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -3540,11 +3544,11 @@ fi rm -f conftest* fi -echo "(line 3544) testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "(line 3548) testing paths of shell programs: $cf_shell_progs ..." 1>&5 if test -s /etc/shells && test `egrep -c -v '^(#| | |$)' /etc/shells` -gt 0; then -echo "(line 3548) testing /etc/shells ..." 1>&5 +echo "(line 3552) testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -3579,14 +3583,14 @@ echo "(line 3548) testing /etc/shells .. echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "(line 3583) testing $PATH ..." 1>&5 +echo "(line 3587) testing $PATH ..." 1>&5 for ac_prog in $cf_shell_progs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3590: checking for $ac_word" >&5 +echo "configure:3594: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3639,7 +3643,7 @@ EOF ### check for this early, since it'll override several options echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6 -echo "configure:3643: checking if NNTP-support will be used" >&5 +echo "configure:3647: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -3661,7 +3665,7 @@ echo "$ac_t""$enableval" 1>&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6 -echo "configure:3665: checking whether to be NNTP_ONLY" >&5 +echo "configure:3669: checking whether to be NNTP_ONLY" >&5 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then @@ -3693,7 +3697,7 @@ fi ### use option --enable-debug to compile-in test/development code echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6 -echo "configure:3697: checking if you want to compile-in debug support" >&5 +echo "configure:3701: checking if you want to compile-in debug support" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -3720,7 +3724,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --disable-echo to suppress full display compiling commands echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3724: checking if you want to see long compiling messages" >&5 +echo "configure:3728: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -3765,7 +3769,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --enable-prototypes to turn on optional prototypes echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6 -echo "configure:3769: checking if you want to compile with fallback prototypes" >&5 +echo "configure:3773: checking if you want to compile with fallback prototypes" >&5 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then @@ -3789,7 +3793,7 @@ EXTRA_CFLAGS="" if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3793: checking if you want to turn on gcc warnings" >&5 +echo "configure:3797: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -3815,7 +3819,7 @@ then GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:3819: checking version of $CC" >&5 +echo "configure:3823: checking version of $CC" >&5 GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown echo "$ac_t""$GCC_VERSION" 1>&6 @@ -3845,11 +3849,11 @@ then elif test "$GCC" = yes then cat > conftest.$ac_ext <&6 -echo "configure:3853: checking for $CC warning options" >&5 +echo "configure:3857: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3868,7 +3872,7 @@ echo "configure:3853: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -3898,7 +3902,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for directories echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:3902: checking for news-library path" >&5 +echo "configure:3906: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -3936,7 +3940,7 @@ eval NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:3940: checking for news spool-directory path" >&5 +echo "configure:3944: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -3974,7 +3978,7 @@ eval SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:3978: checking for news overview-directory path" >&5 +echo "configure:3982: checking for news overview-directory path" >&5 # Check whether --with-nov-dir or --without-nov-dir was given. if test "${with_nov_dir+set}" = set; then @@ -4012,7 +4016,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:4016: checking for overview filename" >&5 +echo "configure:4020: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -4048,7 +4052,7 @@ fi ## TODO: kick the --with-inews-dir= stuff, the check below should be enough ## (requires some code rework in tin) echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6 -echo "configure:4052: checking for directory containing \"inews\"" >&5 +echo "configure:4056: checking for directory containing \"inews\"" >&5 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then @@ -4089,7 +4093,7 @@ echo "$ac_t""$INEWSDIR" 1>&6 # Extract the first word of "inews", so it can be a program name with args. set dummy inews; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4093: checking for $ac_word" >&5 +echo "configure:4097: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4146,7 +4150,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for libraries echo $ac_n "checking for optional INN-NNTP library""... $ac_c" 1>&6 -echo "configure:4150: checking for optional INN-NNTP library" >&5 +echo "configure:4154: checking for optional INN-NNTP library" >&5 # Check whether --with-inn-nntplib or --without-inn-nntplib was given. if test "${with_inn_nntplib+set}" = set; then @@ -4178,7 +4182,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:4182: checking if you want socks library" >&5 +echo "configure:4186: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4198,7 +4202,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:4202: checking if you want socks5 library" >&5 +echo "configure:4206: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4274,7 +4278,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext < @@ -4283,7 +4287,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -4297,7 +4301,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:4301: checking for network libraries" >&5 +echo "configure:4305: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4308,12 +4312,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4312: checking for $ac_func" >&5 +echo "configure:4316: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4359,7 +4363,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:4363: checking for gethostname in -lnsl" >&5 +echo "configure:4367: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4367,7 +4371,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4411,7 +4415,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:4415: checking for gethostname in -lsocket" >&5 +echo "configure:4419: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4419,7 +4423,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4475,7 +4479,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:4479: checking for main in -linet" >&5 +echo "configure:4483: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4483,14 +4487,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4515,12 +4519,12 @@ if test "$ac_cv_func_lsocket" != no ; th for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4519: checking for $ac_func" >&5 +echo "configure:4523: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4566,7 +4570,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:4570: checking for socket in -lsocket" >&5 +echo "configure:4574: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4574,7 +4578,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4618,7 +4622,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:4622: checking for socket in -lbsd" >&5 +echo "configure:4626: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4626,7 +4630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4682,12 +4686,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4686: checking for $ac_func" >&5 +echo "configure:4690: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4733,7 +4737,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4737: checking for gethostbyname in -lnsl" >&5 +echo "configure:4741: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4741,7 +4745,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4793,12 +4797,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4797: checking for $ac_func" >&5 +echo "configure:4801: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4844,7 +4848,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:4848: checking for strcasecmp in -lresolv" >&5 +echo "configure:4852: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4852,7 +4856,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4935,10 +4939,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:4939: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4943: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -4947,7 +4951,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -4959,14 +4963,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5031,9 +5035,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:5035: checking if socks5p.h is available" >&5 +echo "configure:5039: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -5069,17 +5073,17 @@ for ac_hdr in unistd.h fcntl.h sys/file. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5073: checking for $ac_hdr" >&5 +echo "configure:5077: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5106,12 +5110,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:5110: checking for fcntl" >&5 +echo "configure:5114: checking for fcntl" >&5 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fcntl=yes" else @@ -5154,12 +5158,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:5158: checking for lockf" >&5 +echo "configure:5162: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_lockf=yes" else @@ -5202,12 +5206,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:5206: checking for flock" >&5 +echo "configure:5210: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_flock=yes" else @@ -5251,7 +5255,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:5255: checking for file-locking functions" >&5 +echo "configure:5259: checking for file-locking functions" >&5 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5263,7 +5267,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -5291,7 +5295,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5303,7 +5307,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -5323,7 +5327,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5335,7 +5339,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -5358,7 +5362,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5379,7 +5383,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6 echo $ac_n "checking which locking method should be used""... $ac_c" 1>&6 -echo "configure:5383: checking which locking method should be used" >&5 +echo "configure:5387: checking which locking method should be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -5448,7 +5452,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:5452: checking for screen type" >&5 +echo "configure:5456: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -5464,7 +5468,7 @@ use_curses=no use_ncurses=no echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:5468: checking if you specified curses install-directory" >&5 +echo "configure:5472: checking if you specified curses install-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -5521,7 +5525,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:5525: checking if you want to use ncurses library" >&5 +echo "configure:5529: checking if you want to use ncurses library" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then @@ -5534,7 +5538,7 @@ fi echo "$ac_t""$use_ncurses" 1>&6 echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:5538: checking if you want curses rather than termcap interface" >&5 +echo "configure:5542: checking if you want curses rather than termcap interface" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then @@ -5571,7 +5575,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:5575: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:5579: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5582,7 +5586,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5626,7 +5630,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:5630: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5634: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5721,14 +5725,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5755,7 +5759,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -5823,14 +5827,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5885,7 +5889,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5889: checking for ncurses version" >&5 +echo "configure:5893: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5911,7 +5915,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5915: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5919: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -5920,7 +5924,7 @@ EOF else cat > conftest.$ac_ext < @@ -5944,7 +5948,7 @@ int main() exit(0); } EOF -if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5975,7 +5979,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:5979: checking for Gpm_Open in -lgpm" >&5 +echo "configure:5983: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5983,7 +5987,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6010,7 +6014,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:6014: checking for initscr in -lgpm" >&5 +echo "configure:6018: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6018,7 +6022,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6061,7 +6065,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6065: checking for tgoto in -lmytinfo" >&5 +echo "configure:6069: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6069,7 +6073,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6114,12 +6118,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6118: checking for initscr" >&5 +echo "configure:6122: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -6162,17 +6166,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:6166: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:6170: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6241,17 +6245,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:6245: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:6249: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6282,7 +6286,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:6286: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:6290: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -6291,14 +6295,14 @@ echo "configure:6286: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6325,9 +6329,9 @@ EOF for cf_hdr in stdlib.h wchar.h wctype.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:6329: checking for $cf_hdr" >&5 +echo "configure:6333: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -6335,7 +6339,7 @@ echo "configure:6329: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6362,12 +6366,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:6366: checking for wide char and multibyte support" >&5 +echo "configure:6370: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -6403,7 +6407,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -6413,7 +6417,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -6439,7 +6443,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -6480,7 +6484,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:6484: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:6488: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6491,7 +6495,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -6543,7 +6547,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:6547: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:6551: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6638,14 +6642,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6672,7 +6676,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -6748,14 +6752,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6810,7 +6814,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6814: checking for ncurses version" >&5 +echo "configure:6818: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6836,7 +6840,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6840: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6844: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6845,7 +6849,7 @@ EOF else cat > conftest.$ac_ext < @@ -6869,7 +6873,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6900,7 +6904,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:6904: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6908: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6908,7 +6912,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6935,7 +6939,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:6939: checking for initscr in -lgpm" >&5 +echo "configure:6943: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6943,7 +6947,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6986,7 +6990,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6990: checking for tgoto in -lmytinfo" >&5 +echo "configure:6994: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6994,7 +6998,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7039,12 +7043,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:7043: checking for initscr" >&5 +echo "configure:7047: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -7087,17 +7091,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:7091: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:7095: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -7166,17 +7170,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7170: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:7174: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -7207,7 +7211,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:7211: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:7215: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -7216,14 +7220,14 @@ echo "configure:7211: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7246,7 +7250,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7250: checking for ncurses version" >&5 +echo "configure:7254: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7272,7 +7276,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7276: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7280: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7281,7 +7285,7 @@ EOF else cat > conftest.$ac_ext < @@ -7305,7 +7309,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7328,13 +7332,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:7332: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7336: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7346,7 +7350,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:7350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -7354,7 +7358,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -7390,7 +7394,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:7394: checking for extra include directories" >&5 +echo "configure:7398: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7414,7 +7418,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:7418: checking if we have identified curses headers" >&5 +echo "configure:7422: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7427,14 +7431,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:7438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -7457,17 +7461,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7461: checking for $ac_hdr" >&5 +echo "configure:7465: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7498,16 +7502,16 @@ done echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:7502: checking if we have identified curses libraries" >&5 +echo "configure:7506: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7523,7 +7527,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:7527: checking for tgoto in -lmytinfo" >&5 +echo "configure:7531: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7531,7 +7535,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7565,7 +7569,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:7569: checking for initscr in -lcur_colr" >&5 +echo "configure:7573: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7573,7 +7577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7607,7 +7611,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:7611: checking for initscr in -lHcurses" >&5 +echo "configure:7615: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7615,7 +7619,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7679,12 +7683,12 @@ if test ".$ac_cv_func_initscr" != .yes ; # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:7683: checking for tgoto" >&5 +echo "configure:7687: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -7728,7 +7732,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:7732: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7736: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7736,7 +7740,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7777,7 +7781,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:7781: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7785: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7785,7 +7789,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7822,16 +7826,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:7826: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7830: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7847,16 +7851,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:7851: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7855: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -7866,14 +7870,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7894,7 +7898,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7898: checking for ncurses version" >&5 +echo "configure:7902: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7920,7 +7924,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7924: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7928: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7929,7 +7933,7 @@ EOF else cat > conftest.$ac_ext < @@ -7953,7 +7957,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7976,13 +7980,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:7980: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7984: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7994,7 +7998,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -8002,7 +8006,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -8038,7 +8042,7 @@ fi ## substitute externally-installed PCRE library for our bundled version echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6 -echo "configure:8042: checking if you want to use installed version of pcre" >&5 +echo "configure:8046: checking if you want to use installed version of pcre" >&5 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -8104,14 +8108,14 @@ esac PCRE_MAKEFILE= if test "$PCRE_HOME" = "no" ; then - PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest pcre/pcre.h:pcre/pcre.in" + PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest pcre/pcre.h" fi ## debugging libraries (do this after other libraries) debug_malloc=none echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:8115: checking if you want to link with dbmalloc for testing" >&5 +echo "configure:8119: checking if you want to link with dbmalloc for testing" >&5 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then @@ -8125,17 +8129,17 @@ echo "$ac_t""$with_dbmalloc" 1>&6 if test "$with_dbmalloc" = yes ; then ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 -echo "configure:8129: checking for dbmalloc.h" >&5 +echo "configure:8133: checking for dbmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8152,7 +8156,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:8156: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:8160: checking for debug_malloc in -ldbmalloc" >&5 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8160,7 +8164,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8199,7 +8203,7 @@ fi echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6 -echo "configure:8203: checking if you want to link with dmalloc for testing" >&5 +echo "configure:8207: checking if you want to link with dmalloc for testing" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -8213,17 +8217,17 @@ echo "$ac_t""$with_dmalloc" 1>&6 if test "$with_dmalloc" = yes ; then ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 -echo "configure:8217: checking for dmalloc.h" >&5 +echo "configure:8221: checking for dmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8240,7 +8244,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 -echo "configure:8244: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:8248: checking for dmalloc_debug in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8248,7 +8252,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8287,7 +8291,7 @@ fi echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6 -echo "configure:8291: checking if you want debugging-trace" >&5 +echo "configure:8295: checking if you want debugging-trace" >&5 # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -8305,12 +8309,12 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:8309: checking for _tracef" >&5 +echo "configure:8313: checking for _tracef" >&5 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__tracef=yes" else @@ -8355,7 +8359,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6 -echo "configure:8359: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:8363: checking for _tracef in -l${cf_with_screen}_g" >&5 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8363,7 +8367,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8406,7 +8410,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:8410: checking for domain-name" >&5 +echo "configure:8414: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -8435,7 +8439,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6 if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:8439: checking for NNTP default-server" >&5 +echo "configure:8443: checking for NNTP default-server" >&5 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then @@ -8501,7 +8505,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:8505: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:8509: checking whether to use MH style mail handling for mailgroups" >&5 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then @@ -8520,7 +8524,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:8524: checking whether to enable 8-bit keycodes" >&5 +echo "configure:8528: checking whether to enable 8-bit keycodes" >&5 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then @@ -8546,7 +8550,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:8550: checking whether to enable ANSI-color" >&5 +echo "configure:8554: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -8563,7 +8567,7 @@ use_color=$enableval echo "$ac_t""$use_color" 1>&6 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:8567: checking whether to enable posting-etiquette" >&5 +echo "configure:8571: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -8582,7 +8586,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:8586: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:8590: checking whether to strictly observe RFC2047 and break long lines" >&5 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then @@ -8601,7 +8605,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6 -echo "configure:8605: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:8609: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then @@ -8627,7 +8631,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:8631: checking for MIME character-set" >&5 +echo "configure:8635: checking for MIME character-set" >&5 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then @@ -8649,7 +8653,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:8653: checking for default ISO/ASCII table" >&5 +echo "configure:8657: checking for default ISO/ASCII table" >&5 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then @@ -8671,7 +8675,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:8675: checking whether to enable locale support" >&5 +echo "configure:8679: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -8690,7 +8694,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:8694: checking whether to enable posting" >&5 +echo "configure:8698: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -8709,7 +8713,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:8713: checking whether to enable shell escape" >&5 +echo "configure:8717: checking whether to enable shell escape" >&5 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then @@ -8728,7 +8732,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:8732: checking whether to have fascist newsadmin" >&5 +echo "configure:8736: checking whether to have fascist newsadmin" >&5 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then @@ -8747,7 +8751,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:8751: checking whether to enable inverse video and highlighting" >&5 +echo "configure:8755: checking whether to enable inverse video and highlighting" >&5 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then @@ -8766,7 +8770,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:8770: checking whether to enable piping support" >&5 +echo "configure:8774: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -8785,7 +8789,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:8789: checking whether to enable printer support" >&5 +echo "configure:8793: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -8804,7 +8808,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:8808: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:8812: checking whether to unique tmp-files by appending .pid" >&5 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then @@ -8830,7 +8834,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6 -echo "configure:8834: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:8838: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then @@ -8857,7 +8861,7 @@ echo "$ac_t""$enableval" 1>&6 ### bypass a bug in old versions of leafnode & NNTPcache echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6 -echo "configure:8861: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:8865: checking whether to send a GROUP command before a LISTGROUP" >&5 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then @@ -8877,7 +8881,7 @@ echo "$ac_t""$enableval" 1>&6 ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 -echo "configure:8881: checking whether to ignore system()s return value" >&5 +echo "configure:8885: checking whether to ignore system()s return value" >&5 # Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. if test "${enable_broken_system_fix+set}" = set; then @@ -8897,7 +8901,7 @@ echo "$ac_t""$enableval" 1>&6 ### checks for the location of the system-wide default setting file echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6 -echo "configure:8901: checking for directory containing tin.defaults file" >&5 +echo "configure:8905: checking for directory containing tin.defaults file" >&5 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then @@ -8940,7 +8944,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:8944: checking whether to enable IPv6" >&5 +echo "configure:8948: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -8961,7 +8965,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:8965: checking ipv6 stack type" >&5 +echo "configure:8969: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8981,7 +8985,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -8999,7 +9003,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -9017,7 +9021,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -9044,7 +9048,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -9062,7 +9066,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -9080,7 +9084,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -9113,7 +9117,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:9117: checking for IPv6 library if required" >&5 +echo "configure:9121: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -9147,7 +9151,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -9158,7 +9162,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:9162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -9255,12 +9259,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:9259: checking for getaddrinfo" >&5 +echo "configure:9263: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -9303,10 +9307,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:9307: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:9311: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -9317,7 +9321,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:9321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -9386,10 +9390,10 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:9390: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:9394: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -9400,7 +9404,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:9404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -9433,7 +9437,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:9437: checking working getaddrinfo" >&5 +echo "configure:9441: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9442,7 +9446,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -9521,7 +9525,7 @@ int main() } EOF -if { (eval echo configure:9525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -9565,12 +9569,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9569: checking for $ac_func" >&5 +echo "configure:9573: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9622,7 +9626,7 @@ done ### checks for operator characteristics (should be the last option) echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6 -echo "configure:9626: checking whether to make a coffee while compiling" >&5 +echo "configure:9630: checking whether to make a coffee while compiling" >&5 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then @@ -9647,7 +9651,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:9651: checking for makeflags variable" >&5 +echo "configure:9655: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9692,12 +9696,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9696: checking for working const" >&5 +echo "configure:9700: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9767,21 +9771,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9771: checking for inline" >&5 +echo "configure:9775: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9808,13 +9812,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:9812: checking for ansi token expansion/substitution" >&5 +echo "configure:9816: checking for ansi token expansion/substitution" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -9843,13 +9847,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:9847: checking for ansi token concatenation" >&5 +echo "configure:9851: checking for ansi token concatenation" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -9878,20 +9882,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:9882: checking if nested parameters work" >&5 +echo "configure:9886: checking if nested parameters work" >&5 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -9914,12 +9918,12 @@ EOF ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9918: checking for ANSI C header files" >&5 +echo "configure:9922: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9927,7 +9931,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9944,7 +9948,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9962,7 +9966,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9983,7 +9987,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9994,7 +9998,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:9998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -10022,12 +10026,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:10026: checking for $ac_hdr that defines DIR" >&5 +echo "configure:10030: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -10035,7 +10039,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:10039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -10060,7 +10064,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:10064: checking for opendir in -ldir" >&5 +echo "configure:10068: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10068,7 +10072,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10101,7 +10105,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:10105: checking for opendir in -lx" >&5 +echo "configure:10109: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10109,7 +10113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10143,12 +10147,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:10147: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:10151: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -10157,7 +10161,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:10161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -10178,12 +10182,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:10182: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:10186: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -10199,7 +10203,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:10203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -10278,9 +10282,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:10282: checking for $cf_hdr" >&5 +echo "configure:10286: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -10288,7 +10292,7 @@ echo "configure:10282: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10324,17 +10328,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10328: checking for $ac_hdr" >&5 +echo "configure:10332: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10365,17 +10369,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10369: checking for $ac_hdr" >&5 +echo "configure:10373: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10410,16 +10414,16 @@ if test "$ac_cv_header_termios_h" = yes esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:10414: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:10418: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:10423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -10428,7 +10432,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -10460,7 +10464,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10464: checking declaration of size-change" >&5 +echo "configure:10468: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10474,7 +10478,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -10513,7 +10517,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10552,7 +10556,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:10556: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:10560: checking if sys/time.h conflicts with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10560,7 +10564,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -10612,12 +10616,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:10616: checking for gid_t" >&5 +echo "configure:10620: checking for gid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10645,12 +10649,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10649: checking for mode_t" >&5 +echo "configure:10653: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10678,12 +10682,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:10682: checking for off_t" >&5 +echo "configure:10686: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10711,12 +10715,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:10715: checking for pid_t" >&5 +echo "configure:10719: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10744,12 +10748,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:10748: checking for size_t" >&5 +echo "configure:10752: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10777,12 +10781,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:10781: checking for ssize_t" >&5 +echo "configure:10785: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10810,12 +10814,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:10814: checking for time_t" >&5 +echo "configure:10818: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10842,13 +10846,76 @@ EOF fi +cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + rm -rf conftest* + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + rm -rf conftest* + + echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 +echo "configure:10873: checking for in_addr_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_in_addr_t=yes +else + rm -rf conftest* + ac_cv_type_in_addr_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 +if test $ac_cv_type_in_addr_t = no; then + cat >> confdefs.h <<\EOF +#define in_addr_t unsigned long +EOF + +fi + + +fi +rm -f conftest* + + +fi +rm -f conftest* + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10847: checking for uid_t in sys/types.h" >&5 +echo "configure:10914: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -10878,9 +10945,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:10882: checking for quad_t" >&5 +echo "configure:10949: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -10893,7 +10960,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:10897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -10912,9 +10979,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:10916: checking for long long" >&5 +echo "configure:10983: checking for long long" >&5 cat > conftest.$ac_ext < @@ -10923,7 +10990,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:10927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -10942,9 +11009,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:10946: checking for nl_item" >&5 +echo "configure:11013: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -10981,7 +11048,7 @@ fi # libuu/uudeview # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 -echo "configure:10985: checking for UUInitialize in -luu" >&5 +echo "configure:11052: checking for UUInitialize in -luu" >&5 ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10989,7 +11056,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11017,17 +11084,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:11021: checking for uudeview.h" >&5 +echo "configure:11088: checking for uudeview.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11065,7 +11132,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:11069: checking for stringprep_check_version in -lidn" >&5 +echo "configure:11136: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11073,7 +11140,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11101,17 +11168,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:11105: checking for stringprep.h" >&5 +echo "configure:11172: checking for stringprep.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11134,17 +11201,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:11138: checking for idna.h" >&5 +echo "configure:11205: checking for idna.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11166,7 +11233,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:11170: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:11237: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11174,7 +11241,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11206,9 +11273,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:11210: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:11277: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -11257,17 +11324,17 @@ fi # ICU - International Components for Unicode ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:11261: checking for unicode/unorm.h" >&5 +echo "configure:11328: checking for unicode/unorm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11286,17 +11353,17 @@ if eval "test \"`echo '$ac_cv_header_'$a ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:11290: checking for unicode/ustring.h" >&5 +echo "configure:11357: checking for unicode/ustring.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11322,12 +11389,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:11326: checking for unorm_normalize in libicuuc" >&5 +echo "configure:11393: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -11337,7 +11404,7 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:11341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -11356,17 +11423,17 @@ rm -f conftest* echo "$ac_t""$cf_try_icuuc" 1>&6 ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:11360: checking for unicode/ubidi.h" >&5 +echo "configure:11427: checking for unicode/ubidi.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11413,24 +11480,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -11459,16 +11526,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:11463: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:11530: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -11495,7 +11562,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:11499: checking for initscr in -lcurses" >&5 +echo "configure:11566: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11503,7 +11570,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11535,7 +11602,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11539: checking for tgoto in -ltermcap" >&5 +echo "configure:11606: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11543,7 +11610,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11587,11 +11654,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:11591: checking if we should include termcap.h" >&5 +echo "configure:11658: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -11622,7 +11689,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:11626: checking for term.h" >&5 +echo "configure:11693: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11635,7 +11702,7 @@ for cf_header in \ term.h do cat > conftest.$ac_ext < @@ -11644,7 +11711,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:11648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -11685,7 +11752,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:11689: checking if we should include curses.h or termcap.h" >&5 +echo "configure:11756: checking if we should include curses.h or termcap.h" >&5 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11703,7 +11770,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -11724,7 +11791,7 @@ else rm -rf conftest* echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -11808,7 +11875,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:11812: checking declaration of tputs 3rd param" >&5 +echo "configure:11879: checking declaration of tputs 3rd param" >&5 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11824,10 +11891,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "(line 11828) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 11895) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -11891,14 +11958,14 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -11917,13 +11984,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11921: checking if external errno is declared" >&5 +echo "configure:11988: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11964,13 +12031,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:11968: checking if external errno exists" >&5 +echo "configure:12035: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -12012,12 +12079,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12016: checking for $ac_func" >&5 +echo "configure:12083: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12067,13 +12134,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:12071: checking if external sys_nerr is declared" >&5 +echo "configure:12138: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -12114,13 +12181,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:12118: checking if external sys_nerr exists" >&5 +echo "configure:12185: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_nerr=yes else @@ -12159,13 +12226,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:12163: checking if external sys_errlist is declared" >&5 +echo "configure:12230: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -12206,13 +12273,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:12210: checking if external sys_errlist exists" >&5 +echo "configure:12277: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_errlist=yes else @@ -12318,12 +12385,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12322: checking for $ac_func" >&5 +echo "configure:12389: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12372,12 +12439,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:12376: checking for flock" >&5 +echo "configure:12443: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_flock=yes" else @@ -12422,7 +12489,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:12426: checking for flock in -lbsd" >&5 +echo "configure:12493: checking for flock in -lbsd" >&5 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12430,7 +12497,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12470,12 +12537,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:12474: checking for wide char and multibyte support" >&5 +echo "configure:12541: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -12511,7 +12578,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -12521,7 +12588,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -12547,7 +12614,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -12581,9 +12648,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:12585: checking if gettimeofday takes two arguments" >&5 +echo "configure:12652: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -12614,12 +12681,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:12618: checking return type of signal handlers" >&5 +echo "configure:12685: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -12636,7 +12703,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:12640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -12656,7 +12723,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:12660: checking declaration of signal arguments" >&5 +echo "configure:12727: checking declaration of signal arguments" >&5 if eval "test \"`echo '$''{'cf_cv_sig_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12665,7 +12732,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -12673,7 +12740,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:12677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -12699,13 +12766,13 @@ EOF if test "$ac_cv_func_sigaction" = yes; then echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:12703: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:12770: checking whether sigaction needs _POSIX_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_sigact_bad'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12714,7 +12781,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:12718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -12735,13 +12802,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:12739: checking if we have sigaction/related functions" >&5 +echo "configure:12806: checking if we have sigaction/related functions" >&5 if eval "test \"`echo '$''{'cf_cv_sigaction_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -12781,7 +12848,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:12785: checking for fork" >&5 +echo "configure:12852: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12790,7 +12857,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_func_fork=yes else @@ -12822,12 +12889,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:12826: checking for memmove" >&5 +echo "configure:12893: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_memmove=yes" else @@ -12869,12 +12936,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:12873: checking for bcopy" >&5 +echo "configure:12940: checking for bcopy" >&5 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_bcopy=yes" else @@ -12913,7 +12980,7 @@ if eval "test \"`echo '$ac_cv_func_'bcop echo "$ac_t""yes" 1>&6 echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:12917: checking if bcopy does overlapping moves" >&5 +echo "configure:12984: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12922,7 +12989,7 @@ else cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -12973,9 +13040,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:12977: checking if select expects int * arguments" >&5 +echo "configure:13044: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -12995,7 +13062,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:12999: checking whether closedir returns void" >&5 +echo "configure:13066: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13003,13 +13070,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:13013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -13035,7 +13102,7 @@ fi # autoconf 2.5x assumes setvbuf is not reversed when cross-compiling if test "$cross_compiling" != yes ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:13039: checking whether setvbuf arguments are reversed" >&5 +echo "configure:13106: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13043,7 +13110,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -13057,7 +13124,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:13061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -13095,12 +13162,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13099: checking for $ac_func" >&5 +echo "configure:13166: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13150,13 +13217,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:13154: checking for type sigaction_t" >&5 +echo "configure:13221: checking for type sigaction_t" >&5 if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13164,7 +13231,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:13168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -13184,13 +13251,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:13188: checking for nonconflicting termios.h" >&5 +echo "configure:13255: checking for nonconflicting termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_use_termios_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_use_termios_h=yes else @@ -13243,13 +13310,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:13247: checking for passwd.pw_gecos" >&5 +echo "configure:13314: checking for passwd.pw_gecos" >&5 if eval "test \"`echo '$''{'cf_cv_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13260,7 +13327,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:13264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -13280,13 +13347,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:13284: checking for tm.tm_gmtoff" >&5 +echo "configure:13351: checking for tm.tm_gmtoff" >&5 if eval "test \"`echo '$''{'cf_cv_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -13326,7 +13393,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:13330: checking for long file names" >&5 +echo "configure:13397: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13374,17 +13441,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13378: checking for $ac_hdr" >&5 +echo "configure:13445: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13421,17 +13488,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13425: checking for $ac_hdr" >&5 +echo "configure:13492: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13461,17 +13528,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13465: checking for $ac_hdr" >&5 +echo "configure:13532: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13512,13 +13579,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:13516: checking for union wait" >&5 +echo "configure:13583: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -13540,7 +13607,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -13580,7 +13647,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:13584: checking if the system function returns usable child-status" >&5 +echo "configure:13651: checking if the system function returns usable child-status" >&5 if eval "test \"`echo '$''{'cf_cv_system_status'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13589,7 +13656,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -13622,7 +13689,7 @@ int main() } EOF -if { (eval echo configure:13626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=no else @@ -13633,11 +13700,11 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=yes else @@ -13680,13 +13747,13 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:13684: checking for obsolete/broken version of ncurses" >&5 +echo "configure:13751: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13700,7 +13767,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -13725,13 +13792,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:13729: checking if curses supports color attributes" >&5 +echo "configure:13796: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13746,7 +13813,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:13750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -13797,7 +13864,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:13801: checking for redefinable signal constants" >&5 +echo "configure:13868: checking for redefinable signal constants" >&5 if eval "test \"`echo '$''{'cf_cv_sig_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13809,7 +13876,7 @@ if test -n "$cf_cv_sig_args"; then cf_cv_sig_const=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_sig_const=yes else @@ -13862,13 +13929,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:13866: checking for ANSI qsort" >&5 +echo "configure:13933: checking for ANSI qsort" >&5 if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -13908,7 +13975,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:13912: checking if application can dump core" >&5 +echo "configure:13979: checking if application can dump core" >&5 if eval "test \"`echo '$''{'cf_cv_corefile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13917,7 +13984,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -13958,7 +14025,7 @@ int main() #endif } EOF -if { (eval echo configure:13962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_corefile=yes else @@ -14005,18 +14072,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14009: checking for missing "${ac_func}" extern" >&5 +echo "configure:14076: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14015) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14082) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14038,7 +14105,7 @@ if { (eval echo configure:14034: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14097,18 +14164,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14101: checking for missing "${ac_func}" extern" >&5 +echo "configure:14168: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14107) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14174) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14130,7 +14197,7 @@ if { (eval echo configure:14126: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14187,18 +14254,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14191: checking for missing "${ac_func}" extern" >&5 +echo "configure:14258: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14197) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14264) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14220,7 +14287,7 @@ if { (eval echo configure:14216: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14274,6 +14341,7 @@ for ac_func in \ bcopy \ bzero \ calloc \ + fchmod \ fclose \ fdopen \ fflush \ @@ -14328,18 +14396,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14332: checking for missing "${ac_func}" extern" >&5 +echo "configure:14400: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14338) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14406) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14361,7 +14429,7 @@ if { (eval echo configure:14357: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14415,18 +14483,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14419: checking for missing "${ac_func}" extern" >&5 +echo "configure:14487: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14425) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14493) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14448,7 +14516,7 @@ if { (eval echo configure:14444: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14505,18 +14573,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:14509: checking for missing "${ac_func}" extern" >&5 +echo "configure:14577: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 14515) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14583) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -14538,7 +14606,7 @@ if { (eval echo configure:14534: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14586,7 +14654,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:14590: checking for working TIOCGWINSZ" >&5 +echo "configure:14658: checking for working TIOCGWINSZ" >&5 if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14597,7 +14665,7 @@ else cf_cv_use_tiocgwinsz=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_use_tiocgwinsz=yes else @@ -14669,7 +14737,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14673: checking for $ac_word" >&5 +echo "configure:14741: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14699,19 +14767,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:14703: checking for working alloca.h" >&5 +echo "configure:14771: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:14715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -14732,12 +14800,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:14736: checking for alloca" >&5 +echo "configure:14804: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -14797,12 +14865,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:14801: checking whether alloca needs Cray hooks" >&5 +echo "configure:14869: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14831: checking for $ac_func" >&5 +echo "configure:14899: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14882,7 +14950,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:14886: checking stack direction for C alloca" >&5 +echo "configure:14954: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14890,7 +14958,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -14934,17 +15002,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14938: checking for $ac_hdr" >&5 +echo "configure:15006: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14973,12 +15041,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14977: checking for $ac_func" >&5 +echo "configure:15045: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15026,7 +15094,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:15030: checking for working mmap" >&5 +echo "configure:15098: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15034,7 +15102,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -15198,12 +15266,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:15202: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:15270: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15265,17 +15333,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15269: checking for $ac_hdr" >&5 +echo "configure:15337: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15306,12 +15374,12 @@ getgid getuid mempcpy munmap putenv sete strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15310: checking for $ac_func" >&5 +echo "configure:15378: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15375,7 +15443,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:15379: checking for iconv" >&5 +echo "configure:15447: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15383,7 +15451,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -15393,7 +15461,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:15397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -15405,7 +15473,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -15415,7 +15483,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:15419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -15436,13 +15504,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:15440: checking for iconv declaration" >&5 +echo "configure:15508: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15461,7 +15529,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -15490,19 +15558,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:15494: checking for nl_langinfo and CODESET" >&5 +echo "configure:15562: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:15506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -15525,19 +15593,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:15529: checking for LC_MESSAGES" >&5 +echo "configure:15597: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:15541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -15558,7 +15626,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:15562: checking whether NLS is requested" >&5 +echo "configure:15630: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -15582,7 +15650,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:15586: checking whether included gettext is requested" >&5 +echo "configure:15654: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -15603,17 +15671,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:15607: checking for libintl.h" >&5 +echo "configure:15675: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15630,12 +15698,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:15634: checking for GNU gettext in libc" >&5 +echo "configure:15702: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -15644,7 +15712,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -15660,14 +15728,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:15664: checking for GNU gettext in libintl" >&5 +echo "configure:15732: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -15676,7 +15744,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -15709,12 +15777,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15713: checking for $ac_func" >&5 +echo "configure:15781: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15767,7 +15835,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15771: checking for $ac_word" >&5 +echo "configure:15839: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15801,7 +15869,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15805: checking for $ac_word" >&5 +echo "configure:15873: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15839,7 +15907,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15843: checking for $ac_word" >&5 +echo "configure:15911: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15893,7 +15961,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15897: checking for $ac_word" >&5 +echo "configure:15965: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15927,7 +15995,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15931: checking for $ac_word" >&5 +echo "configure:15999: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15964,7 +16032,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15968: checking for $ac_word" >&5 +echo "configure:16036: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16037,7 +16105,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16041: checking for $ac_word" >&5 +echo "configure:16109: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16070,7 +16138,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:16074: checking version of bison" >&5 +echo "configure:16142: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -16118,7 +16186,7 @@ echo "configure:16074: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:16122: checking for catalogs to be installed" >&5 +echo "configure:16190: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -16174,7 +16242,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:16178: checking if we should use included message-library" >&5 +echo "configure:16246: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -16229,17 +16297,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16233: checking for $ac_hdr" >&5 +echo "configure:16301: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16323,19 +16391,19 @@ if test ".$use_alloca" = .yes ; then # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:16327: checking for working alloca.h" >&5 +echo "configure:16395: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:16339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -16356,12 +16424,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:16360: checking for alloca" >&5 +echo "configure:16428: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -16421,12 +16489,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:16425: checking whether alloca needs Cray hooks" >&5 +echo "configure:16493: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16455: checking for $ac_func" >&5 +echo "configure:16523: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16506,7 +16574,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:16510: checking stack direction for C alloca" >&5 +echo "configure:16578: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16514,7 +16582,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -16578,9 +16646,9 @@ fi for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:16582: checking for $cf_hdr" >&5 +echo "configure:16650: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -16588,7 +16656,7 @@ echo "configure:16582: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16614,13 +16682,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:16618: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:16686: checking for iconv_open() //TRANSLIT extension" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_ICONV_OPEN_TRANSLIT 1 @@ -16680,17 +16748,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:16684: checking whether -R must be followed by a space" >&5 +echo "configure:16752: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -16706,14 +16774,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -16745,7 +16813,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:16749: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:16817: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16753,7 +16821,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16786,7 +16854,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:16790: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:16858: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16794,7 +16862,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16834,12 +16902,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:16838: checking for gethostbyname" >&5 +echo "configure:16906: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -16883,7 +16951,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:16887: checking for gethostbyname in -lnsl" >&5 +echo "configure:16955: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16891,7 +16959,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16932,12 +17000,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:16936: checking for connect" >&5 +echo "configure:17004: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -16981,7 +17049,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:16985: checking for connect in -lsocket" >&5 +echo "configure:17053: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16989,7 +17057,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17024,12 +17092,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:17028: checking for remove" >&5 +echo "configure:17096: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -17073,7 +17141,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:17077: checking for remove in -lposix" >&5 +echo "configure:17145: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17081,7 +17149,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17116,12 +17184,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:17120: checking for shmat" >&5 +echo "configure:17188: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -17165,7 +17233,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:17169: checking for shmat in -lipc" >&5 +echo "configure:17237: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17173,7 +17241,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17217,7 +17285,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:17221: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:17289: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17225,7 +17293,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17351,14 +17419,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17377,12 +17445,12 @@ fi echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:17381: checking for XOpenDisplay" >&5 +echo "configure:17449: checking for XOpenDisplay" >&5 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_XOpenDisplay=yes" else @@ -17424,7 +17492,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17428: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17496: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17432,7 +17500,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17467,12 +17535,12 @@ fi echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:17471: checking for XtAppInitialize" >&5 +echo "configure:17539: checking for XtAppInitialize" >&5 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_XtAppInitialize=yes" else @@ -17514,7 +17582,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:17518: checking for XtAppInitialize in -lXt" >&5 +echo "configure:17586: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17522,7 +17590,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17571,7 +17639,7 @@ fi cf_x_athena=${cf_x_athena-Xaw} echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:17575: checking if you want to link with Xaw 3d library" >&5 +echo "configure:17643: checking if you want to link with Xaw 3d library" >&5 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. @@ -17588,7 +17656,7 @@ else fi echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:17592: checking if you want to link with neXT Athena library" >&5 +echo "configure:17660: checking if you want to link with neXT Athena library" >&5 withval= # Check whether --with-neXtaw or --without-neXtaw was given. @@ -17605,7 +17673,7 @@ else fi echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:17609: checking if you want to link with Athena-Plus library" >&5 +echo "configure:17677: checking if you want to link with Athena-Plus library" >&5 withval= # Check whether --with-XawPlus or --without-XawPlus was given. @@ -17622,7 +17690,7 @@ else fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:17626: checking for XextCreateExtension in -lXext" >&5 +echo "configure:17694: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17630,7 +17698,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17680,13 +17748,13 @@ do if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:17684: checking for $cf_test in $cf_path" >&5 +echo "configure:17752: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:17687: checking for $cf_test" >&5 +echo "configure:17755: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -17695,7 +17763,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -17742,23 +17810,23 @@ do if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:17746: checking for $cf_lib in $cf_path" >&5 +echo "configure:17814: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:17750: checking for $cf_test in $cf_lib" >&5 +echo "configure:17818: checking for $cf_test in $cf_lib" >&5 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -17878,14 +17946,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17903,7 +17971,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17907: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17975: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17911,7 +17979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17943,14 +18011,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:17947: checking for XCurses library" >&5 +echo "configure:18015: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext < @@ -17960,7 +18028,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:17964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else diff -Nurp tin-1.7.9/configure.in tin-1.7.10/configure.in --- tin-1.7.9/configure.in 2005-06-29 11:47:02.000000000 +0200 +++ tin-1.7.10/configure.in 2005-09-29 13:37:30.863129956 +0200 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2005-06-09 +dnl Updated : 2005-07-16 dnl Notes : dnl dnl Copyright (c) 1995-2005 Thomas E. Dickey @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.9 +VERSION=1.7.10 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -386,14 +386,14 @@ pdcurses) #(vi none) AC_MSG_CHECKING(if you want to use ncurses library) AC_ARG_WITH(ncurses, - [ --with-ncurses link with ncurses if available], + [ --with-ncurses link with ncurses if available (depriciated)], [use_ncurses=$withval], [use_ncurses=no]) AC_MSG_RESULT($use_ncurses) AC_MSG_CHECKING(if you want curses rather than termcap interface) CF_ARG_ENABLE(curses, - [ --enable-curses use curses interface], + [ --enable-curses use curses interface (depriciated)], [cf_with_screen=curses; use_curses=$withval], [cf_with_screen=termcap; use_curses=no]) AC_MSG_RESULT($enableval) @@ -436,7 +436,7 @@ CF_BUNDLED_PCRE($PCRE_HOME) PCRE_MAKEFILE= if test "$PCRE_HOME" = "no" ; then - PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest pcre/pcre.h:pcre/pcre.in" + PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest pcre/pcre.h" fi ## debugging libraries (do this after other libraries) @@ -752,6 +752,11 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_TYPE(ssize_t, int) AC_CHECK_TYPE(time_t, long) +AC_EGREP_HEADER(in_addr_t, netinet/in.h, ,[ + AC_EGREP_HEADER(in_addr_t, sys/endian.h, ,[ + AC_CHECK_TYPE(in_addr_t, unsigned long)] + )] +) AC_TYPE_UID_T dnl test to see if quad_t is defined @@ -1102,6 +1107,7 @@ CF_CHECK_DECL(\ bcopy \ bzero \ calloc \ + fchmod \ fclose \ fdopen \ fflush \ diff -Nurp tin-1.7.9/doc/CHANGES tin-1.7.10/doc/CHANGES --- tin-1.7.9/doc/CHANGES 2005-06-29 11:32:32.000000000 +0200 +++ tin-1.7.10/doc/CHANGES 2005-09-29 13:18:22.624923065 +0200 @@ -1,3 +1,48 @@ +-- 1.7.10 release 20050929 "Tahay" -- + +U052) Jessica Brennan + Urs Janssen + ADD. check for new mail now also works with maildir-format + FIX. misc.c + +U051) Matthias Buelow + ADD. cache nntp-username and password + FIX. auth.c + +U050) Thomas Bliem + BUG. typos in the german translation + FIX. de.po + +U049) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +U048) Michael Bienia + ADD. user defined keymappings now do override default bindings + ADD. look at char-width for long line warning + FIX. keymap.c + +U047) Urs Janssen + BUG. crash on broken overview data + BUG. long line warning was wrong in multibyte environments + BUG. incorrect prototypes for key_to_func(), func_to_key() and + prompt_slk_response() + BUG. newsgroups file caching didn't work + ADD. pcre update (6.1 -> 6.4) + ADD. check replyto address befor mailing + ADD. a few missing german translations + ADD. config.guess, config.sub update + ADD. allow unbinding keys by mapping them to "NULL" + ADD. configure check for in_addr_t, mksh and fchmod declaration + FIX. autoconf.h[in], extern.h, keymap.h, config.c, filter.c, header.c + help.c, init.c, keymap.c, mail.c, main.c, misc.c, nntplib.c, post.c + thread.c, de.po, config.guess, config.sub, aclocal.m4 + configure[.in], pcre/* + +U046) Travis Brown + ADD. THREAD_PERC to attributes + FIX. tin.h, art.c, attrib.c, tin.5 + -- 1.7.9 release 20050629 "Grimsay" -- U045) Thomas E. Dickey diff -Nurp tin-1.7.9/doc/CREDITS tin-1.7.10/doc/CREDITS --- tin-1.7.9/doc/CREDITS 2005-06-28 10:31:19.000000000 +0200 +++ tin-1.7.10/doc/CREDITS 2005-08-19 21:35:35.000000000 +0200 @@ -4,63 +4,64 @@ David Abbott, Earle Ake, Deniz Akkus, Ru Arka, Joachim Astel, Anton Aylward, Mark Ayzenshteyn, Jens Chr. Bachem, George Baltz, Dieter Baron, Volker Barthelmann, Kirk Bauer, Paul Bauwens, Dieter Becker, Wolfgang Behrens, Fabrice Bellet, Greg Berigan, Enrik -Berkhan, Juergen Bernau, Dan Berry, Michael Bienia, David Binderman, Andrey -Blochintsev, Chris Blum, Fokke de Boer, Andreas Borchert, Sebastian Bork, -Mark Boucher, Robert Brady, Bill Brolik, Travis Brown, Herman ten Brugge, -Martin Buck, Jeremy Buhler, Leila Burrell-Davis, Sean Casey, Peter Castro, -Troy Cauble, Andrey A. Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan -Kwee Chuan, Boleslaw Ciesielski, Robert Claeson, Steven Cogswell, Don -Costello, Joshua Crawford, Bryan Curnutt, Ned Danieley, Lars Dannenberg, -Chris Davies, John Davis, Borislav Deianov, Thomas E. Dickey, Martin -Dickopp, Olaf Dietrich, Herbert Martin Dietze, Theo Van Dinter, Ralf -Doeblitz, Bryan Dongray, Michael Douglass, Nickolay Dudorov, Craig Durland, -Bernd Eckenfels, Phil Edge, Kirk Edson, Nick Efthymiou, Stefan Elf, Nigel -Ellis, Andrei Emeltchenko, L. Scott Emmons, Rob Engle, Olle Eriksson, Brent -Ermlick, Bernd Ernesti, Ragnar Hojland Espinosa, Jason Faultless, Michael -Faurot, Werner Fleck, John M. Flinchbaugh, Andy Gabor, Christian Garbs, -Torsten Gesang, Ruediger Geys, Callum Gibson, Mike Glendinning, Igor -Goryachev, Philippe Goujard, Dan Greenspan, Dennis Grevenstein, Karlo Gross, -Carl Hage, Piers Haken, Paul Halsema, Ed Hanway, Scott Hauck, Christian -Haul, James Hawtin, Per Headland, Arnold Hendriks, Daniel Hermans, Jose -Herrero, Dave Hill, Tom Hite, Torsten Homeyer, Ulli Horlacher, Keith Howell, -Tommy Hsieh, Shih-Kun Huang, Steve Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, Ali -Ibraimi, Pieter Immelman, Jarkko Isokungas, Patrick St. Jean, Hal Jespersen, -Park Sang Jin, Robbin Johnson, Jarkko Jormanainen, Yury July, Nelson Kading, -Geoffrey Keating, Karsten Keil, Charles S. Kerr, Fritz Kleeman, Andreas -Kies, Janne Kiviluoto, Tomasz Kloczko, Dwarven Knight, Thomas Koenig, -Karl-Koenig Koenigsson, Sebnem Korkmaz, Martin Kraemer, Gerald Krause, -Thomas Kroener, Piotr Kucharski, Florian Kuehnert, Bernd Kuemmerlen, Kris -Kugel, Stephan Kulow, Manoj Kumar, Dawid Kuroczko, Yuri Kuzmenko, Olivier -Lacroix, Geoff Lane, Alex Lange, Alain Lasserre, Stanislav Latishko, Hannu -Laurila, Yen-Ming Lee, Vincent Lefevre, Alexander Lehmann, Marty Leisner, -Thomas Leitner, Hakan Lennestal, Kevin Lentin, Chua Choon Leong, Chris -Lewis, Andreas Ley, David-Michael Lincke, Otto Lind, Richard Lloyd, Florian -Lohoff, Reinhard Luebke, Clifford Luke, Michael Lupp, David MacKenzie, Hugh -Mahon, Giuseppe De Marco, Scott Marovich, Dmitri A. Martynoff, Kazushi -Marukawa, Timur Maryin, William McBrine, Geoff McCaughan, Owen Medd, Philipp -Mergenthaler, Andreas Metzler, Arkadiusz Miskiewicz, Soren Moller, Bruce -Momjian, Sergio Morales, Michael Morrell, Klaus Mueller, Mike Muise, Udo -Munk, Steven Michael Murphy, John R. Myers, Daniel Naber, Torsten Neumann, -Dirk Nimmich, James Nugen, David E. O'Brien, Michael O'Reilly, Oleg -Ohotnikov, Ronald Orr, Julien Oster, Guido Ostkamp, Philip Paeps, Jeb -Palmer, Neil Parker, Joseph Parmelee, Tom Parry, Jim Patterson, Sven Paulus, -Walter Pelissero, Cameron Perkins, Colin Perkins, Eric Peterson, Tim Pierce, -Bill Poitras, Scott W. Powers, Wolfgang Prediger, Marc Prud'hommeaux, -GianPiero Puccioni, Thomas Quinot, Stefan Rapp, Martin Reising, Kyle Rhorer, -Ted Richards, Steve Robbins, Ollivier Robert, Branden Robinson, Jim -Robinson, Thomas Roessler, Erik van Roode, Meelis Roos, Stephen Roseman, -Roland Rosenfeld, Peter Van Rossem, Clifton Royston, Juergen Salk, Rich -Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher Sawtell, Holger -Schif, Volker Schmidt, John Schmitz, Torsten Schneider, Stefan Scholl, -Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy Scott, Bart Sears, -Karl-Olav Serrander, Ozge Sevinc, Doug Sewell, Philip Shearer, Jungshik -Shin, Sergey Shkonda, Andreas Siegert, Mark Smith, Toomas Soome, Steve -Spearman, Helmut Springer, Cliff Stanford, Steve Starck, Jason Steiner, Ralf -Stephan, Michael Stenns, Helmrich Streitmatter, Hans Werner Strube, Dieter -Stueken, Ed Sznyter, Lech Szychowski, Dean Takemori, Darrell Tangman, Derek -Terveer, Carsten Theis, Julian Thompson, David Tiller, Andry Timonin, Elmar -W. Tischhauser, Mark Tomlin, Mark Tomlinson, Michael Traub, Martin Treusch -von Buttlar, Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, -Paul Vickers, Corinna Vinschen, Oliver B. Warzecha, Jason Wessel, Cary -Whitney, Henrik Wist, Greg Woods, Andreas Wrede, Lloyd Wright, Jens Wuepper, -Herbert Xu, Billy Y., Hideaki Yoshfuji, Nickolai Zeldovich, Zbigniew Zych +Berkhan, Juergen Bernau, Dan Berry, Michael Bienia, David Binderman, Thomas +Bliem, Andrey Blochintsev, Chris Blum, Fokke de Boer, Andreas Borchert, +Sebastian Bork, Mark Boucher, Robert Brady, Jessica Brennan, Bill Brolik, +Travis Brown, Herman ten Brugge, Martin Buck, Matthias Buelow, Jeremy +Buhler, Leila Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Andrey +A. Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, Boleslaw +Ciesielski, Robert Claeson, Steven Cogswell, Don Costello, Joshua Crawford, +Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris Davies, John Davis, +Borislav Deianov, Thomas E. Dickey, Martin Dickopp, Olaf Dietrich, Herbert +Martin Dietze, Theo Van Dinter, Ralf Doeblitz, Bryan Dongray, Michael +Douglass, Nickolay Dudorov, Craig Durland, Bernd Eckenfels, Phil Edge, Kirk +Edson, Nick Efthymiou, Stefan Elf, Nigel Ellis, Andrei Emeltchenko, L. Scott +Emmons, Rob Engle, Olle Eriksson, Brent Ermlick, Bernd Ernesti, Ragnar +Hojland Espinosa, Jason Faultless, Michael Faurot, Werner Fleck, John M. +Flinchbaugh, Andy Gabor, Christian Garbs, Torsten Gesang, Ruediger Geys, +Callum Gibson, Mike Glendinning, Igor Goryachev, Philippe Goujard, Dan +Greenspan, Dennis Grevenstein, Karlo Gross, Carl Hage, Piers Haken, Paul +Halsema, Ed Hanway, Scott Hauck, Christian Haul, James Hawtin, Per Headland, +Arnold Hendriks, Daniel Hermans, Jose Herrero, Dave Hill, Tom Hite, Torsten +Homeyer, Ulli Horlacher, Keith Howell, Tommy Hsieh, Shih-Kun Huang, Steve +Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, Ali Ibraimi, Pieter Immelman, Jarkko +Isokungas, Patrick St. Jean, Hal Jespersen, Park Sang Jin, Robbin Johnson, +Jarkko Jormanainen, Yury July, Nelson Kading, Geoffrey Keating, Karsten +Keil, Charles S. Kerr, Fritz Kleeman, Andreas Kies, Janne Kiviluoto, Tomasz +Kloczko, Dwarven Knight, Thomas Koenig, Karl-Koenig Koenigsson, Sebnem +Korkmaz, Martin Kraemer, Gerald Krause, Thomas Kroener, Piotr Kucharski, +Florian Kuehnert, Bernd Kuemmerlen, Kris Kugel, Stephan Kulow, Manoj Kumar, +Dawid Kuroczko, Yuri Kuzmenko, Olivier Lacroix, Geoff Lane, Alex Lange, +Alain Lasserre, Stanislav Latishko, Hannu Laurila, Yen-Ming Lee, Vincent +Lefevre, Alexander Lehmann, Marty Leisner, Thomas Leitner, Hakan Lennestal, +Kevin Lentin, Chua Choon Leong, Chris Lewis, Andreas Ley, David-Michael +Lincke, Otto Lind, Richard Lloyd, Florian Lohoff, Reinhard Luebke, Clifford +Luke, Michael Lupp, David MacKenzie, Hugh Mahon, Giuseppe De Marco, Scott +Marovich, Dmitri A. Martynoff, Kazushi Marukawa, Timur Maryin, William +McBrine, Geoff McCaughan, Owen Medd, Philipp Mergenthaler, Andreas Metzler, +Arkadiusz Miskiewicz, Soren Moller, Bruce Momjian, Sergio Morales, Michael +Morrell, Klaus Mueller, Mike Muise, Udo Munk, Steven Michael Murphy, John R. +Myers, Daniel Naber, Torsten Neumann, Dirk Nimmich, James Nugen, David E. +O'Brien, Michael O'Reilly, Oleg Ohotnikov, Ronald Orr, Julien Oster, Guido +Ostkamp, Philip Paeps, Jeb Palmer, Neil Parker, Joseph Parmelee, Tom Parry, +Jim Patterson, Sven Paulus, Walter Pelissero, Cameron Perkins, Colin +Perkins, Eric Peterson, Tim Pierce, Bill Poitras, Scott W. Powers, Wolfgang +Prediger, Marc Prud'hommeaux, GianPiero Puccioni, Thomas Quinot, Stefan +Rapp, Martin Reising, Kyle Rhorer, Ted Richards, Steve Robbins, Ollivier +Robert, Branden Robinson, Jim Robinson, Thomas Roessler, Erik van Roode, +Meelis Roos, Stephen Roseman, Roland Rosenfeld, Peter Van Rossem, Clifton +Royston, Juergen Salk, Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, +Christopher Sawtell, Holger Schif, Volker Schmidt, John Schmitz, Torsten +Schneider, Stefan Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, +Randy Scott, Bart Sears, Karl-Olav Serrander, Ozge Sevinc, Doug Sewell, +Philip Shearer, Jungshik Shin, Sergey Shkonda, Andreas Siegert, Mark Smith, +Toomas Soome, Steve Spearman, Helmut Springer, Cliff Stanford, Steve Starck, +Jason Steiner, Ralf Stephan, Michael Stenns, Helmrich Streitmatter, Hans +Werner Strube, Dieter Stueken, Ed Sznyter, Lech Szychowski, Dean Takemori, +Darrell Tangman, Derek Terveer, Carsten Theis, Julian Thompson, David +Tiller, Andry Timonin, Elmar W. Tischhauser, Mark Tomlin, Mark Tomlinson, +Michael Traub, Martin Treusch von Buttlar, Mark Trumbull, Alex Vasylenko, +Michael Velten, Adri Verhoef, Paul Vickers, Corinna Vinschen, Oliver B. +Warzecha, Jason Wessel, Cary Whitney, Henrik Wist, Greg Woods, Andreas +Wrede, Lloyd Wright, Jens Wuepper, Herbert Xu, Billy Y., Hideaki Yoshfuji, +Nickolai Zeldovich, Zbigniew Zych diff -Nurp tin-1.7.9/doc/INSTALL tin-1.7.10/doc/INSTALL --- tin-1.7.9/doc/INSTALL 2005-06-28 10:31:19.000000000 +0200 +++ tin-1.7.10/doc/INSTALL 2005-09-22 15:45:49.013965186 +0200 @@ -388,7 +388,8 @@ you may select are: curses, ncurses, ncu Define this if you want to link with ncurses instead of termcap. Note: This is required on some Linux distributions (i.e., SuSE) where there is either a curses or termcap library which is not ncurses. If ncurses is installed as -the curses library, this option is usually not needed. +the curses library, this option is usually not needed. This option is +depriciated, use --with-screen=ncurses (see above) instead. --enable-curses (default: off) Enable this if you wish to use the curses screen optimizing rather than @@ -396,8 +397,8 @@ termcap. This has been tested well start (except for mouse support and screen resizing) with SVr4 curses (Solaris 2.5 is known to have a bug in libc which prevents use of curses, ncurses works well on that platform). To build with ncurses screen optimizing, you must -give both the --with-ncurses and --enable-curses options or give the ---with-screen=ncurses option. +give both the --with-ncurses and --enable-curses options. This option is +depriciated, use --with-screen=ncurses (see above) instead. --enable-inverse-video (default: on) Disable if you want inverse video and highlighted bar disabled by default. @@ -644,5 +645,6 @@ Compiled & installed -------------------- Tin was successfully built and installed on a variety of platforms including Linux, FreeBSD, OpenBSD, NetBSD, BSDi, Darwin, Solaris, IRIX, HP-UX, Ultrix, -Tru64, AIX, SINIX, UXP/V, SUPER-UX, QNX, GNU Hurd, DG/UX, SEIUX, Openstep, -MiNT and Cygwin. For a detailed list see +Tru64, AIX, SINIX, UXP/V, SUPER-UX, Unicos, QNX, GNU Hurd, DG/UX, SEIUX, +Openstep, MiNT and Cygwin. +For a detailed list see diff -Nurp tin-1.7.9/doc/TODO tin-1.7.10/doc/TODO --- tin-1.7.9/doc/TODO 2005-06-28 10:31:20.000000000 +0200 +++ tin-1.7.10/doc/TODO 2005-09-29 13:32:22.464137312 +0200 @@ -4,10 +4,9 @@ not read only ,-). Bugs ---- -o a wrong usename in ~/.newsauth leeds to an endless authentication loop - as it can't be corrected anymore, see - - [20050524 Urs Janssen ] + o a wrong usename in ~/.newsauth can't be corrected in the first + pass + [20050816 Urs Janssen ] o can 'V'iew mime-parts with (illegal) encoded filename, e.g: | Content-Type: image/jpeg; @@ -137,8 +136,9 @@ o add user defined screen layout at dif [20041025 Urs Janssen ] o add TLS, NNTPS support - (see draft-ietf-nntpext-tls-nntp-03.txt; - might be useful; + (see draft-ietf-nntpext-tls-nntp-09.txt; + , + might be useful; "stunnel -c -d 1119 -r news.example.org:563; tin -g localhost -p 1119" can be used for NNTPS) [20031210 Urs Janssen ] @@ -458,11 +458,13 @@ o add config option for (external) view Filtering enhancements ---------------------- -o add used filter-type to filter-file or filter-rule or use different +o add spamassassin interface when ever adding body filters + +o add used filter-type to filter file or filter rule or use different filter files for wildmat/regexp -o add command: mark all articles older/newer than as read - (useful when subscribing to a new group with high-traffic...) +o add command: mark all articles older/newer than (or ) as + read (useful when subscribing to a new group with high-traffic...) o fix kill/hot mechanism so that it is possible to match articles on arbitrary headers @@ -491,9 +493,31 @@ o suppress hide_uue=2 checking unless f Internal Changes ---------------- +o move serveral (server related) files into the per-server dir + e.g.: + ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news${NNTPSERVER+"-$NNTPSERVER"}/ + should be + ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}${NNTPSERVER+"/$NNTPSERVER"}/.news/ + [20050807 Urs Janssen ] + +o make article numbers uint_least64_t (on OSs where possible), provide + usefull fallbacks if system doesn't have / + [20050728 Urs Janssen ] + +o upgrade configure-script to autoconf-2.59 + [20050728 Urs Janssen ] + o remove untranslateable constructs like txt_prefix_* [20050413 Urs Janssen ] +o merge tinrc.space_goto_next_unread, tinrc.tab_goto_next_unread and + tinrc.pgdn_goto_next into a single option list + tinrc.goto_next_unread = {SPACE, TAB, PGDN, + SPACE | TAB, SPACE | PGDN, + TAB | PGDN, SPACE | TAB | PGDN} + to shorten 'M'enu and tinrc. + [20050709 Urs Janssen ] + o keys which could be renamed/merged: - 'm' GroupMail, PageMail, PostMail, ThreadMail - 'N' GroupNextUnreadArt, PageNextUnreadArt, (SelectNextUnreadGrp) @@ -646,6 +670,14 @@ o make mm_network_charset an "option_li check wether KOI8-RU is still used/valid) [done except configure check 20010907 urs@tin.org] +o make mm_network_charset an user configurable item list + ("US-ASCII:ISO-8859-1:ISO-8859-9:ISO-8859-15:UTF-8", + "US-ASCII:ISO 8859-5:KOI8-R:UTF-8", + "EUC-CN:ISO-2022-CN:ISO-2022-CN-EXT:Big5:UTF-8", whatever) + and try all given charsets in order till the one is found which matches + best (i.e. can display most (all) of the chars in the article). + [20050805 ] + o add IDNA support (RFC 3490ff.) ( might be usefull) (added minimalistic IDNA decoding support if a recent libidn is found, urs) @@ -665,6 +697,9 @@ o review the turkish, russian and kinya o add installation guide (in html) o add cross-compilation hints + CC="crosscc" LD="crossld" AR="crossar" RANLIB=":" MAKE="crossmake" \ + ./configure --with-build-cc=gcc --with-build-cpp=cpp \ + --target=cross-traget-tripple --without-x # usual configure flags o better document keymap feature @@ -678,6 +713,12 @@ o replace "\\" by "\e" in manpages (por Not yet classified ------------------ +o in several places only the latest keybinding is shown in prompts + (e.g. "q=quit, e=edit, i=ispell, g=pgp, M=menu, w=post, o=postpone: w" + with "PostPost p y w" in keymaps) + should we try to show them all? + [20050718 Urs Janssen ] + o add PGP_INCLUDE_KEY to pgp_mail_keys? [20050426 Urs Janssen ] diff -Nurp tin-1.7.9/doc/tin.1 tin-1.7.10/doc/tin.1 --- tin-1.7.9/doc/tin.1 2005-06-29 11:35:49.000000000 +0200 +++ tin-1.7.10/doc/tin.1 2005-09-14 14:36:31.200463226 +0200 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2005-06-29 +.\" Updated : 2005-09-14 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -19,7 +19,7 @@ .fi .. .\" -.TH tin 1 "June 29th, 2005" "1.7.9" "A Usenet newsreader" +.TH tin 1 "September 14th, 2005" "1.7.10" "A Usenet newsreader" .\" .\" .SH NAME @@ -2811,7 +2811,7 @@ For a detailed description see .IR ${TIN_INDEX_MAILDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.mail/ .PP -.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news/ +.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news${NNTPSERVER+"\-$NNTPSERVER"}/ .PP .IR ${TIN_INDEX_SAVEDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.save/ @@ -2852,6 +2852,9 @@ For a detailed description see .IR ${TIN_HOMEDIR\-"$HOME"}/.tin/postponed.articles .PP +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER:${NNTPPORT+":$NNTPPORT"}/newsgroups +.PP + .IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER:${NNTPPORT+":$NNTPPORT"}/serverrc .PP diff -Nurp tin-1.7.9/doc/tin.5 tin-1.7.10/doc/tin.5 --- tin-1.7.9/doc/tin.5 2005-06-29 11:36:04.000000000 +0200 +++ tin-1.7.10/doc/tin.5 2005-09-14 15:50:42.071372433 +0200 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2005-06-29 +.\" Updated : 2005-09-14 .\" Notes : needs a some work .\" .\" Macros @@ -16,7 +16,7 @@ .fi .. .\" -.TH tin 5 "June 29th, 2005" "1.7.9" "A Usenet newsreader" +.TH tin 5 "September 14th, 2005" "1.7.10" "A Usenet newsreader" .SH NAME tin, rtin \- related files @@ -340,7 +340,7 @@ mailgroups index files .RE .PP -.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news/ +.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news${NNTPSERVER+"\-$NNTPSERVER"}/ .sp .RS newsgroups index files @@ -525,6 +525,9 @@ Identical to the tinrc variable of the s .B thread_arts Identical to the tinrc variable \fBthread_articles\fP .TP +.B thread_perc +Identical to the tinrc variable \fBthread_perc\fP +.TP .B x_body A piece of text that will be added at the start of a message body. If this string starts with a / or ~ then it is assumed to be the name of a file @@ -721,7 +724,7 @@ subj=\\b(cd|[rk]?)?tin(d|pre)?[\-.0\-9]* .RS Keymap-file, containing "\fIkeyname\fR \fIvalue\fR \fI[value]\fR" pairs seperated by spaces or tabs. Below is a list of all rebindable keynames and -their defaults. +their defaults. If a keynames is bound to NULL it is unassigned. .sp .nf .ta \w'GroupSelThdIfUnreadSelected 'u +\w'SPACE'u +\w'SPACE'u @@ -770,7 +773,6 @@ their defaults. \fBPostponed\fP ^O \fBMenuFilterSelect\fP ^A \fBMenuFilterKill\fP ^K - .sp \fBConfigSelect\fP ^J ^M \fBConfigLastPage\fP G @@ -993,6 +995,24 @@ format. .RE .PP +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/newsgroups +.sp +.RS +This file a copy of the servers newsgroups file which provides short +descriptions of each newsgroup. It is automatically updated on startup +except when using the ''\fB\-X\fP''or ''\fB\-q\fP'' command-line option and +an old copy exists. Each line consist of two tab-separated fields +"\fIgroup.name\fR \fIone-line description\fR". +.TP +.B group.name +is the name of the newsgroup +.TP +.B one-line description +is a short single-line description of the group +.RE +.PP + + .IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/serverrc .sp .RS diff -Nurp tin-1.7.9/include/autoconf.hin tin-1.7.10/include/autoconf.hin --- tin-1.7.9/include/autoconf.hin 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/include/autoconf.hin 2005-07-16 15:30:46.000000000 +0200 @@ -3,7 +3,7 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2005-03-20 + * Updated : 2005-07-16 * Notes : #include files, #defines & struct's * * Copyright (c) 1995-2005 Thomas Dickey @@ -138,6 +138,7 @@ * Data types */ # undef gid_t +# undef in_addr_t # undef mode_t # undef off_t # undef pid_t @@ -331,6 +332,7 @@ # undef DECL_BZERO # undef DECL_CALLOC # undef DECL_CONNECT +# undef DECL_FCHMOD # undef DECL_FCLOSE # undef DECL_FDOPEN # undef DECL_FFLUSH diff -Nurp tin-1.7.9/include/extern.h tin-1.7.10/include/extern.h --- tin-1.7.9/include/extern.h 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/include/extern.h 2005-07-16 15:30:27.000000000 +0200 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-06-23 + * Updated : 2005-07-16 * Notes : * * Copyright (c) 1997-2005 Iain Lea @@ -78,6 +78,9 @@ #ifdef DECL_CALLOC extern void *calloc(size_t, size_t); #endif /* DECL_CALLOC */ +#ifdef DECL_FCHMOD + extern int fchmod(int, mode_t); +#endif /* DECL_FCHMOD */ #ifdef DECL_FCLOSE extern int fclose(FILE *); #endif /* DECL_FCLOSE */ diff -Nurp tin-1.7.9/include/keymap.h tin-1.7.10/include/keymap.h --- tin-1.7.9/include/keymap.h 2005-06-28 10:31:20.000000000 +0200 +++ tin-1.7.10/include/keymap.h 2005-07-16 13:56:30.000000000 +0200 @@ -3,7 +3,7 @@ * Module : keymap.h * Author : J. Faultless, D. Nimmich * Created : 1999 - * Updated : 2005-04-10 + * Updated : 2005-07-16 * Notes : * * Copyright (c) 1999-2005 Jason Faultless @@ -384,8 +384,8 @@ extern struct keylist select_keys; extern struct keylist thread_keys; -extern t_function key_to_func (const char key, struct keylist keys); -extern char func_to_key (t_function func, struct keylist keys); +extern char func_to_key (t_function func, const struct keylist keys); +extern t_function global_mouse_action(t_function (*left_action) (void), t_function (*right_action) (void)); extern t_function handle_keypad( t_function (*left_action) (void), t_function (*right_action) (void), @@ -393,8 +393,6 @@ extern t_function handle_keypad( t_function (*left_action) (void), t_function (*right_action) (void)), const struct keylist keys); -extern t_function global_mouse_action( - t_function (*left_action) (void), - t_function (*right_action) (void)); -extern t_function prompt_slk_response(t_function default_func, struct keylist keys, const char *fmt, ...); +extern t_function key_to_func (const char key, const struct keylist keys); +extern t_function prompt_slk_response(t_function default_func, const struct keylist keys, const char *fmt, ...); #endif /* !KEYMAP_H */ diff -Nurp tin-1.7.9/include/nntplib.h tin-1.7.10/include/nntplib.h --- tin-1.7.9/include/nntplib.h 2005-06-28 10:31:20.000000000 +0200 +++ tin-1.7.10/include/nntplib.h 2005-07-21 16:42:14.000000000 +0200 @@ -3,7 +3,7 @@ * Module : nntplib.h * Author : I.Lea * Created : 1991-04-01 - * Updated : 2005-05-23 + * Updated : 2005-07-21 * Notes : nntp.h 1.5.11/1.6 with extensions for tin * * Copyright (c) 1991-2005 Iain Lea @@ -170,27 +170,28 @@ * CAPABILITIES */ struct t_capabilities { - unsigned int type:3; /* none, LIST EXTENSIONS, CAPABILITIES */ + unsigned int type:3; /* none, LIST EXTENSIONS, CAPABILITIES */ unsigned int version; /* CAPABILITIES version */ t_bool mode_reader:1; /* MODE-READER: "MODE READER" */ - t_bool reader:1; /* READER: "ARTCILE", "BODY", "LISTGROUP" */ - t_bool post:1; /* POST */ + t_bool reader:1; /* READER: "ARTCILE", "BODY", "LISTGROUP" */ + t_bool post:1; /* POST */ t_bool list_active:1; /* LIST ACTIVE */ - t_bool list_active_times:1; /* LIST ACTIVE.TIMES, optional */ - t_bool list_distrib_pats:1; /* LIST DISTRIB.PATS, optional */ + t_bool list_active_times:1; /* LIST ACTIVE.TIMES, optional */ + t_bool list_distrib_pats:1; /* LIST DISTRIB.PATS, optional */ t_bool list_headers:1; /* LIST HEADERS */ t_bool list_newsgroups:1; /* LIST NEWSGROUPS */ - t_bool list_overview_fmt:1; /* LIST OVERVIEW.FMT */ + t_bool list_overview_fmt:1; /* LIST OVERVIEW.FMT */ t_bool list_motd:1; /* LIST MOTD, "private" extension */ t_bool list_subscriptions:1; /* LIST SUBSCRIPTIONS, "private" extension, RFC 2980 */ t_bool list_distributions:1; /* LIST DISTRIBUTIONS, "private" extension, RFC 2980 */ - t_bool xpat:1; /* XPAT, "private" extension, RFC 2980 */ - t_bool hdr:1; /* HDR: "HDR", "LIST HEADERS" */ - const char *hdr_cmd; /* [X]HDR */ - t_bool over:1; /* OVER: "OVER", "LIST OVERVIEW.FMT" */ - t_bool over_msgid:1; /* OVER: "OVER mid" */ + t_bool list_moderators:1; /* LIST MODERATORS, "private" extension */ + t_bool xpat:1; /* XPAT, "private" extension, RFC 2980 */ + t_bool hdr:1; /* HDR: "HDR", "LIST HEADERS" */ + const char *hdr_cmd; /* [X]HDR */ + t_bool over:1; /* OVER: "OVER", "LIST OVERVIEW.FMT" */ + t_bool over_msgid:1; /* OVER: "OVER mid" */ const char *over_cmd; /* [X]OVER */ - t_bool newnews:1; /* NEWNEWS */ + t_bool newnews:1; /* NEWNEWS */ char *implementation; /* IMPLEMENTATION */ t_bool starttls:1; /* STARTTLS */ t_bool authinfo_user:1; /* AUTHINFO USER/PASS */ @@ -198,7 +199,7 @@ struct t_capabilities { #if 0 t_bool sasl_cram_md5:1; /* SASL CRAM-MD5 */ t_bool sasl_digest_md5:1; /* SASL DIGEST-MD5 */ - t_bool sasl_plain:1; /* SASL PLAIN */ + t_bool sasl_plain:1; /* SASL PLAIN */ t_bool sasl_gssapi:1; /* SASL GSSAPI */ t_bool sasl_external:1; /* SASL EXTERNAL */ t_bool streaming:1; /* STREAMING: "MODE STREAM", "CHECK", "TAKETHIS" */ diff -Nurp tin-1.7.9/include/policy.h tin-1.7.10/include/policy.h --- tin-1.7.9/include/policy.h 2005-06-28 10:31:20.000000000 +0200 +++ tin-1.7.10/include/policy.h 2005-09-16 14:23:00.152723655 +0200 @@ -280,9 +280,9 @@ static const char *gnksa_domain_list[] = "name", /* For registration by individuals */ "museum", /* Museums */ /* - * more gTLDs to come in 2005, proposed are: + * more gTLDs to come >=2005, proposed are: * .asia .cat .jobs .mail .mobi - * .post .tel .travel .xxx + * .post .tel .travel .xxx .kids */ # if 0 /* $DEAD */ "uucp", diff -Nurp tin-1.7.9/include/proto.h tin-1.7.10/include/proto.h --- tin-1.7.9/include/proto.h 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/include/proto.h 2005-07-17 15:30:25.000000000 +0200 @@ -585,11 +585,11 @@ extern void stow_cursor(void); extern void wait_message(unsigned int sdelay, const char *fmt, ...); /* search.c */ +extern enum option_enum search_config(t_bool forward, t_bool repeat, enum option_enum current, enum option_enum last); extern int get_search_vectors(int *start, int *end); extern int search(t_function func, int current_art, t_bool repeat); extern int search_active(t_bool forward, t_bool repeat); extern int search_article(t_bool forward, t_bool repeat, int start_line, int lines, t_lineinfo *line, int reveal_ctrl_l_lines, FILE *fp); -extern enum option_enum search_config(t_bool forward, t_bool repeat, enum option_enum current, enum option_enum last); extern int search_body(struct t_group *group, int current_art, t_bool repeat); extern void reset_srch_offsets(void); diff -Nurp tin-1.7.9/include/tin.h tin-1.7.10/include/tin.h --- tin-1.7.9/include/tin.h 2005-06-29 04:04:39.000000000 +0200 +++ tin-1.7.10/include/tin.h 2005-06-30 10:22:21.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-06-28 + * Updated : 2005-06-30 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2005 Iain Lea , Rich Skrenta @@ -1532,7 +1532,8 @@ struct t_attribute { unsigned batch_save:1; /* 0=none, 1=save -S/mail -M */ unsigned delete_tmp_files:1; /* 0=leave, 1=delete */ unsigned show_only_unread:1; /* 0=all, 1=only unread */ - unsigned thread_arts:3; /* 0=unthread, 1=subject, 2=refs, 3=both, 4=multipart*/ + unsigned thread_arts:3; /* 0=unthread, 1=subject, 2=refs, 3=both, 4=multipart, 5=percentage */ + unsigned thread_perc:7; /* percentage thrreading threshold */ unsigned show_author:2; /* 0=none, 1=name, 2=addr, 3=both */ unsigned show_info:2; /* 0=none, 1=lines, 2=score, 3=both */ unsigned sort_art_type:4; /* 0=none, 1=subj descend, 2=subj ascend, diff -Nurp tin-1.7.9/include/version.h tin-1.7.10/include/version.h --- tin-1.7.9/include/version.h 2005-06-29 11:47:02.000000000 +0200 +++ tin-1.7.10/include/version.h 2005-09-29 13:37:30.922118864 +0200 @@ -40,13 +40,13 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.9" +# define VERSION "1.7.10" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20050629" -# define RELEASENAME "Grimsay" +# define RELEASEDATE "20050929" +# define RELEASENAME "Tahay" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" -# define ATTRIBUTES_VERSION "1.0.3" +# define ATTRIBUTES_VERSION "1.0.4" # define FILTER_VERSION "1.0.0" # define KEYMAP_VERSION "1.0.6" # define SERVERCONFIG_VERSION "1.0.0" diff -Nurp tin-1.7.9/pcre/ChangeLog tin-1.7.10/pcre/ChangeLog --- tin-1.7.9/pcre/ChangeLog 2005-06-28 10:31:25.000000000 +0200 +++ tin-1.7.10/pcre/ChangeLog 2005-09-12 16:31:22.000000000 +0200 @@ -1,6 +1,90 @@ ChangeLog for PCRE ------------------ +Version 6.4 05-Sep-05 +--------------------- + + 1. Change 6.0/10/(l) to pcregrep introduced a bug that caused separator lines + "--" to be printed when multiple files were scanned, even when none of the + -A, -B, or -C options were used. This is not compatible with Gnu grep, so I + consider it to be a bug, and have restored the previous behaviour. + + 2. A couple of code tidies to get rid of compiler warnings. + + 3. The pcretest program used to cheat by referring to symbols in the library + whose names begin with _pcre_. These are internal symbols that are not + really supposed to be visible externally, and in some environments it is + possible to suppress them. The cheating is now confined to including + certain files from the library's source, which is a bit cleaner. + + 4. Renamed pcre.in as pcre.h.in to go with pcrecpp.h.in; it also makes the + file's purpose clearer. + + 5. Reorganized pcre_ucp_findchar(). + + +Version 6.3 15-Aug-05 +--------------------- + + 1. The file libpcre.pc.in did not have general read permission in the tarball. + + 2. There were some problems when building without C++ support: + + (a) If C++ support was not built, "make install" and "make test" still + tried to test it. + + (b) There were problems when the value of CXX was explicitly set. Some + changes have been made to try to fix these, and ... + + (c) --disable-cpp can now be used to explicitly disable C++ support. + + (d) The use of @CPP_OBJ@ directly caused a blank line preceded by a + backslash in a target when C++ was disabled. This confuses some + versions of "make", apparently. Using an intermediate variable solves + this. (Same for CPP_LOBJ.) + + 3. $(LINK_FOR_BUILD) now includes $(CFLAGS_FOR_BUILD) and $(LINK) + (non-Windows) now includes $(CFLAGS) because these flags are sometimes + necessary on certain architectures. + + 4. Added a setting of -export-symbols-regex to the link command to remove + those symbols that are exported in the C sense, but actually are local + within the library, and not documented. Their names all begin with + "_pcre_". This is not a perfect job, because (a) we have to except some + symbols that pcretest ("illegally") uses, and (b) the facility isn't always + available (and never for static libraries). I have made a note to try to + find a way round (a) in the future. + + +Version 6.2 01-Aug-05 +--------------------- + + 1. There was no test for integer overflow of quantifier values. A construction + such as {1111111111111111} would give undefined results. What is worse, if + a minimum quantifier for a parenthesized subpattern overflowed and became + negative, the calculation of the memory size went wrong. This could have + led to memory overwriting. + + 2. Building PCRE using VPATH was broken. Hopefully it is now fixed. + + 3. Added "b" to the 2nd argument of fopen() in dftables.c, for non-Unix-like + operating environments where this matters. + + 4. Applied Giuseppe Maxia's patch to add additional features for controlling + PCRE options from within the C++ wrapper. + + 5. Named capturing subpatterns were not being correctly counted when a pattern + was compiled. This caused two problems: (a) If there were more than 100 + such subpatterns, the calculation of the memory needed for the whole + compiled pattern went wrong, leading to an overflow error. (b) Numerical + back references of the form \12, where the number was greater than 9, were + not recognized as back references, even though there were sufficient + previous subpatterns. + + 6. Two minor patches to pcrecpp.cc in order to allow it to compile on older + versions of gcc, e.g. 2.95.4. + + Version 6.1 21-Jun-05 --------------------- diff -Nurp tin-1.7.9/pcre/Makefile.in tin-1.7.10/pcre/Makefile.in --- tin-1.7.9/pcre/Makefile.in 2005-06-28 10:31:25.000000000 +0200 +++ tin-1.7.10/pcre/Makefile.in 2005-09-12 16:51:05.000000000 +0200 @@ -52,7 +52,6 @@ OBJ = \ pcre_info$o \ pcre_maketables$o \ pcre_ord2utf8$o \ - pcre_printint$o \ pcre_refcount$o \ pcre_study$o \ pcre_tables$o \ @@ -121,7 +120,7 @@ dftables$X : dftables.c pcre_maketables. clean :; $(RM) -f *$o *.a pcretest$x pcregrep$x -distclean : clean ; $(RM) -f pcre.h dftables$X chartables.c RunTest +distclean : clean ; $(RM) -f pcre.h dftables$X pcre_chartables.c RunTest runtest : all ./RunTest diff -Nurp tin-1.7.9/pcre/Makefile.in-old tin-1.7.10/pcre/Makefile.in-old --- tin-1.7.9/pcre/Makefile.in-old 2005-06-28 10:31:25.000000000 +0200 +++ tin-1.7.10/pcre/Makefile.in-old 2005-09-12 16:32:19.000000000 +0200 @@ -65,6 +65,12 @@ OBJEXT = @OBJEXT@ BUILD_EXEEXT = @BUILD_EXEEXT@ BUILD_OBJEXT = @BUILD_OBJEXT@ +# POSIX_OBJ and POSIX_LOBJ are either set empty, or to the names of the +# POSIX object files. + +POSIX_OBJ = @POSIX_OBJ@ +POSIX_LOBJ = @POSIX_LOBJ@ + # The compiler, C flags, preprocessor flags, etc CC = @CC@ @@ -98,9 +104,9 @@ LIBTOOL = @LIBTOOL@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC) @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs -@NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -LINKLIB = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir) +@NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir) +LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]' $(LDFLAGS) -I. -I$(top_srcdir) +LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir) @ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs @NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) CXXLINKLIB = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) @@ -125,7 +131,6 @@ OBJ = pcre_chartables.@OBJEXT@ \ pcre_info.@OBJEXT@ \ pcre_maketables.@OBJEXT@ \ pcre_ord2utf8.@OBJEXT@ \ - pcre_printint.@OBJEXT@ \ pcre_refcount.@OBJEXT@ \ pcre_study.@OBJEXT@ \ pcre_tables.@OBJEXT@ \ @@ -134,7 +139,7 @@ OBJ = pcre_chartables.@OBJEXT@ \ pcre_valid_utf8.@OBJEXT@ \ pcre_version.@OBJEXT@ \ pcre_xclass.@OBJEXT@ \ - @POSIX_OBJ@ + $(POSIX_OBJ) LOBJ = pcre_chartables.lo \ pcre_compile.lo \ @@ -147,7 +152,6 @@ LOBJ = pcre_chartables.lo \ pcre_info.lo \ pcre_maketables.lo \ pcre_ord2utf8.lo \ - pcre_printint.lo \ pcre_refcount.lo \ pcre_study.lo \ pcre_tables.lo \ @@ -156,7 +160,7 @@ LOBJ = pcre_chartables.lo \ pcre_valid_utf8.lo \ pcre_version.lo \ pcre_xclass.lo \ - @POSIX_LOBJ@ + $(POSIX_LOBJ) CPPOBJ = pcrecpp.@OBJEXT@ \ pcre_scanner.@OBJEXT@ \ @@ -211,7 +215,7 @@ libpcrecpp.la: libpcre.la $(CPPOBJ) # directory, not the source directory. pcre_chartables.@OBJEXT@: pcre_chartables.c - @$(LTCOMPILE) $(top_srcdir)/pcre_chartables.c + @$(LTCOMPILE) pcre_chartables.c pcre_compile.@OBJEXT@: Makefile config.h pcre.h \ $(top_srcdir)/pcre_internal.h $(top_srcdir)/pcre_compile.c @@ -263,11 +267,6 @@ pcre_ord2utf8.@OBJEXT@: Makefile config. @$(LTCOMPILE) $(UTF8) $(UCP) $(POSIX_MALLOC_THRESHOLD) \ $(top_srcdir)/pcre_ord2utf8.c -pcre_printint.@OBJEXT@: Makefile config.h pcre.h \ - $(top_srcdir)/pcre_internal.h $(top_srcdir)/pcre_printint.c - @$(LTCOMPILE) $(UTF8) $(UCP) $(POSIX_MALLOC_THRESHOLD) \ - $(top_srcdir)/pcre_printint.c - pcre_refcount.@OBJEXT@: Makefile config.h pcre.h \ $(top_srcdir)/pcre_internal.h $(top_srcdir)/pcre_refcount.c @$(LTCOMPILE) $(UTF8) $(UCP) $(POSIX_MALLOC_THRESHOLD) \ @@ -329,23 +328,23 @@ pcre_stringpiece.@OBJEXT@: $(top_srcdir pcretest.@OBJEXT@: $(top_srcdir)/pcretest.c $(top_srcdir)/pcre_internal.h \ pcre.h config.h Makefile - $(CC) -c $(CFLAGS) -I. $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcretest.c + $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcretest.c pcrecpp_unittest.@OBJEXT@: $(top_srcdir)/pcrecpp_unittest.cc pcrecpp.h \ pcre_stringpiece.h pcre.h config.h Makefile - $(CXX) -c $(CXXFLAGS) -I. $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcrecpp_unittest.cc + $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcrecpp_unittest.cc pcre_stringpiece_unittest.@OBJEXT@: $(top_srcdir)/pcre_stringpiece_unittest.cc \ pcre_stringpiece.h config.h Makefile - $(CXX) -c $(CXXFLAGS) -I. $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcre_stringpiece_unittest.cc + $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcre_stringpiece_unittest.cc pcre_scanner_unittest.@OBJEXT@: $(top_srcdir)/pcre_scanner_unittest.cc \ $(top_srcdir)/pcre_scanner.h pcrecpp.h pcre_stringpiece.h \ pcre.h config.h Makefile - $(CXX) -c $(CXXFLAGS) -I. $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcre_scanner_unittest.cc + $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(UTF8) $(UCP) $(LINK_SIZE) $(top_srcdir)/pcre_scanner_unittest.cc pcregrep.@OBJEXT@: $(top_srcdir)/pcregrep.c pcre.h Makefile config.h - $(CC) -c $(CFLAGS) -I. $(UTF8) $(UCP) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c + $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(UTF8) $(UCP) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c # Some Windows-specific targets for MinGW. Do not use for Cygwin. @@ -409,11 +408,11 @@ wininstall : winshared $(INSTALL) .libs/@WIN_PREFIX@pcreposix.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcreposix.dll $(INSTALL) .libs/@WIN_PREFIX@libpcreposix.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcreposix.dll.a $(INSTALL) .libs/@WIN_PREFIX@libpcre.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcre.dll.a - $(INSTALL) .libs/@WIN_PREFIX@pcrecpp.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll - $(INSTALL) .libs/@WIN_PREFIX@libpcrecpp.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcrecpp.dll.a +@HAVE_CPP@ $(INSTALL) .libs/@WIN_PREFIX@pcrecpp.dll $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll +@HAVE_CPP@ $(INSTALL) .libs/@WIN_PREFIX@libpcrecpp.dll.a $(DESTDIR)$(LIBDIR)/@WIN_PREFIX@libpcrecpp.dll.a -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcre.dll -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcreposix.dll - -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll +@HAVE_CPP@ -strip -g $(DESTDIR)$(BINDIR)/@WIN_PREFIX@pcrecpp.dll -strip $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@ -strip $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@ @@ -437,22 +436,22 @@ install: all @ON_WINDOWS@ wininst @NOT_ON_WINDOWS@ $(LIBTOOL) --mode=install $(INSTALL) libpcre.la $(DESTDIR)$(LIBDIR)/libpcre.la @NOT_ON_WINDOWS@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la" @NOT_ON_WINDOWS@ $(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la -@NOT_ON_WINDOWS@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" -@NOT_ON_WINDOWS@ $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la +@NOT_ON_WINDOWS@@HAVE_CPP@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" +@NOT_ON_WINDOWS@@HAVE_CPP@ $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la @NOT_ON_WINDOWS@ $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) $(mkinstalldirs) $(DESTDIR)$(INCDIR) $(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h $(INSTALL_DATA) $(top_srcdir)/pcreposix.h $(DESTDIR)$(INCDIR)/pcreposix.h - $(INSTALL_DATA) pcrecpp.h $(DESTDIR)$(INCDIR)/pcrecpp.h - $(INSTALL_DATA) pcre_stringpiece.h $(DESTDIR)$(INCDIR)/pcre_stringpiece.h - $(INSTALL_DATA) $(top_srcdir)/pcre_scanner.h $(DESTDIR)$(INCDIR)/pcre_scanner.h +@HAVE_CPP@ $(INSTALL_DATA) pcrecpp.h $(DESTDIR)$(INCDIR)/pcrecpp.h +@HAVE_CPP@ $(INSTALL_DATA) pcre_stringpiece.h $(DESTDIR)$(INCDIR)/pcre_stringpiece.h +@HAVE_CPP@ $(INSTALL_DATA) $(top_srcdir)/pcre_scanner.h $(DESTDIR)$(INCDIR)/pcre_scanner.h $(mkinstalldirs) $(DESTDIR)$(MANDIR)/man3 $(INSTALL_DATA) $(top_srcdir)/doc/pcre.3 $(DESTDIR)$(MANDIR)/man3/pcre.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcreapi.3 $(DESTDIR)$(MANDIR)/man3/pcreapi.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcrebuild.3 $(DESTDIR)$(MANDIR)/man3/pcrebuild.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcrecallout.3 $(DESTDIR)$(MANDIR)/man3/pcrecallout.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcrecompat.3 $(DESTDIR)$(MANDIR)/man3/pcrecompat.3 - $(INSTALL_DATA) $(top_srcdir)/doc/pcrecpp.3 $(DESTDIR)$(MANDIR)/man3/pcrecpp.3 +@HAVE_CPP@ $(INSTALL_DATA) $(top_srcdir)/doc/pcrecpp.3 $(DESTDIR)$(MANDIR)/man3/pcrecpp.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcrematching.3 $(DESTDIR)$(MANDIR)/man3/pcrematching.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcrepattern.3 $(DESTDIR)$(MANDIR)/man3/pcrepattern.3 $(INSTALL_DATA) $(top_srcdir)/doc/pcreperform.3 $(DESTDIR)$(MANDIR)/man3/pcreperform.3 @@ -557,13 +556,13 @@ test: runtest runtest: all @ON_WINDOWS@ @WIN_PREFIX@pcre.dll @./RunTest @./RunGrepTest - @echo "" - @echo "Testing C++ wrapper" - @echo ""; echo "Test 1++: stringpiece" - @./pcre_stringpiece_unittest@EXEEXT@ - @echo ""; echo "Test 2++: RE class" - @./pcrecpp_unittest@EXEEXT@ - @echo ""; echo "Test 3++: Scanner class" - @./pcre_scanner_unittest@EXEEXT@ +@HAVE_CPP@ @echo "" +@HAVE_CPP@ @echo "Testing C++ wrapper" +@HAVE_CPP@ @echo ""; echo "Test 1++: stringpiece" +@HAVE_CPP@ @./pcre_stringpiece_unittest@EXEEXT@ +@HAVE_CPP@ @echo ""; echo "Test 2++: RE class" +@HAVE_CPP@ @./pcrecpp_unittest@EXEEXT@ +@HAVE_CPP@ @echo ""; echo "Test 3++: Scanner class" +@HAVE_CPP@ @./pcre_scanner_unittest@EXEEXT@ # End diff -Nurp tin-1.7.9/pcre/NON-UNIX-USE tin-1.7.10/pcre/NON-UNIX-USE --- tin-1.7.9/pcre/NON-UNIX-USE 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/NON-UNIX-USE 2005-09-12 16:32:30.000000000 +0200 @@ -46,7 +46,7 @@ configure.in. write pcre.h (3) Compile dftables.c as a stand-alone program, and then run it with -the single argument "chartables.c". This generates a set of standard +the single argument "pcre_chartables.c". This generates a set of standard character tables and writes them to that file. rem Mark Tetrode's commands diff -Nurp tin-1.7.9/pcre/README tin-1.7.10/pcre/README --- tin-1.7.9/pcre/README 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/README 2005-08-19 11:34:07.000000000 +0200 @@ -94,6 +94,11 @@ cd /build/pcre/pcre-xxx There are some optional features that can be included or omitted from the PCRE library. You can read more about them in the pcrebuild man page. +. If you want to suppress the building of the C++ wrapper library, you can add + --disable-cpp to the "configure" command. Otherwise, when "configure" is run, + will try to find a C++ compiler and C++ header files, and if it succeeds, it + will try to build the C++ wrapper. + . If you want to make use of the support for UTF-8 character strings in PCRE, you must add --enable-utf8 to the "configure" command. Without it, the code for handling UTF-8 is not included in the library. (Even when included, it @@ -486,4 +491,4 @@ The distribution should contain the foll Philip Hazel Email local part: ph10 Email domain: cam.ac.uk -June 2005 +August 2005 diff -Nurp tin-1.7.9/pcre/RunTest.in tin-1.7.10/pcre/RunTest.in --- tin-1.7.9/pcre/RunTest.in 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/RunTest.in 2005-08-01 21:51:35.000000000 +0200 @@ -6,7 +6,10 @@ # Run PCRE tests cf=diff -testdata=testdata +if [ ! -d testdata ] ; then + ln -s @top_srcdir@/testdata testdata +fi +testdata=./testdata # Select which tests to run; if no selection, run all diff -Nurp tin-1.7.9/pcre/config.h tin-1.7.10/pcre/config.h --- tin-1.7.9/pcre/config.h 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/config.h 2005-09-12 16:49:42.000000000 +0200 @@ -1,5 +1,5 @@ /* simply include tin's autoconf'd header file */ #include "autoconf.h" -#define EXPORT #define EBCDIC 0 #define POSIX_MALLOC_THRESHOLD 10 +#define PCRE_EXPORT diff -Nurp tin-1.7.9/pcre/configure.in tin-1.7.10/pcre/configure.in --- tin-1.7.9/pcre/configure.in 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/configure.in 2005-09-12 16:34:25.000000000 +0200 @@ -1,5 +1,11 @@ dnl Process this file with autoconf to produce a configure script. +dnl This configure.in file has been hacked around quite a lot as a result of +dnl patches that various people have sent to me (PH). Sometimes the information +dnl I get is contradictory. I've tried to put in comments that explain things, +dnl but in some cases the information is second-hand and I have no way of +dnl verifying it. I am not an autoconf or libtool expert! + dnl This is required at the start; the name is the name of a file dnl it should be seeing, to verify it is in the same directory. @@ -9,10 +15,10 @@ dnl A safety precaution AC_PREREQ(2.57) -dnl Arrange to build config.h from config.in. Note that pcre.h is +dnl Arrange to build config.h from config.h.in. Note that pcre.h is dnl built differently, as it is just a "substitution" file. dnl Manual says this macro should come right after AC_INIT. -AC_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADER(config.h) dnl Provide the current PCRE version information. Do not use numbers dnl with leading zeros for the minor version, as they end up in a C @@ -21,8 +27,8 @@ dnl digits for minor numbers less than 1 dnl that many releases anyway. PCRE_MAJOR=6 -PCRE_MINOR=1 -PCRE_DATE=21-Jun-2005 +PCRE_MINOR=4 +PCRE_DATE=05-Sep-2005 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} dnl Default values for miscellaneous macros @@ -36,11 +42,22 @@ PCRE_LIB_VERSION=0:1:0 PCRE_POSIXLIB_VERSION=0:0:0 PCRE_CPPLIB_VERSION=0:0:0 +dnl Handle --disable-cpp + +AC_ARG_ENABLE(cpp, +[ --disable-cpp disable C++ support], +want_cpp="$enableval", want_cpp=yes) + dnl Checks for programs. AC_PROG_CC -dnl For the C++ wrapper libpcrecpp. +dnl Test for C++ for the C++ wrapper libpcrecpp. It seems, however, that +dnl AC_PROC_CXX will set $CXX to "g++" when no C++ compiler is installed, even +dnl though that is completely bogus. (This may happen only on certain systems +dnl with certain versions of autoconf, of course.) An attempt to include this +dnl test inside a check for want_cpp was criticized by a libtool expert, who +dnl tells me that it isn't allowed. AC_PROG_CXX @@ -60,7 +77,7 @@ dnl while building. It needs to be diffe dnl There is a macro called AC_PROG_CC_FOR_BUILD in the GNU archive for dnl figuring this out automatically. Unfortunately, it does not work with the dnl latest versions of autoconf. So for the moment, we just default to the -dnl same values as the "main" compiler. People who are corss-compiling will +dnl same values as the "main" compiler. People who are cross-compiling will dnl just have to adjust the Makefile by hand or set these values when they dnl run "configure". @@ -77,40 +94,50 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(limits.h) -dnl These are C++ header files +dnl The files below are C++ header files. One person told me (PH) that +dnl AC_LANG_CPLUSPLUS unsets CXX if it was explicitly set to something which +dnl doesn't work. However, this doesn't always seem to be the case. +if test "x$want_cpp" = "xyes" -a -n "$CXX" +then AC_LANG_SAVE AC_LANG_CPLUSPLUS -dnl I could be more clever here, given I'm doing AC_SUBST with this -dnl (eg set a var to be the name of the include file I want). But I'm not + +dnl We could be more clever here, given we're doing AC_SUBST with this +dnl (eg set a var to be the name of the include file we want). But we're not dnl so it's easy to change back to 'regular' autoconf vars if we needed to. -AC_CHECK_HEADERS(string, [pcre_has_cpp_headers="1"], - [pcre_has_cpp_headers="0"]) -AC_CHECK_HEADERS(bits/type_traits.h, [pcre_has_bits_type_traits="1"], - [pcre_has_bits_type_traits="0"]) -AC_CHECK_HEADERS(type_traits.h, [pcre_has_type_traits="1"], - [pcre_has_type_traits="0"]) +AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"], + [pcre_have_cpp_headers="0"]) +AC_CHECK_HEADERS(bits/type_traits.h, [pcre_have_bits_type_traits="1"], + [pcre_have_bits_type_traits="0"]) +AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"], + [pcre_have_type_traits="0"]) dnl Using AC_SUBST eliminates the need to include config.h in a public .h file -AC_SUBST(pcre_has_bits_type_traits) -AC_SUBST(pcre_has_type_traits) +AC_SUBST(pcre_have_bits_type_traits) +AC_SUBST(pcre_have_type_traits) AC_LANG_RESTORE +fi dnl From the above, we now have enough info to know if C++ is fully installed -if test -n "$ac_cv_prog_ac_ct_CXX" -a "$pcre_has_cpp_headers" = 1; then +if test "x$want_cpp" = "xyes" -a -n "$CXX" -a "$pcre_have_cpp_headers" = 1; then MAYBE_CPP_TARGETS='$(CPP_TARGETS)' + HAVE_CPP= +else + MAYBE_CPP_TARGETS= + HAVE_CPP="#" fi AC_SUBST(MAYBE_CPP_TARGETS) - +AC_SUBST(HAVE_CPP) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T -AC_CHECK_TYPES([long long], [pcre_has_long_long="1"], [pcre_has_long_long="0"]) -AC_CHECK_TYPES([unsigned long long], [pcre_has_ulong_long="1"], [pcre_has_ulong_long="0"]) -AC_SUBST(pcre_has_long_long) -AC_SUBST(pcre_has_ulong_long) +AC_CHECK_TYPES([long long], [pcre_have_long_long="1"], [pcre_have_long_long="0"]) +AC_CHECK_TYPES([unsigned long long], [pcre_have_ulong_long="1"], [pcre_have_ulong_long="0"]) +AC_SUBST(pcre_have_long_long) +AC_SUBST(pcre_have_ulong_long) dnl Checks for library functions. @@ -260,4 +287,4 @@ if test "x$enable_shared" = "xno" ; then fi dnl This must be last; it determines what files are written as well as config.h -AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpp.h:pcrecpp.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config]) +AC_OUTPUT(Makefile pcre.h:pcre.h.in pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpp.h:pcrecpp.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config]) diff -Nurp tin-1.7.9/pcre/dftables.c tin-1.7.10/pcre/dftables.c --- tin-1.7.9/pcre/dftables.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/dftables.c 2005-08-01 21:52:36.000000000 +0200 @@ -66,7 +66,7 @@ if (argc != 2) return 1; } -f = fopen(argv[1], "w"); +f = fopen(argv[1], "wb"); if (f == NULL) { fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]); diff -Nurp tin-1.7.9/pcre/doc/pcre.3 tin-1.7.10/pcre/doc/pcre.3 --- tin-1.7.9/pcre/doc/pcre.3 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/doc/pcre.3 2005-08-19 11:35:16.000000000 +0200 @@ -61,7 +61,10 @@ found in the \fBREADME\fP file in the so The library contains a number of undocumented internal functions and data tables that are used by more than one of the exported external functions, but which are not intended for use by external callers. Their names all begin with -"_pcre_", which hopefully will not provoke any name clashes. +"_pcre_", which hopefully will not provoke any name clashes. In some +environments, it is possible to control which external symbols are exported +when a shared library is built, and in these cases the undocumented symbols are +not exported. . . .SH "USER DOCUMENTATION" diff -Nurp tin-1.7.9/pcre/pcre.h.in tin-1.7.10/pcre/pcre.h.in --- tin-1.7.9/pcre/pcre.h.in 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.10/pcre/pcre.h.in 2005-09-12 16:35:10.000000000 +0200 @@ -0,0 +1,258 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* In its original form, this is the .in file that is transformed by +"configure" into pcre.h. + + Copyright (c) 1997-2005 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ + +#ifndef _PCRE_H +#define _PCRE_H + +/* The file pcre.h is build by "configure". Do not edit it; instead +make changes to pcre.in. */ + +#define PCRE_MAJOR @PCRE_MAJOR@ +#define PCRE_MINOR @PCRE_MINOR@ +#define PCRE_DATE @PCRE_DATE@ + +/* Win32 uses DLL by default; it needs special stuff for exported functions. */ + +#ifdef _WIN32 +# ifdef PCRE_DEFINITION +# ifdef DLL_EXPORT +# define PCRE_DATA_SCOPE __declspec(dllexport) +# endif +# else +# ifndef PCRE_STATIC +# define PCRE_DATA_SCOPE extern __declspec(dllimport) +# endif +# endif +#endif + +/* For other operating systems, we use the standard "extern". */ + +#ifndef PCRE_DATA_SCOPE +# ifdef __cplusplus +# define PCRE_DATA_SCOPE extern "C" +# else +# define PCRE_DATA_SCOPE extern +# endif +#endif + +/* Have to include stdlib.h in order to ensure that size_t is defined; +it is needed here for malloc. */ + +#include + +/* Allow for C++ users */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Options */ + +#define PCRE_CASELESS 0x00000001 +#define PCRE_MULTILINE 0x00000002 +#define PCRE_DOTALL 0x00000004 +#define PCRE_EXTENDED 0x00000008 +#define PCRE_ANCHORED 0x00000010 +#define PCRE_DOLLAR_ENDONLY 0x00000020 +#define PCRE_EXTRA 0x00000040 +#define PCRE_NOTBOL 0x00000080 +#define PCRE_NOTEOL 0x00000100 +#define PCRE_UNGREEDY 0x00000200 +#define PCRE_NOTEMPTY 0x00000400 +#define PCRE_UTF8 0x00000800 +#define PCRE_NO_AUTO_CAPTURE 0x00001000 +#define PCRE_NO_UTF8_CHECK 0x00002000 +#define PCRE_AUTO_CALLOUT 0x00004000 +#define PCRE_PARTIAL 0x00008000 +#define PCRE_DFA_SHORTEST 0x00010000 +#define PCRE_DFA_RESTART 0x00020000 +#define PCRE_FIRSTLINE 0x00040000 + +/* Exec-time and get/set-time error codes */ + +#define PCRE_ERROR_NOMATCH (-1) +#define PCRE_ERROR_NULL (-2) +#define PCRE_ERROR_BADOPTION (-3) +#define PCRE_ERROR_BADMAGIC (-4) +#define PCRE_ERROR_UNKNOWN_NODE (-5) +#define PCRE_ERROR_NOMEMORY (-6) +#define PCRE_ERROR_NOSUBSTRING (-7) +#define PCRE_ERROR_MATCHLIMIT (-8) +#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */ +#define PCRE_ERROR_BADUTF8 (-10) +#define PCRE_ERROR_BADUTF8_OFFSET (-11) +#define PCRE_ERROR_PARTIAL (-12) +#define PCRE_ERROR_BADPARTIAL (-13) +#define PCRE_ERROR_INTERNAL (-14) +#define PCRE_ERROR_BADCOUNT (-15) +#define PCRE_ERROR_DFA_UITEM (-16) +#define PCRE_ERROR_DFA_UCOND (-17) +#define PCRE_ERROR_DFA_UMLIMIT (-18) +#define PCRE_ERROR_DFA_WSSIZE (-19) +#define PCRE_ERROR_DFA_RECURSE (-20) + +/* Request types for pcre_fullinfo() */ + +#define PCRE_INFO_OPTIONS 0 +#define PCRE_INFO_SIZE 1 +#define PCRE_INFO_CAPTURECOUNT 2 +#define PCRE_INFO_BACKREFMAX 3 +#define PCRE_INFO_FIRSTBYTE 4 +#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */ +#define PCRE_INFO_FIRSTTABLE 5 +#define PCRE_INFO_LASTLITERAL 6 +#define PCRE_INFO_NAMEENTRYSIZE 7 +#define PCRE_INFO_NAMECOUNT 8 +#define PCRE_INFO_NAMETABLE 9 +#define PCRE_INFO_STUDYSIZE 10 +#define PCRE_INFO_DEFAULT_TABLES 11 + +/* Request types for pcre_config() */ + +#define PCRE_CONFIG_UTF8 0 +#define PCRE_CONFIG_NEWLINE 1 +#define PCRE_CONFIG_LINK_SIZE 2 +#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3 +#define PCRE_CONFIG_MATCH_LIMIT 4 +#define PCRE_CONFIG_STACKRECURSE 5 +#define PCRE_CONFIG_UNICODE_PROPERTIES 6 + +/* Bit flags for the pcre_extra structure */ + +#define PCRE_EXTRA_STUDY_DATA 0x0001 +#define PCRE_EXTRA_MATCH_LIMIT 0x0002 +#define PCRE_EXTRA_CALLOUT_DATA 0x0004 +#define PCRE_EXTRA_TABLES 0x0008 + +/* Types */ + +struct real_pcre; /* declaration; the definition is private */ +typedef struct real_pcre pcre; + +/* The structure for passing additional data to pcre_exec(). This is defined in +such as way as to be extensible. Always add new fields at the end, in order to +remain compatible. */ + +typedef struct pcre_extra { + unsigned long int flags; /* Bits for which fields are set */ + void *study_data; /* Opaque data from pcre_study() */ + unsigned long int match_limit; /* Maximum number of calls to match() */ + void *callout_data; /* Data passed back in callouts */ + const unsigned char *tables; /* Pointer to character tables */ +} pcre_extra; + +/* The structure for passing out data via the pcre_callout_function. We use a +structure so that new fields can be added on the end in future versions, +without changing the API of the function, thereby allowing old clients to work +without modification. */ + +typedef struct pcre_callout_block { + int version; /* Identifies version of block */ + /* ------------------------ Version 0 ------------------------------- */ + int callout_number; /* Number compiled into pattern */ + int *offset_vector; /* The offset vector */ + const char *subject; /* The subject being matched */ + int subject_length; /* The length of the subject */ + int start_match; /* Offset to start of this match attempt */ + int current_position; /* Where we currently are in the subject */ + int capture_top; /* Max current capture */ + int capture_last; /* Most recently closed capture */ + void *callout_data; /* Data passed in with the call */ + /* ------------------- Added for Version 1 -------------------------- */ + int pattern_position; /* Offset to next item in the pattern */ + int next_item_length; /* Length of next item in the pattern */ + /* ------------------------------------------------------------------ */ +} pcre_callout_block; + +/* Indirection for store get and free functions. These can be set to +alternative malloc/free functions if required. Special ones are used in the +non-recursive case for "frames". There is also an optional callout function +that is triggered by the (?) regex item. For Virtual Pascal, these definitions +have to take another form. */ + +#ifndef VPCOMPAT +PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t); +PCRE_DATA_SCOPE void (*pcre_free)(void *); +PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t); +PCRE_DATA_SCOPE void (*pcre_stack_free)(void *); +PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *); +#else /* VPCOMPAT */ +PCRE_DATA_SCOPE void *pcre_malloc(size_t); +PCRE_DATA_SCOPE void pcre_free(void *); +PCRE_DATA_SCOPE void *pcre_stack_malloc(size_t); +PCRE_DATA_SCOPE void pcre_stack_free(void *); +PCRE_DATA_SCOPE int pcre_callout(pcre_callout_block *); +#endif /* VPCOMPAT */ + +/* Exported PCRE functions */ + +PCRE_DATA_SCOPE pcre *pcre_compile(const char *, int, const char **, int *, + const unsigned char *); +PCRE_DATA_SCOPE pcre *pcre_compile2(const char *, int, int *, const char **, + int *, const unsigned char *); +PCRE_DATA_SCOPE int pcre_config(int, void *); +PCRE_DATA_SCOPE int pcre_copy_named_substring(const pcre *, const char *, + int *, int, const char *, char *, int); +PCRE_DATA_SCOPE int pcre_copy_substring(const char *, int *, int, int, char *, + int); +PCRE_DATA_SCOPE int pcre_dfa_exec(const pcre *, const pcre_extra *, + const char *, int, int, int, int *, int , int *, int); +PCRE_DATA_SCOPE int pcre_exec(const pcre *, const pcre_extra *, const char *, + int, int, int, int *, int); +PCRE_DATA_SCOPE void pcre_free_substring(const char *); +PCRE_DATA_SCOPE void pcre_free_substring_list(const char **); +PCRE_DATA_SCOPE int pcre_fullinfo(const pcre *, const pcre_extra *, int, + void *); +PCRE_DATA_SCOPE int pcre_get_named_substring(const pcre *, const char *, + int *, int, const char *, const char **); +PCRE_DATA_SCOPE int pcre_get_stringnumber(const pcre *, const char *); +PCRE_DATA_SCOPE int pcre_get_substring(const char *, int *, int, int, + const char **); +PCRE_DATA_SCOPE int pcre_get_substring_list(const char *, int *, int, + const char ***); +PCRE_DATA_SCOPE int pcre_info(const pcre *, int *, int *); +PCRE_DATA_SCOPE const unsigned char *pcre_maketables(void); +PCRE_DATA_SCOPE int pcre_refcount(pcre *, int); +PCRE_DATA_SCOPE pcre_extra *pcre_study(const pcre *, int, const char **); +PCRE_DATA_SCOPE const char *pcre_version(void); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* End of pcre.h */ diff -Nurp tin-1.7.9/pcre/pcre.in tin-1.7.10/pcre/pcre.in --- tin-1.7.9/pcre/pcre.in 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,258 +0,0 @@ -/************************************************* -* Perl-Compatible Regular Expressions * -*************************************************/ - -/* In its original form, this is the .in file that is transformed by -"configure" into pcre.h. - - Copyright (c) 1997-2005 University of Cambridge - ------------------------------------------------------------------------------ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of Cambridge nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ -*/ - -#ifndef _PCRE_H -#define _PCRE_H - -/* The file pcre.h is build by "configure". Do not edit it; instead -make changes to pcre.in. */ - -#define PCRE_MAJOR @PCRE_MAJOR@ -#define PCRE_MINOR @PCRE_MINOR@ -#define PCRE_DATE @PCRE_DATE@ - -/* Win32 uses DLL by default; it needs special stuff for exported functions. */ - -#ifdef _WIN32 -# ifdef PCRE_DEFINITION -# ifdef DLL_EXPORT -# define PCRE_DATA_SCOPE __declspec(dllexport) -# endif -# else -# ifndef PCRE_STATIC -# define PCRE_DATA_SCOPE extern __declspec(dllimport) -# endif -# endif -#endif - -/* For other operating systems, we use the standard "extern". */ - -#ifndef PCRE_DATA_SCOPE -# ifdef __cplusplus -# define PCRE_DATA_SCOPE extern "C" -# else -# define PCRE_DATA_SCOPE extern -# endif -#endif - -/* Have to include stdlib.h in order to ensure that size_t is defined; -it is needed here for malloc. */ - -#include - -/* Allow for C++ users */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Options */ - -#define PCRE_CASELESS 0x00000001 -#define PCRE_MULTILINE 0x00000002 -#define PCRE_DOTALL 0x00000004 -#define PCRE_EXTENDED 0x00000008 -#define PCRE_ANCHORED 0x00000010 -#define PCRE_DOLLAR_ENDONLY 0x00000020 -#define PCRE_EXTRA 0x00000040 -#define PCRE_NOTBOL 0x00000080 -#define PCRE_NOTEOL 0x00000100 -#define PCRE_UNGREEDY 0x00000200 -#define PCRE_NOTEMPTY 0x00000400 -#define PCRE_UTF8 0x00000800 -#define PCRE_NO_AUTO_CAPTURE 0x00001000 -#define PCRE_NO_UTF8_CHECK 0x00002000 -#define PCRE_AUTO_CALLOUT 0x00004000 -#define PCRE_PARTIAL 0x00008000 -#define PCRE_DFA_SHORTEST 0x00010000 -#define PCRE_DFA_RESTART 0x00020000 -#define PCRE_FIRSTLINE 0x00040000 - -/* Exec-time and get/set-time error codes */ - -#define PCRE_ERROR_NOMATCH (-1) -#define PCRE_ERROR_NULL (-2) -#define PCRE_ERROR_BADOPTION (-3) -#define PCRE_ERROR_BADMAGIC (-4) -#define PCRE_ERROR_UNKNOWN_NODE (-5) -#define PCRE_ERROR_NOMEMORY (-6) -#define PCRE_ERROR_NOSUBSTRING (-7) -#define PCRE_ERROR_MATCHLIMIT (-8) -#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */ -#define PCRE_ERROR_BADUTF8 (-10) -#define PCRE_ERROR_BADUTF8_OFFSET (-11) -#define PCRE_ERROR_PARTIAL (-12) -#define PCRE_ERROR_BADPARTIAL (-13) -#define PCRE_ERROR_INTERNAL (-14) -#define PCRE_ERROR_BADCOUNT (-15) -#define PCRE_ERROR_DFA_UITEM (-16) -#define PCRE_ERROR_DFA_UCOND (-17) -#define PCRE_ERROR_DFA_UMLIMIT (-18) -#define PCRE_ERROR_DFA_WSSIZE (-19) -#define PCRE_ERROR_DFA_RECURSE (-20) - -/* Request types for pcre_fullinfo() */ - -#define PCRE_INFO_OPTIONS 0 -#define PCRE_INFO_SIZE 1 -#define PCRE_INFO_CAPTURECOUNT 2 -#define PCRE_INFO_BACKREFMAX 3 -#define PCRE_INFO_FIRSTBYTE 4 -#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */ -#define PCRE_INFO_FIRSTTABLE 5 -#define PCRE_INFO_LASTLITERAL 6 -#define PCRE_INFO_NAMEENTRYSIZE 7 -#define PCRE_INFO_NAMECOUNT 8 -#define PCRE_INFO_NAMETABLE 9 -#define PCRE_INFO_STUDYSIZE 10 -#define PCRE_INFO_DEFAULT_TABLES 11 - -/* Request types for pcre_config() */ - -#define PCRE_CONFIG_UTF8 0 -#define PCRE_CONFIG_NEWLINE 1 -#define PCRE_CONFIG_LINK_SIZE 2 -#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3 -#define PCRE_CONFIG_MATCH_LIMIT 4 -#define PCRE_CONFIG_STACKRECURSE 5 -#define PCRE_CONFIG_UNICODE_PROPERTIES 6 - -/* Bit flags for the pcre_extra structure */ - -#define PCRE_EXTRA_STUDY_DATA 0x0001 -#define PCRE_EXTRA_MATCH_LIMIT 0x0002 -#define PCRE_EXTRA_CALLOUT_DATA 0x0004 -#define PCRE_EXTRA_TABLES 0x0008 - -/* Types */ - -struct real_pcre; /* declaration; the definition is private */ -typedef struct real_pcre pcre; - -/* The structure for passing additional data to pcre_exec(). This is defined in -such as way as to be extensible. Always add new fields at the end, in order to -remain compatible. */ - -typedef struct pcre_extra { - unsigned long int flags; /* Bits for which fields are set */ - void *study_data; /* Opaque data from pcre_study() */ - unsigned long int match_limit; /* Maximum number of calls to match() */ - void *callout_data; /* Data passed back in callouts */ - const unsigned char *tables; /* Pointer to character tables */ -} pcre_extra; - -/* The structure for passing out data via the pcre_callout_function. We use a -structure so that new fields can be added on the end in future versions, -without changing the API of the function, thereby allowing old clients to work -without modification. */ - -typedef struct pcre_callout_block { - int version; /* Identifies version of block */ - /* ------------------------ Version 0 ------------------------------- */ - int callout_number; /* Number compiled into pattern */ - int *offset_vector; /* The offset vector */ - const char *subject; /* The subject being matched */ - int subject_length; /* The length of the subject */ - int start_match; /* Offset to start of this match attempt */ - int current_position; /* Where we currently are in the subject */ - int capture_top; /* Max current capture */ - int capture_last; /* Most recently closed capture */ - void *callout_data; /* Data passed in with the call */ - /* ------------------- Added for Version 1 -------------------------- */ - int pattern_position; /* Offset to next item in the pattern */ - int next_item_length; /* Length of next item in the pattern */ - /* ------------------------------------------------------------------ */ -} pcre_callout_block; - -/* Indirection for store get and free functions. These can be set to -alternative malloc/free functions if required. Special ones are used in the -non-recursive case for "frames". There is also an optional callout function -that is triggered by the (?) regex item. For Virtual Pascal, these definitions -have to take another form. */ - -#ifndef VPCOMPAT -PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t); -PCRE_DATA_SCOPE void (*pcre_free)(void *); -PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t); -PCRE_DATA_SCOPE void (*pcre_stack_free)(void *); -PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *); -#else /* VPCOMPAT */ -PCRE_DATA_SCOPE void *pcre_malloc(size_t); -PCRE_DATA_SCOPE void pcre_free(void *); -PCRE_DATA_SCOPE void *pcre_stack_malloc(size_t); -PCRE_DATA_SCOPE void pcre_stack_free(void *); -PCRE_DATA_SCOPE int pcre_callout(pcre_callout_block *); -#endif /* VPCOMPAT */ - -/* Exported PCRE functions */ - -PCRE_DATA_SCOPE pcre *pcre_compile(const char *, int, const char **, int *, - const unsigned char *); -PCRE_DATA_SCOPE pcre *pcre_compile2(const char *, int, int *, const char **, - int *, const unsigned char *); -PCRE_DATA_SCOPE int pcre_config(int, void *); -PCRE_DATA_SCOPE int pcre_copy_named_substring(const pcre *, const char *, - int *, int, const char *, char *, int); -PCRE_DATA_SCOPE int pcre_copy_substring(const char *, int *, int, int, char *, - int); -PCRE_DATA_SCOPE int pcre_dfa_exec(const pcre *, const pcre_extra *, - const char *, int, int, int, int *, int , int *, int); -PCRE_DATA_SCOPE int pcre_exec(const pcre *, const pcre_extra *, const char *, - int, int, int, int *, int); -PCRE_DATA_SCOPE void pcre_free_substring(const char *); -PCRE_DATA_SCOPE void pcre_free_substring_list(const char **); -PCRE_DATA_SCOPE int pcre_fullinfo(const pcre *, const pcre_extra *, int, - void *); -PCRE_DATA_SCOPE int pcre_get_named_substring(const pcre *, const char *, - int *, int, const char *, const char **); -PCRE_DATA_SCOPE int pcre_get_stringnumber(const pcre *, const char *); -PCRE_DATA_SCOPE int pcre_get_substring(const char *, int *, int, int, - const char **); -PCRE_DATA_SCOPE int pcre_get_substring_list(const char *, int *, int, - const char ***); -PCRE_DATA_SCOPE int pcre_info(const pcre *, int *, int *); -PCRE_DATA_SCOPE const unsigned char *pcre_maketables(void); -PCRE_DATA_SCOPE int pcre_refcount(pcre *, int); -PCRE_DATA_SCOPE pcre_extra *pcre_study(const pcre *, int, const char **); -PCRE_DATA_SCOPE const char *pcre_version(void); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* End of pcre.h */ diff -Nurp tin-1.7.9/pcre/pcre_compile.c tin-1.7.10/pcre/pcre_compile.c --- tin-1.7.9/pcre/pcre_compile.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_compile.c 2005-09-12 16:37:57.000000000 +0200 @@ -45,6 +45,15 @@ supporting internal functions that are n #include "pcre_internal.h" +/* When DEBUG is defined, we need the pcre_printint() function, which is also +used by pcretest. DEBUG is not defined when building a production library. */ + +#ifdef DEBUG +#include "pcre_printint.src" +#endif + + + /************************************************* * Code parameters and static tables * *************************************************/ @@ -698,7 +707,18 @@ read_repeat_counts(const uschar *p, int int min = 0; int max = -1; +/* Read the minimum value and do a paranoid check: a negative value indicates +an integer overflow. */ + while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorcodeptr = ERR5; + return p; + } + +/* Read the maximum value if there is one, and again do a paranoid on its size. +Also, max must not be less than min. */ if (*p == '}') max = min; else { @@ -706,6 +726,11 @@ if (*p == '}') max = min; else { max = 0; while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorcodeptr = ERR5; + return p; + } if (max < min) { *errorcodeptr = ERR4; @@ -714,16 +739,11 @@ if (*p == '}') max = min; else } } -/* Do paranoid checks, then fill in the required variables, and pass back the -pointer to the terminating '}'. */ +/* Fill in the required variables, and pass back the pointer to the terminating +'}'. */ -if (min > 65535 || max > 65535) - *errorcodeptr = ERR5; -else - { - *minp = min; - *maxp = max; - } +*minp = min; +*maxp = max; return p; } @@ -3828,7 +3848,7 @@ Returns: pointer to compiled data with errorptr and erroroffset set */ -EXPORT pcre * +PCRE_EXPORT pcre * pcre_compile(const char *pattern, int options, const char **errorptr, int *erroroffset, const unsigned char *tables) { @@ -3836,7 +3856,7 @@ return pcre_compile2(pattern, options, N } -EXPORT pcre * +PCRE_EXPORT pcre * pcre_compile2(const char *pattern, int options, int *errorcodeptr, const char **errorptr, int *erroroffset, const unsigned char *tables) { @@ -3856,6 +3876,7 @@ BOOL utf8; BOOL class_utf8; #endif BOOL inescq = FALSE; +BOOL capturing; unsigned int brastackptr = 0; size_t size; uschar *code; @@ -4410,6 +4431,7 @@ while ((c = *(++ptr)) != 0) case '(': branch_newextra = 0; bracket_length = 1 + LINK_SIZE; + capturing = FALSE; /* Handle special forms of bracket, which all start (? */ @@ -4497,6 +4519,9 @@ while ((c = *(++ptr)) != 0) case 'P': ptr += 3; + + /* Handle the definition of a named subpattern */ + if (*ptr == '<') { const uschar *p; /* Don't amalgamate; some compilers */ @@ -4509,9 +4534,12 @@ while ((c = *(++ptr)) != 0) } name_count++; if (ptr - p > max_name_size) max_name_size = (ptr - p); + capturing = TRUE; /* Named parentheses are always capturing */ break; } + /* Handle back references and recursive calls to named subpatterns */ + if (*ptr == '=' || *ptr == '>') { while ((compile_block.ctypes[*(++ptr)] & ctype_word) != 0); @@ -4695,18 +4723,24 @@ while ((c = *(++ptr)) != 0) continue; } - /* If options were terminated by ':' control comes here. Fall through - to handle the group below. */ + /* If options were terminated by ':' control comes here. This is a + non-capturing group with an options change. There is nothing more that + needs to be done because "capturing" is already set FALSE by default; + we can just fall through. */ + } } - /* Extracting brackets must be counted so we can process escapes in a - Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to - need an additional 3 bytes of store per extracting bracket. However, if - PCRE_NO_AUTO)CAPTURE is set, unadorned brackets become non-capturing, so we - must leave the count alone (it will aways be zero). */ + /* Ordinary parentheses, not followed by '?', are capturing unless + PCRE_NO_AUTO_CAPTURE is set. */ + + else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0; + + /* Capturing brackets must be counted so we can process escapes in a + Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need + an additional 3 bytes of memory per capturing bracket. */ - else if ((options & PCRE_NO_AUTO_CAPTURE) == 0) + if (capturing) { bracount++; if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3; @@ -4975,7 +5009,8 @@ if (reqbyte >= 0 && re->options |= PCRE_REQCHSET; } -/* Print out the compiled data for debugging */ +/* Print out the compiled data if debugging is enabled. This is never the +case when building a production library. */ #ifdef DEBUG @@ -5013,7 +5048,7 @@ if ((re->options & PCRE_REQCHSET) != 0) else printf("Req char = \\x%02x%s\n", ch, caseless); } -_pcre_printint(re, stdout); +pcre_printint(re, stdout); /* This check is done here in the debugging case so that the code that was compiled can be seen. */ diff -Nurp tin-1.7.9/pcre/pcre_config.c tin-1.7.10/pcre/pcre_config.c --- tin-1.7.9/pcre/pcre_config.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_config.c 2005-09-12 16:38:09.000000000 +0200 @@ -58,7 +58,7 @@ Arguments: Returns: 0 if data returned, negative on error */ -EXPORT int +PCRE_EXPORT int pcre_config(int what, void *where) { switch (what) diff -Nurp tin-1.7.9/pcre/pcre_dfa_exec.c tin-1.7.10/pcre/pcre_dfa_exec.c --- tin-1.7.9/pcre/pcre_dfa_exec.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_dfa_exec.c 2005-09-12 16:38:43.000000000 +0200 @@ -758,7 +758,7 @@ for (;;) if (clen > 0) { int rqdtype, category; - category = ucp_findchar(c, &chartype, &othercase); + category = _pcre_ucp_findchar(c, &chartype, &othercase); rqdtype = code[1]; if (rqdtype >= 128) { @@ -865,7 +865,7 @@ for (;;) if (count > 0) { ADD_ACTIVE(state_offset + 3, 0); } if (clen > 0) { - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); int rqdtype = code[2]; if ((d == OP_PROP) == (rqdtype == ((rqdtype >= 128)? (category + 128) : chartype))) @@ -878,7 +878,7 @@ for (;;) case OP_EXTUNI_EXTRA + OP_TYPEMINPLUS: count = current_state->count; /* Already matched */ if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); } - if (clen > 0 && ucp_findchar(c, &chartype, &othercase) != ucp_M) + if (clen > 0 && _pcre_ucp_findchar(c, &chartype, &othercase) != ucp_M) { const uschar *nptr = ptr + clen; int ncount = 0; @@ -887,7 +887,7 @@ for (;;) int nd; int ndlen = 1; GETCHARLEN(nd, nptr, ndlen); - if (ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; + if (_pcre_ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; ncount++; nptr += ndlen; } @@ -911,7 +911,7 @@ for (;;) ADD_ACTIVE(state_offset + 3, 0); if (clen > 0) { - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); int rqdtype = code[2]; if ((d == OP_PROP) == (rqdtype == ((rqdtype >= 128)? (category + 128) : chartype))) @@ -932,7 +932,7 @@ for (;;) QS2: ADD_ACTIVE(state_offset + 2, 0); - if (clen > 0 && ucp_findchar(c, &chartype, &othercase) != ucp_M) + if (clen > 0 && _pcre_ucp_findchar(c, &chartype, &othercase) != ucp_M) { const uschar *nptr = ptr + clen; int ncount = 0; @@ -941,7 +941,7 @@ for (;;) int nd; int ndlen = 1; GETCHARLEN(nd, nptr, ndlen); - if (ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; + if (_pcre_ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; ncount++; nptr += ndlen; } @@ -958,7 +958,7 @@ for (;;) count = current_state->count; /* Number already matched */ if (clen > 0) { - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); int rqdtype = code[4]; if ((d == OP_PROP) == (rqdtype == ((rqdtype >= 128)? (category + 128) : chartype))) @@ -978,7 +978,7 @@ for (;;) if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT) { ADD_ACTIVE(state_offset + 4, 0); } count = current_state->count; /* Number already matched */ - if (clen > 0 && ucp_findchar(c, &chartype, &othercase) != ucp_M) + if (clen > 0 && _pcre_ucp_findchar(c, &chartype, &othercase) != ucp_M) { const uschar *nptr = ptr + clen; int ncount = 0; @@ -987,7 +987,7 @@ for (;;) int nd; int ndlen = 1; GETCHARLEN(nd, nptr, ndlen); - if (ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; + if (_pcre_ucp_findchar(nd, &chartype, &othercase) != ucp_M) break; ncount++; nptr += ndlen; } @@ -1022,11 +1022,11 @@ for (;;) /* If we have Unicode property support, we can use it to test the other case of the character, if there is one. The result of - ucp_findchar() is < 0 if the char isn't found, and othercase is + _pcre_ucp_findchar() is < 0 if the char isn't found, and othercase is returned as zero if there isn't another case. */ #ifdef SUPPORT_UCP - if (ucp_findchar(c, &chartype, &othercase) < 0) + if (_pcre_ucp_findchar(c, &chartype, &othercase) < 0) #endif othercase = -1; @@ -1050,7 +1050,7 @@ for (;;) to wait for them to pass before continuing. */ case OP_EXTUNI: - if (clen > 0 && ucp_findchar(c, &chartype, &othercase) != ucp_M) + if (clen > 0 && _pcre_ucp_findchar(c, &chartype, &othercase) != ucp_M) { const uschar *nptr = ptr + clen; int ncount = 0; @@ -1058,7 +1058,7 @@ for (;;) { int nclen = 1; GETCHARLEN(c, nptr, nclen); - if (ucp_findchar(c, &chartype, &othercase) != ucp_M) break; + if (_pcre_ucp_findchar(c, &chartype, &othercase) != ucp_M) break; ncount++; nptr += nclen; } @@ -1096,7 +1096,7 @@ for (;;) if (utf8 && c >= 128) { #ifdef SUPPORT_UCP - if (ucp_findchar(d, &chartype, &otherd) < 0) otherd = -1; + if (_pcre_ucp_findchar(d, &chartype, &otherd) < 0) otherd = -1; #endif /* SUPPORT_UCP */ } else @@ -1123,7 +1123,7 @@ for (;;) if (utf8 && c >= 128) { #ifdef SUPPORT_UCP - if (ucp_findchar(c, &chartype, &otherd) < 0) otherd = -1; + if (_pcre_ucp_findchar(c, &chartype, &otherd) < 0) otherd = -1; #endif /* SUPPORT_UCP */ } else @@ -1150,7 +1150,7 @@ for (;;) if (utf8 && c >= 128) { #ifdef SUPPORT_UCP - if (ucp_findchar(c, &chartype, &otherd) < 0) otherd = -1; + if (_pcre_ucp_findchar(c, &chartype, &otherd) < 0) otherd = -1; #endif /* SUPPORT_UCP */ } else @@ -1181,7 +1181,7 @@ for (;;) if (utf8 && c >= 128) { #ifdef SUPPORT_UCP - if (ucp_findchar(d, &chartype, &otherd) < 0) otherd = -1; + if (_pcre_ucp_findchar(d, &chartype, &otherd) < 0) otherd = -1; #endif /* SUPPORT_UCP */ } else @@ -1424,7 +1424,6 @@ for (;;) /*-----------------------------------------------------------------*/ case OP_ONCE: { - const uschar *endcode; int local_offsets[2]; int local_workspace[1000]; @@ -1446,7 +1445,6 @@ for (;;) const uschar *end_subpattern = code; int charcount = local_offsets[1] - local_offsets[0]; int next_state_offset, repeat_state_offset; - BOOL is_repeated; do { end_subpattern += GET(end_subpattern, 1); } while (*end_subpattern == OP_ALT); @@ -1613,7 +1611,7 @@ Returns: > 0 => number of match < -1 => some kind of unexpected problem */ -EXPORT int +PCRE_EXPORT int pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data, const char *subject, int length, int start_offset, int options, int *offsets, int offsetcount, int *workspace, int wscount) diff -Nurp tin-1.7.9/pcre/pcre_exec.c tin-1.7.10/pcre/pcre_exec.c --- tin-1.7.9/pcre/pcre_exec.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_exec.c 2005-09-12 16:38:16.000000000 +0200 @@ -1354,7 +1354,7 @@ for (;;) { int chartype, rqdtype; int othercase; - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); rqdtype = *(++ecode); ecode++; @@ -1381,7 +1381,7 @@ for (;;) { int chartype; int othercase; - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); if (category == ucp_M) RRETURN(MATCH_NOMATCH); while (eptr < md->end_subject) { @@ -1390,7 +1390,7 @@ for (;;) { GETCHARLEN(c, eptr, len); } - category = ucp_findchar(c, &chartype, &othercase); + category = _pcre_ucp_findchar(c, &chartype, &othercase); if (category != ucp_M) break; eptr += len; } @@ -1841,7 +1841,7 @@ for (;;) ecode += length; /* If we have Unicode property support, we can use it to test the other - case of the character, if there is one. The result of ucp_findchar() is + case of the character, if there is one. The result of _pcre_ucp_findchar() is < 0 if the char isn't found, and othercase is returned as zero if there isn't one. */ @@ -1850,7 +1850,7 @@ for (;;) #ifdef SUPPORT_UCP int chartype; int othercase; - if (ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase) + if (_pcre_ucp_findchar(fc, &chartype, &othercase) < 0 || dc != othercase) #endif RRETURN(MATCH_NOMATCH); } @@ -1920,7 +1920,7 @@ for (;;) int othercase; int chartype; if ((ims & PCRE_CASELESS) != 0 && - ucp_findchar(fc, &chartype, &othercase) >= 0 && + _pcre_ucp_findchar(fc, &chartype, &othercase) >= 0 && othercase > 0) oclength = _pcre_ord2utf8(othercase, occhars); #endif /* SUPPORT_UCP */ @@ -2439,7 +2439,7 @@ for (;;) for (i = 1; i <= min; i++) { GETCHARINC(c, eptr); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if ((*prop_test_variable == prop_test_against) == prop_fail_result) RRETURN(MATCH_NOMATCH); } @@ -2453,7 +2453,7 @@ for (;;) for (i = 1; i <= min; i++) { GETCHARINCTEST(c, eptr); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH); while (eptr < md->end_subject) { @@ -2462,7 +2462,7 @@ for (;;) { GETCHARLEN(c, eptr, len); } - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category != ucp_M) break; eptr += len; } @@ -2632,7 +2632,7 @@ for (;;) if (rrc != MATCH_NOMATCH) RRETURN(rrc); if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); GETCHARINC(c, eptr); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if ((*prop_test_variable == prop_test_against) == prop_fail_result) RRETURN(MATCH_NOMATCH); } @@ -2649,7 +2649,7 @@ for (;;) if (rrc != MATCH_NOMATCH) RRETURN(rrc); if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH); GETCHARINCTEST(c, eptr); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH); while (eptr < md->end_subject) { @@ -2658,7 +2658,7 @@ for (;;) { GETCHARLEN(c, eptr, len); } - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category != ucp_M) break; eptr += len; } @@ -2790,7 +2790,7 @@ for (;;) int len = 1; if (eptr >= md->end_subject) break; GETCHARLEN(c, eptr, len); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if ((*prop_test_variable == prop_test_against) == prop_fail_result) break; eptr+= len; @@ -2816,7 +2816,7 @@ for (;;) { if (eptr >= md->end_subject) break; GETCHARINCTEST(c, eptr); - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category == ucp_M) break; while (eptr < md->end_subject) { @@ -2825,7 +2825,7 @@ for (;;) { GETCHARLEN(c, eptr, len); } - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category != ucp_M) break; eptr += len; } @@ -2846,7 +2846,7 @@ for (;;) { GETCHARLEN(c, eptr, len); } - prop_category = ucp_findchar(c, &prop_chartype, &prop_othercase); + prop_category = _pcre_ucp_findchar(c, &prop_chartype, &prop_othercase); if (prop_category != ucp_M) break; eptr--; } @@ -3200,7 +3200,7 @@ Returns: > 0 => success; value < -1 => some kind of unexpected problem */ -EXPORT int +PCRE_EXPORT int pcre_exec(const pcre *argument_re, const pcre_extra *extra_data, const char *subject, int length, int start_offset, int options, int *offsets, int offsetcount) diff -Nurp tin-1.7.9/pcre/pcre_fullinfo.c tin-1.7.10/pcre/pcre_fullinfo.c --- tin-1.7.9/pcre/pcre_fullinfo.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_fullinfo.c 2005-09-12 16:38:55.000000000 +0200 @@ -61,7 +61,7 @@ Arguments: Returns: 0 if data returned, negative on error */ -EXPORT int +PCRE_EXPORT int pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data, int what, void *where) { diff -Nurp tin-1.7.9/pcre/pcre_info.c tin-1.7.10/pcre/pcre_info.c --- tin-1.7.9/pcre/pcre_info.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_info.c 2005-09-12 16:39:03.000000000 +0200 @@ -68,7 +68,7 @@ Returns: number of capturing subp or negative values on error */ -EXPORT int +PCRE_EXPORT int pcre_info(const pcre *argument_re, int *optptr, int *first_byte) { real_pcre internal_re; diff -Nurp tin-1.7.9/pcre/pcre_internal.h tin-1.7.10/pcre/pcre_internal.h --- tin-1.7.9/pcre/pcre_internal.h 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_internal.h 2005-09-12 16:39:11.000000000 +0200 @@ -42,12 +42,14 @@ POSSIBILITY OF SUCH DAMAGE. modules, but which are not relevant to the exported API. This includes some functions whose names all begin with "_pcre_". */ +#ifndef PCRE_INTERNAL_H +#define PCRE_INTERNAL_H /* Define DEBUG to get debugging output on stdout. */ -/**** +#if 0 #define DEBUG -****/ +#endif /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef inline, and there are *still* stupid compilers about that don't like indented @@ -112,14 +114,10 @@ Unix, where it is defined in sys/types, typedef unsigned char uschar; -/* Include the public PCRE header */ +/* Include the public PCRE header and the definitions of UCP character property +values. */ #include "pcre.h" - -/* Include the (copy of) the public ucp header, changing the external name into -a private one. This does no harm, even if we aren't compiling UCP support. */ - -#define ucp_findchar _pcre_ucp_findchar #include "ucp.h" /* When compiling for use with the Virtual Pascal compiler, these functions @@ -862,7 +860,7 @@ total length. */ #define tables_length (ctypes_offset + 256) /* Layout of the UCP type table that translates property names into codes for -ucp_findchar(). */ +pcre_ucp_findchar(). */ typedef struct { const char *name; @@ -895,11 +893,12 @@ one of the exported public functions. Th sense, but are not part of the PCRE public API. */ extern int _pcre_ord2utf8(int, uschar *); -extern void _pcre_printint(pcre *, FILE *); extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *, const pcre_study_data *, pcre_study_data *); extern int _pcre_ucp_findchar(const int, int *, int *); extern int _pcre_valid_utf8(const uschar *, int); extern BOOL _pcre_xclass(int, const uschar *); +#endif + /* End of pcre_internal.h */ diff -Nurp tin-1.7.9/pcre/pcre_ord2utf8.c tin-1.7.10/pcre/pcre_ord2utf8.c --- tin-1.7.9/pcre/pcre_ord2utf8.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_ord2utf8.c 2005-09-12 16:39:20.000000000 +0200 @@ -59,7 +59,7 @@ Arguments: Returns: number of characters placed in the buffer */ -EXPORT int +PCRE_EXPORT int _pcre_ord2utf8(int cvalue, uschar *buffer) { register int i, j; diff -Nurp tin-1.7.9/pcre/pcre_printint.c tin-1.7.10/pcre/pcre_printint.c --- tin-1.7.9/pcre/pcre_printint.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_printint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,451 +0,0 @@ -/************************************************* -* Perl-Compatible Regular Expressions * -*************************************************/ - -/* PCRE is a library of functions to support regular expressions whose syntax -and semantics are as close as possible to those of the Perl 5 language. - - Written by Philip Hazel - Copyright (c) 1997-2005 University of Cambridge - ------------------------------------------------------------------------------ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of Cambridge nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ -*/ - - -/* This module contains an PCRE private debugging function for printing out the -internal form of a compiled regular expression, along with some supporting -local functions. */ - - -#include "pcre_internal.h" - - -static const char *OP_names[] = { OP_NAME_LIST }; - - -/************************************************* -* Print single- or multi-byte character * -*************************************************/ - -static int -print_char(FILE *f, uschar *ptr, BOOL utf8) -{ -int c = *ptr; - -if (!utf8 || (c & 0xc0) != 0xc0) - { - if (isprint(c)) fprintf(f, "%c", c); else fprintf(f, "\\x%02x", c); - return 0; - } -else - { - int i; - int a = _pcre_utf8_table4[c & 0x3f]; /* Number of additional bytes */ - int s = 6*a; - c = (c & _pcre_utf8_table3[a]) << s; - for (i = 1; i <= a; i++) - { - /* This is a check for malformed UTF-8; it should only occur if the sanity - check has been turned off. Rather than swallow random bytes, just stop if - we hit a bad one. Print it with \X instead of \x as an indication. */ - - if ((ptr[i] & 0xc0) != 0x80) - { - fprintf(f, "\\X{%x}", c); - return i - 1; - } - - /* The byte is OK */ - - s -= 6; - c |= (ptr[i] & 0x3f) << s; - } - if (c < 128) fprintf(f, "\\x%02x", c); else fprintf(f, "\\x{%x}", c); - return a; - } -} - - - -/************************************************* -* Find Unicode property name * -*************************************************/ - -static const char * -get_ucpname(int property) -{ -#ifdef SUPPORT_UCP -int i; -for (i = _pcre_utt_size; i >= 0; i--) - { - if (property == _pcre_utt[i].value) break; - } -return (i >= 0)? _pcre_utt[i].name : "??"; -#else -return "??"; -#endif -} - - - -/************************************************* -* Print compiled regex * -*************************************************/ - -/* Make this function work for a regex with integers either byte order. -However, we assume that what we are passed is a compiled regex. */ - -EXPORT void -_pcre_printint(pcre *external_re, FILE *f) -{ -real_pcre *re = (real_pcre *)external_re; -uschar *codestart, *code; -BOOL utf8; - -unsigned int options = re->options; -int offset = re->name_table_offset; -int count = re->name_count; -int size = re->name_entry_size; - -if (re->magic_number != MAGIC_NUMBER) - { - offset = ((offset << 8) & 0xff00) | ((offset >> 8) & 0xff); - count = ((count << 8) & 0xff00) | ((count >> 8) & 0xff); - size = ((size << 8) & 0xff00) | ((size >> 8) & 0xff); - options = ((options << 24) & 0xff000000) | - ((options << 8) & 0x00ff0000) | - ((options >> 8) & 0x0000ff00) | - ((options >> 24) & 0x000000ff); - } - -code = codestart = (uschar *)re + offset + count * size; -utf8 = (options & PCRE_UTF8) != 0; - -for(;;) - { - uschar *ccode; - int c; - int extra = 0; - - fprintf(f, "%3d ", (int)(code - codestart)); - - if (*code >= OP_BRA) - { - if (*code - OP_BRA > EXTRACT_BASIC_MAX) - fprintf(f, "%3d Bra extra\n", GET(code, 1)); - else - fprintf(f, "%3d Bra %d\n", GET(code, 1), *code - OP_BRA); - code += _pcre_OP_lengths[OP_BRA]; - continue; - } - - switch(*code) - { - case OP_END: - fprintf(f, " %s\n", OP_names[*code]); - fprintf(f, "------------------------------------------------------------------\n"); - return; - - case OP_OPT: - fprintf(f, " %.2x %s", code[1], OP_names[*code]); - break; - - case OP_CHAR: - { - fprintf(f, " "); - do - { - code++; - code += 1 + print_char(f, code, utf8); - } - while (*code == OP_CHAR); - fprintf(f, "\n"); - continue; - } - break; - - case OP_CHARNC: - { - fprintf(f, " NC "); - do - { - code++; - code += 1 + print_char(f, code, utf8); - } - while (*code == OP_CHARNC); - fprintf(f, "\n"); - continue; - } - break; - - case OP_KETRMAX: - case OP_KETRMIN: - case OP_ALT: - case OP_KET: - case OP_ASSERT: - case OP_ASSERT_NOT: - case OP_ASSERTBACK: - case OP_ASSERTBACK_NOT: - case OP_ONCE: - case OP_COND: - case OP_REVERSE: - fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]); - break; - - case OP_BRANUMBER: - printf("%3d %s", GET2(code, 1), OP_names[*code]); - break; - - case OP_CREF: - if (GET2(code, 1) == CREF_RECURSE) - fprintf(f, " Cond recurse"); - else - fprintf(f, "%3d %s", GET2(code,1), OP_names[*code]); - break; - - case OP_STAR: - case OP_MINSTAR: - case OP_PLUS: - case OP_MINPLUS: - case OP_QUERY: - case OP_MINQUERY: - case OP_TYPESTAR: - case OP_TYPEMINSTAR: - case OP_TYPEPLUS: - case OP_TYPEMINPLUS: - case OP_TYPEQUERY: - case OP_TYPEMINQUERY: - fprintf(f, " "); - if (*code >= OP_TYPESTAR) - { - fprintf(f, "%s", OP_names[code[1]]); - if (code[1] == OP_PROP || code[1] == OP_NOTPROP) - { - fprintf(f, " %s ", get_ucpname(code[2])); - extra = 1; - } - } - else extra = print_char(f, code+1, utf8); - fprintf(f, "%s", OP_names[*code]); - break; - - case OP_EXACT: - case OP_UPTO: - case OP_MINUPTO: - fprintf(f, " "); - extra = print_char(f, code+3, utf8); - fprintf(f, "{"); - if (*code != OP_EXACT) fprintf(f, ","); - fprintf(f, "%d}", GET2(code,1)); - if (*code == OP_MINUPTO) fprintf(f, "?"); - break; - - case OP_TYPEEXACT: - case OP_TYPEUPTO: - case OP_TYPEMINUPTO: - fprintf(f, " %s", OP_names[code[3]]); - if (code[3] == OP_PROP || code[3] == OP_NOTPROP) - { - fprintf(f, " %s ", get_ucpname(code[4])); - extra = 1; - } - fprintf(f, "{"); - if (*code != OP_TYPEEXACT) fprintf(f, "0,"); - fprintf(f, "%d}", GET2(code,1)); - if (*code == OP_TYPEMINUPTO) fprintf(f, "?"); - break; - - case OP_NOT: - if (isprint(c = code[1])) fprintf(f, " [^%c]", c); - else fprintf(f, " [^\\x%02x]", c); - break; - - case OP_NOTSTAR: - case OP_NOTMINSTAR: - case OP_NOTPLUS: - case OP_NOTMINPLUS: - case OP_NOTQUERY: - case OP_NOTMINQUERY: - if (isprint(c = code[1])) fprintf(f, " [^%c]", c); - else fprintf(f, " [^\\x%02x]", c); - fprintf(f, "%s", OP_names[*code]); - break; - - case OP_NOTEXACT: - case OP_NOTUPTO: - case OP_NOTMINUPTO: - if (isprint(c = code[3])) fprintf(f, " [^%c]{", c); - else fprintf(f, " [^\\x%02x]{", c); - if (*code != OP_NOTEXACT) fprintf(f, "0,"); - fprintf(f, "%d}", GET2(code,1)); - if (*code == OP_NOTMINUPTO) fprintf(f, "?"); - break; - - case OP_RECURSE: - fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]); - break; - - case OP_REF: - fprintf(f, " \\%d", GET2(code,1)); - ccode = code + _pcre_OP_lengths[*code]; - goto CLASS_REF_REPEAT; - - case OP_CALLOUT: - fprintf(f, " %s %d %d %d", OP_names[*code], code[1], GET(code,2), - GET(code, 2 + LINK_SIZE)); - break; - - case OP_PROP: - case OP_NOTPROP: - fprintf(f, " %s %s", OP_names[*code], get_ucpname(code[1])); - break; - - /* OP_XCLASS can only occur in UTF-8 mode. However, there's no harm in - having this code always here, and it makes it less messy without all those - #ifdefs. */ - - case OP_CLASS: - case OP_NCLASS: - case OP_XCLASS: - { - int i, min, max; - BOOL printmap; - - fprintf(f, " ["); - - if (*code == OP_XCLASS) - { - extra = GET(code, 1); - ccode = code + LINK_SIZE + 1; - printmap = (*ccode & XCL_MAP) != 0; - if ((*ccode++ & XCL_NOT) != 0) fprintf(f, "^"); - } - else - { - printmap = TRUE; - ccode = code + 1; - } - - /* Print a bit map */ - - if (printmap) - { - for (i = 0; i < 256; i++) - { - if ((ccode[i/8] & (1 << (i&7))) != 0) - { - int j; - for (j = i+1; j < 256; j++) - if ((ccode[j/8] & (1 << (j&7))) == 0) break; - if (i == '-' || i == ']') fprintf(f, "\\"); - if (isprint(i)) fprintf(f, "%c", i); else fprintf(f, "\\x%02x", i); - if (--j > i) - { - if (j != i + 1) fprintf(f, "-"); - if (j == '-' || j == ']') fprintf(f, "\\"); - if (isprint(j)) fprintf(f, "%c", j); else fprintf(f, "\\x%02x", j); - } - i = j; - } - } - ccode += 32; - } - - /* For an XCLASS there is always some additional data */ - - if (*code == OP_XCLASS) - { - int ch; - while ((ch = *ccode++) != XCL_END) - { - if (ch == XCL_PROP) - { - fprintf(f, "\\p{%s}", get_ucpname(*ccode++)); - } - else if (ch == XCL_NOTPROP) - { - fprintf(f, "\\P{%s}", get_ucpname(*ccode++)); - } - else - { - ccode += 1 + print_char(f, ccode, TRUE); - if (ch == XCL_RANGE) - { - fprintf(f, "-"); - ccode += 1 + print_char(f, ccode, TRUE); - } - } - } - } - - /* Indicate a non-UTF8 class which was created by negation */ - - fprintf(f, "]%s", (*code == OP_NCLASS)? " (neg)" : ""); - - /* Handle repeats after a class or a back reference */ - - CLASS_REF_REPEAT: - switch(*ccode) - { - case OP_CRSTAR: - case OP_CRMINSTAR: - case OP_CRPLUS: - case OP_CRMINPLUS: - case OP_CRQUERY: - case OP_CRMINQUERY: - fprintf(f, "%s", OP_names[*ccode]); - extra += _pcre_OP_lengths[*ccode]; - break; - - case OP_CRRANGE: - case OP_CRMINRANGE: - min = GET2(ccode,1); - max = GET2(ccode,3); - if (max == 0) fprintf(f, "{%d,}", min); - else fprintf(f, "{%d,%d}", min, max); - if (*ccode == OP_CRMINRANGE) fprintf(f, "?"); - extra += _pcre_OP_lengths[*ccode]; - break; - } - } - break; - - /* Anything else is just an item with no data*/ - - default: - fprintf(f, " %s", OP_names[*code]); - break; - } - - code += _pcre_OP_lengths[*code] + extra; - fprintf(f, "\n"); - } -} - -/* End of pcre_printint.c */ diff -Nurp tin-1.7.9/pcre/pcre_printint.src tin-1.7.10/pcre/pcre_printint.src --- tin-1.7.9/pcre/pcre_printint.src 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.10/pcre/pcre_printint.src 2005-09-12 16:40:01.000000000 +0200 @@ -0,0 +1,454 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* PCRE is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel + Copyright (c) 1997-2005 University of Cambridge + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ + + +/* This module contains a PCRE private debugging function for printing out the +internal form of a compiled regular expression, along with some supporting +local functions. This source file is used in two places: + +(1) It is #included by pcre_compile.c when it is compiled in debugging mode +(DEBUG defined in pcre_internal.h). It is not included in production compiles. + +(2) It is always #included by pcretest.c, which can be asked to print out a +compiled regex for debugging purposes. */ + + +static const char *OP_names[] = { OP_NAME_LIST }; + + +/************************************************* +* Print single- or multi-byte character * +*************************************************/ + +static int +print_char(FILE *f, uschar *ptr, BOOL utf8) +{ +int c = *ptr; + +if (!utf8 || (c & 0xc0) != 0xc0) + { + if (isprint(c)) fprintf(f, "%c", c); else fprintf(f, "\\x%02x", c); + return 0; + } +else + { + int i; + int a = _pcre_utf8_table4[c & 0x3f]; /* Number of additional bytes */ + int s = 6*a; + c = (c & _pcre_utf8_table3[a]) << s; + for (i = 1; i <= a; i++) + { + /* This is a check for malformed UTF-8; it should only occur if the sanity + check has been turned off. Rather than swallow random bytes, just stop if + we hit a bad one. Print it with \X instead of \x as an indication. */ + + if ((ptr[i] & 0xc0) != 0x80) + { + fprintf(f, "\\X{%x}", c); + return i - 1; + } + + /* The byte is OK */ + + s -= 6; + c |= (ptr[i] & 0x3f) << s; + } + if (c < 128) fprintf(f, "\\x%02x", c); else fprintf(f, "\\x{%x}", c); + return a; + } +} + + + +/************************************************* +* Find Unicode property name * +*************************************************/ + +static const char * +get_ucpname(int property) +{ +#ifdef SUPPORT_UCP +int i; +for (i = _pcre_utt_size; i >= 0; i--) + { + if (property == _pcre_utt[i].value) break; + } +return (i >= 0)? _pcre_utt[i].name : "??"; +#else +return "??"; +#endif +} + + + +/************************************************* +* Print compiled regex * +*************************************************/ + +/* Make this function work for a regex with integers either byte order. +However, we assume that what we are passed is a compiled regex. */ + +static void +pcre_printint(pcre *external_re, FILE *f) +{ +real_pcre *re = (real_pcre *)external_re; +uschar *codestart, *code; +BOOL utf8; + +unsigned int options = re->options; +int offset = re->name_table_offset; +int count = re->name_count; +int size = re->name_entry_size; + +if (re->magic_number != MAGIC_NUMBER) + { + offset = ((offset << 8) & 0xff00) | ((offset >> 8) & 0xff); + count = ((count << 8) & 0xff00) | ((count >> 8) & 0xff); + size = ((size << 8) & 0xff00) | ((size >> 8) & 0xff); + options = ((options << 24) & 0xff000000) | + ((options << 8) & 0x00ff0000) | + ((options >> 8) & 0x0000ff00) | + ((options >> 24) & 0x000000ff); + } + +code = codestart = (uschar *)re + offset + count * size; +utf8 = (options & PCRE_UTF8) != 0; + +for(;;) + { + uschar *ccode; + int c; + int extra = 0; + + fprintf(f, "%3d ", (int)(code - codestart)); + + if (*code >= OP_BRA) + { + if (*code - OP_BRA > EXTRACT_BASIC_MAX) + fprintf(f, "%3d Bra extra\n", GET(code, 1)); + else + fprintf(f, "%3d Bra %d\n", GET(code, 1), *code - OP_BRA); + code += _pcre_OP_lengths[OP_BRA]; + continue; + } + + switch(*code) + { + case OP_END: + fprintf(f, " %s\n", OP_names[*code]); + fprintf(f, "------------------------------------------------------------------\n"); + return; + + case OP_OPT: + fprintf(f, " %.2x %s", code[1], OP_names[*code]); + break; + + case OP_CHAR: + { + fprintf(f, " "); + do + { + code++; + code += 1 + print_char(f, code, utf8); + } + while (*code == OP_CHAR); + fprintf(f, "\n"); + continue; + } + break; + + case OP_CHARNC: + { + fprintf(f, " NC "); + do + { + code++; + code += 1 + print_char(f, code, utf8); + } + while (*code == OP_CHARNC); + fprintf(f, "\n"); + continue; + } + break; + + case OP_KETRMAX: + case OP_KETRMIN: + case OP_ALT: + case OP_KET: + case OP_ASSERT: + case OP_ASSERT_NOT: + case OP_ASSERTBACK: + case OP_ASSERTBACK_NOT: + case OP_ONCE: + case OP_COND: + case OP_REVERSE: + fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]); + break; + + case OP_BRANUMBER: + printf("%3d %s", GET2(code, 1), OP_names[*code]); + break; + + case OP_CREF: + if (GET2(code, 1) == CREF_RECURSE) + fprintf(f, " Cond recurse"); + else + fprintf(f, "%3d %s", GET2(code,1), OP_names[*code]); + break; + + case OP_STAR: + case OP_MINSTAR: + case OP_PLUS: + case OP_MINPLUS: + case OP_QUERY: + case OP_MINQUERY: + case OP_TYPESTAR: + case OP_TYPEMINSTAR: + case OP_TYPEPLUS: + case OP_TYPEMINPLUS: + case OP_TYPEQUERY: + case OP_TYPEMINQUERY: + fprintf(f, " "); + if (*code >= OP_TYPESTAR) + { + fprintf(f, "%s", OP_names[code[1]]); + if (code[1] == OP_PROP || code[1] == OP_NOTPROP) + { + fprintf(f, " %s ", get_ucpname(code[2])); + extra = 1; + } + } + else extra = print_char(f, code+1, utf8); + fprintf(f, "%s", OP_names[*code]); + break; + + case OP_EXACT: + case OP_UPTO: + case OP_MINUPTO: + fprintf(f, " "); + extra = print_char(f, code+3, utf8); + fprintf(f, "{"); + if (*code != OP_EXACT) fprintf(f, ","); + fprintf(f, "%d}", GET2(code,1)); + if (*code == OP_MINUPTO) fprintf(f, "?"); + break; + + case OP_TYPEEXACT: + case OP_TYPEUPTO: + case OP_TYPEMINUPTO: + fprintf(f, " %s", OP_names[code[3]]); + if (code[3] == OP_PROP || code[3] == OP_NOTPROP) + { + fprintf(f, " %s ", get_ucpname(code[4])); + extra = 1; + } + fprintf(f, "{"); + if (*code != OP_TYPEEXACT) fprintf(f, "0,"); + fprintf(f, "%d}", GET2(code,1)); + if (*code == OP_TYPEMINUPTO) fprintf(f, "?"); + break; + + case OP_NOT: + if (isprint(c = code[1])) fprintf(f, " [^%c]", c); + else fprintf(f, " [^\\x%02x]", c); + break; + + case OP_NOTSTAR: + case OP_NOTMINSTAR: + case OP_NOTPLUS: + case OP_NOTMINPLUS: + case OP_NOTQUERY: + case OP_NOTMINQUERY: + if (isprint(c = code[1])) fprintf(f, " [^%c]", c); + else fprintf(f, " [^\\x%02x]", c); + fprintf(f, "%s", OP_names[*code]); + break; + + case OP_NOTEXACT: + case OP_NOTUPTO: + case OP_NOTMINUPTO: + if (isprint(c = code[3])) fprintf(f, " [^%c]{", c); + else fprintf(f, " [^\\x%02x]{", c); + if (*code != OP_NOTEXACT) fprintf(f, "0,"); + fprintf(f, "%d}", GET2(code,1)); + if (*code == OP_NOTMINUPTO) fprintf(f, "?"); + break; + + case OP_RECURSE: + fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]); + break; + + case OP_REF: + fprintf(f, " \\%d", GET2(code,1)); + ccode = code + _pcre_OP_lengths[*code]; + goto CLASS_REF_REPEAT; + + case OP_CALLOUT: + fprintf(f, " %s %d %d %d", OP_names[*code], code[1], GET(code,2), + GET(code, 2 + LINK_SIZE)); + break; + + case OP_PROP: + case OP_NOTPROP: + fprintf(f, " %s %s", OP_names[*code], get_ucpname(code[1])); + break; + + /* OP_XCLASS can only occur in UTF-8 mode. However, there's no harm in + having this code always here, and it makes it less messy without all those + #ifdefs. */ + + case OP_CLASS: + case OP_NCLASS: + case OP_XCLASS: + { + int i, min, max; + BOOL printmap; + + fprintf(f, " ["); + + if (*code == OP_XCLASS) + { + extra = GET(code, 1); + ccode = code + LINK_SIZE + 1; + printmap = (*ccode & XCL_MAP) != 0; + if ((*ccode++ & XCL_NOT) != 0) fprintf(f, "^"); + } + else + { + printmap = TRUE; + ccode = code + 1; + } + + /* Print a bit map */ + + if (printmap) + { + for (i = 0; i < 256; i++) + { + if ((ccode[i/8] & (1 << (i&7))) != 0) + { + int j; + for (j = i+1; j < 256; j++) + if ((ccode[j/8] & (1 << (j&7))) == 0) break; + if (i == '-' || i == ']') fprintf(f, "\\"); + if (isprint(i)) fprintf(f, "%c", i); else fprintf(f, "\\x%02x", i); + if (--j > i) + { + if (j != i + 1) fprintf(f, "-"); + if (j == '-' || j == ']') fprintf(f, "\\"); + if (isprint(j)) fprintf(f, "%c", j); else fprintf(f, "\\x%02x", j); + } + i = j; + } + } + ccode += 32; + } + + /* For an XCLASS there is always some additional data */ + + if (*code == OP_XCLASS) + { + int ch; + while ((ch = *ccode++) != XCL_END) + { + if (ch == XCL_PROP) + { + fprintf(f, "\\p{%s}", get_ucpname(*ccode++)); + } + else if (ch == XCL_NOTPROP) + { + fprintf(f, "\\P{%s}", get_ucpname(*ccode++)); + } + else + { + ccode += 1 + print_char(f, ccode, TRUE); + if (ch == XCL_RANGE) + { + fprintf(f, "-"); + ccode += 1 + print_char(f, ccode, TRUE); + } + } + } + } + + /* Indicate a non-UTF8 class which was created by negation */ + + fprintf(f, "]%s", (*code == OP_NCLASS)? " (neg)" : ""); + + /* Handle repeats after a class or a back reference */ + + CLASS_REF_REPEAT: + switch(*ccode) + { + case OP_CRSTAR: + case OP_CRMINSTAR: + case OP_CRPLUS: + case OP_CRMINPLUS: + case OP_CRQUERY: + case OP_CRMINQUERY: + fprintf(f, "%s", OP_names[*ccode]); + extra += _pcre_OP_lengths[*ccode]; + break; + + case OP_CRRANGE: + case OP_CRMINRANGE: + min = GET2(ccode,1); + max = GET2(ccode,3); + if (max == 0) fprintf(f, "{%d,}", min); + else fprintf(f, "{%d,%d}", min, max); + if (*ccode == OP_CRMINRANGE) fprintf(f, "?"); + extra += _pcre_OP_lengths[*ccode]; + break; + } + } + break; + + /* Anything else is just an item with no data*/ + + default: + fprintf(f, " %s", OP_names[*code]); + break; + } + + code += _pcre_OP_lengths[*code] + extra; + fprintf(f, "\n"); + } +} + +/* End of pcre_printint.src */ diff -Nurp tin-1.7.9/pcre/pcre_refcount.c tin-1.7.10/pcre/pcre_refcount.c --- tin-1.7.9/pcre/pcre_refcount.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_refcount.c 2005-09-12 16:40:34.000000000 +0200 @@ -63,7 +63,7 @@ Returns: the (possibly updated) c a negative error number */ -EXPORT int +PCRE_EXPORT int pcre_refcount(pcre *argument_re, int adjust) { real_pcre *re = (real_pcre *)argument_re; diff -Nurp tin-1.7.9/pcre/pcre_study.c tin-1.7.10/pcre/pcre_study.c --- tin-1.7.9/pcre/pcre_study.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_study.c 2005-09-12 16:40:40.000000000 +0200 @@ -401,7 +401,7 @@ Returns: pointer to a pcre_extra bloc NULL on error or if no optimization possible */ -EXPORT pcre_extra * +PCRE_EXPORT pcre_extra * pcre_study(const pcre *external_re, int options, const char **errorptr) { uschar start_bits[32]; diff -Nurp tin-1.7.9/pcre/pcre_tables.c tin-1.7.10/pcre/pcre_tables.c --- tin-1.7.9/pcre/pcre_tables.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_tables.c 2005-09-12 16:40:50.000000000 +0200 @@ -39,7 +39,9 @@ POSSIBILITY OF SUCH DAMAGE. /* This module contains some fixed tables that are used by more than one of the -PCRE code modules. */ +PCRE code modules. The tables are also #included by the pcretest program, which +uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name +clashes with the library. */ #include "pcre_internal.h" @@ -81,8 +83,7 @@ const uschar _pcre_utf8_table4[] = { 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 }; /* This table translates Unicode property names into code values for the -ucp_findchar() function. It is used by pcretest as well as by the library -functions. */ +ucp_findchar() function. */ const ucp_type_table _pcre_utt[] = { { "C", 128 + ucp_C }, diff -Nurp tin-1.7.9/pcre/pcre_try_flipped.c tin-1.7.10/pcre/pcre_try_flipped.c --- tin-1.7.9/pcre/pcre_try_flipped.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_try_flipped.c 2005-09-12 16:41:00.000000000 +0200 @@ -94,7 +94,7 @@ Returns: the new block if is i NULL if it is not */ -EXPORT real_pcre * +PCRE_EXPORT real_pcre * _pcre_try_flipped(const real_pcre *re, real_pcre *internal_re, const pcre_study_data *study, pcre_study_data *internal_study) { diff -Nurp tin-1.7.9/pcre/pcre_ucp_findchar.c tin-1.7.10/pcre/pcre_ucp_findchar.c --- tin-1.7.9/pcre/pcre_ucp_findchar.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_ucp_findchar.c 2005-09-12 16:41:12.000000000 +0200 @@ -41,13 +41,121 @@ POSSIBILITY OF SUCH DAMAGE. /* This module compiles code for supporting the use of Unicode character properties. We use the (embryonic at the time of writing) UCP library, by including some of its files, copies of which have been put in the PCRE -distribution. There is a macro in pcre_internal.h that changes the name -ucp_findchar into _pcre_ucp_findchar. */ +distribution. The actual search function is reproduced here, with its name +changed. */ #include "pcre_internal.h" -#include "ucp_findchar.c" +#include "ucp.h" /* Category definitions */ +#include "ucpinternal.h" /* Internal table details */ +#include "ucptable.c" /* The table itself */ + +/************************************************* +* Search table and return data * +*************************************************/ + +/* Two values are returned: the category is ucp_C, ucp_L, etc. The detailed +character type is ucp_Lu, ucp_Nd, etc. + +Arguments: + c the character value + type_ptr the detailed character type is returned here + case_ptr for letters, the opposite case is returned here, if there + is one, else zero + +Returns: the character type category or -1 if not found +*/ + +PCRE_EXPORT int +_pcre_ucp_findchar(const int c, int *type_ptr, int *case_ptr) +{ +cnode *node = ucp_table; +register int cc = c; +int case_offset; + +for (;;) + { + register int d = node->f1 | ((node->f0 & f0_chhmask) << 16); + if (cc == d) break; + if (cc < d) + { + if ((node->f0 & f0_leftexists) == 0) return -1; + node ++; + } + else + { + register int roffset = (node->f2 & f2_rightmask) >> f2_rightshift; + if (roffset == 0) return -1; + node += 1 << (roffset - 1); + } + } + +switch ((*type_ptr = ((node->f0 & f0_typemask) >> f0_typeshift))) + { + case ucp_Cc: + case ucp_Cf: + case ucp_Cn: + case ucp_Co: + case ucp_Cs: + return ucp_C; + break; + + case ucp_Ll: + case ucp_Lu: + case_offset = node->f2 & f2_casemask; + if ((case_offset & 0x0100) != 0) case_offset |= 0xfffff000; + *case_ptr = (case_offset == 0)? 0 : cc + case_offset; + return ucp_L; + + case ucp_Lm: + case ucp_Lo: + case ucp_Lt: + *case_ptr = 0; + return ucp_L; + break; + + case ucp_Mc: + case ucp_Me: + case ucp_Mn: + return ucp_M; + break; + + case ucp_Nd: + case ucp_Nl: + case ucp_No: + return ucp_N; + break; + + case ucp_Pc: + case ucp_Pd: + case ucp_Pe: + case ucp_Pf: + case ucp_Pi: + case ucp_Ps: + case ucp_Po: + return ucp_P; + break; + + case ucp_Sc: + case ucp_Sk: + case ucp_Sm: + case ucp_So: + return ucp_S; + break; + + case ucp_Zl: + case ucp_Zp: + case ucp_Zs: + return ucp_Z; + break; + + default: /* "Should never happen" */ + return -1; + break; + } +} + /* End of pcre_ucp_findchar.c */ diff -Nurp tin-1.7.9/pcre/pcre_valid_utf8.c tin-1.7.10/pcre/pcre_valid_utf8.c --- tin-1.7.9/pcre/pcre_valid_utf8.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_valid_utf8.c 2005-09-12 16:41:21.000000000 +0200 @@ -63,7 +63,7 @@ Returns: < 0 if the string is a >= 0 otherwise; the value is the offset of the bad byte */ -EXPORT int +PCRE_EXPORT int _pcre_valid_utf8(const uschar *string, int length) { register const uschar *p; diff -Nurp tin-1.7.9/pcre/pcre_version.c tin-1.7.10/pcre/pcre_version.c --- tin-1.7.9/pcre/pcre_version.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_version.c 2005-09-12 16:41:30.000000000 +0200 @@ -52,7 +52,7 @@ string that identifies the PCRE version #define STRING(a) # a #define XSTRING(s) STRING(s) -EXPORT const char * +PCRE_EXPORT const char * pcre_version(void) { return XSTRING(PCRE_MAJOR) "." XSTRING(PCRE_MINOR) " " XSTRING(PCRE_DATE); diff -Nurp tin-1.7.9/pcre/pcre_xclass.c tin-1.7.10/pcre/pcre_xclass.c --- tin-1.7.9/pcre/pcre_xclass.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcre_xclass.c 2005-09-12 16:41:39.000000000 +0200 @@ -60,7 +60,7 @@ Arguments: Returns: TRUE if character matches, else FALSE */ -EXPORT BOOL +PCRE_EXPORT BOOL _pcre_xclass(int c, const uschar *data) { int t; @@ -102,7 +102,7 @@ while ((t = *data++) != XCL_END) { int chartype, othercase; int rqdtype = *data++; - int category = ucp_findchar(c, &chartype, &othercase); + int category = _pcre_ucp_findchar(c, &chartype, &othercase); if (rqdtype >= 128) { if ((rqdtype - 128 == category) == (t == XCL_PROP)) return !negated; diff -Nurp tin-1.7.9/pcre/pcregrep.c tin-1.7.10/pcre/pcregrep.c --- tin-1.7.9/pcre/pcregrep.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcregrep.c 2005-09-12 16:41:52.000000000 +0200 @@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE. typedef int BOOL; -#define VERSION "4.0 07-Jun-2005" +#define VERSION "4.1 05-Sep-2005" #define MAX_PATTERN_COUNT 100 #if BUFSIZ > 8192 @@ -531,9 +531,11 @@ while (ptr < endptr) } /* Now print the matching line(s); ensure we set hyphenpending at the end - of the file. */ + of the file if any context lines are being output. */ + + if (after_context > 0 || before_context > 0) + endhyphenpending = TRUE; - endhyphenpending = TRUE; if (printname != NULL) fprintf(stdout, "%s:", printname); if (number) fprintf(stdout, "%d:", linenumber); diff -Nurp tin-1.7.9/pcre/pcreposix.c tin-1.7.10/pcre/pcreposix.c --- tin-1.7.9/pcre/pcreposix.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcreposix.c 2005-09-12 16:41:59.000000000 +0200 @@ -131,7 +131,7 @@ static const char *const pstring[] = { * Translate error code to string * *************************************************/ -EXPORT size_t +PCRE_EXPORT size_t regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) { const char *message, *addmessage; @@ -166,7 +166,7 @@ return length + addlength; * Free store held by a regex * *************************************************/ -EXPORT void +PCRE_EXPORT void regfree(regex_t *preg) { (pcre_free)(preg->re_pcre); @@ -189,7 +189,7 @@ Returns: 0 on success various non-zero codes on failure */ -EXPORT int +PCRE_EXPORT int regcomp(regex_t *preg, const char *pattern, int cflags) { const char *errorptr; @@ -225,7 +225,7 @@ ints. However, if the number of possible block of store on the stack, to reduce the use of malloc/free. The threshold is in a macro that can be changed at configure time. */ -EXPORT int +PCRE_EXPORT int regexec(const regex_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags) { diff -Nurp tin-1.7.9/pcre/pcretest.c tin-1.7.10/pcre/pcretest.c --- tin-1.7.9/pcre/pcretest.c 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/pcretest.c 2005-09-12 16:42:07.000000000 +0200 @@ -46,13 +46,34 @@ POSSIBILITY OF SUCH DAMAGE. #define PCRE_SPY /* For Win32 build, import data, not export */ -/* We need the internal info for displaying the results of pcre_study() and -other internal data; pcretest also uses some of the fixed tables, and generally -has "inside information" compared to a program that strictly follows the PCRE -API. */ +/* We include pcre_internal.h because we need the internal info for displaying +the results of pcre_study() and we also need to know about the internal +macros, structures, and other internal data values; pcretest has "inside +information" compared to a program that strictly follows the PCRE API. */ #include "pcre_internal.h" +/* We need access to the data tables that PCRE uses. So as not to have to keep +two copies, we include the source file here, changing the names of the external +symbols to prevent clashes. */ + +#define _pcre_utf8_table1 utf8_table1 +#define _pcre_utf8_table1_size utf8_table1_size +#define _pcre_utf8_table2 utf8_table2 +#define _pcre_utf8_table3 utf8_table3 +#define _pcre_utf8_table4 utf8_table4 +#define _pcre_utt utt +#define _pcre_utt_size utt_size +#define _pcre_OP_lengths OP_lengths + +#include "pcre_tables.c" + +/* We also need the pcre_printint() function for printing out compiled +patterns. This function is in a separate file so that it can be included in +pcre_compile.c when that module is compiled with debugging enabled. */ + +#include "pcre_printint.src" + /* It is possible to compile this test program without including support for testing the POSIX interface, though this is not available via the standard @@ -68,6 +89,8 @@ to the DFA matcher (NODFA), and without function (define NOINFOCHECK). */ +/* Other parameters */ + #ifndef CLOCKS_PER_SEC #ifdef CLK_TCK #define CLOCKS_PER_SEC CLK_TCK @@ -83,6 +106,8 @@ function (define NOINFOCHECK). */ #define DBUFFER_SIZE BUFFER_SIZE +/* Static variables */ + static FILE *outfile; static int log_store = 0; static int callout_count; @@ -162,7 +187,7 @@ if (i == 0 || i == 6) return 0; / /* i now has a value in the range 1-5 */ s = 6*i; -d = (c & _pcre_utf8_table3[i]) << s; +d = (c & utf8_table3[i]) << s; for (j = 0; j < i; j++) { @@ -174,8 +199,8 @@ for (j = 0; j < i; j++) /* Check that encoding was the correct unique one */ -for (j = 0; j < _pcre_utf8_table1_size; j++) - if (d <= _pcre_utf8_table1[j]) break; +for (j = 0; j < utf8_table1_size; j++) + if (d <= utf8_table1[j]) break; if (j != i) return -(i+1); /* Valid value */ @@ -189,6 +214,38 @@ return i+1; /************************************************* +* Convert character value to UTF-8 * +*************************************************/ + +/* This function takes an integer value in the range 0 - 0x7fffffff +and encodes it as a UTF-8 character in 0 to 6 bytes. + +Arguments: + cvalue the character value + buffer pointer to buffer for result - at least 6 bytes long + +Returns: number of characters placed in the buffer +*/ + +static int +ord2utf8(int cvalue, uschar *buffer) +{ +register int i, j; +for (i = 0; i < utf8_table1_size; i++) + if (cvalue <= utf8_table1[i]) break; +buffer += i; +for (j = i; j > 0; j--) + { + *buffer-- = 0x80 | (cvalue & 0x3f); + cvalue >>= 6; + } +*buffer = utf8_table2[i] | cvalue; +return i + 1; +} + + + +/************************************************* * Print character string * *************************************************/ @@ -198,7 +255,7 @@ chars without printing. */ static int pchars(unsigned char *p, int length, FILE *f) { -int c; +int c = 0; int yield = 0; while (length-- > 0) @@ -988,7 +1045,7 @@ while (!done) if (do_debug) { fprintf(outfile, "------------------------------------------------------------------\n"); - _pcre_printint(re, outfile); + pcre_printint(re, outfile); } new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options); @@ -1290,7 +1347,7 @@ while (!done) { unsigned char buff8[8]; int ii, utn; - utn = _pcre_ord2utf8(c, buff8); + utn = ord2utf8(c, buff8); for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii]; c = buff8[ii]; /* Last byte */ p = pt + 1; diff -Nurp tin-1.7.9/pcre/testdata/testinput2 tin-1.7.10/pcre/testdata/testinput2 --- tin-1.7.9/pcre/testdata/testinput2 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testinput2 2005-09-12 16:42:32.000000000 +0200 @@ -1428,5 +1428,26 @@ AbCd ** Failers abcd + +/a{11111111111111111111}/ + +/(){64294967295}/ + +/(){2,4294967295}/ + +"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B" + abcdefghijklAkB + +"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B" + abcdefghijklAkB + +"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B" + abcdefghijklAkB + +"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)" + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + +"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)" + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa / End of testinput2 / diff -Nurp tin-1.7.9/pcre/testdata/testoutput1 tin-1.7.10/pcre/testdata/testoutput1 --- tin-1.7.9/pcre/testdata/testoutput1 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput1 2005-09-12 16:42:32.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /the quick brown fox/ the quick brown fox diff -Nurp tin-1.7.9/pcre/testdata/testoutput2 tin-1.7.10/pcre/testdata/testoutput2 --- tin-1.7.9/pcre/testdata/testoutput2 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput2 2005-09-12 16:42:33.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /(a)b|/ Capturing subpattern count = 1 @@ -5715,6 +5715,229 @@ Need char = 'd' No match abcd No match + +/a{11111111111111111111}/ +Failed: number too big in {} quantifier at offset 22 + +/(){64294967295}/ +Failed: number too big in {} quantifier at offset 14 + +/(){2,4294967295}/ +Failed: number too big in {} quantifier at offset 15 + +"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B" +Capturing subpattern count = 1 +Max back reference = 1 +No options +Case state changes +First char = 'a' (caseless) +Need char = 'B' + abcdefghijklAkB + 0: abcdefghijklAkB + 1: k + +"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B" +Capturing subpattern count = 12 +Max back reference = 11 +Named capturing subpatterns: + n0 1 + n1 2 + n10 11 + n11 12 + n2 3 + n3 4 + n4 5 + n5 6 + n6 7 + n7 8 + n8 9 + n9 10 +No options +First char = 'a' +Need char = 'B' + abcdefghijklAkB + 0: abcdefghijklAkB + 1: a + 2: b + 3: c + 4: d + 5: e + 6: f + 7: g + 8: h + 9: i +10: j +11: k +12: l + +"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B" +Capturing subpattern count = 12 +Max back reference = 11 +No options +First char = 'a' +Need char = 'B' + abcdefghijklAkB + 0: abcdefghijklAkB + 1: a + 2: b + 3: c + 4: d + 5: e + 6: f + 7: g + 8: h + 9: i +10: j +11: k +12: l + +"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)" +Capturing subpattern count = 101 +Named capturing subpatterns: + name0 1 + name1 2 + name10 11 + name100 101 + name11 12 + name12 13 + name13 14 + name14 15 + name15 16 + name16 17 + name17 18 + name18 19 + name19 20 + name2 3 + name20 21 + name21 22 + name22 23 + name23 24 + name24 25 + name25 26 + name26 27 + name27 28 + name28 29 + name29 30 + name3 4 + name30 31 + name31 32 + name32 33 + name33 34 + name34 35 + name35 36 + name36 37 + name37 38 + name38 39 + name39 40 + name4 5 + name40 41 + name41 42 + name42 43 + name43 44 + name44 45 + name45 46 + name46 47 + name47 48 + name48 49 + name49 50 + name5 6 + name50 51 + name51 52 + name52 53 + name53 54 + name54 55 + name55 56 + name56 57 + name57 58 + name58 59 + name59 60 + name6 7 + name60 61 + name61 62 + name62 63 + name63 64 + name64 65 + name65 66 + name66 67 + name67 68 + name68 69 + name69 70 + name7 8 + name70 71 + name71 72 + name72 73 + name73 74 + name74 75 + name75 76 + name76 77 + name77 78 + name78 79 + name79 80 + name8 9 + name80 81 + name81 82 + name82 83 + name83 84 + name84 85 + name85 86 + name86 87 + name87 88 + name88 89 + name89 90 + name9 10 + name90 91 + name91 92 + name92 93 + name93 94 + name94 95 + name95 96 + name96 97 + name97 98 + name98 99 + name99 100 +No options +First char = 'a' +Need char = 'a' + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +Matched, but too many substrings + 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + 1: a + 2: a + 3: a + 4: a + 5: a + 6: a + 7: a + 8: a + 9: a +10: a +11: a +12: a +13: a +14: a + +"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)" +Capturing subpattern count = 101 +No options +First char = 'a' +Need char = 'a' + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +Matched, but too many substrings + 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + 1: a + 2: a + 3: a + 4: a + 5: a + 6: a + 7: a + 8: a + 9: a +10: a +11: a +12: a +13: a +14: a / End of testinput2 / Capturing subpattern count = 0 diff -Nurp tin-1.7.9/pcre/testdata/testoutput3 tin-1.7.10/pcre/testdata/testoutput3 --- tin-1.7.9/pcre/testdata/testoutput3 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput3 2005-09-12 16:42:33.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /^[\w]+/ *** Failers diff -Nurp tin-1.7.9/pcre/testdata/testoutput4 tin-1.7.10/pcre/testdata/testoutput4 --- tin-1.7.9/pcre/testdata/testoutput4 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput4 2005-09-12 16:42:33.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /-- Do not use the \x{} construct except with patterns that have the --/ /-- /8 option set, because PCRE doesn't recognize them as UTF-8 unless --/ diff -Nurp tin-1.7.9/pcre/testdata/testoutput5 tin-1.7.10/pcre/testdata/testoutput5 --- tin-1.7.9/pcre/testdata/testoutput5 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput5 2005-09-12 16:42:33.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /\x{100}/8DM Memory allocation (code space): 10 diff -Nurp tin-1.7.9/pcre/testdata/testoutput6 tin-1.7.10/pcre/testdata/testoutput6 --- tin-1.7.9/pcre/testdata/testoutput6 2005-06-28 10:31:27.000000000 +0200 +++ tin-1.7.10/pcre/testdata/testoutput6 2005-09-12 16:42:33.000000000 +0200 @@ -1,4 +1,4 @@ -PCRE version 6.1 21-Jun-2005 +PCRE version 6.4 05-Sep-2005 /^\pC\pL\pM\pN\pP\pS\pZf1 | ((node->f0 & f0_chhmask) << 16); - if (cc == d) break; - if (cc < d) - { - if ((node->f0 & f0_leftexists) == 0) return -1; - node ++; - } - else - { - register int roffset = (node->f2 & f2_rightmask) >> f2_rightshift; - if (roffset == 0) return -1; - node += 1 << (roffset - 1); - } - } - -switch ((*type_ptr = ((node->f0 & f0_typemask) >> f0_typeshift))) - { - case ucp_Cc: - case ucp_Cf: - case ucp_Cn: - case ucp_Co: - case ucp_Cs: - return ucp_C; - break; - - case ucp_Ll: - case ucp_Lu: - case_offset = node->f2 & f2_casemask; - if ((case_offset & 0x0100) != 0) case_offset |= 0xfffff000; - *case_ptr = (case_offset == 0)? 0 : cc + case_offset; - return ucp_L; - - case ucp_Lm: - case ucp_Lo: - case ucp_Lt: - *case_ptr = 0; - return ucp_L; - break; - - case ucp_Mc: - case ucp_Me: - case ucp_Mn: - return ucp_M; - break; - - case ucp_Nd: - case ucp_Nl: - case ucp_No: - return ucp_N; - break; - - case ucp_Pc: - case ucp_Pd: - case ucp_Pe: - case ucp_Pf: - case ucp_Pi: - case ucp_Ps: - case ucp_Po: - return ucp_P; - break; - - case ucp_Sc: - case ucp_Sk: - case ucp_Sm: - case ucp_So: - return ucp_S; - break; - - case ucp_Zl: - case ucp_Zp: - case ucp_Zs: - return ucp_Z; - break; - - default: /* "Should never happen" */ - return -1; - break; - } -} - -/* End of ucp_findchar.c */ diff -Nurp tin-1.7.9/pcre/version.sh tin-1.7.10/pcre/version.sh --- tin-1.7.9/pcre/version.sh 2005-06-28 10:31:26.000000000 +0200 +++ tin-1.7.10/pcre/version.sh 2005-09-12 16:34:51.000000000 +0200 @@ -7,6 +7,6 @@ # that many releases anyway. PCRE_MAJOR=6 -PCRE_MINOR=1 -PCRE_DATE=21-Jun-2005 +PCRE_MINOR=4 +PCRE_DATE=05-Sep-2005 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} Binary files tin-1.7.9/po/de.gmo and tin-1.7.10/po/de.gmo differ diff -Nurp tin-1.7.9/po/de.po tin-1.7.10/po/de.po --- tin-1.7.9/po/de.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/de.po 2005-09-29 13:21:08.694939894 +0200 @@ -5,9 +5,9 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.7.9\n" +msgstr "Project-Id-Version: tin 1.7.10\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2005-01-29 23:50+0100\n" "Last-Translator: Sven Hartge , Kai Bojens \n" @@ -16,334 +16,345 @@ msgstr "Project-Id-Version: tin 1.7.9\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Fehlerhafter Overview-Datensatz (%d Felder) '%s'" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# Diesen Kommentarabschnitt nicht verändern\n" "#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=ZEICHENKETTE [notwendig]\n" "# Gültigkeitsbereich, z.B. alt.*,!alt.bin*\n" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=ZEICHENKETTE\n" "# Verzeichnis der Mail-Ordner, z.B. ~/Mail\n" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=ZEICHENKETTE\n" "# Verzeichnis zum Speichern, z.B. ~user/News\n" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=ZEICHENKETTE\n" "# Datei zum Speichern, z.B. =linux\n" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=ZEICHENKETTE\n" "# Signatur, z.B. $var/sig\n" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=ZEICHENKETTE\n" "# Organization-Header; ist das erste Zeichen ein '/', wird der\n" "# Wert aus dieser Datei gelesen.\n" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=ZEICHENKETTE\n" "# Voreinstellung für den Followup-To-Header\n" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=ZEICHENKETTE\n" "# Gruppe ist eine gegatete Mailingliste, z.B. majordomo@example.org\n" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=ZEICHENKETTE\n" "# Zusätzliche Header, z.B. ~/.tin/extra-headers\n" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=ZEICHENKETTE\n" "# Text wird automatisch zu Beginn des Artikels eingefügt,\n" "# z.B. ~/.tin/extra-body-text\n" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=ZEICHENKETTE\n" "# Absender, einfach den gewünschten Wert eintragen,\n" "# keine Anführungszeichen verwenden\n" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=ZEICHENKETTE\n" "# Einleitungszeile, z.B. news_quote_format=In %%M, %%F wrote:\n" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=ZEICHENKETTE\n" "# Zeichen für Zitate in Antworten, %%s oder %%S ergibt Autoreninitialien\n" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=ZEICHENKETTE\n" "# z.B. image/*,!image/bmp\n" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=ZEICHENKETTE\n" "# Aufruf der Rechtschreibprüfung,\n" "# z.B. ispell -C -ddeutsch -w äöüÄÖÜß@ -Tlatin1\n" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" "# Führe GroupMarkUnselArtRead Kommando automatisch beim Betreten\n" "# der Gruppe aus\n" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" "# Artikel mit 'Archive-name:'-Header automatisch in die darin\n" "# angegebene Datei speichern\n" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" "# Im Batch-Modus werden die Artikel beachtet\n" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" "# Gespeicherte, zur Nachbearbeitung weitergegebene Artikel ohne\n" "# Nachfrage löschen\n" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" "# nur ungelesene Artikel anzeigen\n" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "# thread_arts=ZAHL\n" "# Threading nach:" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "# thread_perc=ZAHL\n" + "# Wieviel Prozent des Subjects müssen gleich sein?\n" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=ZAHL\n" "# Anzeige des From-Felds\n" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "# show_info=ZAHL\n" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=ZAHL\n" "# Artikel sortieren nach:\n" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=ZAHL\n" "# Threads sortieren nach:\n" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=ZAHL\n" "# Nachbearbeitung\n" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=ZEICHENKETTE\n" "# Voreinstellung für Gültigkeitsbereich neuer Kill-Einträge,\n" "# z.B. talk.*\n" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" "# Kill verfällt automatisch\n" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" "# Kill beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=ZAHL\n" "# Killen nach:\n" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=Subject (Gross/Kleinschreibung beachten), 1=Subject (G/K ignorieren)\n" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=From (G/K beachten), 3=From (G/K ignorieren)\n" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "# 4=Message-ID, 5=Zeilen\n" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=ZEICHENKETTE\n" "# Voreinstellung für Gültigkeitsbereich neuer Auswahlregeln (Hochscoren)\n" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" "# Regel verfällt automatisch\n" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" "# Regel beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" "# Auswählen (Hochscoren) nach:\n" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" "# X-Comment-To:-Header einfügen.\n" "# (Nur sinnvoll in nach Fido Technology Network gegateten Gruppen.)\n" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=ZEICHENKETTE\n" "# Datei in der eine Kopie der Mail abgelegt werden soll,# z.B: " "=mailbox\n" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" "# Automatische Umwandlung von TeX-Umlauten\n" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" "# Weitergeleitete Artikel als MIME-Anhang senden\n" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=Zeichensatz\n" "# Erlaubt sind folgende:" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=ZEICHENKETTE\n" "# Voreinstellung ist US-ASCII\n" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Es empfiehlt sich, zuerst allgemein gültige und danach spezielle,\n" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# nur für bestimmte Newsgruppen gültige Einträge aufzuführen.\n" "#\n" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "# Zusätzliche Header einfügen\n" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "# in *sources* nur Nachbearbeitung mit shar\n" -#: src/attrib.c:761 +#: src/attrib.c:768 #, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "# in *binaries* Nachbearbeitung ohne TeX2ISO umwandlung,\n" -#: src/attrib.c:762 +#: src/attrib.c:769 #, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "# temporäre Dateien löschen und Followup-To: poster setzen\n" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "(unbekannt)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "Aus der vorigen Regel gelöscht: " +# TRANSLATION MISSING +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "1 Antwort" @@ -818,25 +829,25 @@ msgstr "In der Mailadresse fehlt das '@' #: src/lang.c:160 msgid "Single component FQDN is not allowed. Add your domain.\n" -msgstr "Ein einteiliger FQDN ist nicht erlaubt. Fügen Sie ihre Domain hinzu.\n" +msgstr "Ein einteiliger FQDN ist nicht erlaubt. Fügen Sie Ihre Domain hinzu.\n" #: src/lang.c:161 msgid "Invalid domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" -msgstr "Unzulässige Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n" - "wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n" +msgstr "Unzulässige Domain. Senden Sie einen Fehlerbericht, wenn es Ihre TL-Domain\n" + "wirklich gibt. Benutzen Sie .invalid für bewusst falsche Adressen.\n" #: src/lang.c:162 msgid "Illegal domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" -msgstr "Regelwidrige Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n" - "wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n" +msgstr "Regelwidrige Domain. Senden Sie einen Fehlerbericht, wenn es Ihre TL-Domain\n" + "wirklich gibt. Benutzen Sie .invalid für bewusst falsche Adressen.\n" #: src/lang.c:163 msgid "Unknown domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" -msgstr "Unbekannte Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n" - "wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n" +msgstr "Unbekannte Domain. Senden Sie einen Fehlerbericht, wenn es Ihre TL-Domain\n" + "wirklich gibt. Benutzen Sie .invalid für bewusst falsche Adressen.\n" #: src/lang.c:164 msgid "Illegal character in FQDN.\n" @@ -932,7 +943,7 @@ msgid "\n" msgstr "\n" "Fehler: Das Posting enthält nicht-ASCII Zeichen, aber MM_CHARSET ist\n" " auf US-ASCII eingestellt. Bitte ändern Sie dies auf einen\n" - " passenden Wert für ihre Sprache, indem Sie M)enü benutzen,\n" + " passenden Wert für Ihre Sprache, indem Sie M)enü benutzen,\n" " oder direkt die tinrc ändern.\n" #: src/lang.c:188 @@ -1116,7 +1127,7 @@ msgstr "Muster eingeben [%s]> " msgid "\n" "You requested followups to your article to go to the following %s:\n" msgstr "\n" - "Antworten auf ihre Artikel sollen in folgenden %s erscheinen:\n" + "Antworten auf Ihre Artikel sollen in folgenden %s erscheinen:\n" #: src/lang.c:228 #, c-format @@ -1161,7 +1172,7 @@ msgid "# Format:\n" msgstr "# Format:\n" "# comment=Z.KETTE Optionaler Kommentar. Es sind mehrere " "Kommentareinträge\n" - "# Regel erlaubt. Kommentare müssen ganz am Anfang " + "# pro Regel erlaubt. Kommentare müssen ganz am Anfang " "stehen,\n" "# sonst werden sie zur nächsten Regel verschoben. '#' " "darf\n" @@ -1293,7 +1304,7 @@ msgstr "Subject: zum Filter hinzufügen. #: src/lang.c:276 msgid "Enter text pattern to filter if Subject: & From: lines are not what you want." -msgstr "Textmuster zum Filtern, wenn Subject: & From: nicht ihren Wünschen entspricht." +msgstr "Textmuster zum Filtern, wenn Subject: & From: nicht Ihren Wünschen entspricht." #: src/lang.c:277 msgid "Select where text pattern should be applied. toggles & sets." @@ -1526,7 +1537,7 @@ msgstr "poste zurückgestellte Artikel" #: src/lang.c:334 msgid "list articles posted by you (from posted file)" -msgstr "listet ihre geposteten Artikel auf (aus der 'posted' Datei)" +msgstr "listet Ihre geposteten Artikel auf (aus der 'posted' Datei)" #: src/lang.c:335 msgid "return to previous menu" @@ -1992,7 +2003,7 @@ msgstr "\n" "\n" "Artikel, Threads, markierte Artikel oder Artikel, die einem Suchmuster\n" "entsprechen, können gemailt ('m'), gedruckt ('o'), gespeichert ('s') oder\n" - "gepipet ('|') werden. Benutzen sie 'w', um einen neuen Artikel zu schreiben,\n" + "gepipet ('|') werden. Benutzen Sie 'w', um einen neuen Artikel zu schreiben,\n" "'f'/'F', um auf einen Artikel zu antworten und 'r'/'R', um den Autor via\n" "Mail zu antworten. Mit 'M' können Sie %s mittels eines Menüs konfigurieren.\n" "\n" @@ -2003,7 +2014,7 @@ msgstr "\n" #: src/lang.c:453 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." -msgstr "Ungültige From: %s Zeile. Lesen sie INSTALL nochmal." +msgstr "Ungültige From: %s Zeile. Lesen Sie INSTALL nochmal." #: src/lang.c:454 #, c-format @@ -2712,7 +2723,7 @@ msgstr "Antw. %4d von %4d" #: src/lang.c:629 msgid "Press to continue..." -msgstr "Drücken sie um fortzufahren..." +msgstr "Drücken Sie um fortzufahren..." #: src/lang.c:631 #, c-format @@ -2764,7 +2775,7 @@ msgstr "# %s Server Konfigurationsdatei\ "#\n" "# Nicht verändern während %s läuft, da alle Änderungen automatisch\n" "# überschrieben werden wenn Sie %s verlassen.\n" - "# Wenn Sie nicht genau wissen was Sie tun, dann lassen sie einfach die\n" + "# Wenn Sie nicht genau wissen was Sie tun, dann lassen Sie einfach die\n" "# Finger von dieser Datei.\n" "############################################################################\n" "\n" @@ -2900,7 +2911,7 @@ msgstr "Wähle thread > " #: src/lang.c:675 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" -msgstr "%s %s %s (\"%s\") [%s]: schicken sie einen DETAILLIERTEN Fehlerbericht an %s\n" +msgstr "%s %s %s (\"%s\") [%s]: schicken Sie einen DETAILLIERTEN Fehlerbericht an %s\n" #: src/lang.c:676 msgid "servers active-file" @@ -2966,7 +2977,7 @@ msgstr "Überschreibe Artikel ..." msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" - "Angehalten. Geben sie 'fg' ein um %s wieder zu starten\n" + "Angehalten. Geben Sie 'fg' ein um %s wieder zu starten\n" #: src/lang.c:691 #, c-format @@ -3347,7 +3358,7 @@ msgstr "Sorgfältig lesen!\n" " Dies wird den Artikel von den meisten Newsservern dieser Welt löschen.\n" " Es gibt aber keine Garantie, das dies überall geschieht.\n" "\n" - "Das ist der Artikel, den sie canceln (löschen) wollen:\n" + "Das ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" #: src/lang.c:790 @@ -3358,7 +3369,7 @@ msgid "\n" " not be encoded properly.\n" msgstr "\n" "Warnung: Sie benutzen eine Zeichenkodierung, die Zeichen verändert (z.B.\n" - " base64 oder quoted-printable) und einen externen inews um ihren\n" + " base64 oder quoted-printable) und einen externen inews um Ihren\n" " Artikel zu übertragen. Falls durch diesen inews eine Signatur\n" " angehängt wird, so kann diese nicht korrekt kodiert werden.\n" @@ -3373,7 +3384,7 @@ msgstr "\n" "\n" "Sie benutzen jetzt tin %s, eine neuere Version als früher.\n" "Einige Einstellungen in Ihrem %s-File haben sich geändert!\n" - "Lesen sie \"WHATSNEW\", usw....\n" + "Lesen Sie \"WHATSNEW\", usw....\n" #: src/lang.c:797 #, c-format @@ -3394,11 +3405,11 @@ msgid "Warning: tin wrote fewer groups t "than it read at startup. If you didn't unsubscribe from %ld %s during\n" "this session this indicates an error and you should backup your %s\n" "before you start tin once again!\n" -msgstr "Warnung: tin hat weniger Gruppen in ihre\n" +msgstr "Warnung: tin hat weniger Gruppen in Ihre\n" "\t%s\n" "geschrieben, als es beim Start eingelesen hat. Falls Sie nicht %ld %s\n" "währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n" - "ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n" + "Ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n" #: src/lang.c:804 #, c-format @@ -3927,7 +3938,7 @@ msgid "\n" msgstr "\n" "Fehler: Die \"%s:\" Zeile hat Leerzeichen, die entfernt werden MÜSSEN.\n" " Der einzig erlaubte Leerraum ist derjenige, der das ':'\n" - " vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n" + " vom Inhalt trennt. Benutzen Sie ein ',' um mehrere Newsgruppen\n" " anzugeben\n" #: src/lang.c:1008 @@ -3980,14 +3991,14 @@ msgid "\n" "are\n" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "\n" - " Wenn ihr Artikel zitierten Text enthält, nehmen Sie sich Zeit und kürzen\n" + " Wenn Ihr Artikel zitierten Text enthält, nehmen Sie sich Zeit und kürzen\n" " Sie die Zitate auf das Nötigste, behalten Sie nur die Kernpunkte bei, auf\n" " die Sie sich beziehen! Viele Leute lesen Artikel, deren erste Seite nur\n" - " aus zitiertem Text besteht, überhaupt nicht. Formatieren Sie ihren Artikel\n" - " so, dass er maximal 80 Zeichen lange Zeilen enthält, für ihren eigenen\n" + " aus zitiertem Text besteht, überhaupt nicht. Formatieren Sie Ihren Artikel\n" + " so, dass er maximal 80 Zeichen lange Zeilen enthält, für Ihren eigenen\n" " Text sind 72 Zeichen eine gute Wahl, so bleibt dieser auch zitiert unter\n" - " 80 Zeichen. Wenn ihre Zeilen zu lang sind, werden Sie auf dem Bildschirm\n" - " kammartig umbrochen, und sind daher sehr mühsam zu lesen. Wenn Sie ihren\n" + " 80 Zeichen. Wenn Ihre Zeilen zu lang sind, werden Sie auf dem Bildschirm\n" + " kammartig umbrochen, und sind daher sehr mühsam zu lesen. Wenn Sie Ihren\n" " Artikel nicht sorgfältig formatieren, ist es sehr wahrscheinlich, dass er\n" " von vielen gar nicht gelesen wird.\n" @@ -5238,7 +5249,7 @@ msgstr "# Welche Operationen müssen expl # TRANSLATION TOO LONG #: src/lang.c:1787 msgid "'Mark article read' ignores tags" -msgstr "'Artikel gelesen markieren' ignoriert Markierte" +msgstr "'Art. gelesen markieren' ignoriert Markierte" #: src/lang.c:1788 msgid "# If ON the 'Mark article read' function marks only the current article.\n" @@ -5757,7 +5768,7 @@ msgstr "# Wenn ON, zeige leeren Followup #: src/lang.c:2120 msgid "Enter path/! command/--none to create your default signature. sets." -msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." +msgstr "Setze Pfad/! Kommando/--none um Ihre Signatur festzulegen. setzt." #: src/lang.c:2121 msgid "Create signature from path/command" @@ -6231,7 +6242,7 @@ msgstr "%E für Editor, %F für Dateiname, #: src/lang.c:2379 msgid "Invocation of your editor" -msgstr "Aufruf ihres Editors" +msgstr "Aufruf Ihres Editors" #: src/lang.c:2380 #, c-format @@ -6261,7 +6272,7 @@ msgstr "%M für den Mailer, %S für Subjec #: src/lang.c:2392 msgid "Invocation of your mail command" -msgstr "Aufruf ihres Mailkommandos" +msgstr "Aufruf Ihres Mailkommandos" #: src/lang.c:2393 #, c-format @@ -6269,7 +6280,7 @@ msgid "# Format of mailer line including "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" -msgstr "# Format der Mailkommandozeile mit ihren Parametern\n" +msgstr "# Format der Mailkommandozeile mit Ihren Parametern\n" "# %%M Mailprogramm %%S Subject %%T To %%F Dateiname\n" "# Ein Beispiel für elm : elm -s \"%%S\" \"%%T\" < %%F\n" "# Ein Beispiel für elm interaktiv: elm -i %%F -s \"%%S\" \"%%T\"\n" @@ -6427,12 +6438,12 @@ msgstr "BiDi wiedergeben" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Falls ON, wird bi-direktionaler Text von tin wiedergeben.\n" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s Ausgabe %s (\"%s\") %s %s\n" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" @@ -6470,23 +6481,23 @@ msgstr "Sende letztes Kommando (%s) neu\ #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "Zeile %d ist länger als 998 Oktets und sollte gefaltet werden,\n" "aber die Kodierung ist weder auf %s noch auf %s gestellt\n" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" @@ -6496,28 +6507,28 @@ msgstr "Zeile %d ist länger als 998 Okte "angeschaltet zu haben, oder der Artikel enhält keine 8Bit Zeichen\n" "und wird daher nicht automatisch gefaltet wird.\n" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "Zeile %d ist länger als 998 Oktets und sollte gefaltet werden,\n" "aber die Kodierung ist nicht auf %s gesetzt\n" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "Breche Lesen ab, bitte warten..." -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "Lesen abgebrochen\n" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "Ablassen\n" @@ -6534,30 +6545,30 @@ msgstr "[- Nicht Verfügbar -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" "to understand the new format, and some of what follows may look strange.\n" "\n" msgstr "Dieser Artikel wurde im 'multipart/mixed' MIME-Format verfasst. Wenn Sie\n" - "dieses Präfix lesen ist ihr Mailprogramm vermutlich nicht in der Lage dieses\n" + "dieses Präfix lesen ist Ihr Mailprogramm vermutlich nicht in der Lage dieses\n" "Format zu verstehen und einiges von was folgt, kann merkwürdig aussehen.\n" "\n" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "Bytes" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "ungelesen" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "Alle" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr " R" Binary files tin-1.7.9/po/en_GB.gmo and tin-1.7.10/po/en_GB.gmo differ diff -Nurp tin-1.7.9/po/en_GB.po tin-1.7.10/po/en_GB.po --- tin-1.7.9/po/en_GB.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/en_GB.po 2005-09-29 13:21:09.213843084 +0200 @@ -2,9 +2,9 @@ # Robert Brady , 2000-2002 # msgid "" -msgstr "Project-Id-Version: tin 1.7.7\n" +msgstr "Project-Id-Version: tin 1.7.9\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -12,281 +12,290 @@ msgstr "Project-Id-Version: tin 1.7.7\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:761 +#: src/attrib.c:768 #, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "" -#: src/attrib.c:762 +#: src/attrib.c:769 #, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "" +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "" @@ -5895,12 +5904,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -5936,49 +5945,49 @@ msgstr "" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "" #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "" -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "" @@ -5995,7 +6004,7 @@ msgstr "" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -6003,19 +6012,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr "" Binary files tin-1.7.9/po/et.gmo and tin-1.7.10/po/et.gmo differ diff -Nurp tin-1.7.9/po/et.po tin-1.7.10/po/et.po --- tin-1.7.9/po/et.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/et.po 2005-09-29 13:22:24.410730585 +0200 @@ -3,296 +3,307 @@ # Toomas Soome , 2005. # msgid "" -msgstr "Project-Id-Version: tin 1.7.7\n" +msgstr "Project-Id-Version: tin 1.7.9\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" - "PO-Revision-Date: 2003-01-07 18:45+0300\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" + "PO-Revision-Date: 2005-07-05 15:41+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Vigane overview kirje (%d välja) '%s'" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ärge seda kommentaari blokki muutke\n" "#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=SÕNE (n. alt.*,!alt.bin*) [kohustuslik]\n" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=SÕNE (n. ~/Mail)\n" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=SÕNE (n. ~user/News)\n" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=SÕNE (n. =linux)\n" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=SÕNE (n. $var/sig)\n" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=SÕNE (kui algab sümboliga '/', loe failist)\n" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=SÕNE\n" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=SÕNE (n. majordomo@example.org)\n" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=SÕNE (n. ~/.tin/extra-headers)\n" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=SÕNE (n. ~/.tin/extra-body-text)\n" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=SÕNE (kirjutage soovitav From: rida, ärge kasutage jutumärke)\n" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=SÕNE\n" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=SÕNE (%%s, %%S annavad initsiaalid)\n" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=SÕNE (n. image/*,!image/bmp)\n" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=SÕNE\n" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "# thread_perc=NUM\n" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=SÕNE (n. talk.*)\n" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=teema (tõstutundlik) 1=teema (tõstutundetu)\n" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=saatja (tõstutundlik) 3=saatja (tõstutundetu)\n" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "# 4=msgid 5=read\n" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=SÕNE\n" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=SÕNE (n. =postkast)\n" # -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=toetatud_koodileht" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=SÕNE (vaikimisi on US-ASCII)\n" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Märkus: parem on kõigepealt kirjeldada üldisemad (globaalse skoobiga)\n" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# ning seejärel konkreetsemad, grupi spetsiifilised, reeglid.\n" "#\n" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "# lisa täiendavaid päiseid\n" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "# *tekstidel* sea järeltöötlemise tüübiks ainult shar\n" -#: src/attrib.c:761 -#, fuzzy, c-format +#: src/attrib.c:768 +#, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" -msgstr "# *binaarfailidel* sea täielik järeltöötlemine, kustuta ajutised failid\n" +msgstr "# *binaarfailidel* sea täielik järeltöötlemine, kuid mitte TeX2ISO " + "teisendus,\n" -#: src/attrib.c:762 -#, fuzzy, c-format +#: src/attrib.c:769 +#, c-format msgid "# remove tmp files and set Followup-To: poster\n" -msgstr "# ja sea Followup-To: postitaja\n" +msgstr "# kustuta ajutised failid ja sea Followup-To: postitaja\n" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "(tundmatu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "Eelmisest reeglist eemaldatud: " +# TRANSLATION MISSING +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "1 Vastus" @@ -1420,9 +1431,8 @@ msgid "escape from command prompt" msgstr "pääs käsuviibalt" #: src/lang.c:322 -#, fuzzy msgid "edit filter file" -msgstr "Loen filtrite faili" +msgstr "toimeta filtrite faili" #: src/lang.c:323 msgid "get help" @@ -1974,7 +1984,7 @@ msgstr "Vigane klahvi nimi '%s'\n" #: src/lang.c:461 #, c-format msgid "Keymap file was upgraded to version %s\n" -msgstr "" +msgstr "Keymap fail uuendati versioonini %s\n" #: src/lang.c:462 #, c-format @@ -2029,9 +2039,8 @@ msgid "Message-ID: line " msgstr "Message-ID: rida " #: src/lang.c:476 -#, fuzzy msgid "Mail" -msgstr "Saadetud" +msgstr "E-post" #: src/lang.c:477 msgid "mailbox " @@ -4035,7 +4044,7 @@ msgstr "Mitmeosaliste teema" #: src/lang.c:1099 msgid "Percentage Match" -msgstr "" +msgstr "Percentage Match" #: src/lang.c:1111 src/lang.c:1222 msgid "No" @@ -4463,7 +4472,6 @@ msgid "Thread articles by" msgstr "Artiklite teemadesse jagamine" #: src/lang.c:1413 -#, fuzzy msgid "# Thread articles by ...\n" "# Possible values are (the default is marked with *):\n" "# 0 = nothing\n" @@ -4479,14 +4487,15 @@ msgstr "# Artiklite teemadesse jagamine\ "# 2 = Viited\n" "# * 3 = Mõlemad (Teema ja Viited)\n" "# 4 = Mitmeosaline teema\n" + "# 5 = Protsentuaalne sobivus\n" #: src/lang.c:1424 msgid "Enter percentage match required to thread together. sets." -msgstr "" +msgstr "Sisestage teema loomiseks vajalik protsentuaalne sobivus. seab." #: src/lang.c:1425 msgid "Thread percentage match" -msgstr "" +msgstr "Teema protsentuaalne sobivus" #: src/lang.c:1426 #, c-format @@ -4499,7 +4508,12 @@ msgid "# Thread percentage match...\n" "# no insertion of a character, for the two articles to be put in the same\n" "# thread. eg. 'happy' and 'harpy' would match, but 'harpie', 'happie' and\n" "# 'harppy' would be threaded separately from 'happy'\n" -msgstr "" +msgstr "# Teema protsentuaalne sobivus...\n" + "# artikli teemas olevate sõmbolite protsent, mis peab sobima baasartikliga,\n" + "# et nad mõlemad loetaks samasse teemasse. Väärtus on täisarv, näiteks 80.\n" + "# Väärtuse 80 korral peab täpselt 80%% sümbolitest sobima et artiklid ühte\n" + "# teemasse seotaks. Näiteks 'happy' ja 'harpy' sobiksid, aga 'harpie',\n" + "# 'happie' ja 'harppy' samasse teemasse 'happy'-ga ei läheks\n" #: src/lang.c:1438 msgid "Score of a thread" @@ -6351,12 +6365,12 @@ msgstr "Renderda BiDi" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Kui väärtus on ON, renderdab tin mitmesuunalist (BiDi) teksti\n" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Versioon: %s %s väljalase %s (\"%s\") %s %s\n" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" @@ -6393,49 +6407,53 @@ msgstr "Saada viimane käsk uuesti (%s)\n #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " -msgstr "" +msgstr "MOTD: " -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" -msgstr "" +msgstr "Rida %d on pikem, kui 998 sümbolit ja tuleks poolitada, aga kodeering\n" + "pole ei %s ega %s\n" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" -msgstr "" +msgstr "Rida %d on pikem, kui 998 sümbolit ja tuleks poolitada, aga kodeering\n" + "on %s ja MIME_BREAK_LONG_LINES pole seatud või postitamine ei sisalda\n" + "8 bitiseid sümboleid ja seetõttu poolitamist ei toimu\n" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" -msgstr "" +msgstr "Rida %d on pikem, kui 998 sümbolit ja tuleks poolitada, aga kodeering\n" + "pole %s\n" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "Katkestan lugemise, palun oodake..." -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "Katkestatud lugemine\n" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "Tühjendan\n" @@ -6452,7 +6470,7 @@ msgstr "[- Pole kasutatav -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -6463,19 +6481,19 @@ msgstr "See teade on koostatud kasutades "vormingut kasutama ja järgnev tekst võib olla kummaline.\n" "\n" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "baiti" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "lugemata" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "kõik" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr " L" Binary files tin-1.7.9/po/fr.gmo and tin-1.7.10/po/fr.gmo differ diff -Nurp tin-1.7.9/po/fr.po tin-1.7.10/po/fr.po --- tin-1.7.9/po/fr.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/fr.po 2005-09-29 13:21:10.336633608 +0200 @@ -2,9 +2,9 @@ # Matt Anton , 2003-2004 # msgid "" -msgstr "Project-Id-Version: 1.7.8\n" +msgstr "Project-Id-Version: 1.7.9\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2004-11-17 00:50+0100\n" "Last-Translator: Matt Anton \n" @@ -12,286 +12,294 @@ msgstr "Project-Id-Version: 1.7.8\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Mauvais overview (%d champs) '%s'" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ne pas éditer ce commentaire\n" "#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=TERME (pe. alt.*,!alt.bin*) [obligatoire]\n" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=TERME (pe. ~/Mail)\n" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=TERME (pe. ~user/News)\n" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=TERME (pe. =linux)\n" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=TERME (pe. $var/sig)\n" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=TERME (si commence par '/' lire dans fichier)\n" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=TERME\n" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=TERME (pe. majordomo@example.org)\n" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=TERME (pe. ~/.tin/extra-headers)\n" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=TERME (pe. ~/.tin/extra-body-text)\n" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=TERME (choix du 'From:', ne pas utiliser celui cité)\n" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=TERME\n" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=TERME (%%s, %%S pour les initiales)\n" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=TERME (pe. image/*,!image/bmp)\n" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "# ispell=TERME\n" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "# thread_perc=NUM\n" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=TERME (pe. talk.*)\n" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=subject (casse sensible) 1=subject (ignore la casse)\n" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=from (casse sensible) 3=from (ignore la casse)\n" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "# 4=msgid 5=lines\n" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=TERME\n" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=TERME (pe. =mailbox)\n" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=encodage_supporté" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=TERME (défaut est US-ASCII)\n" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Notez que placer les entrées générales (portée globale) en premier\n" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# est préférable, suivies des entrées spécifiques aux groupes.\n" "#\n" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "# inclure des en-têtes supplémentaires\n" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "# dans *sources* choisir le type shar en post-traitement\n" -#: src/attrib.c:761 +#: src/attrib.c:768 #, fuzzy, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" -msgstr "# dans *binaries* faire traitement complet, effaçant les fichiers " - "temporaires\n" +msgstr "# dans *binaries* faire traitement complet,\n" -#: src/attrib.c:762 -#, fuzzy, c-format +#: src/attrib.c:769 +#, c-format msgid "# remove tmp files and set Followup-To: poster\n" -msgstr "# et utiliser Followup-To: poster\n" +msgstr "# effaçant les fichiers temporaires et utiliser Followup-To: poster\n" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "(inconnu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "Effacé de la règle précédente : " +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "1 Réponse" @@ -6436,12 +6444,12 @@ msgstr "Rendu BiDi" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# Si ON, le texte bi-directionnel est affiché par tin\n" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version : %s %s release %s (\"%s\") %s %s\n" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version : %s %s release %s (\"%s\")\n" @@ -6479,24 +6487,24 @@ msgstr "Réenvoyer la dernière commande ( #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" # TRANSLATION MISSING -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" # TRANSLATION MISSING -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" @@ -6504,27 +6512,27 @@ msgid "Line %d is longer than 998 octets msgstr "" # TRANSLATION MISSING -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "Annulation de la lecture, un moment svp..." -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "Lecture annulée\n" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "Purge\n" @@ -6541,7 +6549,7 @@ msgstr "[- Indisponible -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -6552,19 +6560,19 @@ msgstr "Ce message a été composé avec le "ce qui suit peut paraître assez bizarre.\n" "\n" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "octets" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "non lu(s)" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "tout" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr " R" Binary files tin-1.7.9/po/ru.gmo and tin-1.7.10/po/ru.gmo differ diff -Nurp tin-1.7.9/po/ru.po tin-1.7.10/po/ru.po --- tin-1.7.9/po/ru.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/ru.po 2005-09-29 13:21:10.935521875 +0200 @@ -4,9 +4,9 @@ # Andrei Emeltchenko , 2005. # msgid "" -msgstr "Project-Id-Version: tin 1.7.8\n" +msgstr "Project-Id-Version: tin 1.7.9\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2005-03-23 15:39+0200\n" "Last-Translator: Andrei Emeltchenko \n" "Language-Team: Russian \n" @@ -16,281 +16,290 @@ msgstr "Project-Id-Version: tin 1.7.8\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# îÅ ÒÅÄÁËÔÉÒÕÊÔÅ ÜÔÏÔ ÂÌÏË ËÏÍÍÅÎÔÁÒÉÅ×#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:761 +#: src/attrib.c:768 #, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "" -#: src/attrib.c:762 +#: src/attrib.c:769 #, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "(ÎÅÉÚ×ÅÓÔÎÏ)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "õÄÁÌÅÎ ÉÚ ÐÒÅÄÙÄÕÝÅÇÏ ÐÒÁ×ÉÌÁ: " +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "1 ïÔ×ÅÔ" @@ -5986,12 +5995,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -6028,49 +6037,49 @@ msgstr "ðÅÒÅÓÌÁÔØ ÐÏÓÌÅÄÎÀÀ ËÏÍÁÎÄÕ (%s) #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÒÁÓËÒÙÔØ %s\n" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "ïÔÐÒÁ×ÌÅÎÉÅ × ÇÒÕÐÐÕ %.*s ..." #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "ðÒÅÒÙ×ÁÎÉÅ ÞÔÅÎÉÑ, ÐÏÄÏÖÄÉÔÅ..." -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "þÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ\n" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "ïÓÕÛÅÎÉÅ\n" @@ -6087,7 +6096,7 @@ msgstr "[- îÅÄÏÓÔÕÐÎÏ -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -6095,19 +6104,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "ÂÁÊÔ" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "ÎÅÐÒÏÞÉÔÁÎÎÙÅ" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "×ÓÅ" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr "" Binary files tin-1.7.9/po/rw.gmo and tin-1.7.10/po/rw.gmo differ diff -Nurp tin-1.7.9/po/rw.po tin-1.7.10/po/rw.po --- tin-1.7.9/po/rw.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/rw.po 2005-09-29 13:21:11.432429168 +0200 @@ -15,7 +15,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.7.8\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2005-04-03 10:55-0700\n" "Last-Translator: Steven Michael Murphy \n" "Language-Team: Kinyarwanda \n" @@ -23,274 +23,279 @@ msgstr "Project-Id-Version: tin 1.7.8\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, fuzzy, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Incamake Icyabitswe Imyanya" -#: src/attrib.c:643 +#: src/attrib.c:649 #, fuzzy, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# O YA Guhindura iyi Icyo wongeraho\n" "#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, fuzzy, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# Alt. Alt.\n" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:646 +#: src/attrib.c:652 #, fuzzy, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# Ukoresha:\n" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:648 +#: src/attrib.c:654 #, fuzzy, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# VAR\n" -#: src/attrib.c:649 +#: src/attrib.c:655 #, fuzzy, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# Ihuzagahunda NIBA Itangiriro Na: Gusoma Bivuye IDOSIYE\n" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:651 +#: src/attrib.c:657 #, fuzzy, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# Urutonde rwa Imeli Urugero org\n" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:654 +#: src/attrib.c:660 #, fuzzy, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# Bivuye Kongeraho... Umurongo Gukoresha\n" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:662 #, fuzzy, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# kugirango Izibanza\n" -#: src/attrib.c:657 +#: src/attrib.c:663 #, fuzzy, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# Ishusho Ishusho bmp\n" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:668 #, fuzzy, c-format msgid "# auto_save=ON/OFF\n" msgstr "# NyaMwishyingura\n" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, fuzzy, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0 1. Kwirengagiza\n" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, fuzzy, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2. Bivuye 3. Bivuye Kwirengagiza\n" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:739 +#: src/attrib.c:746 #, fuzzy, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# Mburabuzi ni\n" -#: src/attrib.c:741 +#: src/attrib.c:748 #, fuzzy, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# ni Kuri Gushyira Rusange\n" -#: src/attrib.c:742 +#: src/attrib.c:749 #, fuzzy, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# Ibyinjijwe Itangira ku Itsinda Ibyinjijwe\n" "#\n" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:749 +#: src/attrib.c:756 #, fuzzy, c-format msgid "# include extra headers\n" msgstr "# Gushyiramo Birenga\n" -#: src/attrib.c:757 +#: src/attrib.c:764 #, fuzzy, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "# in Gushyiraho Iposita Ubwoko Kuri\n" -#: src/attrib.c:761 +#: src/attrib.c:768 #, fuzzy, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "# in Iposita Inonosora Gukuraho...\n" -#: src/attrib.c:762 +#: src/attrib.c:769 #, fuzzy, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "# Na Gushyiraho\n" -#: src/cook.c:497 +#: src/cook.c:495 #, fuzzy msgid "(unknown)" msgstr "(Itazwi)" @@ -298,11 +303,15 @@ msgstr "(Itazwi)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 #, fuzzy msgid "Removed from the previous rule: " msgstr "Bivuye i Ibanjirije" +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 #, fuzzy msgid "1 Response" @@ -4756,7 +4765,6 @@ msgid "Enter percentage match required t msgstr "" #: src/lang.c:1425 -#, fuzzy msgid "Thread percentage match" msgstr "" @@ -6776,12 +6784,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "#Umwandiko ni ku" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -6819,50 +6827,50 @@ msgstr "Iheruka Komandi:" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, fuzzy, c-format msgid "couldn't expand %s\n" msgstr "Kwagura" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, fuzzy, c-format msgid "Posting: %.*s ..." msgstr "S" #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 #, fuzzy msgid "Aborting read, please wait..." msgstr "Gusoma Tegereza" -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "" @@ -6879,7 +6887,7 @@ msgstr "" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, fuzzy, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -6888,22 +6896,22 @@ msgid "This message has been composed in msgstr "Ubutumwa in i Imiterere iyi Imbanziriza Ubutumwa OYA i Gishya Imiterere Na " "Bya Gicurasi" -#: src/save.c:978 +#: src/save.c:972 #, fuzzy msgid "bytes" msgstr "Bayite" -#: src/select.c:381 +#: src/select.c:379 #, fuzzy msgid "unread" msgstr "Bidasomye" -#: src/select.c:381 +#: src/select.c:379 #, fuzzy msgid "all" msgstr "Byose" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 #, fuzzy msgid " R" msgstr " R" diff -Nurp tin-1.7.9/po/tin.pot tin-1.7.10/po/tin.pot --- tin-1.7.9/po/tin.pot 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/tin.pot 2005-09-29 13:21:21.326583243 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-22 20:13+0200\n" +"POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,285 +15,294 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:661 #, c-format msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:659 +#: src/attrib.c:665 #, c-format msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:720 +#: src/attrib.c:727 #, c-format msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:741 +#: src/attrib.c:748 #, c-format msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:742 +#: src/attrib.c:749 #, c-format msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "" "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:761 +#: src/attrib.c:768 #, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "" -#: src/attrib.c:762 +#: src/attrib.c:769 #, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "" +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 msgid "1 Response" msgstr "" @@ -6116,12 +6125,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3728 +#: src/misc.c:3750 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3731 +#: src/misc.c:3753 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -6158,23 +6167,23 @@ msgstr "" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "" "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "" "Line %d is longer than 998 octets, and should be folded, but\n" @@ -6182,28 +6191,28 @@ msgid "" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "" "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, c-format msgid "Posting: %.*s ..." msgstr "" #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "" -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "" -#: src/read.c:417 +#: src/read.c:414 msgid "Draining\n" msgstr "" @@ -6220,7 +6229,7 @@ msgstr "" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "" "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" @@ -6230,19 +6239,19 @@ msgid "" "\n" msgstr "" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr "" Binary files tin-1.7.9/po/tr.gmo and tin-1.7.10/po/tr.gmo differ diff -Nurp tin-1.7.9/po/tr.po tin-1.7.10/po/tr.po --- tin-1.7.9/po/tr.po 2005-06-28 10:31:29.000000000 +0200 +++ tin-1.7.10/po/tr.po 2005-09-29 13:21:11.929336462 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.7.7\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-22 20:13+0200\n" + "POT-Creation-Date: 2005-09-29 13:20+0200\n" "PO-Revision-Date: 2005-03-06 09:25+0200\n" "Last-Translator: Þebnem Korkmaz \n" "Language-Team: Turkish \n" @@ -15,285 +15,294 @@ msgstr "Project-Id-Version: tin 1.7.7\n" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1553 +#: src/art.c:1533 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:643 +#: src/attrib.c:649 #, c-format msgid "# Do not edit this comment block\n" "#\n" msgstr "# Bu açýklama bloðunu düzenlemeyin\n" "#\n" -#: src/attrib.c:644 +#: src/attrib.c:650 #, c-format msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=DÝZGE (kapsam, örn. alt.*,!alt.bin*) [zorunlu]\n" -#: src/attrib.c:645 +#: src/attrib.c:651 #, c-format msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=DÝZGE (posta dizini, örn. ~/Mail)\n" -#: src/attrib.c:646 +#: src/attrib.c:652 #, c-format msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=DÝZGE (saklama dizini, örn. ~user/News)\n" -#: src/attrib.c:647 +#: src/attrib.c:653 #, c-format msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=DÝZGE (saklama dosyasý, örn. =linux)\n" -#: src/attrib.c:648 +#: src/attrib.c:654 #, c-format msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=DÝZGE (imza dosyasý, örn. $var/sig)\n" -#: src/attrib.c:649 +#: src/attrib.c:655 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=DÝZGE (kurum; eðer / ile baþlýyor ise, dosyadan okunur)\n" -#: src/attrib.c:650 +#: src/attrib.c:656 #, c-format msgid "# followup_to=STRING\n" msgstr "# followup_to=DÝZGE (cevap yönlendirmesi)\n" -#: src/attrib.c:651 +#: src/attrib.c:657 #, c-format msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=DÝZGE (posta listesi, örn. majordomo@example.org)\n" -#: src/attrib.c:652 +#: src/attrib.c:658 #, c-format msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=DÝZGE (ekstra baþlýk dosyasý, örn. ~/.tin/extra-headers)\n" -#: src/attrib.c:653 +#: src/attrib.c:659 #, c-format msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=DÝZGE (extra gövde dosyasý, örn. ~/.tin/extra-body-text)\n" -#: src/attrib.c:654 +#: src/attrib.c:660 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:661 #, fuzzy, c-format msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=DÝZGE\n" -#: src/attrib.c:656 +#: src/attrib.c:662 #, c-format msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:663 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:659 +#: src/attrib.c:665 #, fuzzy, c-format msgid "# ispell=STRING\n" msgstr "# ispell=DÝZGE\n" -#: src/attrib.c:661 +#: src/attrib.c:667 #, c-format msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:668 #, c-format msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:669 #, c-format msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:670 #, c-format msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:671 #, c-format msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:666 +#: src/attrib.c:672 #, c-format msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:679 +#, c-format +msgid "# thread_perc=NUM\n" +msgstr "" + +#: src/attrib.c:680 #, c-format msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:686 #, c-format msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:685 +#: src/attrib.c:692 #, c-format msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:710 #, c-format msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:715 #, c-format msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:713 +#: src/attrib.c:720 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:714 +#: src/attrib.c:721 #, c-format msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:715 +#: src/attrib.c:722 #, c-format msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:716 +#: src/attrib.c:723 #, c-format msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:717 src/attrib.c:724 +#: src/attrib.c:724 src/attrib.c:731 #, c-format msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:718 src/attrib.c:725 +#: src/attrib.c:725 src/attrib.c:732 #, c-format msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:719 src/attrib.c:726 +#: src/attrib.c:726 src/attrib.c:733 #, c-format msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:720 +#: src/attrib.c:727 #, fuzzy, c-format msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=DÝZGE\n" -#: src/attrib.c:721 +#: src/attrib.c:728 #, c-format msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:722 +#: src/attrib.c:729 #, c-format msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:723 +#: src/attrib.c:730 #, c-format msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:727 +#: src/attrib.c:734 #, c-format msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:728 +#: src/attrib.c:735 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:729 +#: src/attrib.c:736 #, c-format msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:730 +#: src/attrib.c:737 #, c-format msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:732 +#: src/attrib.c:739 #, c-format msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:739 +#: src/attrib.c:746 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:741 +#: src/attrib.c:748 #, fuzzy, c-format msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Genel(küresel) kaplamýn en iyi olduðunu not ediniz.\n" -#: src/attrib.c:742 +#: src/attrib.c:749 #, fuzzy, c-format msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# Öncelikle özgül grup girdileri tarafýndan takip edilen girdiler\n" "#\n" -#: src/attrib.c:743 +#: src/attrib.c:750 #, c-format msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:749 +#: src/attrib.c:756 #, c-format msgid "# include extra headers\n" msgstr "# extra baþlýklarý içerir\n" -#: src/attrib.c:757 +#: src/attrib.c:764 #, c-format msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:761 +#: src/attrib.c:768 #, fuzzy, c-format msgid "# in *binaries* do full post processing but no TeX2ISO conversion,\n" msgstr "# ikilik dosyalarda iþletim sonrasýný tam yapýn, tmp dosyalarýný kaldýrýn.\n" -#: src/attrib.c:762 +#: src/attrib.c:769 #, c-format msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:497 +#: src/cook.c:495 msgid "(unknown)" msgstr "(bilinmiyor)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:600 src/filter.c:608 +#: src/filter.c:597 src/filter.c:605 msgid "Removed from the previous rule: " msgstr "Önceki kuraldan kaldýrýldý: " +#: src/keymap.c:239 +msgid "NULL" +msgstr "" + #: src/lang.c:42 #, fuzzy msgid "1 Response" @@ -7066,12 +7075,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3728 +#: src/misc.c:3750 #, fuzzy, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Sürüm: %s %s serbest býrak %s (\"%s\") %s %s\n" -#: src/misc.c:3731 +#: src/misc.c:3753 #, fuzzy, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Sürüm: %s %s serbest býrak %s (\"%s\")\n" @@ -7110,49 +7119,49 @@ msgstr "Son komutu tekrr yolla (%s)\n" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1715 +#: src/nntplib.c:1724 msgid "MOTD: " msgstr "" -#: src/nrctbl.c:172 +#: src/nrctbl.c:170 #, c-format msgid "couldn't expand %s\n" msgstr "%s geniþletilemedi\n" -#: src/post.c:1152 +#: src/post.c:1171 #, c-format msgid "Line %d is longer than 998 octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1157 +#: src/post.c:1176 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1159 +#: src/post.c:1178 #, c-format msgid "Line %d is longer than 998 octets, and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:1974 +#: src/post.c:1993 #, fuzzy, c-format msgid "Posting: %.*s ..." msgstr "Gönderiliyor: %.*s ..." #. Check if okay to read -#: src/read.c:214 +#: src/read.c:211 msgid "Aborting read, please wait..." msgstr "Okuma durduruluyor, lütfen bekleyin..." -#: src/read.c:361 +#: src/read.c:358 msgid "Aborted read\n" msgstr "Okuma durduruldu\n" -#: src/read.c:417 +#: src/read.c:414 #, fuzzy msgid "Draining\n" msgstr "Akaçlanma\n" @@ -7172,7 +7181,7 @@ msgstr "[- Kullanýlamýyor -]" #. * preamble #. * TODO: -> lang.c #. -#: src/rfc2047.c:1203 +#: src/rfc2047.c:1201 #, c-format msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" "are reading this prefix, your mail reader probably has not yet been modified\n" @@ -7180,19 +7189,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:978 +#: src/save.c:972 msgid "bytes" msgstr "bayt" -#: src/select.c:381 +#: src/select.c:379 msgid "unread" msgstr "okunmamýþ" -#: src/select.c:381 +#: src/select.c:379 msgid "all" msgstr "Hepsi" -#: src/select.c:551 src/select.c:553 +#: src/select.c:549 src/select.c:551 msgid " R" msgstr " R" diff -Nurp tin-1.7.9/src/Makefile.in tin-1.7.10/src/Makefile.in --- tin-1.7.9/src/Makefile.in 2005-06-28 19:49:36.000000000 +0200 +++ tin-1.7.10/src/Makefile.in 2005-07-16 21:49:36.000000000 +0200 @@ -1,7 +1,7 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2005-06-22 +# Updated: 2005-07-02 # # Copyright (c) 1995-2005 Thomas E. Dickey # All rights reserved. @@ -499,10 +499,10 @@ $(OBJDIR)/color$o : $(SRCDIR)/color.c $ $(OBJDIR)/config$o : $(SRCDIR)/config.c $(TIN_DEP) \ $(INCDIR)/tnntp.h \ $(INCDIR)/version.h -$(OBJDIR)/curses$o : $(SRCDIR)/curses.c $(TIN_DEP) \ - $(INCDIR)/tnntp.h $(OBJDIR)/cook$o : $(SRCDIR)/cook.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h +$(OBJDIR)/curses$o : $(SRCDIR)/curses.c $(TIN_DEP) \ + $(INCDIR)/tnntp.h $(OBJDIR)/debug$o : $(SRCDIR)/debug.c $(TIN_DEP) \ $(INCDIR)/newsrc.h $(OBJDIR)/envarg$o : $(SRCDIR)/envarg.c $(TIN_DEP) @@ -600,9 +600,9 @@ $(OBJDIR)/strftime$o : $(SRCDIR)/strfti $(OBJDIR)/string$o : $(SRCDIR)/string.c $(TIN_DEP) $(OBJDIR)/tags$o : $(SRCDIR)/tags.c $(TIN_DEP) $(OBJDIR)/tcurses$o : $(SRCDIR)/tcurses.c $(TIN_DEP) -$(OBJDIR)/tmpfile$o : $(SRCDIR)/tmpfile.c $(TIN_DEP) $(OBJDIR)/thread$o : $(SRCDIR)/thread.c $(TIN_DEP) \ $(INCDIR)/keymap.h +$(OBJDIR)/tmpfile$o : $(SRCDIR)/tmpfile.c $(TIN_DEP) $(OBJDIR)/version$o : $(SRCDIR)/version.c $(TIN_DEP) \ $(INCDIR)/keymap.h \ $(INCDIR)/version.h diff -Nurp tin-1.7.9/src/art.c tin-1.7.10/src/art.c --- tin-1.7.9/src/art.c 2005-06-28 10:31:23.000000000 +0200 +++ tin-1.7.10/src/art.c 2005-06-30 10:22:35.000000000 +0200 @@ -3,7 +3,7 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2005-06-25 + * Updated : 2005-06-30 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -86,7 +86,7 @@ static t_bool parse_headers(FILE *fp, st static t_compfunc eval_sort_arts_func(unsigned int sort_art_type); static void sort_base(unsigned int sort_threads_type); static void thread_by_multipart(void); -static void thread_by_percentage(void); +static void thread_by_percentage(struct t_group *group); static void thread_by_subject(void); @@ -730,12 +730,12 @@ thread_by_subject( */ static void thread_by_percentage( - void) + struct t_group *group) { int i, j, k; int root_num = 0; /* The index number of the root we are currently working on. */ int unmatched; /* This is the number of characters that don't match between the two strings */ - unsigned int percentage = 100 - tinrc.thread_perc; + unsigned int percentage = 100 - group->attribute->thread_perc; size_t slen; /* First we need to sort art[] to simplify and speed up the matching. */ @@ -1094,7 +1094,7 @@ make_threads( break; case THREAD_PERC: - thread_by_percentage(); + thread_by_percentage(group); break; default: /* not reached */ diff -Nurp tin-1.7.9/src/attrib.c tin-1.7.10/src/attrib.c --- tin-1.7.9/src/attrib.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/attrib.c 2005-06-30 10:23:16.000000000 +0200 @@ -3,7 +3,7 @@ * Module : attrib.c * Author : I. Lea * Created : 1993-12-01 - * Updated : 2005-05-07 + * Updated : 2005-06-30 * Notes : Group attribute routines * * Copyright (c) 1993-2005 Iain Lea @@ -65,6 +65,7 @@ enum { ATTRIB_DELETE_TMP_FILES, ATTRIB_SHOW_ONLY_UNREAD, ATTRIB_THREAD_ARTS, + ATTRIB_THREAD_PERC, ATTRIB_SHOW_AUTHOR, ATTRIB_SHOW_INFO, ATTRIB_SORT_ART_TYPE, @@ -152,6 +153,7 @@ set_default_attributes( attributes->quick_select_expire = tinrc.default_filter_select_expire; attributes->show_only_unread = tinrc.show_only_unread_arts; attributes->thread_arts = tinrc.thread_articles; + attributes->thread_perc = tinrc.thread_perc; attributes->sort_art_type = tinrc.sort_article_type; attributes->sort_threads_type = tinrc.sort_threads_type; attributes->show_info = tinrc.show_info; @@ -355,6 +357,7 @@ read_attributes_file( case 't': MATCH_BOOLEAN("tex2iso_conv=", ATTRIB_TEX2ISO_CONV); MATCH_INTEGER("thread_arts=", ATTRIB_THREAD_ARTS, THREAD_MAX); + MATCH_INTEGER("thread_perc=", ATTRIB_THREAD_PERC, 100); break; case 'u': @@ -509,6 +512,9 @@ do_set_attrib( case ATTRIB_THREAD_ARTS: SET_INTEGER(thread_arts); + case ATTRIB_THREAD_PERC: + SET_INTEGER(thread_perc); + case ATTRIB_SHOW_AUTHOR: SET_INTEGER(show_author); @@ -670,6 +676,7 @@ write_attributes_file( fprintf(fp, "%d=%s, ", i, _(txt_threading[i])); } fprintf(fp, "\n"); + fprintf(fp, _("# thread_perc=NUM\n")); fprintf(fp, _("# show_author=NUM\n")); fprintf(fp, "# %d=%s, %d=%s, %d=%s, %d=%s\n", SHOW_FROM_NONE, _(txt_show_from[SHOW_FROM_NONE]), @@ -818,6 +825,7 @@ write_attributes_file( # endif /* HAVE_ISPELL */ fprintf(fp, "show_only_unread=%s\n", print_boolean(attr->show_only_unread)); fprintf(fp, "thread_arts=%d\n", attr->thread_arts); + fprintf(fp, "thread_perc=%d\n", attr->thread_perc); fprintf(fp, "auto_select=%s\n", print_boolean(attr->auto_select)); fprintf(fp, "auto_save=%s\n", print_boolean(attr->auto_save)); fprintf(fp, "batch_save=%s\n", print_boolean(attr->batch_save)); @@ -910,6 +918,7 @@ dump_attributes( # endif /* HAVE_ISPELL */ fprintf(stderr, "\tshow_only_unread=%s\n", print_boolean(group->attribute->show_only_unread)); fprintf(stderr, "\tthread_arts=%d\n", group->attribute->thread_arts); + fprintf(stderr, "\tthread_perc=%d\n", group->attribute->thread_perc); fprintf(stderr, "\tauto_select=%s\n", print_boolean(group->attribute->auto_select)); fprintf(stderr, "\tauto_save=%s\n", print_boolean(group->attribute->auto_save)); fprintf(stderr, "\tbatch_save=%s\n", print_boolean(group->attribute->batch_save)); diff -Nurp tin-1.7.9/src/auth.c tin-1.7.10/src/auth.c --- tin-1.7.9/src/auth.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/auth.c 2005-08-16 22:46:07.000000000 +0200 @@ -3,7 +3,7 @@ * Module : auth.c * Author : Dirk Nimmich * Created : 1997-04-05 - * Updated : 2004-06-30 + * Updated : 2005-08-16 * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * @@ -289,8 +289,10 @@ do_authinfo_original( /* * NNTP user authorization. Returns TRUE if authorization succeeded, * FALSE if not. - * Password read from ~/.newsauth or, if not present or no matching + * If username/passwd already given, and server wasn't changed, retry those. + * Otherwise, read password from ~/.newsauth or, if not present or no matching * server found, from console. + * * The ~/.newsauth authorization file has the format: * nntpserver1 password [user] * nntpserver2 password [user] @@ -303,22 +305,36 @@ authinfo_original( t_bool startup) { char *authpass; - char authusername[PATH_LEN]; - char authpassword[PATH_LEN]; int ret = ERR_AUTHBAD, changed; + static char authusername[PATH_LEN] = ""; + static char authpassword[PATH_LEN] = ""; static char last_server[PATH_LEN] = ""; static t_bool already_failed = FALSE; + static t_bool initialized = FALSE; #ifdef DEBUG debug_nntp("authorization", "original authinfo"); #endif /* DEBUG */ + + changed = strcmp(server, last_server); /* do we need new auth values? */ + strncpy(last_server, server, PATH_LEN - 1); + last_server[PATH_LEN - 1] = '\0'; + + /* + * Let's try the previous auth pair first, if applicable. + * Else, proceed to the other mechanisms. + */ + if (initialized && !changed && !already_failed && do_authinfo_original(server, authusername, authpassword)) + return TRUE; + authpassword[0] = '\0'; authuser = strncpy(authusername, authuser, sizeof(authusername) - 1); authpass = authpassword; /* - * read .newsauth only if we had not failed authentication yet for the + * No username/password given yet. + * Read .newsauth only if we had not failed authentication yet for the * current server (we don't want to try wrong username/password pairs * more than once because this may lead to an infinite loop at connection * startup: nntp_open tries to authenticate, it fails, server closes @@ -330,7 +346,7 @@ authinfo_original( * and restart tin or change to another server and back in order to get * it read again. */ - if ((changed = strcmp(server, last_server)) || (!changed && !already_failed)) { + if (changed || (!changed && !already_failed)) { already_failed = FALSE; if (read_newsauth_file(server, authuser, authpass)) { ret = do_authinfo_original(server, authuser, authpass); @@ -338,6 +354,7 @@ authinfo_original( #ifdef DEBUG debug_nntp("authorization", "succeeded"); #endif /* DEBUG */ + initialized = TRUE; return TRUE; } } @@ -392,6 +409,7 @@ authinfo_original( #endif /* USE_CURSES */ ret = do_authinfo_original(server, authuser, authpass); + initialized = TRUE; my_retouch(); /* Get rid of the chaff */ } diff -Nurp tin-1.7.9/src/config.c tin-1.7.10/src/config.c --- tin-1.7.9/src/config.c 2005-06-28 10:31:24.000000000 +0200 +++ tin-1.7.10/src/config.c 2005-09-14 15:00:14.528875095 +0200 @@ -3,7 +3,7 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-06-20 + * Updated : 2005-08-14 * Notes : Configuration file routines * * Copyright (c) 1991-2005 Iain Lea @@ -1833,7 +1833,7 @@ read_server_config( } JOINPATH(serverdir, rcdir, file); joinpath(file, serverdir, SERVERCONFIG_FILE); - + joinpath(local_newsgroups_file, serverdir, NEWSGROUPS_FILE); if ((fp = fopen(file, "r")) == NULL) return; while (NULL != (line = tin_fgets(fp, FALSE))) { diff -Nurp tin-1.7.9/src/cook.c tin-1.7.10/src/cook.c --- tin-1.7.9/src/cook.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/cook.c 2005-07-20 15:10:58.000000000 +0200 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2004-11-04 + * Updated : 2005-07-20 * Notes : Split from page.c * * Copyright (c) 2000-2005 Jason Faultless @@ -40,9 +40,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ + /* * We malloc() this many t_lineinfo's at a time @@ -507,7 +505,7 @@ process_text_body_part( * Skip output if we're hiding uue or the sig */ if (in_uue && hide_uue) - continue; /* No further processing needed */ + continue; /* No further processing needed */ flags = in_sig ? C_SIG : C_BODY; diff -Nurp tin-1.7.9/src/curses.c tin-1.7.10/src/curses.c --- tin-1.7.9/src/curses.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/curses.c 2005-08-27 12:41:21.000000000 +0200 @@ -57,7 +57,7 @@ t_bool have_linescroll = TRUE; /* USE_CU #define DEFAULT_COLUMNS_ON_TERMINAL 80 int cLINES = DEFAULT_LINES_ON_TERMINAL - 1; -int cCOLS = DEFAULT_COLUMNS_ON_TERMINAL; +int cCOLS = DEFAULT_COLUMNS_ON_TERMINAL; int _hp_glitch = FALSE; /* stdout not erased by overwriting on HP terms */ static int _inraw = FALSE; /* are we IN rawmode? */ static int xclicks = FALSE; /* do we have an xterm? */ @@ -335,9 +335,9 @@ get_termcaps( for (n = 0; n < ARRAY_SIZE(table); n++) { *(table[n].value) = TGETSTR(table[n].capname, &ptr); } - _lines = TGETNUM(dCAPNAME("li", "lines")); - _columns = TGETNUM(dCAPNAME("co", "cols")); - _hp_glitch = TGETFLAG(dCAPNAME("xs", "xhp")); + _lines = TGETNUM(dCAPNAME("li", "lines")); + _columns = TGETNUM(dCAPNAME("co", "cols")); + _hp_glitch = TGETFLAG(dCAPNAME("xs", "xhp")); # if defined(USE_TERMCAP) && defined(HAVE_EXTERN_TCAP_PC) t = TGETSTR(CAPNAME("pc", "pad"), &p); @@ -347,10 +347,10 @@ get_termcaps( if (STRCMPEQ(the_termname, "xterm")) { static char x_init[] = "\033[?9h"; - static char x_end[] = "\033[?9l"; + static char x_end[] = "\033[?9l"; xclicks = TRUE; - _xclickinit = x_init; - _xclickend = x_end; + _xclickinit = x_init; + _xclickend = x_end; } if (NO_CAP(_clearscreen)) { @@ -418,35 +418,34 @@ InitScreen( * we're going to assume a terminal here... */ - _clearscreen = "\033[1;1H\033[J"; - _moveto = "\033[%d;%dH"; /* not a termcap string! */ - _cleartoeoln = "\033[K"; - _setinverse = "\033[7m"; - _clearinverse = "\033[0m"; - _setunderline = "\033[4m"; - _clearunderline = "\033[0m"; - _keypadlocal = ""; - _keypadxmit = ""; + _clearscreen = "\033[1;1H\033[J"; + _moveto = "\033[%d;%dH"; /* not a termcap string! */ + _cleartoeoln = "\033[K"; + _setinverse = "\033[7m"; + _clearinverse = "\033[0m"; + _setunderline = "\033[4m"; + _clearunderline = "\033[0m"; + _keypadlocal = ""; + _keypadxmit = ""; # ifdef VMS - _cleartoeos = "\033[J"; - _terminalinit = NULL; - _terminalend = ""; + _cleartoeos = "\033[J"; + _terminalinit = NULL; + _terminalend = ""; # endif /* VMS */ /* needed for word highlighting */ - _reset = "\033[0m"; - _reversevideo = "\033[7m"; - _blink = "\033[5m"; - _dim = "\033[2m"; - _bold = "\033[1m"; + _reset = "\033[0m"; + _reversevideo = "\033[7m"; + _blink = "\033[5m"; + _dim = "\033[2m"; + _bold = "\033[1m"; _lines = _columns = -1; - if ((ptr = getenv("LINES")) != 0) { + if ((ptr = getenv("LINES")) != 0) _lines = atol(ptr); - } - if ((ptr = getenv("COLUMNS")) != 0) { + + if ((ptr = getenv("COLUMNS")) != 0) _columns = atol(ptr); - } /* * If that failed, try get a response from the console itself @@ -508,7 +507,7 @@ InitScreen( xclicks = TRUE; if (!eightbit) { _xclickinit = "\033[?9h"; - _xclickend = "\033[?9l"; + _xclickend = "\033[?9l"; } # if 0 else { diff -Nurp tin-1.7.9/src/feed.c tin-1.7.10/src/feed.c --- tin-1.7.9/src/feed.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/feed.c 2005-07-02 15:12:26.000000000 +0200 @@ -3,7 +3,7 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2005-05-13 + * Updated : 2005-07-02 * Notes : provides same interface to mail,pipe,print,save & repost commands * * Copyright (c) 1991-2005 Iain Lea @@ -45,14 +45,6 @@ # endif /* !TCURSES_H */ #endif /* DEBUG */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ - -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ - static t_bool confirm; /* only used for FEED_MAIL */ static t_bool is_mailbox = FALSE; diff -Nurp tin-1.7.9/src/filter.c tin-1.7.10/src/filter.c --- tin-1.7.9/src/filter.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/filter.c 2005-07-06 02:56:24.000000000 +0200 @@ -3,7 +3,7 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2005-05-04 + * Updated : 2005-07-06 * Notes : Filter articles. Kill & auto selection are supported. * * Copyright (c) 1991-2005 Iain Lea @@ -44,9 +44,6 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ #define IS_READ(i) (arts[i].status == ART_READ) @@ -77,8 +74,8 @@ * Easier access to hashed msgids. Note that in REFS(), y must be free()d * msgid is mandatory in an article and cannot be NULL */ -#define MSGID(x) (x->refptr->txt) -#define REFS(x,y) ((y = get_references(x->refptr->parent)) ? y : "") +#define MSGID(x) (x->refptr ? x->refptr->txt : "") +#define REFS(x,y) ((y = get_references(x->refptr ? x->refptr->parent : NULL)) ? y : "") /* * global filter array @@ -1936,7 +1933,7 @@ filter_articles( break; case FILTER_MSGID_LAST: - myrefs = (art->refptr->parent) ? art->refptr->parent->txt : ""; + myrefs = art->refptr ? (art->refptr->parent ? art->refptr->parent->txt : "") : ""; mymsgid = MSGID(art); break; diff -Nurp tin-1.7.9/src/global.c tin-1.7.10/src/global.c --- tin-1.7.9/src/global.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/global.c 2005-07-02 15:12:42.000000000 +0200 @@ -3,7 +3,7 @@ * Module : global.c * Author : Jason Faultless * Created : 1999-12-12 - * Updated : 2005-01-30 + * Updated : 2005-07-02 * Notes : Generic nagivation and key handling routines * * Copyright (c) 1999-2005 Jason Faultless @@ -41,9 +41,6 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ /* * Local prototypes diff -Nurp tin-1.7.9/src/group.c tin-1.7.10/src/group.c --- tin-1.7.9/src/group.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/group.c 2005-07-02 15:12:51.000000000 +0200 @@ -3,7 +3,7 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-04-18 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -41,9 +41,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + /* * Globally accessible pointer to currently active group diff -Nurp tin-1.7.9/src/header.c tin-1.7.10/src/header.c --- tin-1.7.9/src/header.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/header.c 2005-07-09 16:18:32.000000000 +0200 @@ -3,7 +3,7 @@ * Module : header.c * Author : Urs Janssen * Created : 1997-03-10 - * Updated : 2003-09-19 + * Updated : 2005-07-09 * * Copyright (c) 1997-2005 Urs Janssen * All rights reserved. @@ -154,8 +154,9 @@ get_fqdn( # ifdef HAVE_INET_ADDR if ('0' <= *name && *name <= '9') { - in.s_addr = inet_addr(name); - if ((hp = gethostbyaddr((char *) &in.s_addr, 4, AF_INET))) + in_addr_t addr = inet_addr(name); + + if ((hp = gethostbyaddr((char *) &addr, 4, AF_INET))) in.s_addr = (*hp->h_addr); return (hp && strchr(hp->h_name, '.') ? hp->h_name : inet_ntoa(in)); } diff -Nurp tin-1.7.9/src/help.c tin-1.7.10/src/help.c --- tin-1.7.9/src/help.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/help.c 2005-07-02 15:13:03.000000000 +0200 @@ -3,7 +3,7 @@ * Module : help.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-04-19 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea @@ -41,9 +41,6 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ typedef struct thp { @@ -475,7 +472,7 @@ make_help_page( fprintf(fp, "%s", buf); } else { for (i = 0; i < keys.used; i++) { - if (keys.list[i].function == helppage->func) { + if (keys.list[i].function == helppage->func && keys.list[i].key) { buf = my_realloc(buf, LEN); snprintf(buf, LEN, "%s\t %s", printascii(key, keys.list[i].key), _(helppage->helptext)); buf[LEN - 1] = '\0'; diff -Nurp tin-1.7.9/src/init.c tin-1.7.10/src/init.c --- tin-1.7.9/src/init.c 2005-06-28 10:31:24.000000000 +0200 +++ tin-1.7.10/src/init.c 2005-09-14 15:00:46.217945854 +0200 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-06-21 + * Updated : 2005-08-14 * Notes : * * Copyright (c) 1991-2005 Iain Lea @@ -44,9 +44,6 @@ #ifndef included_trace_h # include "trace.h" #endif /* !included_trace_h */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ @@ -435,6 +432,7 @@ struct t_capabilities nntp_caps = { FALSE, /* LIST: "LIST MOTD" */ FALSE, /* LIST: "LIST SUBSCRIPTIONS" */ FALSE, /* LIST: "LIST DISTRIBUTIONS" */ + FALSE, /* LIST: "LIST MODERATORS" */ FALSE, /* XPAT */ FALSE, /* HDR: "HDR", "LIST HEADERS" */ NULL, /* [X]HDR */ @@ -813,7 +811,6 @@ init_selfinfo( joinpath(filter_file, rcdir, FILTER_FILE); joinpath(local_input_history_file, rcdir, INPUT_HISTORY_FILE); joinpath(local_newsrctable_file, rcdir, NEWSRCTABLE_FILE); - joinpath(local_newsgroups_file, rcdir, NEWSGROUPS_FILE); #ifdef HAVE_MH_MAIL_HANDLING joinpath(mail_active_file, rcdir, ACTIVE_MAIL_FILE); #endif /* HAVE_MH_MAIL_HANDLING */ diff -Nurp tin-1.7.9/src/keymap.c tin-1.7.10/src/keymap.c --- tin-1.7.9/src/keymap.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/keymap.c 2005-08-27 12:34:15.000000000 +0200 @@ -3,7 +3,7 @@ * Module : keymap.c * Author : D. Nimmich, J. Faultless * Created : 2000-05-25 - * Updated : 2005-06-22 + * Updated : 2005-07-29 * Notes : This file contains key mapping routines and variables. * * Copyright (c) 2000-2005 Dirk Nimmich @@ -37,9 +37,6 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ @@ -47,11 +44,11 @@ /* * local prototypes */ -static void add_default_key(struct keylist *keys, char key, t_function func); +static void add_default_key(struct keylist *key_list, const char *keys, t_function func); static void add_global_keys(struct keylist *keys); static void free_keylist(struct keylist *keys); static void upgrade_keymap_file(char *old); -static t_bool add_key(struct keylist *keys, char key, t_function func, t_bool overwrite); +static t_bool add_key(struct keylist *keys, const char key, t_function func, t_bool override); static t_bool process_keys(t_function func, const char *keys, struct keylist *kl); static t_bool process_mapping(char *keyname, char *keys); @@ -124,14 +121,15 @@ func_to_key( /* * adds a key to a keylist + * default_key: TRUE if a default key should be added * returns TRUE if the key was succesfully added else FALSE */ static t_bool add_key( struct keylist *keys, - char key, + const char key, t_function func, - t_bool overwrite) + t_bool override) { size_t i; struct keynode *entry = NULL; @@ -143,7 +141,7 @@ add_key( } if (entry != NULL) { - if (overwrite) { + if (override) { entry->function = func; return TRUE; } else @@ -170,11 +168,17 @@ add_key( static void add_default_key( - struct keylist *keys, - char key, + struct keylist *key_list, + const char *keys, t_function func) { - add_key(keys, key, func, FALSE); + const char *key = keys; + /* check if the function has already a key assigned before we add the default one */ + if (func_to_key(func, *key_list) != '?') + return; + + for (; *key != '\0'; key++) + add_key(key_list, *key, func, FALSE); } @@ -231,7 +235,9 @@ printascii( char *buf, int ch) { - if ((ch == 0) || isgraph(ch)) { /* Regular printables */ + if (ch == 0) + strcpy(buf, _("NULL")); + else if (isgraph(ch)) { /* Regular printables */ buf[0] = ch; buf[1] = '\0'; } else if (ch == '\t') { /* TAB */ @@ -391,8 +397,12 @@ process_keys( * SPACE -> ' ' */ if (strlen(keydef) > 1) { - switch (keydef[0]) { - case 'S': /* Only test 1st char - crude but effective */ + switch (keydef[0]) { /* Only test 1st char - crude but effective */ + case 'N': + key = '\0'; + break; + + case 'S': key = ' '; break; @@ -2229,364 +2239,347 @@ setup_default_keys( { /* select level */ add_global_keys(&select_keys); - add_default_key(&select_keys, ctrl('J'), SELECT_ENTER_GROUP); - add_default_key(&select_keys, ctrl('M'), SELECT_ENTER_GROUP); - add_default_key(&select_keys, ctrl('R'), SELECT_RESET_NEWSRC); - add_default_key(&select_keys, 'c', CATCHUP); - add_default_key(&select_keys, 'd', SELECT_TOGGLE_DESCRIPTIONS); - add_default_key(&select_keys, 'g', SELECT_GOTO); - add_default_key(&select_keys, 'm', SELECT_MOVE_GROUP); - add_default_key(&select_keys, 'n', SELECT_ENTER_NEXT_UNREAD_GROUP); - add_default_key(&select_keys, 'r', SELECT_TOGGLE_READ_DISPLAY); - add_default_key(&select_keys, 's', SELECT_SUBSCRIBE); - add_default_key(&select_keys, 'u', SELECT_UNSUBSCRIBE); - add_default_key(&select_keys, 'y', SELECT_YANK_ACTIVE); - add_default_key(&select_keys, 'z', SELECT_MARK_GROUP_UNREAD); - add_default_key(&select_keys, 'C', CATCHUP_NEXT_UNREAD); - add_default_key(&select_keys, 'E', GLOBAL_EDIT_FILTER); - add_default_key(&select_keys, 'N', SELECT_NEXT_UNREAD_GROUP); - add_default_key(&select_keys, 'S', SELECT_SUBSCRIBE_PATTERN); - add_default_key(&select_keys, 'U', SELECT_UNSUBSCRIBE_PATTERN); - add_default_key(&select_keys, 'X', SELECT_QUIT_NO_WRITE); - add_default_key(&select_keys, 'Y', SELECT_SYNC_WITH_ACTIVE); - add_default_key(&select_keys, 'Z', SELECT_MARK_GROUP_UNREAD); - add_default_key(&select_keys, ' ', GLOBAL_PAGE_DOWN); - add_default_key(&select_keys, '.', SELECT_SORT_ACTIVE); - add_default_key(&select_keys, '\t', SELECT_ENTER_NEXT_UNREAD_GROUP); + add_default_key(&select_keys, " ", GLOBAL_PAGE_DOWN); + add_default_key(&select_keys, "\n\r", SELECT_ENTER_GROUP); + add_default_key(&select_keys, "", SELECT_RESET_NEWSRC); + add_default_key(&select_keys, "c", CATCHUP); + add_default_key(&select_keys, "d", SELECT_TOGGLE_DESCRIPTIONS); + add_default_key(&select_keys, "g", SELECT_GOTO); + add_default_key(&select_keys, "m", SELECT_MOVE_GROUP); + add_default_key(&select_keys, "n\t", SELECT_ENTER_NEXT_UNREAD_GROUP); + add_default_key(&select_keys, "r", SELECT_TOGGLE_READ_DISPLAY); + add_default_key(&select_keys, "s", SELECT_SUBSCRIBE); + add_default_key(&select_keys, "u", SELECT_UNSUBSCRIBE); + add_default_key(&select_keys, "y", SELECT_YANK_ACTIVE); + add_default_key(&select_keys, "z", SELECT_MARK_GROUP_UNREAD); + add_default_key(&select_keys, "C", CATCHUP_NEXT_UNREAD); + add_default_key(&select_keys, "E", GLOBAL_EDIT_FILTER); + add_default_key(&select_keys, "N", SELECT_NEXT_UNREAD_GROUP); + add_default_key(&select_keys, "S", SELECT_SUBSCRIBE_PATTERN); + add_default_key(&select_keys, "U", SELECT_UNSUBSCRIBE_PATTERN); + add_default_key(&select_keys, "X", SELECT_QUIT_NO_WRITE); + add_default_key(&select_keys, "Y", SELECT_SYNC_WITH_ACTIVE); + add_default_key(&select_keys, "Z", SELECT_MARK_GROUP_UNREAD); + add_default_key(&select_keys, ".", SELECT_SORT_ACTIVE); + add_default_key(&select_keys, ">", GLOBAL_SCROLL_DOWN); + add_default_key(&select_keys, "<", GLOBAL_SCROLL_UP); /* group level */ add_global_keys(&group_keys); - add_default_key(&group_keys, ctrl('A'), GLOBAL_MENU_FILTER_SELECT); - add_default_key(&group_keys, ctrl('J'), GROUP_READ_BASENOTE); - add_default_key(&group_keys, ctrl('K'), GLOBAL_MENU_FILTER_KILL); - add_default_key(&group_keys, ctrl('M'), GROUP_READ_BASENOTE); - add_default_key(&group_keys, 'a', GLOBAL_SEARCH_AUTHOR_FORWARD); - add_default_key(&group_keys, 'c', CATCHUP); - add_default_key(&group_keys, 'd', GROUP_TOGGLE_SUBJECT_DISPLAY); - add_default_key(&group_keys, 'g', GROUP_GOTO); - add_default_key(&group_keys, 'l', GROUP_LIST_THREAD); - add_default_key(&group_keys, 'm', GROUP_MAIL); - add_default_key(&group_keys, 'n', GROUP_NEXT_GROUP); + add_default_key(&group_keys, " ", GLOBAL_PAGE_DOWN); + add_default_key(&group_keys, "", GLOBAL_MENU_FILTER_SELECT); + add_default_key(&group_keys, "\n\r", GROUP_READ_BASENOTE); + add_default_key(&group_keys, " ", GLOBAL_MENU_FILTER_KILL); + add_default_key(&group_keys, "a", GLOBAL_SEARCH_AUTHOR_FORWARD); + add_default_key(&group_keys, "c", CATCHUP); + add_default_key(&group_keys, "d", GROUP_TOGGLE_SUBJECT_DISPLAY); + add_default_key(&group_keys, "g", GROUP_GOTO); + add_default_key(&group_keys, "l", GROUP_LIST_THREAD); + add_default_key(&group_keys, "m", GROUP_MAIL); + add_default_key(&group_keys, "n", GROUP_NEXT_GROUP); #ifndef DISABLE_PRINTING - add_default_key(&group_keys, 'o', GLOBAL_PRINT); + add_default_key(&group_keys, "o", GLOBAL_PRINT); #endif /* !DISABLE_PRINTING */ - add_default_key(&group_keys, 'p', GROUP_PREVIOUS_GROUP); - add_default_key(&group_keys, 'r', GROUP_TOGGLE_READ_UNREAD); - add_default_key(&group_keys, 's', GROUP_SAVE); - add_default_key(&group_keys, 't', GROUP_TAG); - add_default_key(&group_keys, 'u', GROUP_TOGGLE_THREADING); - add_default_key(&group_keys, 'x', GROUP_REPOST); - add_default_key(&group_keys, 'z', MARK_ARTICLE_UNREAD); - add_default_key(&group_keys, 'A', GLOBAL_SEARCH_AUTHOR_BACKWARD); - add_default_key(&group_keys, 'B', GLOBAL_SEARCH_BODY); - add_default_key(&group_keys, 'C', CATCHUP_NEXT_UNREAD); - add_default_key(&group_keys, 'E', GLOBAL_EDIT_FILTER); - add_default_key(&group_keys, 'G', GROUP_TOGGLE_GET_ARTICLES_LIMIT); - add_default_key(&group_keys, 'K', GROUP_MARK_THREAD_READ); - add_default_key(&group_keys, 'L', GLOBAL_LOOKUP_MESSAGEID); - add_default_key(&group_keys, 'N', GROUP_NEXT_UNREAD_ARTICLE); - add_default_key(&group_keys, 'P', GROUP_PREVIOUS_UNREAD_ARTICLE); - add_default_key(&group_keys, 'S', GROUP_AUTOSAVE); - add_default_key(&group_keys, 'T', GROUP_TAG_PARTS); - add_default_key(&group_keys, 'U', GROUP_UNTAG); - add_default_key(&group_keys, 'X', GROUP_MARK_UNSELECTED_ARTICLES_READ); - add_default_key(&group_keys, 'Z', MARK_THREAD_UNREAD); - add_default_key(&group_keys, '\t', GROUP_NEXT_UNREAD_ARTICLE_OR_GROUP); - add_default_key(&group_keys, ' ', GLOBAL_PAGE_DOWN); - add_default_key(&group_keys, '-', GLOBAL_LAST_VIEWED); - add_default_key(&group_keys, '|', GLOBAL_PIPE); - add_default_key(&group_keys, '[', GLOBAL_QUICK_FILTER_SELECT); - add_default_key(&group_keys, ']', GLOBAL_QUICK_FILTER_KILL); - add_default_key(&group_keys, '*', GROUP_SELECT_THREAD); - add_default_key(&group_keys, '.', GROUP_TOGGLE_SELECT_THREAD); - add_default_key(&group_keys, '@', GROUP_REVERSE_SELECTIONS); - add_default_key(&group_keys, '~', GROUP_UNDO_SELECTIONS); - add_default_key(&group_keys, '=', GROUP_SELECT_PATTERN); - add_default_key(&group_keys, ';', GROUP_SELECT_THREAD_IF_UNREAD_SELECTED); - add_default_key(&group_keys, '+', GROUP_DO_AUTOSELECT); + add_default_key(&group_keys, "p", GROUP_PREVIOUS_GROUP); + add_default_key(&group_keys, "r", GROUP_TOGGLE_READ_UNREAD); + add_default_key(&group_keys, "s", GROUP_SAVE); + add_default_key(&group_keys, "t", GROUP_TAG); + add_default_key(&group_keys, "u", GROUP_TOGGLE_THREADING); + add_default_key(&group_keys, "x", GROUP_REPOST); + add_default_key(&group_keys, "z", MARK_ARTICLE_UNREAD); + add_default_key(&group_keys, "A", GLOBAL_SEARCH_AUTHOR_BACKWARD); + add_default_key(&group_keys, "B", GLOBAL_SEARCH_BODY); + add_default_key(&group_keys, "C", CATCHUP_NEXT_UNREAD); + add_default_key(&group_keys, "E", GLOBAL_EDIT_FILTER); + add_default_key(&group_keys, "G", GROUP_TOGGLE_GET_ARTICLES_LIMIT); + add_default_key(&group_keys, "K", GROUP_MARK_THREAD_READ); + add_default_key(&group_keys, "L", GLOBAL_LOOKUP_MESSAGEID); + add_default_key(&group_keys, "N", GROUP_NEXT_UNREAD_ARTICLE); + add_default_key(&group_keys, "P", GROUP_PREVIOUS_UNREAD_ARTICLE); + add_default_key(&group_keys, "S", GROUP_AUTOSAVE); + add_default_key(&group_keys, "T", GROUP_TAG_PARTS); + add_default_key(&group_keys, "U", GROUP_UNTAG); + add_default_key(&group_keys, "X", GROUP_MARK_UNSELECTED_ARTICLES_READ); + add_default_key(&group_keys, "Z", MARK_THREAD_UNREAD); + add_default_key(&group_keys, "\t", GROUP_NEXT_UNREAD_ARTICLE_OR_GROUP); + add_default_key(&group_keys, "-", GLOBAL_LAST_VIEWED); + add_default_key(&group_keys, "|", GLOBAL_PIPE); + add_default_key(&group_keys, "[", GLOBAL_QUICK_FILTER_SELECT); + add_default_key(&group_keys, "]", GLOBAL_QUICK_FILTER_KILL); + add_default_key(&group_keys, "*", GROUP_SELECT_THREAD); + add_default_key(&group_keys, ".", GROUP_TOGGLE_SELECT_THREAD); + add_default_key(&group_keys, "@", GROUP_REVERSE_SELECTIONS); + add_default_key(&group_keys, "~", GROUP_UNDO_SELECTIONS); + add_default_key(&group_keys, "=", GROUP_SELECT_PATTERN); + add_default_key(&group_keys, ";", GROUP_SELECT_THREAD_IF_UNREAD_SELECTED); + add_default_key(&group_keys, "+", GROUP_DO_AUTOSELECT); + add_default_key(&group_keys, ">", GLOBAL_SCROLL_DOWN); + add_default_key(&group_keys, "<", GLOBAL_SCROLL_UP); /* thread keys */ add_global_keys(&thread_keys); - add_default_key(&thread_keys, ctrl('A'), GLOBAL_MENU_FILTER_SELECT); - add_default_key(&thread_keys, ctrl('K'), GLOBAL_MENU_FILTER_KILL); - add_default_key(&thread_keys, ctrl('J'), THREAD_READ_ARTICLE); - add_default_key(&thread_keys, ctrl('M'), THREAD_READ_ARTICLE); - add_default_key(&thread_keys, 'a', GLOBAL_SEARCH_AUTHOR_FORWARD); - add_default_key(&thread_keys, 'c', CATCHUP); - add_default_key(&thread_keys, 'd', THREAD_TOGGLE_SUBJECT_DISPLAY); - add_default_key(&thread_keys, 'm', THREAD_MAIL); + add_default_key(&thread_keys, " ", GLOBAL_PAGE_DOWN); + add_default_key(&thread_keys, "", GLOBAL_MENU_FILTER_SELECT); + add_default_key(&thread_keys, " ", GLOBAL_MENU_FILTER_KILL); + add_default_key(&thread_keys, "\n\r", THREAD_READ_ARTICLE); + add_default_key(&thread_keys, "a", GLOBAL_SEARCH_AUTHOR_FORWARD); + add_default_key(&thread_keys, "c", CATCHUP); + add_default_key(&thread_keys, "d", THREAD_TOGGLE_SUBJECT_DISPLAY); + add_default_key(&thread_keys, "m", THREAD_MAIL); #ifndef DISABLE_PRINTING - add_default_key(&thread_keys, 'o', GLOBAL_PRINT); + add_default_key(&thread_keys, "o", GLOBAL_PRINT); #endif /* !DISABLE_PRINTING */ - add_default_key(&thread_keys, 's', THREAD_SAVE); - add_default_key(&thread_keys, 't', THREAD_TAG); - add_default_key(&thread_keys, 'z', MARK_ARTICLE_UNREAD); - add_default_key(&thread_keys, 'A', GLOBAL_SEARCH_AUTHOR_BACKWARD); - add_default_key(&thread_keys, 'B', GLOBAL_SEARCH_BODY); - add_default_key(&thread_keys, 'C', CATCHUP_NEXT_UNREAD); - add_default_key(&thread_keys, 'E', GLOBAL_EDIT_FILTER); - add_default_key(&thread_keys, 'K', THREAD_MARK_ARTICLE_READ); - add_default_key(&thread_keys, 'L', GLOBAL_LOOKUP_MESSAGEID); - add_default_key(&thread_keys, 'S', THREAD_AUTOSAVE); - add_default_key(&thread_keys, 'U', THREAD_UNTAG); - add_default_key(&thread_keys, 'Z', MARK_THREAD_UNREAD); - add_default_key(&thread_keys, '\t', THREAD_READ_NEXT_ARTICLE_OR_THREAD); - add_default_key(&thread_keys, ' ', GLOBAL_PAGE_DOWN); - add_default_key(&thread_keys, '-', GLOBAL_LAST_VIEWED); - add_default_key(&thread_keys, '|', GLOBAL_PIPE); - add_default_key(&thread_keys, '*', THREAD_SELECT_ARTICLE); - add_default_key(&thread_keys, '.', THREAD_TOGGLE_ARTICLE_SELECTION); - add_default_key(&thread_keys, '@', THREAD_REVERSE_SELECTIONS); - add_default_key(&thread_keys, '~', THREAD_UNDO_SELECTIONS); + add_default_key(&thread_keys, "s", THREAD_SAVE); + add_default_key(&thread_keys, "t", THREAD_TAG); + add_default_key(&thread_keys, "z", MARK_ARTICLE_UNREAD); + add_default_key(&thread_keys, "A", GLOBAL_SEARCH_AUTHOR_BACKWARD); + add_default_key(&thread_keys, "B", GLOBAL_SEARCH_BODY); + add_default_key(&thread_keys, "C", CATCHUP_NEXT_UNREAD); + add_default_key(&thread_keys, "E", GLOBAL_EDIT_FILTER); + add_default_key(&thread_keys, "K", THREAD_MARK_ARTICLE_READ); + add_default_key(&thread_keys, "L", GLOBAL_LOOKUP_MESSAGEID); + add_default_key(&thread_keys, "S", THREAD_AUTOSAVE); + add_default_key(&thread_keys, "U", THREAD_UNTAG); + add_default_key(&thread_keys, "Z", MARK_THREAD_UNREAD); + add_default_key(&thread_keys, "\t", THREAD_READ_NEXT_ARTICLE_OR_THREAD); + add_default_key(&thread_keys, "-", GLOBAL_LAST_VIEWED); + add_default_key(&thread_keys, "|", GLOBAL_PIPE); + add_default_key(&thread_keys, "*", THREAD_SELECT_ARTICLE); + add_default_key(&thread_keys, ".", THREAD_TOGGLE_ARTICLE_SELECTION); + add_default_key(&thread_keys, "@", THREAD_REVERSE_SELECTIONS); + add_default_key(&thread_keys, "~", THREAD_UNDO_SELECTIONS); + add_default_key(&thread_keys, ">", GLOBAL_SCROLL_DOWN); + add_default_key(&thread_keys, "<", GLOBAL_SCROLL_UP); /* page level */ add_global_keys(&page_keys); - add_default_key(&page_keys, ctrl('A'), GLOBAL_MENU_FILTER_SELECT); - add_default_key(&page_keys, ctrl('E'), PAGE_REPLY_QUOTE_HEADERS); + add_default_key(&page_keys, "", GLOBAL_PAGE_DOWN); + add_default_key(&page_keys, "", GLOBAL_MENU_FILTER_SELECT); + add_default_key(&page_keys, "", PAGE_REPLY_QUOTE_HEADERS); #ifdef HAVE_PGP_GPG - add_default_key(&page_keys, ctrl('G'), PAGE_PGP_CHECK_ARTICLE); + add_default_key(&page_keys, "", PAGE_PGP_CHECK_ARTICLE); #endif /* HAVE_PGP_GPG */ - add_default_key(&page_keys, ctrl('H'), PAGE_TOGGLE_HEADERS); - add_default_key(&page_keys, ctrl('J'), PAGE_NEXT_THREAD); - add_default_key(&page_keys, ctrl('K'), GLOBAL_MENU_FILTER_KILL); - add_default_key(&page_keys, ctrl('M'), PAGE_NEXT_THREAD); - add_default_key(&page_keys, ctrl('T'), PAGE_TOGGLE_TABS); - add_default_key(&page_keys, ctrl('W'), PAGE_FOLLOWUP_QUOTE_HEADERS); - add_default_key(&page_keys, 'a', GLOBAL_SEARCH_AUTHOR_FORWARD); - add_default_key(&page_keys, 'c', CATCHUP); - add_default_key(&page_keys, 'e', PAGE_EDIT_ARTICLE); - add_default_key(&page_keys, 'f', PAGE_FOLLOWUP_QUOTE); - add_default_key(&page_keys, 'g', GLOBAL_FIRST_PAGE); - add_default_key(&page_keys, 'l', PAGE_LIST_THREAD); - add_default_key(&page_keys, 'm', PAGE_MAIL); - add_default_key(&page_keys, 'n', PAGE_NEXT_ARTICLE); + add_default_key(&page_keys, "", PAGE_TOGGLE_HEADERS); + add_default_key(&page_keys, " ", GLOBAL_MENU_FILTER_KILL); + add_default_key(&page_keys, "\n\r", PAGE_NEXT_THREAD); + add_default_key(&page_keys, "", PAGE_TOGGLE_TABS); + add_default_key(&page_keys, "", PAGE_FOLLOWUP_QUOTE_HEADERS); + add_default_key(&page_keys, "a", GLOBAL_SEARCH_AUTHOR_FORWARD); + add_default_key(&page_keys, "c", CATCHUP); + add_default_key(&page_keys, "e", PAGE_EDIT_ARTICLE); + add_default_key(&page_keys, "f", PAGE_FOLLOWUP_QUOTE); + add_default_key(&page_keys, "g", GLOBAL_FIRST_PAGE); + add_default_key(&page_keys, "l", PAGE_LIST_THREAD); + add_default_key(&page_keys, "m", PAGE_MAIL); + add_default_key(&page_keys, "n", PAGE_NEXT_ARTICLE); #ifndef DISABLE_PRINTING - add_default_key(&page_keys, 'o', GLOBAL_PRINT); + add_default_key(&page_keys, "o", GLOBAL_PRINT); #endif /* !DISABLE_PRINTING */ - add_default_key(&page_keys, 'p', PAGE_PREVIOUS_ARTICLE); - add_default_key(&page_keys, 'r', PAGE_REPLY_QUOTE); - add_default_key(&page_keys, 's', PAGE_SAVE); - add_default_key(&page_keys, 't', PAGE_TAG); - add_default_key(&page_keys, 'u', PAGE_GOTO_PARENT); - add_default_key(&page_keys, 'x', PAGE_REPOST); - add_default_key(&page_keys, 'z', MARK_ARTICLE_UNREAD); - add_default_key(&page_keys, 'A', GLOBAL_SEARCH_AUTHOR_BACKWARD); - add_default_key(&page_keys, 'B', GLOBAL_SEARCH_BODY); - add_default_key(&page_keys, 'C', CATCHUP_NEXT_UNREAD); - add_default_key(&page_keys, 'D', PAGE_CANCEL); - add_default_key(&page_keys, 'E', GLOBAL_EDIT_FILTER); - add_default_key(&page_keys, 'F', PAGE_FOLLOWUP); - add_default_key(&page_keys, 'G', GLOBAL_LAST_PAGE); - add_default_key(&page_keys, 'K', PAGE_MARK_THREAD_READ); - add_default_key(&page_keys, 'L', GLOBAL_LOOKUP_MESSAGEID); - add_default_key(&page_keys, 'N', PAGE_NEXT_UNREAD_ARTICLE); - add_default_key(&page_keys, 'P', PAGE_PREVIOUS_UNREAD_ARTICLE); - add_default_key(&page_keys, 'R', PAGE_REPLY); - add_default_key(&page_keys, 'S', PAGE_AUTOSAVE); - add_default_key(&page_keys, 'T', PAGE_GROUP_SELECT); - add_default_key(&page_keys, 'U', PAGE_VIEW_URL); - add_default_key(&page_keys, 'V', PAGE_VIEW_ATTACHMENTS); - add_default_key(&page_keys, 'Z', MARK_THREAD_UNREAD); - add_default_key(&page_keys, '\t', PAGE_NEXT_UNREAD); - add_default_key(&page_keys, ' ', PAGE_PAGE_DOWN3); - add_default_key(&page_keys, '-', GLOBAL_LAST_VIEWED); - add_default_key(&page_keys, '|', GLOBAL_PIPE); - add_default_key(&page_keys, '<', PAGE_TOP_THREAD); - add_default_key(&page_keys, '>', PAGE_BOTTOM_THREAD); - add_default_key(&page_keys, '"', PAGE_TOGGLE_TEX2ISO); - add_default_key(&page_keys, '(', PAGE_TOGGLE_UUE); - add_default_key(&page_keys, ')', PAGE_REVEAL); - add_default_key(&page_keys, '[', GLOBAL_QUICK_FILTER_SELECT); - add_default_key(&page_keys, ']', GLOBAL_QUICK_FILTER_KILL); - add_default_key(&page_keys, '%', PAGE_TOGGLE_ROT13); - add_default_key(&page_keys, ':', PAGE_SKIP_INCLUDED_TEXT); - add_default_key(&page_keys, '_', PAGE_TOGGLE_HIGHLIGHTING); + add_default_key(&page_keys, "p", PAGE_PREVIOUS_ARTICLE); + add_default_key(&page_keys, "r", PAGE_REPLY_QUOTE); + add_default_key(&page_keys, "s", PAGE_SAVE); + add_default_key(&page_keys, "t", PAGE_TAG); + add_default_key(&page_keys, "u", PAGE_GOTO_PARENT); + add_default_key(&page_keys, "x", PAGE_REPOST); + add_default_key(&page_keys, "z", MARK_ARTICLE_UNREAD); + add_default_key(&page_keys, "A", GLOBAL_SEARCH_AUTHOR_BACKWARD); + add_default_key(&page_keys, "B", GLOBAL_SEARCH_BODY); + add_default_key(&page_keys, "C", CATCHUP_NEXT_UNREAD); + add_default_key(&page_keys, "D", PAGE_CANCEL); + add_default_key(&page_keys, "E", GLOBAL_EDIT_FILTER); + add_default_key(&page_keys, "F", PAGE_FOLLOWUP); + add_default_key(&page_keys, "G", GLOBAL_LAST_PAGE); + add_default_key(&page_keys, "K", PAGE_MARK_THREAD_READ); + add_default_key(&page_keys, "L", GLOBAL_LOOKUP_MESSAGEID); + add_default_key(&page_keys, "N", PAGE_NEXT_UNREAD_ARTICLE); + add_default_key(&page_keys, "P", PAGE_PREVIOUS_UNREAD_ARTICLE); + add_default_key(&page_keys, "R", PAGE_REPLY); + add_default_key(&page_keys, "S", PAGE_AUTOSAVE); + add_default_key(&page_keys, "T", PAGE_GROUP_SELECT); + add_default_key(&page_keys, "U", PAGE_VIEW_URL); + add_default_key(&page_keys, "V", PAGE_VIEW_ATTACHMENTS); + add_default_key(&page_keys, "Z", MARK_THREAD_UNREAD); + add_default_key(&page_keys, "\t", PAGE_NEXT_UNREAD); + add_default_key(&page_keys, " ", PAGE_PAGE_DOWN3); + add_default_key(&page_keys, "-", GLOBAL_LAST_VIEWED); + add_default_key(&page_keys, "|", GLOBAL_PIPE); + add_default_key(&page_keys, "<", PAGE_TOP_THREAD); + add_default_key(&page_keys, ">", PAGE_BOTTOM_THREAD); + add_default_key(&page_keys, "\"", PAGE_TOGGLE_TEX2ISO); + add_default_key(&page_keys, "(", PAGE_TOGGLE_UUE); + add_default_key(&page_keys, ")", PAGE_REVEAL); + add_default_key(&page_keys, "[", GLOBAL_QUICK_FILTER_SELECT); + add_default_key(&page_keys, "]", GLOBAL_QUICK_FILTER_KILL); + add_default_key(&page_keys, "%", PAGE_TOGGLE_ROT13); + add_default_key(&page_keys, ":", PAGE_SKIP_INCLUDED_TEXT); + add_default_key(&page_keys, "_", PAGE_TOGGLE_HIGHLIGHTING); /* info pager */ - add_default_key(&info_keys, ESC, GLOBAL_ABORT); - add_default_key(&info_keys, ctrl('B'), GLOBAL_PAGE_UP); - add_default_key(&info_keys, ctrl('D'), GLOBAL_PAGE_DOWN); - add_default_key(&info_keys, ctrl('F'), GLOBAL_PAGE_DOWN); - add_default_key(&info_keys, ctrl('N'), GLOBAL_LINE_DOWN); - add_default_key(&info_keys, ctrl('P'), GLOBAL_LINE_UP); - add_default_key(&info_keys, ctrl('U'), GLOBAL_PAGE_UP); - add_default_key(&info_keys, 'b', GLOBAL_PAGE_UP); - add_default_key(&info_keys, 'g', GLOBAL_FIRST_PAGE); - add_default_key(&info_keys, 'j', GLOBAL_LINE_DOWN); - add_default_key(&info_keys, 'k', GLOBAL_LINE_UP); - add_default_key(&info_keys, 'q', GLOBAL_QUIT); - add_default_key(&info_keys, 'G', GLOBAL_LAST_PAGE); - add_default_key(&info_keys, 'H', GLOBAL_TOGGLE_HELP_DISPLAY); - add_default_key(&info_keys, ' ', GLOBAL_PAGE_DOWN); - add_default_key(&info_keys, '^', GLOBAL_FIRST_PAGE); - add_default_key(&info_keys, '$', GLOBAL_LAST_PAGE); - add_default_key(&info_keys, '/', GLOBAL_SEARCH_SUBJECT_FORWARD); - add_default_key(&info_keys, '?', GLOBAL_SEARCH_SUBJECT_BACKWARD); - add_default_key(&info_keys, '\\', GLOBAL_SEARCH_REPEAT); + add_default_key(&info_keys, "", GLOBAL_ABORT); + add_default_key(&info_keys, "j", GLOBAL_LINE_DOWN); + add_default_key(&info_keys, "k", GLOBAL_LINE_UP); + add_default_key(&info_keys, " ", GLOBAL_PAGE_DOWN); + add_default_key(&info_keys, "b", GLOBAL_PAGE_UP); + add_default_key(&info_keys, "g^", GLOBAL_FIRST_PAGE); + add_default_key(&info_keys, "G$", GLOBAL_LAST_PAGE); + add_default_key(&info_keys, "q", GLOBAL_QUIT); + add_default_key(&info_keys, "H", GLOBAL_TOGGLE_HELP_DISPLAY); + add_default_key(&info_keys, "/", GLOBAL_SEARCH_SUBJECT_FORWARD); + add_default_key(&info_keys, "?", GLOBAL_SEARCH_SUBJECT_BACKWARD); + add_default_key(&info_keys, "\\", GLOBAL_SEARCH_REPEAT); /* options menu */ - add_default_key(&option_menu_keys, '1', DIGIT_1); - add_default_key(&option_menu_keys, '2', DIGIT_2); - add_default_key(&option_menu_keys, '3', DIGIT_3); - add_default_key(&option_menu_keys, '4', DIGIT_4); - add_default_key(&option_menu_keys, '5', DIGIT_5); - add_default_key(&option_menu_keys, '6', DIGIT_6); - add_default_key(&option_menu_keys, '7', DIGIT_7); - add_default_key(&option_menu_keys, '8', DIGIT_8); - add_default_key(&option_menu_keys, '9', DIGIT_9); - add_default_key(&option_menu_keys, ctrl('B'), GLOBAL_PAGE_UP); - add_default_key(&option_menu_keys, ctrl('D'), GLOBAL_PAGE_DOWN); - add_default_key(&option_menu_keys, ctrl('F'), GLOBAL_PAGE_DOWN); - add_default_key(&option_menu_keys, ctrl('J'), CONFIG_SELECT); - add_default_key(&option_menu_keys, ctrl('L'), GLOBAL_REDRAW_SCREEN); - add_default_key(&option_menu_keys, ctrl('M'), CONFIG_SELECT); - add_default_key(&option_menu_keys, ctrl('N'), GLOBAL_LINE_DOWN); - add_default_key(&option_menu_keys, ctrl('P'), GLOBAL_LINE_UP); - add_default_key(&option_menu_keys, ctrl('U'), GLOBAL_PAGE_UP); - add_default_key(&option_menu_keys, 'b', GLOBAL_PAGE_UP); - add_default_key(&option_menu_keys, 'g', GLOBAL_FIRST_PAGE); - add_default_key(&option_menu_keys, 'j', GLOBAL_LINE_DOWN); - add_default_key(&option_menu_keys, 'k', GLOBAL_LINE_UP); - add_default_key(&option_menu_keys, 'q', GLOBAL_QUIT); - add_default_key(&option_menu_keys, 'v', GLOBAL_VERSION); - add_default_key(&option_menu_keys, 'G', GLOBAL_LAST_PAGE); - add_default_key(&option_menu_keys, 'Q', CONFIG_NO_SAVE); - add_default_key(&option_menu_keys, '^', GLOBAL_FIRST_PAGE); - add_default_key(&option_menu_keys, '$', GLOBAL_LAST_PAGE); - add_default_key(&option_menu_keys, ' ', GLOBAL_PAGE_DOWN); - add_default_key(&option_menu_keys, '>', GLOBAL_SCROLL_DOWN); - add_default_key(&option_menu_keys, '<', GLOBAL_SCROLL_UP); - add_default_key(&option_menu_keys, '/', GLOBAL_SEARCH_SUBJECT_FORWARD); - add_default_key(&option_menu_keys, '?', GLOBAL_SEARCH_SUBJECT_BACKWARD); - add_default_key(&option_menu_keys, '\\', GLOBAL_SEARCH_REPEAT); + add_default_key(&option_menu_keys, "1", DIGIT_1); + add_default_key(&option_menu_keys, "2", DIGIT_2); + add_default_key(&option_menu_keys, "3", DIGIT_3); + add_default_key(&option_menu_keys, "4", DIGIT_4); + add_default_key(&option_menu_keys, "5", DIGIT_5); + add_default_key(&option_menu_keys, "6", DIGIT_6); + add_default_key(&option_menu_keys, "7", DIGIT_7); + add_default_key(&option_menu_keys, "8", DIGIT_8); + add_default_key(&option_menu_keys, "9", DIGIT_9); + add_default_key(&option_menu_keys, "b", GLOBAL_PAGE_UP); + add_default_key(&option_menu_keys, " ", GLOBAL_PAGE_DOWN); + add_default_key(&option_menu_keys, "\n\r", CONFIG_SELECT); + add_default_key(&option_menu_keys, " ", GLOBAL_REDRAW_SCREEN); + add_default_key(&option_menu_keys, "j", GLOBAL_LINE_DOWN); + add_default_key(&option_menu_keys, "k", GLOBAL_LINE_UP); + add_default_key(&option_menu_keys, "g^", GLOBAL_FIRST_PAGE); + add_default_key(&option_menu_keys, "G$", GLOBAL_LAST_PAGE); + add_default_key(&option_menu_keys, "q", GLOBAL_QUIT); + add_default_key(&option_menu_keys, "v", GLOBAL_VERSION); + add_default_key(&option_menu_keys, "Q", CONFIG_NO_SAVE); + add_default_key(&option_menu_keys, ">", GLOBAL_SCROLL_DOWN); + add_default_key(&option_menu_keys, "<", GLOBAL_SCROLL_UP); + add_default_key(&option_menu_keys, "/", GLOBAL_SEARCH_SUBJECT_FORWARD); + add_default_key(&option_menu_keys, "?", GLOBAL_SEARCH_SUBJECT_BACKWARD); + add_default_key(&option_menu_keys, "\\", GLOBAL_SEARCH_REPEAT); /* prompt keys */ - add_default_key(&prompt_keys, ESC, GLOBAL_ABORT); - add_default_key(&prompt_keys, 'n', PROMPT_NO); - add_default_key(&prompt_keys, 'q', GLOBAL_QUIT); - add_default_key(&prompt_keys, 'y', PROMPT_YES); - add_default_key(&prompt_keys, 'N', PROMPT_NO); - add_default_key(&prompt_keys, 'Y', PROMPT_YES); + add_default_key(&prompt_keys, "", GLOBAL_ABORT); + add_default_key(&prompt_keys, "nN", PROMPT_NO); + add_default_key(&prompt_keys, "q", GLOBAL_QUIT); + add_default_key(&prompt_keys, "yY", PROMPT_YES); /* post keys */ - add_default_key(&post_send_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_send_keys, 'e', POST_EDIT); + add_default_key(&post_send_keys, "", GLOBAL_ABORT); + add_default_key(&post_send_keys, "e", POST_EDIT); #ifdef HAVE_PGP_GPG - add_default_key(&post_send_keys, 'g', POST_PGP); + add_default_key(&post_send_keys, "g", POST_PGP); #endif /* HAVE_PGP_GPG */ #ifdef HAVE_ISPELL - add_default_key(&post_send_keys, 'i', POST_ISPELL); + add_default_key(&post_send_keys, "i", POST_ISPELL); #endif /* HAVE_ISPELL */ - add_default_key(&post_send_keys, 'q', GLOBAL_QUIT); - add_default_key(&post_send_keys, 's', POST_SEND); + add_default_key(&post_send_keys, "q", GLOBAL_QUIT); + add_default_key(&post_send_keys, "s", POST_SEND); - add_default_key(&post_edit_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_edit_keys, 'e', POST_EDIT); - add_default_key(&post_edit_keys, 'o', POST_POSTPONE); - add_default_key(&post_edit_keys, 'q', GLOBAL_QUIT); - - add_default_key(&post_edit_ext_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_edit_ext_keys, 'e', POST_EDIT); - add_default_key(&post_edit_ext_keys, 'q', GLOBAL_QUIT); - add_default_key(&post_edit_ext_keys, 'M', GLOBAL_OPTION_MENU); + add_default_key(&post_edit_keys, "", GLOBAL_ABORT); + add_default_key(&post_edit_keys, "e", POST_EDIT); + add_default_key(&post_edit_keys, "o", POST_POSTPONE); + add_default_key(&post_edit_keys, "q", GLOBAL_QUIT); + + add_default_key(&post_edit_ext_keys, "", GLOBAL_ABORT); + add_default_key(&post_edit_ext_keys, "e", POST_EDIT); + add_default_key(&post_edit_ext_keys, "q", GLOBAL_QUIT); + add_default_key(&post_edit_ext_keys, "M", GLOBAL_OPTION_MENU); - add_default_key(&post_post_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_post_keys, 'e', POST_EDIT); + add_default_key(&post_post_keys, "", GLOBAL_ABORT); + add_default_key(&post_post_keys, "e", POST_EDIT); #ifdef HAVE_PGP_GPG - add_default_key(&post_post_keys, 'g', POST_PGP); + add_default_key(&post_post_keys, "g", POST_PGP); #endif /* HAVE_PGP_GPG */ #ifdef HAVE_ISPELL - add_default_key(&post_post_keys, 'i', POST_ISPELL); + add_default_key(&post_post_keys, "i", POST_ISPELL); #endif /* HAVE_ISPELL */ - add_default_key(&post_post_keys, 'o', POST_POSTPONE); - add_default_key(&post_post_keys, 'p', GLOBAL_POST); - add_default_key(&post_post_keys, 'q', GLOBAL_QUIT); - add_default_key(&post_post_keys, 'M', GLOBAL_OPTION_MENU); - - add_default_key(&post_postpone_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_postpone_keys, 'n', PROMPT_NO); - add_default_key(&post_postpone_keys, 'q', GLOBAL_QUIT); - add_default_key(&post_postpone_keys, 'y', PROMPT_YES); - add_default_key(&post_postpone_keys, 'A', POSTPONE_ALL); - add_default_key(&post_postpone_keys, 'Y', POSTPONE_OVERRIDE); - - add_default_key(&post_mail_fup_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_mail_fup_keys, 'm', POST_MAIL); - add_default_key(&post_mail_fup_keys, 'p', GLOBAL_POST); - add_default_key(&post_mail_fup_keys, 'q', GLOBAL_QUIT); - - add_default_key(&post_ignore_fupto_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_ignore_fupto_keys, 'i', POST_IGNORE_FUPTO); - add_default_key(&post_ignore_fupto_keys, 'p', GLOBAL_POST); - add_default_key(&post_ignore_fupto_keys, 'q', GLOBAL_QUIT); - - add_default_key(&post_continue_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_continue_keys, 'a', POST_ABORT); - add_default_key(&post_continue_keys, 'c', POST_CONTINUE); - add_default_key(&post_continue_keys, 'q', GLOBAL_QUIT); - - add_default_key(&post_delete_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_delete_keys, 'd', POST_CANCEL); - add_default_key(&post_delete_keys, 'q', GLOBAL_QUIT); - add_default_key(&post_delete_keys, 's', POST_SUPERSEDE); - - add_default_key(&post_cancel_keys, ESC, GLOBAL_ABORT); - add_default_key(&post_cancel_keys, 'e', POST_EDIT); - add_default_key(&post_cancel_keys, 'd', POST_CANCEL); - add_default_key(&post_cancel_keys, 'q', GLOBAL_QUIT); + add_default_key(&post_post_keys, "o", POST_POSTPONE); + add_default_key(&post_post_keys, "p", GLOBAL_POST); + add_default_key(&post_post_keys, "q", GLOBAL_QUIT); + add_default_key(&post_post_keys, "M", GLOBAL_OPTION_MENU); + + add_default_key(&post_postpone_keys, "", GLOBAL_ABORT); + add_default_key(&post_postpone_keys, "n", PROMPT_NO); + add_default_key(&post_postpone_keys, "q", GLOBAL_QUIT); + add_default_key(&post_postpone_keys, "y", PROMPT_YES); + add_default_key(&post_postpone_keys, "A", POSTPONE_ALL); + add_default_key(&post_postpone_keys, "Y", POSTPONE_OVERRIDE); + + add_default_key(&post_mail_fup_keys, "", GLOBAL_ABORT); + add_default_key(&post_mail_fup_keys, "m", POST_MAIL); + add_default_key(&post_mail_fup_keys, "p", GLOBAL_POST); + add_default_key(&post_mail_fup_keys, "q", GLOBAL_QUIT); + + add_default_key(&post_ignore_fupto_keys, "", GLOBAL_ABORT); + add_default_key(&post_ignore_fupto_keys, "i", POST_IGNORE_FUPTO); + add_default_key(&post_ignore_fupto_keys, "p", GLOBAL_POST); + add_default_key(&post_ignore_fupto_keys, "q", GLOBAL_QUIT); + + add_default_key(&post_continue_keys, "", GLOBAL_ABORT); + add_default_key(&post_continue_keys, "a", POST_ABORT); + add_default_key(&post_continue_keys, "c", POST_CONTINUE); + add_default_key(&post_continue_keys, "q", GLOBAL_QUIT); + + add_default_key(&post_delete_keys, "", GLOBAL_ABORT); + add_default_key(&post_delete_keys, "d", POST_CANCEL); + add_default_key(&post_delete_keys, "q", GLOBAL_QUIT); + add_default_key(&post_delete_keys, "s", POST_SUPERSEDE); + + add_default_key(&post_cancel_keys, "", GLOBAL_ABORT); + add_default_key(&post_cancel_keys, "e", POST_EDIT); + add_default_key(&post_cancel_keys, "d", POST_CANCEL); + add_default_key(&post_cancel_keys, "q", GLOBAL_QUIT); /* feed keys */ - add_default_key(&feed_post_process_keys, ESC, GLOBAL_ABORT); - add_default_key(&feed_post_process_keys, 'n', POSTPROCESS_NO); - add_default_key(&feed_post_process_keys, 's', POSTPROCESS_SHAR); - add_default_key(&feed_post_process_keys, 'y', POSTPROCESS_YES); - add_default_key(&feed_post_process_keys, 'q', GLOBAL_QUIT); - - add_default_key(&feed_type_keys, ESC, GLOBAL_ABORT); - add_default_key(&feed_type_keys, 'a', FEED_ARTICLE); - add_default_key(&feed_type_keys, 'h', FEED_HOT); - add_default_key(&feed_type_keys, 'p', FEED_PATTERN); - add_default_key(&feed_type_keys, 'q', GLOBAL_QUIT); - add_default_key(&feed_type_keys, 't', FEED_THREAD); - add_default_key(&feed_type_keys, 'T', FEED_TAGGED); - - add_default_key(&feed_supersede_article_keys, ESC, GLOBAL_ABORT); - add_default_key(&feed_supersede_article_keys, 'q', GLOBAL_QUIT); - add_default_key(&feed_supersede_article_keys, 'r', FEED_KEY_REPOST); - add_default_key(&feed_supersede_article_keys, 's', FEED_SUPERSEDE); + add_default_key(&feed_post_process_keys, "", GLOBAL_ABORT); + add_default_key(&feed_post_process_keys, "n", POSTPROCESS_NO); + add_default_key(&feed_post_process_keys, "s", POSTPROCESS_SHAR); + add_default_key(&feed_post_process_keys, "y", POSTPROCESS_YES); + add_default_key(&feed_post_process_keys, "q", GLOBAL_QUIT); + + add_default_key(&feed_type_keys, "", GLOBAL_ABORT); + add_default_key(&feed_type_keys, "a", FEED_ARTICLE); + add_default_key(&feed_type_keys, "h", FEED_HOT); + add_default_key(&feed_type_keys, "p", FEED_PATTERN); + add_default_key(&feed_type_keys, "q", GLOBAL_QUIT); + add_default_key(&feed_type_keys, "t", FEED_THREAD); + add_default_key(&feed_type_keys, "T", FEED_TAGGED); + + add_default_key(&feed_supersede_article_keys, "", GLOBAL_ABORT); + add_default_key(&feed_supersede_article_keys, "q", GLOBAL_QUIT); + add_default_key(&feed_supersede_article_keys, "r", FEED_KEY_REPOST); + add_default_key(&feed_supersede_article_keys, "s", FEED_SUPERSEDE); /* filter keys */ - add_default_key(&filter_keys, ESC, GLOBAL_ABORT); - add_default_key(&filter_keys, 'e', FILTER_EDIT); - add_default_key(&filter_keys, 'q', GLOBAL_QUIT); - add_default_key(&filter_keys, 's', FILTER_SAVE); + add_default_key(&filter_keys, "", GLOBAL_ABORT); + add_default_key(&filter_keys, "e", FILTER_EDIT); + add_default_key(&filter_keys, "q", GLOBAL_QUIT); + add_default_key(&filter_keys, "s", FILTER_SAVE); /* mark read */ - add_default_key(&mark_read_keys, ESC, GLOBAL_ABORT); - add_default_key(&mark_read_keys, 'c', MARK_READ_CURRENT); - add_default_key(&mark_read_keys, 'q', GLOBAL_QUIT); - add_default_key(&mark_read_keys, 't', MARK_READ_TAGGED); + add_default_key(&mark_read_keys, "", GLOBAL_ABORT); + add_default_key(&mark_read_keys, "c", MARK_READ_CURRENT); + add_default_key(&mark_read_keys, "q", GLOBAL_QUIT); + add_default_key(&mark_read_keys, "t", MARK_READ_TAGGED); #ifdef HAVE_PGP_GPG /* pgp mail */ - add_default_key(&pgp_mail_keys, ESC, GLOBAL_ABORT); - add_default_key(&pgp_mail_keys, 'b', PGP_KEY_ENCRYPT_SIGN); - add_default_key(&pgp_mail_keys, 'e', PGP_KEY_ENCRYPT); - add_default_key(&pgp_mail_keys, 'q', GLOBAL_QUIT); - add_default_key(&pgp_mail_keys, 's', PGP_KEY_SIGN); + add_default_key(&pgp_mail_keys, "", GLOBAL_ABORT); + add_default_key(&pgp_mail_keys, "b", PGP_KEY_ENCRYPT_SIGN); + add_default_key(&pgp_mail_keys, "e", PGP_KEY_ENCRYPT); + add_default_key(&pgp_mail_keys, "q", GLOBAL_QUIT); + add_default_key(&pgp_mail_keys, "s", PGP_KEY_SIGN); /* pgp news */ - add_default_key(&pgp_news_keys, ESC, GLOBAL_ABORT); - add_default_key(&pgp_news_keys, 'i', PGP_INCLUDE_KEY); - add_default_key(&pgp_news_keys, 'q', GLOBAL_QUIT); - add_default_key(&pgp_news_keys, 's', PGP_KEY_SIGN); + add_default_key(&pgp_news_keys, "", GLOBAL_ABORT); + add_default_key(&pgp_news_keys, "i", PGP_INCLUDE_KEY); + add_default_key(&pgp_news_keys, "q", GLOBAL_QUIT); + add_default_key(&pgp_news_keys, "s", PGP_KEY_SIGN); #endif /* HAVE_PGP_GPG */ /* save */ - add_default_key(&save_append_overwrite_keys, ESC, GLOBAL_ABORT); - add_default_key(&save_append_overwrite_keys, 'a', SAVE_APPEND_FILE); - add_default_key(&save_append_overwrite_keys, 'o', SAVE_OVERWRITE_FILE); - add_default_key(&save_append_overwrite_keys, 'q', GLOBAL_QUIT); + add_default_key(&save_append_overwrite_keys, "", GLOBAL_ABORT); + add_default_key(&save_append_overwrite_keys, "a", SAVE_APPEND_FILE); + add_default_key(&save_append_overwrite_keys, "o", SAVE_OVERWRITE_FILE); + add_default_key(&save_append_overwrite_keys, "q", GLOBAL_QUIT); } @@ -2598,52 +2591,43 @@ static void add_global_keys( struct keylist *keys) { - add_default_key(keys, ESC, GLOBAL_ABORT); - add_default_key(keys, '0', DIGIT_0); - add_default_key(keys, '1', DIGIT_1); - add_default_key(keys, '2', DIGIT_2); - add_default_key(keys, '3', DIGIT_3); - add_default_key(keys, '4', DIGIT_4); - add_default_key(keys, '5', DIGIT_5); - add_default_key(keys, '6', DIGIT_6); - add_default_key(keys, '7', DIGIT_7); - add_default_key(keys, '8', DIGIT_8); - add_default_key(keys, '9', DIGIT_9); - add_default_key(keys, ctrl('B'), GLOBAL_PAGE_UP); - add_default_key(keys, ctrl('D'), GLOBAL_PAGE_DOWN); - add_default_key(keys, ctrl('F'), GLOBAL_PAGE_DOWN); - add_default_key(keys, ctrl('L'), GLOBAL_REDRAW_SCREEN); - add_default_key(keys, ctrl('N'), GLOBAL_LINE_DOWN); - add_default_key(keys, ctrl('O'), GLOBAL_POSTPONED); - add_default_key(keys, ctrl('P'), GLOBAL_LINE_UP); - add_default_key(keys, ctrl('U'), GLOBAL_PAGE_UP); - add_default_key(keys, 'b', GLOBAL_PAGE_UP); - add_default_key(keys, 'h', GLOBAL_HELP); - add_default_key(keys, 'i', GLOBAL_TOGGLE_INFO_LAST_LINE); - add_default_key(keys, 'j', GLOBAL_LINE_DOWN); - add_default_key(keys, 'k', GLOBAL_LINE_UP); - add_default_key(keys, 'q', GLOBAL_QUIT); - add_default_key(keys, 'v', GLOBAL_VERSION); - add_default_key(keys, 'w', GLOBAL_POST); - add_default_key(keys, 'H', GLOBAL_TOGGLE_HELP_DISPLAY); - add_default_key(keys, 'I', GLOBAL_TOGGLE_INVERSE_VIDEO); - add_default_key(keys, 'M', GLOBAL_OPTION_MENU); - add_default_key(keys, 'O', GLOBAL_POSTPONED); - add_default_key(keys, 'Q', GLOBAL_QUIT_TIN); - add_default_key(keys, 'R', GLOBAL_BUGREPORT); - add_default_key(keys, 'W', GLOBAL_DISPLAY_POST_HISTORY); - add_default_key(keys, '^', GLOBAL_FIRST_PAGE); - add_default_key(keys, '$', GLOBAL_LAST_PAGE); - add_default_key(keys, '>', GLOBAL_SCROLL_DOWN); - add_default_key(keys, '<', GLOBAL_SCROLL_UP); - add_default_key(keys, '/', GLOBAL_SEARCH_SUBJECT_FORWARD); - add_default_key(keys, '?', GLOBAL_SEARCH_SUBJECT_BACKWARD); - add_default_key(keys, '\\', GLOBAL_SEARCH_REPEAT); - add_default_key(keys, '#', GLOBAL_SET_RANGE); + add_default_key(keys, "", GLOBAL_ABORT); + add_default_key(keys, "0", DIGIT_0); + add_default_key(keys, "1", DIGIT_1); + add_default_key(keys, "2", DIGIT_2); + add_default_key(keys, "3", DIGIT_3); + add_default_key(keys, "4", DIGIT_4); + add_default_key(keys, "5", DIGIT_5); + add_default_key(keys, "6", DIGIT_6); + add_default_key(keys, "7", DIGIT_7); + add_default_key(keys, "8", DIGIT_8); + add_default_key(keys, "9", DIGIT_9); + add_default_key(keys, "b", GLOBAL_PAGE_UP); + add_default_key(keys, " ", GLOBAL_REDRAW_SCREEN); + add_default_key(keys, "j", GLOBAL_LINE_DOWN); + add_default_key(keys, "k", GLOBAL_LINE_UP); + add_default_key(keys, "O", GLOBAL_POSTPONED); + add_default_key(keys, "h", GLOBAL_HELP); + add_default_key(keys, "i", GLOBAL_TOGGLE_INFO_LAST_LINE); + add_default_key(keys, "q", GLOBAL_QUIT); + add_default_key(keys, "v", GLOBAL_VERSION); + add_default_key(keys, "w", GLOBAL_POST); + add_default_key(keys, "H", GLOBAL_TOGGLE_HELP_DISPLAY); + add_default_key(keys, "I", GLOBAL_TOGGLE_INVERSE_VIDEO); + add_default_key(keys, "M", GLOBAL_OPTION_MENU); + add_default_key(keys, "Q", GLOBAL_QUIT_TIN); + add_default_key(keys, "R", GLOBAL_BUGREPORT); + add_default_key(keys, "W", GLOBAL_DISPLAY_POST_HISTORY); + add_default_key(keys, "^", GLOBAL_FIRST_PAGE); + add_default_key(keys, "$", GLOBAL_LAST_PAGE); + add_default_key(keys, "/", GLOBAL_SEARCH_SUBJECT_FORWARD); + add_default_key(keys, "?", GLOBAL_SEARCH_SUBJECT_BACKWARD); + add_default_key(keys, "\\", GLOBAL_SEARCH_REPEAT); + add_default_key(keys, "#", GLOBAL_SET_RANGE); #ifndef NO_SHELL_ESCAPE - add_default_key(keys, '!', GLOBAL_SHELL_ESCAPE); + add_default_key(keys, "!", GLOBAL_SHELL_ESCAPE); #endif /* NO_SHELL_ESCAPE */ #ifdef HAVE_COLOR - add_default_key(keys, '&', GLOBAL_TOGGLE_COLOR); + add_default_key(keys, "&", GLOBAL_TOGGLE_COLOR); #endif /* HAVE COLOR */ } diff -Nurp tin-1.7.9/src/list.c tin-1.7.10/src/list.c --- tin-1.7.9/src/list.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/list.c 2005-07-20 14:59:54.000000000 +0200 @@ -3,7 +3,7 @@ * Module : list.c * Author : I. Lea * Created : 1993-12-18 - * Updated : 2002-05-13 + * Updated : 2005-07-20 * Notes : Low level functions handling the active[] list and its group_hash index * * Copyright (c) 1993-2005 Iain Lea @@ -38,9 +38,11 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef TCURSES_H -# include "tcurses.h" -#endif /* !TCURSES_H */ +#ifdef DEBUG +# ifndef TCURSES_H +# include "tcurses.h" +# endif /* !TCURSES_H */ +#endif /* DEBUG */ static int group_hash[TABLE_SIZE]; /* group name --> active[] */ @@ -93,7 +95,9 @@ hash_groupname( } } hash_value = hash % prime; +# ifdef DEBUG /* my_printf("hash=[%s] [%ld]\n", group, hash_value); */ +# endif /* DEBUG */ #else unsigned long hash_value = 0L; unsigned int len = 0; diff -Nurp tin-1.7.9/src/mail.c tin-1.7.10/src/mail.c --- tin-1.7.9/src/mail.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/mail.c 2005-09-14 15:47:17.755894517 +0200 @@ -3,7 +3,7 @@ * Module : mail.c * Author : I. Lea * Created : 1992-10-02 - * Updated : 2004-03-23 + * Updated : 2005-08-14 * Notes : Mail handling routines for creating pseudo newsgroups * * Copyright (c) 1992-2005 Iain Lea @@ -252,14 +252,19 @@ open_newsgroups_fp( if (read_news_via_nntp && !read_saved_news) { if (read_local_newsgroups_file) { - result = fopen(local_newsgroups_file, "r"); - if (result != NULL) { + struct stat buf; + + if (!stat(local_newsgroups_file, &buf)) { + if (buf.st_size > 0) { + if ((result = fopen(local_newsgroups_file, "r")) != NULL) { # ifdef DEBUG - debug_nntp("open_newsgroups_fp", "Using local copy of newsgroups file"); + debug_nntp("open_newsgroups_fp", "Using local copy of newsgroups file"); # endif /* DEBUG */ - return result; + return result; + } + } else + unlink(local_newsgroups_file); } - read_local_newsgroups_file = FALSE; } # if 0 /* TODO: */ if (list_newsgroups_wildmat_supported && newsrc_active @@ -292,8 +297,12 @@ read_newsgroups_file( if (!batch_mode && verb) wait_message(0, _(txt_reading_newsgroups_file)); - if (read_news_via_nntp && !read_local_newsgroups_file && !no_write) - fp_save = fopen(local_newsgroups_file, "w" FOPEN_OPTS); + if (read_news_via_nntp && !no_write) { + struct stat buf; + + if (stat(local_newsgroups_file, &buf) || !read_local_newsgroups_file) + fp_save = fopen(local_newsgroups_file, "w" FOPEN_OPTS); + } read_groups_descriptions(fp, fp_save); @@ -353,7 +362,7 @@ read_groups_descriptions( * newsgroups file to only subscribed-to groups when tin is called * with the "-q" option. */ - if ((fp_save != NULL) && read_news_via_nntp && !read_local_newsgroups_file) + if ((fp_save != NULL) && read_news_via_nntp) fprintf(fp_save, "%s\n", ptr); if (!space) { /* initial malloc */ diff -Nurp tin-1.7.9/src/main.c tin-1.7.10/src/main.c --- tin-1.7.9/src/main.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/main.c 2005-09-14 15:00:33.878254627 +0200 @@ -3,7 +3,7 @@ * Module : main.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-05-04 + * Updated : 2005-08-14 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -288,8 +288,11 @@ main( /* * Read text descriptions for mail and/or news groups */ - if (show_description && !batch_mode) + if (show_description && !batch_mode) { + no_write = tmp_no_write; /* restore original value */ read_descriptions(TRUE); + no_write = TRUE; /* disable newsrc updates */ + } /* * TODO: what has write_config_file() to do with create_mail_save_dirs () diff -Nurp tin-1.7.9/src/memory.c tin-1.7.10/src/memory.c --- tin-1.7.9/src/memory.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/memory.c 2005-07-02 15:15:34.000000000 +0200 @@ -3,7 +3,7 @@ * Module : memory.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-05-06 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -38,9 +38,7 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ + /* * Dynamic arrays maximum (initialized in init_alloc()) & current sizes diff -Nurp tin-1.7.9/src/misc.c tin-1.7.10/src/misc.c --- tin-1.7.9/src/misc.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/misc.c 2005-09-14 14:59:52.074076886 +0200 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-05-12 + * Updated : 2005-08-14 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -50,9 +50,6 @@ #ifndef TIN_POLICY_H # include "policy.h" #endif /* !TIN_POLICY_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ #if defined(HAVE_IDNA_H) && !defined(_IDNA_H) # include @@ -915,6 +912,7 @@ dir_name( * * TODO: why not cache the mailbox_name? */ +#define MAILDIR_NEW "/new" t_bool mail_check( void) @@ -924,8 +922,35 @@ mail_check( mailbox_name = get_val("MAIL", mailbox); - if (mailbox_name != 0 && stat(mailbox_name, &buf) >= 0 && buf.st_atime < buf.st_mtime && buf.st_size > 0) - return TRUE; + if (mailbox_name != 0 && stat(mailbox_name, &buf) >= 0) { + if ((int) (buf.st_mode & S_IFMT) == (int) S_IFDIR) { /* maildir setup */ + DIR *dirp; + char *maildir_box; + struct dirent *dp; + + maildir_box = my_malloc(strlen(mailbox_name) + strlen(MAILDIR_NEW) + 1); +#ifdef VMS + joindir(maildir_box, mailbox_name, MAILDIR_NEW); +#else + joinpath(maildir_box, mailbox_name, MAILDIR_NEW); +#endif /* VMS */ + if (!(dirp = opendir(maildir_box))) { + free(maildir_box); + return FALSE; + } + free(maildir_box); + while ((dp = readdir(dirp)) != NULL) { + if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, ".."))) { + closedir(dirp); + return TRUE; + } + } + closedir(dirp); + } else { + if (buf.st_atime < buf.st_mtime && buf.st_size > 0) + return TRUE; + } + } return FALSE; } @@ -2034,9 +2059,6 @@ cleanup_tmp_files( } #endif /* 0 */ - if (!tinrc.cache_overview_files) - unlink(local_newsgroups_file); - if (batch_mode) unlink(lock_file); } diff -Nurp tin-1.7.9/src/nntplib.c tin-1.7.10/src/nntplib.c --- tin-1.7.9/src/nntplib.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/nntplib.c 2005-08-27 12:37:22.000000000 +0200 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2005-06-17 + * Updated : 2005-07-21 * Notes : NNTP client routines taken from clientlib.c 1.5.11 (1991-02-10) * Copyright : (c) Copyright 1991-99 by Stan Barber & Iain Lea * Permission is hereby granted to copy, reproduce, redistribute @@ -630,8 +630,8 @@ get_tcp6_socket( # endif /* PF_UNSPEC */ # endif /* AF_UNSPEC */ memset(&hints, 0, sizeof(hints)); -/* hints.ai_flags = AI_CANONNAME; */ - hints.ai_family = ADDRFAM; +/* hints.ai_flags = AI_CANONNAME; */ + hints.ai_family = ADDRFAM; hints.ai_socktype = SOCK_STREAM; res = (struct addrinfo *) 0; res0 = (struct addrinfo *) 0; @@ -1003,7 +1003,7 @@ check_extensions( nntp_caps.list_active_times = TRUE; else if (!strcasecmp(d, "DISTRIB.PATS")) nntp_caps.list_distrib_pats = TRUE; - else if (!strcasecmp(d, "DISTRIBUTIONS")) + else if (!strcasecmp(d, "DISTRIBUTIONS")) /* LIST DISTRIBUTIONS, "private" extension, RFC 2980 */ nntp_caps.list_distributions = TRUE; else if (!strcasecmp(d, "HEADERS")) nntp_caps.list_headers = TRUE; /* HDR requires LIST HEADERS, but not vice versa */ @@ -1015,6 +1015,8 @@ check_extensions( nntp_caps.list_motd = TRUE; else if (!strcasecmp(d, "SUBSCRIPTIONS")) /* "private" extension, RFC 2980 */ nntp_caps.list_subscriptions = TRUE; + else if (!strcasecmp(d, "MODERATORS")) /* "private" extension */ + nntp_caps.list_moderators = TRUE; d = strpbrk(d, " \t"); } } else if (!strcasecmp(ptr, "IMPLEMENTATION")) @@ -1104,9 +1106,16 @@ check_extensions( buf[0] = '\0'; i = new_nntp_command("LIST EXTENSIONS", OK_EXTENSIONS, buf, sizeof(buf)); switch (i) { - case OK_EXTENSIONS: /* as defined draft-ietf-nntpext-base-24.txt */ + case 215: /* Netscape-Collabra/3.52 (badly broken); NetWare-News-Server/5.1 */ +# ifdef DEBUG + debug_nntp("LIST EXTENSIONS", "skipping data"); +# endif /* DEBUG */ + while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) + ; + break; + + case OK_EXTENSIONS: /* as defined draft-ietf-nntpext-base-27.txt */ case 205: /* M$ Exchange 5.5 */ - case 215: /* Netscape-Collabra/3.52 && NetWare-News-Server/5.1 */ nntp_caps.type = LIST_EXTENSIONS; while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { if (nntp_caps.type == LIST_EXTENSIONS) { diff -Nurp tin-1.7.9/src/nrctbl.c tin-1.7.10/src/nrctbl.c --- tin-1.7.9/src/nrctbl.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/nrctbl.c 2005-08-12 11:56:44.000000000 +0200 @@ -3,7 +3,7 @@ * Module : nrctbl.c * Author : Sven Paulus * Created : 1996-10-06 - * Updated : 2005-02-02 + * Updated : 2005-07-02 * Notes : This module does the NNTP server name lookup in * ~/.tin/newsrctable and returns the real hostname * and the name of the newsrc file for a given @@ -47,9 +47,7 @@ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + /* * local prototypes @@ -230,6 +228,10 @@ get_newsrcname( return TRUE; case 'a': + /* + * FIXME this (e.g. the location of the alternativce name) + * is not documented in the man page + */ snprintf(name_found, sizeof(name_found), ".newsrc-%s", nntpserver_name); joinpath(newsrc_name, homedir, name_found); return TRUE; diff -Nurp tin-1.7.9/src/options_menu.c tin-1.7.10/src/options_menu.c --- tin-1.7.9/src/options_menu.c 2005-06-28 10:31:24.000000000 +0200 +++ tin-1.7.10/src/options_menu.c 2005-07-16 21:58:43.000000000 +0200 @@ -3,7 +3,7 @@ * Module : options_menu.c * Author : Michael Bienia * Created : 2004-09-05 - * Updated : 2005-06-22 + * Updated : 2005-07-02 * Notes : Split from config.c * * Copyright (c) 2004-2005 Michael Bienia @@ -44,9 +44,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + #define option_lines_per_page (cLINES - INDEX_TOP - 3) @@ -178,9 +176,6 @@ option_is_visible( case OPT_MONO_MARKSTROKE: return tinrc.word_highlight; - case OPT_THREAD_PERC: - return (tinrc.thread_articles == THREAD_PERC); - default: return TRUE; } diff -Nurp tin-1.7.9/src/page.c tin-1.7.10/src/page.c --- tin-1.7.9/src/page.c 2005-06-28 10:31:21.000000000 +0200 +++ tin-1.7.10/src/page.c 2005-07-05 16:23:00.000000000 +0200 @@ -3,7 +3,7 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-06-18 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -41,12 +41,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ + #if defined(HAVE_IDNA_H) && !defined(_IDNA_H) # include @@ -1703,14 +1698,14 @@ load_article( #endif /* DEBUG */ if (new_respnum != this_resp) { - char *progress_mesg; + char *progress_mesg = my_strdup(_(txt_reading_article)); int ret; art_close(&pgart); /* close previously opened art in pager */ - progress_mesg = my_strdup(_(txt_reading_article)); ret = art_open(TRUE, &arts[new_respnum], group, &pgart, TRUE, progress_mesg); free(progress_mesg); + switch (ret) { case ART_UNAVAILABLE: art_mark(group, &arts[new_respnum], ART_READ); diff -Nurp tin-1.7.9/src/pgp.c tin-1.7.10/src/pgp.c --- tin-1.7.9/src/pgp.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/pgp.c 2005-07-02 15:13:57.000000000 +0200 @@ -3,7 +3,7 @@ * Module : pgp.c * Author : Steven J. Madsen * Created : 1995-05-12 - * Updated : 2005-06-22 + * Updated : 2005-07-02 * Notes : PGP support * * Copyright (c) 1995-2005 Steven J. Madsen @@ -43,9 +43,6 @@ # ifndef TCURSES_H # include "tcurses.h" # endif /* !TCURSES_H */ -# ifndef KEYMAP_H -# include "keymap.h" -# endif /* !KEYMAP_H */ /* diff -Nurp tin-1.7.9/src/post.c tin-1.7.10/src/post.c --- tin-1.7.9/src/post.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/post.c 2005-07-20 14:36:18.000000000 +0200 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-06-21 + * Updated : 2005-07-20 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2005 Iain Lea @@ -41,12 +41,6 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ @@ -1120,14 +1114,39 @@ check_article_to_be_posted( } #endif /* CHARSET_CONVERSION */ - col = 0; - for (cp = line; *cp; cp++) { - if (!contains_8bit && !isascii(*cp)) - contains_8bit = TRUE; - if (*cp == '\t') - col += 8 - (col % 8); - else - col++; + { +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + int num_bytes, wc_width; + wchar_t wc; +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + + col = 0; + for (cp = line; *cp; ) { + if (*cp == '\t') { + col += 8 - (col % 8); + cp++; + } else { +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if ((num_bytes = mbtowc(&wc, cp, MB_CUR_MAX)) != -1) { + cp += num_bytes; + if (!contains_8bit && num_bytes > 1) + contains_8bit = TRUE; + if (iswprint(wc) && ((wc_width = wcwidth(wc)) != -1)) + col += wc_width; + else + col++; + } else { + cp++; + col++; + } +#else + if (!contains_8bit && !isascii(*cp)) + contains_8bit = TRUE; + cp++; + col++; +#endif /* MULTIBYTE_ABLE && ! NO_LOCALE */ + } + } } if (col > MAX_COL && !got_long_line) { setup_check_article_screen(&init); @@ -3100,12 +3119,16 @@ mail_to_author( char subject[HEADER_LEN]; char initials[64]; int ret_code = POSTED_NONE; + int i; struct t_header note_h = pgart.hdr; wait_message(0, _(txt_reply_to_author)); find_reply_to_addr(from_addr, FALSE, &pgart.hdr); - if (check_for_spamtrap(from_addr)) { + i = gnksa_check_from(from_addr); + + /* TODO: make gnksa error level configurable */ + if (check_for_spamtrap(from_addr) || (i > GNKSA_OK && i < GNKSA_ILLEGAL_UNQUOTED_CHAR)) { char keyabort[MAXKEYLEN], keycont[MAXKEYLEN]; t_function func; @@ -3171,8 +3194,7 @@ mail_to_author( */ fseek(pgart.cooked, 0L, SEEK_SET); } else { /* without headers */ - int i = 0; - + i = 0; while (pgart.cookl[i].flags & C_HEADER) /* skip headers in cooked art if any */ i++; if (i) /* cooked art contained any headers, so skip also the header/body seperator */ @@ -3287,7 +3309,7 @@ cancel_article( int oldraw; struct t_header note_h = pgart.hdr, hdr; t_bool redraw_screen = FALSE; - t_function func = POST_CANCEL; + t_function func; t_function default_func = POST_CANCEL; msg_init_headers(); diff -Nurp tin-1.7.9/src/prompt.c tin-1.7.10/src/prompt.c --- tin-1.7.9/src/prompt.c 2005-06-28 10:31:24.000000000 +0200 +++ tin-1.7.10/src/prompt.c 2005-07-02 15:14:16.000000000 +0200 @@ -3,7 +3,7 @@ * Module : prompt.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-06-21 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea @@ -41,9 +41,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + static char *prompt_slk_message; /* prompt message for prompt_slk_redraw */ diff -Nurp tin-1.7.9/src/read.c tin-1.7.10/src/read.c --- tin-1.7.9/src/read.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/read.c 2005-07-21 16:45:54.000000000 +0200 @@ -3,7 +3,7 @@ * Module : read.c * Author : Jason Faultless * Created : 1997-04-10 - * Updated : 2005-02-12 + * Updated : 2005-07-02 * * Copyright (c) 1997-2005 Jason Faultless * All rights reserved. @@ -40,9 +40,6 @@ #ifndef TNNTP_H # include "tnntp.h" #endif /* !TNNTP_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ /* diff -Nurp tin-1.7.9/src/refs.c tin-1.7.10/src/refs.c --- tin-1.7.9/src/refs.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/refs.c 2005-07-20 14:26:58.000000000 +0200 @@ -3,7 +3,7 @@ * Module : refs.c * Author : Jason Faultless * Created : 1996-05-09 - * Updated : 2004-03-01 + * Updated : 2005-07-20 * Notes : Cacheing of message ids / References based threading * Credits : Richard Hodson * hash_msgid, free_msgid @@ -238,7 +238,7 @@ add_msgid( struct t_msgid *newparent) { struct t_msgid *ptr; - struct t_msgid *i = NULL; + struct t_msgid *i; unsigned int h; if (!msgid) { diff -Nurp tin-1.7.9/src/rfc1524.c tin-1.7.10/src/rfc1524.c --- tin-1.7.9/src/rfc1524.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/rfc1524.c 2005-07-02 15:15:57.000000000 +0200 @@ -3,7 +3,7 @@ * Module : rfc1524.c * Author : Urs Janssen , Jason Faultless * Created : 2000-05-15 - * Updated : 2005-05-10 + * Updated : 2005-07-02 * Notes : mailcap parsing as defined in RFC 1524 * * Copyright (c) 2000-2005 Urs Janssen , Jason Faultless @@ -37,9 +37,7 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ + /* TODO: what about !unix systems? */ #define DEFAULT_MAILCAPS "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/etc/mail/mailcap" diff -Nurp tin-1.7.9/src/rfc2046.c tin-1.7.10/src/rfc2046.c --- tin-1.7.9/src/rfc2046.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/rfc2046.c 2005-07-27 22:49:09.000000000 +0200 @@ -3,7 +3,7 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2004-07-07 + * Updated : 2005-07-02 * Notes : RFC 2046 MIME article parsing * * Copyright (c) 2000-2005 Jason Faultless @@ -38,9 +38,6 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ /* @@ -362,6 +359,13 @@ parse_content_type( /* Look up major type */ /* + * TODO: remove/ignore comments in the CT-header, currently + * we do not recognize + * Content-Type: (foo) text/plain; charset=us-ascii + * as "text/plain" + */ + + /* * Unrecognised type, treat according to RFC */ if ((i = content_type(type)) == -1) { diff -Nurp tin-1.7.9/src/rfc2047.c tin-1.7.10/src/rfc2047.c --- tin-1.7.9/src/rfc2047.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/rfc2047.c 2005-07-02 15:16:21.000000000 +0200 @@ -3,7 +3,7 @@ * Module : rfc2047.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2004-11-26 + * Updated : 2005-07-02 * Notes : MIME header encoding/decoding stuff * * Copyright (c) 1995-2005 Chris Blum @@ -38,9 +38,7 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef RFC2046_H -# include "rfc2046.h" -#endif /* !RFC2046_H */ + #define isreturn(c) ((c) == '\r' || ((c) == '\n')) diff -Nurp tin-1.7.9/src/save.c tin-1.7.10/src/save.c --- tin-1.7.9/src/save.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/save.c 2005-07-02 15:14:35.000000000 +0200 @@ -3,7 +3,7 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-04-28 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -41,12 +41,6 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ -#ifndef RFC2046_H -/* # include "rfc2046.h" */ -#endif /* !RFC2046_H */ #ifdef HAVE_UUDEVIEW_H # ifndef __UUDEVIEW_H__ diff -Nurp tin-1.7.9/src/screen.c tin-1.7.10/src/screen.c --- tin-1.7.9/src/screen.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/screen.c 2005-07-04 14:54:53.000000000 +0200 @@ -521,7 +521,7 @@ show_progress( last_count = count; gettimeofday(&last_time, NULL); -#else /* HAVE_GETTIMEOFDAY */ +#else snprintf(display, sizeof(display), "%s %3d%%", txt, ratio); #endif /* HAVE_GETTIMEOFDAY */ diff -Nurp tin-1.7.9/src/search.c tin-1.7.10/src/search.c --- tin-1.7.9/src/search.c 2005-06-28 10:31:25.000000000 +0200 +++ tin-1.7.10/src/search.c 2005-07-02 15:14:46.000000000 +0200 @@ -3,7 +3,7 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-06-21 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -38,9 +38,7 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + /* * local prototypes diff -Nurp tin-1.7.9/src/select.c tin-1.7.10/src/select.c --- tin-1.7.9/src/select.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/select.c 2005-07-02 15:14:53.000000000 +0200 @@ -3,7 +3,7 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-03-14 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 1991-2005 Iain Lea , Rich Skrenta @@ -41,9 +41,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + /* * Local prototypes diff -Nurp tin-1.7.9/src/thread.c tin-1.7.10/src/thread.c --- tin-1.7.9/src/thread.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/thread.c 2005-07-27 21:17:38.000000000 +0200 @@ -3,7 +3,7 @@ * Module : thread.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-05-10 + * Updated : 2005-07-27 * Notes : * * Copyright (c) 1991-2005 Iain Lea @@ -41,9 +41,7 @@ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + #define IS_EXPIRED(a) ((a)->article == ART_UNAVAILABLE || arts[(a)->article].thread == ART_EXPIRED) @@ -797,7 +795,7 @@ thread_page( break; default: - info_message(_(txt_bad_command), printascii(key, key_to_func(GLOBAL_HELP, thread_keys))); + info_message(_(txt_bad_command), printascii(key, func_to_key(GLOBAL_HELP, thread_keys))); } } /* ret_code >= 0 */ diff -Nurp tin-1.7.9/src/version.c tin-1.7.10/src/version.c --- tin-1.7.9/src/version.c 2005-06-28 10:31:22.000000000 +0200 +++ tin-1.7.10/src/version.c 2005-07-02 15:15:14.000000000 +0200 @@ -3,7 +3,7 @@ * Module : version.c * Author : U. Janssen * Created : 2003-05-11 - * Updated : 2005-01-30 + * Updated : 2005-07-02 * Notes : * * Copyright (c) 2003-2005 Urs Janssen @@ -41,9 +41,7 @@ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ -#ifndef KEYMAP_H -# include "keymap.h" -#endif /* !KEYMAP_H */ + /* * line is the entire line we should check diff -Nurp tin-1.7.9/tin.spec tin-1.7.10/tin.spec --- tin-1.7.9/tin.spec 2005-06-28 10:31:19.000000000 +0200 +++ tin-1.7.10/tin.spec 2005-08-15 11:38:15.000000000 +0200 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.7.8 +Version: 1.7.10 Release: 1 Copyright: BSD Group: Applications/News diff -Nurp tin-1.7.9/tools/url_handler.sh tin-1.7.10/tools/url_handler.sh --- tin-1.7.9/tools/url_handler.sh 2005-06-28 10:31:20.000000000 +0200 +++ tin-1.7.10/tools/url_handler.sh 2005-07-08 17:13:49.000000000 +0200 @@ -25,6 +25,7 @@ case $method in ( netscape -remote openURL\($url\) || netscape $url ) || exit 1 fi ;; + ftp) if test x$DISPLAY = x; then target=`echo $url | sed 's;^.*://\([^/]*\)/*\(.*\);\1:/\2;'` @@ -33,18 +34,22 @@ case $method in ( netscape -remote openURL\($url\) || netscape $url ) || exit 1 fi ;; + mailto) - # mutt can't handle mailto:-URLs with embedet subject - if test `echo $url | grep -c '\?'` -eq 0 ; then - ( mutt `echo $url | sed 's;^[^:]*:\(.*\);\1;'` ) || exit 1 - else - if test x$DISPLAY = x; then - lynx $url || exit 1 - else - ( netscape -remote openURL\($url\) || netscape $url ) || exit 1 - fi - fi + ( mutt `echo $url` ) || exit 1 + # ( pine -url `echo $url` ) || exit 1 +# # old mutts can't handle mailto:-URLs with embedet subject +# if test `echo $url | grep -c '\?'` -eq 0 ; then +# ( mutt `echo $url | sed 's;^[^:]*:\(.*\);\1;'` ) || exit 1 +# else +# if test x$DISPLAY = x; then +# lynx $url || exit 1 +# else +# ( netscape -remote openURL\($url\) || netscape $url ) || exit 1 +# fi +# fi ;; + news|snews) # usualy ment for reading news on the local server if test x$DISPLAY = x; then @@ -53,12 +58,14 @@ case $method in ( netscape -remote openURL\($url\) || netscape $url ) || exit 1 fi ;; + nntp) # usualy ment for reading news via NNTP # needs a special case as netscape can't handle nntp-URLs # *sigh* lynx $url || exit 1 ;; + esac exit 0