----------------------------------------------------------------------------- MANIFEST | 62 +++++++++--------- Makefile | 4 - aclocal.m4 | 6 - config.guess | 5 - config.sub | 6 - configure | 10 +-- configure.in | 2 doc/CHANGES | 17 +++++ doc/TODO | 8 ++ doc/WHATSNEW | 1 doc/tin.1 | 6 - doc/tin.5 | 2 include/autoconf.hin | 3 include/extern.h | 4 - include/policy.h | 36 ++++++---- include/tin.h | 5 + include/version.h | 6 - po/de.gmo |binary po/de.po | 16 ++-- po/en_GB.gmo |binary po/en_GB.po | 14 ++-- po/et.gmo |binary po/et.po | 14 ++-- po/fr.gmo |binary po/fr.po | 14 ++-- po/ru.gmo |binary po/ru.po | 14 ++-- po/rw.gmo |binary po/rw.po | 14 ++-- po/sv.gmo |binary po/sv.po | 14 ++-- po/tin.pot | 14 ++-- po/tr.gmo |binary po/tr.po | 14 ++-- src/cook.c | 163 +++++++++++++++++++++++++------------------------ src/init.c | 6 + src/memory.c | 6 + src/misc.c | 12 ++- src/nntplib.c | 12 +++ tin.spec | 2 tools/tinews.pl | 4 - 41 files changed, 289 insertions(+), 227 deletions(-) ----------------------------------------------------------------------------- diff -Nurp tin-1.9.0/MANIFEST tin-1.9.1/MANIFEST --- tin-1.9.0/MANIFEST 2006-02-28 20:12:57.000000000 +0100 +++ tin-1.9.1/MANIFEST 2006-04-09 18:34:39.801434067 +0200 @@ -1,27 +1,27 @@ -MANIFEST for tin-1.9.0 (Tue Feb 28 20:12:55 CET 2006) +MANIFEST for tin-1.9.1 (Sun Apr 9 18:34:38 CEST 2006) ---------------------------------------------------- 13113 ./Makefile - 7677 ./MANIFEST + 7678 ./MANIFEST 1440 ./README 564 ./README.MAC 1006 ./README.WIN - 150667 ./aclocal.m4 + 150679 ./aclocal.m4 882 ./conf-tin - 44002 ./config.guess - 32356 ./config.sub - 491104 ./configure + 43937 ./config.guess + 32372 ./config.sub + 491128 ./configure 31023 ./configure.in 7123 ./install.sh 838 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 1481 ./doc/CHANGES + 2112 ./doc/CHANGES 252172 ./doc/CHANGES.old 4895 ./doc/CREDITS 1469 ./doc/DEBUG_REFS 30011 ./doc/INSTALL - 34465 ./doc/TODO - 134 ./doc/WHATSNEW + 34823 ./doc/TODO + 162 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1700 ./doc/article.txt 3862 ./doc/auth.txt @@ -47,7 +47,7 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 118192 ./doc/tin.1 + 118214 ./doc/tin.1 72829 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 @@ -55,27 +55,27 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 3815 ./tools/metamutt 2787 ./tools/opt-case.pl 1410 ./tools/tinlock - 25180 ./tools/tinews.pl + 25305 ./tools/tinews.pl 1654 ./tools/url_handler.sh 3347 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2778 ./include/bool.h 1947 ./include/bugrep.h - 58747 ./include/extern.h + 58841 ./include/extern.h 13625 ./include/keymap.h 6340 ./include/newsrc.h 8397 ./include/nntplib.h 665 ./include/plp_snprintf.h - 12337 ./include/policy.h + 12538 ./include/policy.h 31008 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5756 ./include/tcurses.h - 59178 ./include/tin.h + 59301 ./include/tin.h 13398 ./include/tinrc.h 4405 ./include/tnntp.h 2264 ./include/trace.h - 2508 ./include/version.h + 2507 ./include/version.h 25899 ./src/active.c 58423 ./src/art.c 32260 ./src/attrib.c @@ -83,7 +83,7 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 13728 ./src/charset.c 8220 ./src/color.c 58140 ./src/config.c - 20158 ./src/cook.c + 20553 ./src/cook.c 26667 ./src/curses.c 10378 ./src/debug.c 3408 ./src/envarg.c @@ -96,7 +96,7 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 8351 ./src/header.c 28753 ./src/help.c 13665 ./src/inews.c - 33111 ./src/init.c + 33304 ./src/init.c 2145 ./src/joinpath.c 90146 ./src/keymap.c 117417 ./src/lang.c @@ -106,11 +106,11 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 13489 ./src/mail.c 21250 ./src/main.c 10814 ./src/makecfg.c - 12256 ./src/memory.c + 12418 ./src/memory.c 5187 ./src/mimetypes.c - 89167 ./src/misc.c + 89340 ./src/misc.c 39712 ./src/newsrc.c - 44905 ./src/nntplib.c + 45256 ./src/nntplib.c 7192 ./src/nrctbl.c 41832 ./src/options_menu.c 58527 ./src/page.c @@ -208,7 +208,7 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 103554 ./pcre/testdata/testoutput7 51389 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 - 19937 ./include/autoconf.hin + 19917 ./include/autoconf.hin 21094 ./src/Makefile.in 7657 ./src/tincfg.tbl 946 ./libcanlock/Build @@ -271,21 +271,21 @@ MANIFEST for tin-1.9.0 (Tue Feb 28 20:12 41 ./intl/VERSION 4962 ./po/Makefile.inn 847 ./po/POTFILES.in - 123203 ./po/tin.pot + 123241 ./po/tin.pot 166688 ./po/de.gmo - 199581 ./po/de.po + 199619 ./po/de.po 7359 ./po/en_GB.gmo - 125787 ./po/en_GB.po + 125825 ./po/en_GB.po 159182 ./po/et.gmo - 190794 ./po/et.po + 190832 ./po/et.po 162233 ./po/fr.gmo - 196280 ./po/fr.po + 196318 ./po/fr.po 124139 ./po/ru.gmo - 175534 ./po/ru.po + 175572 ./po/ru.po 2081 ./po/rw.gmo - 169403 ./po/rw.po + 169441 ./po/rw.po 23145 ./po/sv.gmo - 130508 ./po/sv.po + 130546 ./po/sv.po 5889 ./po/tr.gmo - 190178 ./po/tr.po -7658009 total + 190216 ./po/tr.po +7661174 total diff -Nurp tin-1.9.0/Makefile tin-1.9.1/Makefile --- tin-1.9.0/Makefile 2006-02-28 20:12:55.000000000 +0100 +++ tin-1.9.1/Makefile 2006-04-09 18:34:37.498011297 +0200 @@ -7,9 +7,9 @@ PROJECT = tin LVER = 1 PVER = 9 -SVER = 0 +SVER = 1 VER = $(LVER).$(PVER).$(SVER) -DVER = 20060228 +DVER = 20060409 EXE = tin # directory structure diff -Nurp tin-1.9.0/aclocal.m4 tin-1.9.1/aclocal.m4 --- tin-1.9.0/aclocal.m4 2006-02-15 21:03:41.000000000 +0100 +++ tin-1.9.1/aclocal.m4 2006-03-02 00:49:56.765731895 +0100 @@ -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-12-11 +dnl Updated : 2006-03-02 dnl Notes : dnl dnl Copyright (c) 1995-2006 Thomas E. Dickey @@ -309,7 +309,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], mbstowcs(wcb, icb, 5); iswprint((wint_t) wcb[0]); wcslen(wcb); - wcsnlen(wcb, 4); + /* wcsnlen(wcb, 4); */ wcwidth((wint_t) wcb[0]); wcswidth(wcb, 5); wcstombs(ocb, wcb, 5); @@ -333,7 +333,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], mbstowcs(wcb, icb, 5); iswprint((wint_t) wcb[0]); wcslen(wcb); - wcsnlen(wcb, 4); + /* wcsnlen(wcb, 4); */ wcwidth((wint_t) wcb[0]); wcswidth(wcb, 5); wcstombs(ocb, wcb, 5); diff -Nurp tin-1.9.0/config.guess tin-1.9.1/config.guess --- tin-1.9.0/config.guess 2006-02-27 04:22:08.000000000 +0100 +++ tin-1.9.1/config.guess 2006-03-13 01:45:27.861393050 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -timestamp='2006-02-27' +timestamp='2006-03-13' # 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 @@ -780,9 +780,6 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS_NT-*:*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 diff -Nurp tin-1.9.0/config.sub tin-1.9.1/config.sub --- tin-1.9.0/config.sub 2006-02-27 04:25:39.000000000 +0100 +++ tin-1.9.1/config.sub 2006-03-08 12:42:42.178617603 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -timestamp='2006-02-27' +timestamp='2006-03-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -274,7 +274,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -358,7 +358,7 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ diff -Nurp tin-1.9.0/configure tin-1.9.1/configure --- tin-1.9.0/configure 2006-02-28 20:12:55.000000000 +0100 +++ tin-1.9.1/configure 2006-04-09 18:34:38.095861484 +0200 @@ -863,7 +863,7 @@ fi PACKAGE=tin -VERSION=1.9.0 +VERSION=1.9.1 cat >> confdefs.h < + ADD. slrn style verbatim mark support (#v+/#v-) + ADD. use tinrc.date_format for %D date expansion + ADD. config.guess update + REM. unused gb, so and um TLDs + FIX. config.guess, autoconf.hin, extern.h, tin.h, cook.c, init.c + memory.c, misc.c, tin.1 + + 009) Urs Janssen + BUG. didn't reissue GROUP cmd after reconnect with authentication + BUG. possible buffer overflow + REM. unnecessary test for wcsnlen + ADD. cat, jobs, travel and mobi TLDs + FIX. aclocal.m4, policy.h, misc.c, nntplib.c + -- 1.9.0 release 20060228 "Ardlussa" -- 008) Urs Janssen diff -Nurp tin-1.9.0/doc/TODO tin-1.9.1/doc/TODO --- tin-1.9.0/doc/TODO 2006-02-15 22:32:56.000000000 +0100 +++ tin-1.9.1/doc/TODO 2006-03-16 16:10:26.314568549 +0100 @@ -176,6 +176,10 @@ o allow bold, underline, italic, ... as ) [20030218 Serge Matveev ] +o add 'M'enu option to turn on/off slrn '#v+'/'#v-' verbatim mark handling. + (and make the VERBATIM_*_REGEXs user configurable; add a verbatim_color; ...) + [20060311 Urs Janssen ] + o hierarchical 'M'enu, e.g. put all art_marked_*into a 'submenu', ... [20020322 Urs Janssen ] @@ -819,7 +823,9 @@ o cleanup main.c/init_selfinfo() [fixed some of the double/tripple reads, urs] o either use libinn(3) where ever it's possible inside the code (if - configured to use that lib) or drop support for it. + configured to use that lib; the related configure check needs to be + rewritten from scratch (limitations to SPOOLDIR doesn't make sense + anymore, test for libinn.h is missing, ...)) or drop support for it. [20030511 Urs Janssen ] o detect pcre version and add compatibility macros for old versions diff -Nurp tin-1.9.0/doc/WHATSNEW tin-1.9.1/doc/WHATSNEW --- tin-1.9.0/doc/WHATSNEW 2006-02-18 03:21:10.000000000 +0100 +++ tin-1.9.1/doc/WHATSNEW 2006-03-11 13:38:30.494648035 +0100 @@ -2,6 +2,7 @@ New features and changes since tin-1.8.1 New features ------------ +. slrn style verbatim marks Changes ------- diff -Nurp tin-1.9.0/doc/tin.1 tin-1.9.1/doc/tin.1 --- tin-1.9.0/doc/tin.1 2006-02-28 20:09:15.000000000 +0100 +++ tin-1.9.1/doc/tin.1 2006-03-27 16:09:32.601250885 +0200 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2006-02-15 +.\" Updated : 2006-03-27 .\" 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 "February 28th, 2006" "1.9.0" "A Usenet newsreader" +.TH tin 1 "March 27th, 2006" "1.9.1" "A Usenet newsreader" .\" .\" .SH NAME @@ -2431,7 +2431,7 @@ following variables are expanded if foun .nf .ta \w'%A 'u +\w'Address'u \fB%A\fP Address (Email) -\fB%D\fP Date +\fB%D\fP Date (uses \fBdate_format\fP) \fB%F\fP Full address (%N <%A>) \fB%G\fP Groupname \fB%M\fP Message\-ID diff -Nurp tin-1.9.0/doc/tin.5 tin-1.9.1/doc/tin.5 --- tin-1.9.0/doc/tin.5 2006-02-28 20:09:23.000000000 +0100 +++ tin-1.9.1/doc/tin.5 2006-02-28 20:28:15.889963458 +0100 @@ -16,7 +16,7 @@ .fi .. .\" -.TH tin 5 "February 28th, 2006" "1.9.0" "A Usenet newsreader" +.TH tin 5 "February 28th, 2006" "1.9.1" "A Usenet newsreader" .SH NAME tin, rtin \- related files diff -Nurp tin-1.9.0/include/autoconf.hin tin-1.9.1/include/autoconf.hin --- tin-1.9.0/include/autoconf.hin 2006-02-15 19:44:37.000000000 +0100 +++ tin-1.9.1/include/autoconf.hin 2006-03-16 17:22:55.537663257 +0100 @@ -3,7 +3,7 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2005-07-16 + * Updated : 2006-03-16 * Notes : #include files, #defines & struct's * * Copyright (c) 1995-2006 Thomas Dickey @@ -95,7 +95,6 @@ # undef HAVE_FASCIST_NEWSADMIN # undef INEWSDIR # undef PATH_INEWS -# undef INN_NNTPLIB # undef MIME_BREAK_LONG_LINES # undef MIME_STRICT_CHARSET # undef MM_CHARSET diff -Nurp tin-1.9.0/include/extern.h tin-1.9.1/include/extern.h --- tin-1.9.0/include/extern.h 2006-02-15 19:44:37.000000000 +0100 +++ tin-1.9.1/include/extern.h 2006-03-11 11:29:56.565502571 +0100 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2005-10-19 + * Updated : 2006-03-11 * Notes : * * Copyright (c) 1997-2006 Iain Lea @@ -1254,6 +1254,8 @@ extern struct regex_cache strip_re_regex extern struct regex_cache strip_was_regex; extern struct regex_cache uubegin_regex; extern struct regex_cache uubody_regex; +extern struct regex_cache verbatim_begin_regex; +extern struct regex_cache verbatim_end_regex; extern struct regex_cache url_regex; extern struct regex_cache mail_regex; extern struct regex_cache news_regex; diff -Nurp tin-1.9.0/include/policy.h tin-1.9.1/include/policy.h --- tin-1.9.0/include/policy.h 2006-02-15 19:44:37.000000000 +0100 +++ tin-1.9.1/include/policy.h 2006-04-05 01:28:18.857558861 +0200 @@ -3,7 +3,7 @@ * Module : policy.h * Author : Ralf Doeblitz * Created : 1999-01-12 - * Updated : 2005-11-17 + * Updated : 2006-04-05 * Notes : #defines and static data for policy configuration * * Copyright (c) 1999-2006 Ralf Doeblitz @@ -165,10 +165,9 @@ * .sh St. Helena .si Slovenia * .sk Slovakia .sl Sierra Leone * .sm San Marino .sn Senegal - * .so Somalia .sr Surinam - * .st Sao Tome and Principe .su Soviet Union (former) - * .sv El Salvador .sy Syrian Arab Republic - * .sz Swaziland + * .sr Surinam .st Sao Tome and Principe + * .su Soviet Union (former) .sv El Salvador + * .sy Syrian Arab Republic .sz Swaziland * * .tc The Turks & Caicos Islands .td Chad * .tf French Southern Territories .tg Togo @@ -182,7 +181,6 @@ * * .ua Ukraine .ug Uganda * .uk United Kingdom - * .um United States Minor Outlying Islands * .us United States .uy Uruguay * .uz Uzbekistan * @@ -213,18 +211,21 @@ * .aa, .qm, .qz, .xa, .xz, .zz * * unused TLDs: - * .bv Bouvet Island + * .bv Bouvet Island (Norway) * .eh Western Sahara + * .gb United Kingdom, use .uk * .kp Korea, Democratic People's Republic * .nt Neutral Zone - * .sj Svalbard and Jan Mayen Islands + * .sj Svalbard and Jan Mayen Islands (Norway) + * .so Somalia + * .um United States Minor Outlying Islands * * requested new TLDs: * .ax Aaland-Islands (Finnish; planned for 2006) * .cs Serbia and Montenegro + * .ct Catalonia * * xccTLDs: - * .gb United Kingdom, use .uk * .hk Hong Kong, now .cn * .su former USSR, now .ru * .tp former East Timor, now .tl @@ -239,7 +240,7 @@ static char gnksa_country_codes[26*26] = /* D */ 0,0,0,0,1, 0,0,0,0,1, 1,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0,1, /* E */ 0,0,1,0,1, 0,1,0,0,0, 0,0,0,0,0, 0,0,1,1,1, 1,0,0,0,0,0, /* F */ 0,0,0,0,0, 0,0,0,1,1, 1,0,1,0,1, 0,0,1,0,0, 0,0,0,0,0,0, -/* G */ 1,1,0,1,1, 1,1,1,1,0, 0,1,1,1,0, 1,1,1,1,1, 1,0,1,0,1,0, +/* G */ 1,0,0,1,1, 1,1,1,1,0, 0,1,1,1,0, 1,1,1,1,1, 1,0,1,0,1,0, /* H */ 0,0,0,0,0, 0,0,0,0,0, 1,0,1,1,0, 0,0,1,0,1, 1,0,0,0,0,0, /* I */ 0,0,0,1,1, 0,0,0,0,0, 0,1,1,1,1, 0,1,1,1,1, 0,0,0,0,0,0, /* J */ 0,0,0,0,1, 0,0,0,0,0, 0,0,1,0,1, 1,0,0,0,0, 0,0,0,0,0,0, @@ -251,9 +252,9 @@ static char gnksa_country_codes[26*26] = /* P */ 1,0,0,0,1, 1,1,1,0,0, 1,1,1,1,0, 0,0,1,1,1, 0,0,1,0,1,0, /* Q */ 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,0, /* R */ 0,0,0,0,1, 0,0,0,0,0, 0,0,0,0,1, 0,0,0,0,0, 1,0,1,0,0,0, -/* S */ 1,1,1,1,1, 0,1,1,1,0, 1,1,1,1,1, 0,0,1,0,1, 1,1,0,0,1,1, +/* S */ 1,1,1,1,1, 0,1,1,1,0, 1,1,1,1,0, 0,0,1,0,1, 1,1,0,0,1,1, /* T */ 0,0,1,1,0, 1,1,1,0,1, 1,1,1,1,1, 1,0,1,0,1, 0,1,1,0,0,1, -/* U */ 1,0,0,0,0, 0,1,0,0,0, 1,0,1,0,0, 0,0,0,1,0, 0,0,0,0,1,1, +/* U */ 1,0,0,0,0, 0,1,0,0,0, 1,0,0,0,0, 0,0,0,1,0, 0,0,0,0,1,1, /* V */ 1,0,1,0,1, 0,1,0,1,0, 0,0,0,1,0, 0,0,0,0,0, 1,0,0,0,0,0, /* W */ 0,0,0,0,0, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,1,0, 0,0,0,0,0,0, /* X */ 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,0, @@ -268,6 +269,7 @@ static char gnksa_country_codes[26*26] = */ static const char *gnksa_domain_list[] = { "biz", /* Businesses */ + "cat", /* Catalan linguistic and cultural community */ "com", /* Commercial */ "edu", /* Educational */ "gov", /* US Government */ @@ -280,16 +282,20 @@ static const char *gnksa_domain_list[] = "arpa", /* Address and Routing Parameter Area */ "coop", /* Non-profit cooperatives */ "info", /* Unrestricted use */ + "jobs", /* Human resource managers */ + "mobi", /* Mobile products and services */ "name", /* For registration by individuals */ "museum", /* Museums */ + "travel", /* Travel industry */ /* - * more gTLDs to come >=2005, proposed are: - * .asia .cat .jobs .mail .mobi - * .post .tel .travel .xxx .kids + * more gTLDs to come >=2006, proposed are: + * .asia .mail .kids (.berlin) + * .post .tel .xxx (.sco) */ # if 0 /* $DEAD */ "nato", "uucp", + "csnet", "bitnet", # endif /* 0 */ /* the next four are defined in RFC 2606 */ diff -Nurp tin-1.9.0/include/tin.h tin-1.9.1/include/tin.h --- tin-1.9.0/include/tin.h 2006-02-16 13:14:34.000000000 +0100 +++ tin-1.9.1/include/tin.h 2006-03-11 11:26:22.302893201 +0100 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2006-02-15 + * Updated : 2006-03-11 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2006 Iain Lea , Rich Skrenta @@ -598,6 +598,9 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ /* case sensitive & ^-anchored */ #define SHAR_REGEX "\\#(?:!\\s?(?:/usr)?/bin/sh|\\s?(?i)this\\sis\\sa\\sshell\\sarchive)" +/* slrn verbatim marks, case sensitive & ^-anchored */ +#define VERBATIM_BEGIN_REGEX "#v+" +#define VERBATIM_END_REGEX "#v-" /* * URL related regexs: diff -Nurp tin-1.9.0/include/version.h tin-1.9.1/include/version.h --- tin-1.9.0/include/version.h 2006-02-28 20:12:55.000000000 +0100 +++ tin-1.9.1/include/version.h 2006-04-09 18:34:37.542000274 +0200 @@ -40,10 +40,10 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.9.0" +# define VERSION "1.9.1" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20060228" -# define RELEASENAME "Ardlussa" +# define RELEASEDATE "20060409" +# define RELEASENAME "Benmore" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" # define ATTRIBUTES_VERSION "1.0.4" Binary files tin-1.9.0/po/de.gmo and tin-1.9.1/po/de.gmo differ diff -Nurp tin-1.9.0/po/de.po tin-1.9.1/po/de.po --- tin-1.9.0/po/de.po 2006-02-28 20:00:04.000000000 +0100 +++ tin-1.9.1/po/de.po 2006-04-09 17:55:07.791100559 +0200 @@ -5,9 +5,9 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.9.0\n" +msgstr "Project-Id-Version: tin 1.9.1\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2005-01-29 23:50+0100\n" "Last-Translator: Sven Hartge , Kai Bojens \n" @@ -339,7 +339,7 @@ msgstr "# in *binaries* Nachbearbeitung 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:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(unbekannt)" @@ -6442,12 +6442,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:3691 +#: src/misc.c:3693 #, 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:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" @@ -6463,11 +6463,11 @@ msgid "\n" msgstr "\n" "Server reagierte nicht, Wiederholung Nummer # %d\n" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "Betrete aktuelle Gruppe neu\n" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "Lese (%s)\n" @@ -6485,7 +6485,7 @@ msgstr "Sende letztes Kommando (%s) neu\ #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/en_GB.gmo and tin-1.9.1/po/en_GB.gmo differ diff -Nurp tin-1.9.0/po/en_GB.po tin-1.9.1/po/en_GB.po --- tin-1.9.0/po/en_GB.po 2006-02-28 20:00:04.000000000 +0100 +++ tin-1.9.1/po/en_GB.po 2006-04-09 17:55:08.244945085 +0200 @@ -4,7 +4,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.8.1\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -281,7 +281,7 @@ msgstr "" msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "" @@ -5908,12 +5908,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3691 +#: src/misc.c:3693 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -5928,11 +5928,11 @@ msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "" @@ -5949,7 +5949,7 @@ msgstr "" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/et.gmo and tin-1.9.1/po/et.gmo differ diff -Nurp tin-1.9.0/po/et.po tin-1.9.1/po/et.po --- tin-1.9.0/po/et.po 2006-02-28 20:00:04.000000000 +0100 +++ tin-1.9.1/po/et.po 2006-04-09 17:55:08.771764629 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.7.11\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2005-09-30 09:49+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -288,7 +288,7 @@ msgstr "# *binaarfailidel* sea täielik j msgid "# remove tmp files and set Followup-To: poster\n" msgstr "# kustuta ajutised failid ja sea Followup-To: postitaja\n" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(tundmatu)" @@ -6366,12 +6366,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:3691 +#: src/misc.c:3693 #, 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:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" @@ -6387,11 +6387,11 @@ msgid "\n" msgstr "\n" "Ühendus serveriga aegus, proovin taastada, katse %d\n" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "Taasühinen jooksva grupiga\n" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "Lugesin (%s)\n" @@ -6408,7 +6408,7 @@ msgstr "Saada viimane käsk uuesti (%s)\n #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "MOTD: " Binary files tin-1.9.0/po/fr.gmo and tin-1.9.1/po/fr.gmo differ diff -Nurp tin-1.9.0/po/fr.po tin-1.9.1/po/fr.po --- tin-1.9.0/po/fr.po 2006-02-28 20:00:05.000000000 +0100 +++ tin-1.9.1/po/fr.po 2006-04-09 17:55:09.809409251 +0200 @@ -4,7 +4,7 @@ msgid "" msgstr "Project-Id-Version: 1.8.0\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2004-11-17 00:50+0100\n" "Last-Translator: Matt Anton \n" @@ -286,7 +286,7 @@ msgstr "# dans *binaries* faire traiteme msgid "# remove tmp files and set Followup-To: poster\n" msgstr "# effaçant les fichiers temporaires et utiliser Followup-To: poster\n" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(inconnu)" @@ -6452,12 +6452,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:3691 +#: src/misc.c:3693 #, 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:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version : %s %s release %s (\"%s\")\n" @@ -6473,11 +6473,11 @@ msgid "\n" msgstr "\n" "Connexion au serveur expirée, reconnexion # %d\n" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "Rejoindre le groupe actuel\n" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "Lecture (%s)\n" @@ -6495,7 +6495,7 @@ msgstr "Réenvoyer la dernière commande ( #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/ru.gmo and tin-1.9.1/po/ru.gmo differ diff -Nurp tin-1.9.0/po/ru.po tin-1.9.1/po/ru.po --- tin-1.9.0/po/ru.po 2006-02-28 20:00:05.000000000 +0100 +++ tin-1.9.1/po/ru.po 2006-04-09 17:55:10.448190518 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.8.0\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2005-03-23 15:39+0200\n" "Last-Translator: Andrei Emeltchenko \n" "Language-Team: Russian \n" @@ -285,7 +285,7 @@ msgstr "" msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(ÎÅÉÚ×ÅÓÔÎÏ)" @@ -6181,12 +6181,12 @@ msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ BiDi" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "# åÓÌÉ ON, ÔÏ Ä×ÕÎÁÐÒÁ×ÌÅÎÎÙÊ ÔÅËÓÔ ×ÏÓÐÒÏÉÚ×ÏÄÉÔÓÑ tin'ÏÍ\n" -#: src/misc.c:3691 +#: src/misc.c:3693 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\") %s %s\n" -#: src/misc.c:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\")\n" @@ -6202,11 +6202,11 @@ msgid "\n" msgstr "\n" "óÅÒ×ÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ, ÐÏÐÙÔËÁ ÓÏÅÄÉÎÉÔØÓÑ ÓÎÏ×Á # %d\n" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "÷ÓÔÕÐÉÔØ ÓÎÏ×Á × ÔÅËÕÝÕÀ ÇÒÕÐÐÕ\n" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "þÔÅÎÉÅ (%s)\n" @@ -6223,7 +6223,7 @@ msgstr "ðÅÒÅÓÌÁÔØ ÐÏÓÌÅÄÎÀÀ ËÏÍÁÎÄÕ (%s) #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/rw.gmo and tin-1.9.1/po/rw.gmo differ diff -Nurp tin-1.9.0/po/rw.po tin-1.9.1/po/rw.po --- tin-1.9.0/po/rw.po 2006-02-28 20:00:06.000000000 +0100 +++ tin-1.9.1/po/rw.po 2006-04-09 17:55:11.055982413 +0200 @@ -15,7 +15,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.7.8\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2005-04-03 10:55-0700\n" "Last-Translator: Steven Michael Murphy \n" "Language-Team: Kinyarwanda \n" @@ -295,7 +295,7 @@ msgstr "# in Iposita Inonosora Gukuraho. msgid "# remove tmp files and set Followup-To: poster\n" msgstr "# Na Gushyiraho\n" -#: src/cook.c:499 +#: src/cook.c:507 #, fuzzy msgid "(unknown)" msgstr "(Itazwi)" @@ -6788,12 +6788,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "#Umwandiko ni ku" -#: src/misc.c:3691 +#: src/misc.c:3693 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -6808,13 +6808,13 @@ msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "Inyuma" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 #, fuzzy msgid "Rejoin current group\n" msgstr "KIGEZWEHO" # svx/inc\globlmn.hrc:ITEM_FILE_MAIL_INBOX.text -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, fuzzy, c-format msgid "Read (%s)\n" msgstr "Gusoma" @@ -6831,7 +6831,7 @@ msgstr "Iheruka Komandi:" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/sv.gmo and tin-1.9.1/po/sv.gmo differ diff -Nurp tin-1.9.0/po/sv.po tin-1.9.1/po/sv.po --- tin-1.9.0/po/sv.po 2006-02-28 20:00:06.000000000 +0100 +++ tin-1.9.1/po/sv.po 2006-04-09 17:55:11.409861268 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.8.0\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2006-01-11 21:22+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -283,7 +283,7 @@ msgstr "" msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(okänd)" @@ -5892,12 +5892,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3691 +#: src/misc.c:3693 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s utgåva %s (\"%s\") %s %s\n" -#: src/misc.c:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s utgåva %s (\"%s\")\n" @@ -5912,11 +5912,11 @@ msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "Läs (%s)\n" @@ -5933,7 +5933,7 @@ msgstr "" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" diff -Nurp tin-1.9.0/po/tin.pot tin-1.9.1/po/tin.pot --- tin-1.9.0/po/tin.pot 2006-02-28 19:59:59.000000000 +0100 +++ tin-1.9.1/po/tin.pot 2006-04-09 17:55:01.776162453 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 19:59+0100\n" +"POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -288,7 +288,7 @@ msgstr "" msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "" @@ -6129,12 +6129,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3691 +#: src/misc.c:3693 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3694 +#: src/misc.c:3696 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" @@ -6150,11 +6150,11 @@ msgid "" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, c-format msgid "Read (%s)\n" msgstr "" @@ -6171,7 +6171,7 @@ msgstr "" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" Binary files tin-1.9.0/po/tr.gmo and tin-1.9.1/po/tr.gmo differ diff -Nurp tin-1.9.0/po/tr.po tin-1.9.1/po/tr.po --- tin-1.9.0/po/tr.po 2006-02-28 20:00:06.000000000 +0100 +++ tin-1.9.1/po/tr.po 2006-04-09 17:55:11.803726435 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: tin 1.7.7\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-28 19:59+0100\n" + "POT-Creation-Date: 2006-04-09 17:19+0200\n" "PO-Revision-Date: 2005-03-06 09:25+0200\n" "Last-Translator: Þebnem Korkmaz \n" "Language-Team: Turkish \n" @@ -288,7 +288,7 @@ msgstr "# ikilik dosyalarda iþletim sonr msgid "# remove tmp files and set Followup-To: poster\n" msgstr "" -#: src/cook.c:499 +#: src/cook.c:507 msgid "(unknown)" msgstr "(bilinmiyor)" @@ -7079,12 +7079,12 @@ msgstr "" msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/misc.c:3691 +#: src/misc.c:3693 #, 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:3694 +#: src/misc.c:3696 #, fuzzy, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Sürüm: %s %s serbest býrak %s (\"%s\")\n" @@ -7101,12 +7101,12 @@ msgid "\n" msgstr "\n" "Sunucu süresi doldu, tekrar baðlanmaya çalýþýyor # %d\n" -#: src/nntplib.c:834 +#: src/nntplib.c:834 src/nntplib.c:1621 #, fuzzy msgid "Rejoin current group\n" msgstr "Þu anki gruba tekrar katýl\n" -#: src/nntplib.c:841 +#: src/nntplib.c:841 src/nntplib.c:1628 #, fuzzy, c-format msgid "Read (%s)\n" msgstr "Oku (%s)\n" @@ -7123,7 +7123,7 @@ msgstr "Son komutu tekrr yolla (%s)\n" #. * - use some sort of pager? #. * - -> lang.c #. -#: src/nntplib.c:1750 +#: src/nntplib.c:1760 msgid "MOTD: " msgstr "" diff -Nurp tin-1.9.0/src/cook.c tin-1.9.1/src/cook.c --- tin-1.9.0/src/cook.c 2006-02-15 19:44:38.000000000 +0100 +++ tin-1.9.1/src/cook.c 2006-03-11 13:35:26.651011449 +0100 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2005-07-20 + * Updated : 2006-03-11 * Notes : Split from page.c * * Copyright (c) 2000-2006 Jason Faultless @@ -355,6 +355,7 @@ process_text_body_part( int size_offsets = ARRAY_SIZE(offsets); t_bool in_sig = FALSE; /* Set when in sig portion */ t_bool in_uue = FALSE; /* Set when in uuencoded section */ + t_bool verbatim = FALSE; /* Set when in verbatim section */ t_bool is_uubody; /* Set when current line looks like a uuencoded line */ t_part *curruue = NULL; @@ -420,103 +421,111 @@ process_text_body_part( len = (int) strlen(line); - /* - * Detect and skip signatures if necessary - */ - if (!in_sig) { - if (strcmp(line, SIGDASHES) == 0) { - in_sig = TRUE; - if (in_uue) { - in_uue = FALSE; - if (hide_uue) - PUT_UUE(curruue, _(txt_incomplete)); + /* look for verbatim marks */ + if (!in_sig && !in_uue && !verbatim && MATCH_REGEX(verbatim_begin_regex, line, len)) + verbatim = TRUE; + if (verbatim && MATCH_REGEX(verbatim_end_regex, line, len)) + verbatim = FALSE; + + if (!verbatim) { + /* + * Detect and skip signatures if necessary + */ + if (!in_sig) { + if (strcmp(line, SIGDASHES) == 0) { + in_sig = TRUE; + if (in_uue) { + in_uue = FALSE; + if (hide_uue) + PUT_UUE(curruue, _(txt_incomplete)); + } } } - } - if (in_sig && !tinrc.show_signatures) - continue; /* No further processing needed */ + if (in_sig && !tinrc.show_signatures) + continue; /* No further processing needed */ - /* - * Detect and process uuencoded sections - * Look for the start or the end of a uuencoded section - * - * TODO: look for a tailing size line after end (non standard - * extension)? - */ - if (pcre_exec(uubegin_regex.re, uubegin_regex.extra, line, len, 0, 0, offsets, size_offsets) != PCRE_ERROR_NOMATCH) { - in_uue = TRUE; - curruue = new_uue(&part, line + offsets[1]); - if (hide_uue) - continue; /* Don't cook the 'begin' line */ - } else if (strncmp(line, "end\n", 4) == 0) { - if (in_uue) { - in_uue = FALSE; - if (hide_uue) { - PUT_UUE(curruue, ""); - continue; /* Don't cook the 'end' line */ + /* + * Detect and process uuencoded sections + * Look for the start or the end of a uuencoded section + * + * TODO: look for a tailing size line after end (non standard + * extension)? + */ + if (pcre_exec(uubegin_regex.re, uubegin_regex.extra, line, len, 0, 0, offsets, size_offsets) != PCRE_ERROR_NOMATCH) { + in_uue = TRUE; + curruue = new_uue(&part, line + offsets[1]); + if (hide_uue) + continue; /* Don't cook the 'begin' line */ + } else if (strncmp(line, "end\n", 4) == 0) { + if (in_uue) { + in_uue = FALSE; + if (hide_uue) { + PUT_UUE(curruue, ""); + continue; /* Don't cook the 'end' line */ + } } } - } - /* - * See if this line looks like a uuencoded 'body' line - */ - is_uubody = FALSE; + /* + * See if this line looks like a uuencoded 'body' line + */ + is_uubody = FALSE; - if (MATCH_REGEX (uubody_regex, line, len)) { - int sum = (((*line) - ' ') & 077) * 4 / 3; /* uuencode octet checksum */ + if (MATCH_REGEX(uubody_regex, line, len)) { + int sum = (((*line) - ' ') & 077) * 4 / 3; /* uuencode octet checksum */ - /* sum = 0 in a uubody only on the last line, a single ` */ - if (sum == 0 && len == 1 + 1) /* +1 for the \n */ - is_uubody = TRUE; - else if (len == sum + 1 + 1) - is_uubody = TRUE; + /* sum = 0 in a uubody only on the last line, a single ` */ + if (sum == 0 && len == 1 + 1) /* +1 for the \n */ + is_uubody = TRUE; + else if (len == sum + 1 + 1) + is_uubody = TRUE; #ifdef DEBUG_ART - if (debug == 2) - fprintf(stderr, "%s sum=%d len=%d (%s)\n", bool_unparse(is_uubody), sum, len, line); + if (debug == 2) + fprintf(stderr, "%s sum=%d len=%d (%s)\n", bool_unparse(is_uubody), sum, len, line); #endif /* DEBUG_ART */ - } + } - if (in_uue) { - if (is_uubody) - curruue->line_count++; - else { - if (line[0] == '\n') { /* Blank line in a uubody - definitely a failure */ - /* fprintf(stderr, "not a uue line while reading a uue body?\n"); */ - in_uue = FALSE; - if (hide_uue) - /* don't continue here, so we see the line that 'broke' in_uue */ - PUT_UUE(curruue, _(txt_incomplete)); + if (in_uue) { + if (is_uubody) + curruue->line_count++; + else { + if (line[0] == '\n') { /* Blank line in a uubody - definitely a failure */ + /* fprintf(stderr, "not a uue line while reading a uue body?\n"); */ + in_uue = FALSE; + if (hide_uue) + /* don't continue here, so we see the line that 'broke' in_uue */ + PUT_UUE(curruue, _(txt_incomplete)); + } + } + } else { + /* + * UUE_ALL = 'Try harder' - we never saw a begin line, but useful + * when uue sections are split across > 1 article + */ + if (is_uubody && hide_uue == UUE_ALL) { + char name[] = N_("(unknown)"); + + curruue = new_uue(&part, name); + curruue->line_count++; + in_uue = TRUE; + continue; } } - } else { + /* - * UUE_ALL = 'Try harder' - we never saw a begin line, but useful - * when uue sections are split across > 1 article + * Skip output if we're hiding uue or the sig */ - if (is_uubody && hide_uue == UUE_ALL) { - char name[] = N_("(unknown)"); - - curruue = new_uue(&part, name); - curruue->line_count++; - in_uue = TRUE; - continue; - } + if (in_uue && hide_uue) + continue; /* No further processing needed */ } - /* - * Skip output if we're hiding uue or the sig - */ - if (in_uue && hide_uue) - continue; /* No further processing needed */ - - flags = in_sig ? C_SIG : C_BODY; + flags = verbatim ? 0 : in_sig ? C_SIG : C_BODY; /* - * Don't do any further handling of uue lines - the data is binary after all + * Don't do any further handling of uue || verbatim lines */ - if (in_uue) { + if (in_uue || verbatim) { put_cooked(max_line_len, wrap_lines, flags, "%s", line); continue; } diff -Nurp tin-1.9.0/src/init.c tin-1.9.1/src/init.c --- tin-1.9.0/src/init.c 2006-02-15 22:20:30.000000000 +0100 +++ tin-1.9.1/src/init.c 2006-03-11 11:29:08.530556624 +0100 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2006-02-15 + * Updated : 2006-03-11 * Notes : * * Copyright (c) 1991-2006 Iain Lea @@ -176,6 +176,7 @@ char *input_history[HIST_MAXNUM + 1][HIS struct regex_cache strip_re_regex, strip_was_regex, uubegin_regex, uubody_regex, + verbatim_begin_regex, verbatim_end_regex, url_regex, mail_regex, news_regex, shar_regex, slashes_regex, stars_regex, underscores_regex, strokes_regex @@ -978,6 +979,9 @@ postinit_regexp( compile_regex(UUBEGIN_REGEX, &uubegin_regex, PCRE_ANCHORED); compile_regex(UUBODY_REGEX, &uubody_regex, PCRE_ANCHORED); + compile_regex(VERBATIM_BEGIN_REGEX, &verbatim_begin_regex, PCRE_ANCHORED); + compile_regex(VERBATIM_END_REGEX, &verbatim_end_regex, PCRE_ANCHORED); + compile_regex(URL_REGEX, &url_regex, PCRE_CASELESS); compile_regex(MAIL_REGEX, &mail_regex, PCRE_CASELESS); compile_regex(NEWS_REGEX, &news_regex, PCRE_CASELESS); diff -Nurp tin-1.9.0/src/memory.c tin-1.9.1/src/memory.c --- tin-1.9.0/src/memory.c 2006-02-15 19:44:37.000000000 +0100 +++ tin-1.9.1/src/memory.c 2006-03-11 11:31:57.259755553 +0100 @@ -3,7 +3,7 @@ * Module : memory.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2005-07-02 + * Updated : 2006-03-11 * Notes : * * Copyright (c) 1991-2006 Iain Lea , Rich Skrenta @@ -226,6 +226,10 @@ free_all_arrays( FreeIfNeeded(uubegin_regex.extra); FreeIfNeeded(uubody_regex.re); FreeIfNeeded(uubody_regex.extra); + FreeIfNeeded(verbatim_begin_regex.re); + FreeIfNeeded(verbatim_begin_regex.extra); + FreeIfNeeded(verbatim_end_regex.re); + FreeIfNeeded(verbatim_end_regex.extra); FreeIfNeeded(url_regex.re); FreeIfNeeded(url_regex.extra); FreeIfNeeded(mail_regex.re); diff -Nurp tin-1.9.0/src/misc.c tin-1.9.1/src/misc.c --- tin-1.9.0/src/misc.c 2006-02-15 22:20:48.000000000 +0100 +++ tin-1.9.1/src/misc.c 2006-04-08 16:31:40.680146249 +0200 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2006-02-15 + * Updated : 2006-04-06 * Notes : * * Copyright (c) 1991-2006 Iain Lea , Rich Skrenta @@ -883,7 +883,7 @@ mail_check( char *maildir_box; struct dirent *dp; - maildir_box = my_malloc(strlen(mailbox_name) + strlen(MAILDIR_NEW) + 1); + maildir_box = my_malloc(strlen(mailbox_name) + strlen(MAILDIR_NEW) + 2); joinpath(maildir_box, mailbox_name, MAILDIR_NEW); if (!(dirp = opendir(maildir_box))) { @@ -1100,7 +1100,7 @@ create_index_lock_file( /* * strfquote() - produce formatted quote string * %A Articles Email address - * %D Articles Date + * %D Articles Date (uses tinrc.date_format) * %F Articles Address+Name * %G Groupname of Article * %M Articles MessageId @@ -1195,8 +1195,10 @@ strfquote( } break; - case 'D': /* Articles Date */ - STRCPY(tbuf, BlankIfNull(pgart.hdr.date)); + case 'D': /* Articles Date (reformated as specified in tinrc.date_format) */ + if (!my_strftime(tbuf, LEN - 1, tinrc.date_format, localtime(&arts[this_resp].date))) { + STRCPY(tbuf, BlankIfNull(pgart.hdr.date)); + } break; case 'F': /* Articles Address+Name */ diff -Nurp tin-1.9.0/src/nntplib.c tin-1.9.1/src/nntplib.c --- tin-1.9.0/src/nntplib.c 2006-02-18 03:34:12.000000000 +0100 +++ tin-1.9.1/src/nntplib.c 2006-03-06 18:42:45.395230251 +0100 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2006-02-15 + * Updated : 2006-03-05 * 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 @@ -1617,6 +1617,16 @@ get_respcode( strncpy(savebuf, last_put, sizeof(savebuf) - 1); /* Take copy, as authenticate() will clobber this */ if (authenticate(nntp_server, userid, FALSE)) { + if (curr_group != NULL) { + DEBUG_IO((stderr, _("Rejoin current group\n"))); + snprintf(last_put, sizeof(last_put), "GROUP %s", curr_group->name); + put_server(last_put); + s_gets(last_put, NNTP_STRLEN, nntp_rd_fp); +# ifdef DEBUG + debug_nntp("<<<", last_put); +# endif /* DEBUG */ + DEBUG_IO((stderr, _("Read (%s)\n"), last_put)); + } strcpy(last_put, savebuf); put_server(last_put); diff -Nurp tin-1.9.0/tin.spec tin-1.9.1/tin.spec --- tin-1.9.0/tin.spec 2006-02-18 03:20:21.000000000 +0100 +++ tin-1.9.1/tin.spec 2006-02-28 20:27:56.152754283 +0100 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.9.0 +Version: 1.9.1 Release: 1 Copyright: BSD Group: Applications/News diff -Nurp tin-1.9.0/tools/tinews.pl tin-1.9.1/tools/tinews.pl --- tin-1.9.0/tools/tinews.pl 2006-02-15 19:44:37.000000000 +0100 +++ tin-1.9.1/tools/tinews.pl 2006-03-04 12:56:50.598031223 +0100 @@ -44,7 +44,7 @@ # - cleanup, remove duplicated code # # version Number -my $version = "1.1.8"; +my $version = "1.1.10"; my %config; @@ -497,6 +497,7 @@ sub signarticle { } } + unless (substr($pgpbody,-1,1)=~ /\n/ ) {$pgpbody.="\n"}; open(FH, ">" . $config{'pgptmpf'} . ".txt") or die "$0: can't open ".$config{'pgptmpf'}.": $!\n"; print FH $pgphead, "\n", $pgpbody; print FH "\n" if ($config{'PGPVersion'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify @@ -563,6 +564,7 @@ sub signarticle { } } + push @pgphead, ("X-PGP-Hash: " . $config{'digest-algo'} . "\n"); push @pgphead, ("X-PGP-Key: " . $config{'PGPSigner'} . "\n"), $tmppgpheader; undef $tmppgpheader;