--- lynx-cur-2.8.8dev.9.orig/debian/README.Debian +++ lynx-cur-2.8.8dev.9/debian/README.Debian @@ -0,0 +1,53 @@ +lynx-cur for Debian +---------------------- + +Developemnet version of lynx with NLS support. + +* In /etc/lynx-cur/lynx.cfg, we set + +EXTERNAL:ftp:w3m %s:TRUE +EXTERNAL:file:w3m %s:TRUE +EXTERNAL:http:w3m %s:TRUE +EXTERNAL:http:wget %s:TRUE +EXTERNAL:http:wget -r %s:TRUE +EXTERNAL:ftp:netscape %s:TRUE +EXTERNAL:file:netscape %s:TRUE +EXTERNAL:http:netscape %s:TRUE + +which gives a popup menu when you press '.' or ',' for the current link +or page respectively, + +SUFFIX:.deb:application/octet-stream +SUFFIX:.tgz:application/octet-stream + +and + +INCLUDE:~/.lynx/colors:COLOR +INCLUDE:~/.lynx/keymap:KEYMAP +INCLUDE:~/.lynx/viewers:VIEWER +INCLUDE:~/.lynx/external:EXTERNAL + +the latter will enable you to alter options privately by the files +~/.lynx/colors etc. + +* In /etc/lynx-cur/local.cfg, you may check the settings of + +STARTFILE:, NNTPSERVER: + +* In /etc/lynx-cur/lynx.cfg, you might want to modify the settings of + +LOCAL_DOMAIN:, SAVE_SPACE: + +* If you use always option "-use_mouse" then it may be useful to set +alias lynx 'lynx -use_mouse' +in appropriate file, for example .bashrc or .tcshrc + +* lynx will be in color mode but if this causes any troubles do: + +1) In Lynx Options Menu, set option "show color" as "NEVER" +then the default is changed to monochrome. + +2) If you do not want to change default setting, then try +lynx -nocolor + + -- Atsuhito KOHDA , Wed, 7 Jul 1999 07:29:50 +0900 --- lynx-cur-2.8.8dev.9.orig/debian/changelog +++ lynx-cur-2.8.8dev.9/debian/changelog @@ -0,0 +1,1474 @@ +lynx-cur (2.8.8dev.9-2) unstable; urgency=low + + * Merging in unstable. + + -- Atsuhito KOHDA Tue, 21 Jun 2011 12:21:36 +0900 + +lynx-cur (2.8.8dev.9-1) experimental; urgency=low + + * New Upstream Release. Updated patch-1. + * Yet continue to change packaging. + Removed unnecessary po-debconf from Build-Depends. + - now no alternatives for lynx.1 (Closes: #258858) + + -- Atsuhito KOHDA Mon, 13 Jun 2011 14:39:34 +0900 + +lynx-cur (2.8.8dev.8-2) experimental; urgency=low + + * New packaging. So drastically changed packaging, this should go + experimental for test. + Provided only transition lynx-cur-wrapper so conflicted + with lynx-cur-wrapper (<< 2.8.8dev.8-2). + Removed update-alternatives of lynx from old lynx-cur and lynx-cur-wrapper + - not fiddling with local.cfg anymore. (Closes: #515848, #607005, #627126) + - not used alternatives anymore. (Closes: #268925) + - made lynx-cur-wrapper as transition package. (Closes: #293068, #619318) + + -- Atsuhito KOHDA Tue, 07 Jun 2011 13:10:45 +0900 + +lynx-cur (2.8.8dev.8-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Wed, 26 Jan 2011 13:21:26 +0900 + +lynx-cur (2.8.8dev.7-1) unstable; urgency=low + + * New Upstream Release. + - add PERSONAL_MAIL_NAME to options menu and .lynxrc (Closes: #603647) + - remind user how to cancel message (Closes: #292787) + - add HTML5_CHARSETS feature (Closes: #604466, #514897) + - add EXTERNAL_MENU feature to lynx.cfg (Closes: #603646) + - add check in getfile() when handling a "mailto:" url, to prevent it + when the user has requested a dump (Closes: #533308) + - makes RMDIR_PATH configurable (Closes: #604984) + * Replaced obsolete "netscape" to "x-www-brpwser" in patch-1 + (Closes: #600693) + + -- Atsuhito KOHDA Mon, 13 Dec 2010 15:38:16 +0900 + +lynx-cur (2.8.8dev.6-3) unstable; urgency=low + + * Applied lynx2.8.8dev.6b.patch (by patches/patch-3) + + -- Atsuhito KOHDA Mon, 08 Nov 2010 21:23:34 +0900 + +lynx-cur (2.8.8dev.6-2) unstable; urgency=low + + * Applied lynx2.8.8dev.6a.patch (by patches/patch-3) + + -- Atsuhito KOHDA Mon, 08 Nov 2010 13:48:24 +0900 + +lynx-cur (2.8.8dev.6-1) unstable; urgency=low + + * New Upstream Release. + - amend change for Debian #514897 to exclude XML documents + (Closes: #592883) + - use HTParsePort() in a few places, e.g., HTFinger.c, to allow for IPv6 + addresses with colons (Closes: #587330) + - add option -unique-urls (Closes: #586762) + * Updated patch-1 for a new upstream source. + + -- Atsuhito KOHDA Fri, 05 Nov 2010 16:05:27 +0900 + +lynx-cur (2.8.8dev.5-1) unstable; urgency=high + + * New upstream release. This should fix a security bug so urgency=high. + * Fixed a security bug, CVE-2010-2810 (Closes: #594300) + * A fix for #592078 with patch-3 is not necessary so removed it. + * Some bugs forgotten to be closed. + - unable to reproduce. (Closes: #575922) + - a problem of gnutls. (Closes: #592718) + - if necessary, please reopen. (Closes: #490265) + - only a report of a patch for 2.8.7dev9-1.1 (Closes: #489360) + + -- Atsuhito KOHDA Thu, 26 Aug 2010 09:50:33 +0900 + +lynx-cur (2.8.8dev.4-3) unstable; urgency=low + + * Applied a patch from the upstream. (Closes: #592078) + + -- Atsuhito KOHDA Mon, 09 Aug 2010 11:06:00 +0900 + +lynx-cur (2.8.8dev.4-2) unstable; urgency=low + + * Applied a patch from the upstream (Mon, 28 Jun 2010 20:32:58 -0400 (EDT)). + + -- Atsuhito KOHDA Tue, 29 Jun 2010 09:44:13 +0900 + +lynx-cur (2.8.8dev.4-1) unstable; urgency=low + + * New upstream release. + + -- Atsuhito KOHDA Sat, 26 Jun 2010 12:19:47 +0900 + +lynx-cur (2.8.8dev.3-3) unstable; urgency=low + + * Fixed a problem of ssl connection by a patch from the upstream. + Closes: #579501 + + -- Atsuhito KOHDA Thu, 06 May 2010 10:48:26 +0900 + +lynx-cur (2.8.8dev.3-2) unstable; urgency=low + + * Fixed a small error in 2.8.8dev.3 + + -- Atsuhito KOHDA Tue, 27 Apr 2010 20:45:15 +0900 + +lynx-cur (2.8.8dev.3-1) unstable; urgency=low + + * New Upstream Release. + - modify print_wwwfile_to_fd() to add field values to the printed form + Closes: #574940 + - correct a place where LYStrExtent2 was used where byte-count is needed + Closes: #561363 + + -- Atsuhito KOHDA Mon, 26 Apr 2010 15:22:19 +0900 + +lynx-cur (2.8.8dev.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Dropped empty lynx-cur-wrapper.postrm + * Fix pending l10n issues. Debconf translations: + - Finnish (Esko Arajärvi). Closes: #537446 + + -- Christian Perrier Fri, 19 Mar 2010 06:42:57 +0100 + +lynx-cur (2.8.8dev.2-1) unstable; urgency=low + + * New Upstream Release. + - modify trimming of URI in LYSetCookie() to eliminate trimming of + final leaf (Closes: #460108) + * Updated rules, control and patches files. + * Changed lynx.cfg and now we set LOCALE_CHARSET:TRUE + * Added libidn11-dev to Build-Depends to fix #541694 (Closes: #541694) + + -- Atsuhito KOHDA Sun, 19 Dec 2009 20:04:44 +0900 + +lynx-cur (2.8.8dev.1-1) unstable; urgency=low + + * New Upstream Release. + - add optional support for IDNA using GNU libidn (Closes: #352596) + - ignore LEFT-TO-RIGHT-MARK (U+200E) in HTML files (Closes: #408835) + - correct check for return-value from gnutls_certificate_verify_peers2(), + which caused some sites to be treated as if they were version-1 X.509 CAs + (Closes: #231609) + - change compiled-in default for SYSLOG_REQUESTED_URLS to false. + (Closes: #537907) + + -- Atsuhito KOHDA Mon, 31 Aug 2009 20:04:44 +0900 + +lynx-cur (2.8.7rel.1-1) unstable; urgency=low + + * New Upstream Release. + * Linked against libbsd to fix a security problem. (Closes: #532520) + + -- Atsuhito KOHDA Wed, 8 Jul 2009 21:08:12 +0900 + +lynx-cur (2.8.7pre6-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Wed, 24 Jun 2009 12:24:37 +0900 + +lynx-cur (2.8.7pre5-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Sun, 7 Jun 2009 21:50:20 +0900 + +lynx-cur (2.8.7pre4-1) unstable; urgency=low + + * New Upstream Release. + - amend fix for Debian #388622 (Closes: #388622) + - suppress check for "disabled" attribute in a select, as a workaround + (Closes: #525934) + - accommodate (in)compatibility "feature" in HTML5 draft (Closes: #514897) + - Sanitize build-dependencies. Applied suggested patch which I forgot + to do in former versions. (Closes: #481767) + * Sanitize build-dependencies. Removed exim4, bzip2, unzip, zip also. + There remain sharutils, telnet, openssh-client now. + * Uncomment SSL_CERT_FILE line in lynx.cfg (Closes: #529482) + + -- Atsuhito KOHDA Wed, 27 May 2009 12:44:09 +0900 + +lynx-cur (2.8.7pre2-1) unstable; urgency=low + + * New Upstream Release. + - modify Lynx's DTD information. (Closes: #398986) + - correct length of padding with underscores. (Closes: #519199) + - fix a few cases where PUTC's intended for pretty-src would display in the + HTML view. (Closes: #521489) + * Can use persistent cookies now but please edit /etc/lynx-cur/lynx.cfg + and make it looks as "PERSISTENT_COOKIES:TRUE" (Closes: #426481) + * Updated patch-1 so it should be applied cleanly. + * Fixed typo in 2.8.7pre1-1 changelog. + + -- Atsuhito KOHDA Fri, 01 May 2009 13:02:04 +0900 + +lynx-cur (2.8.7pre1-1) unstable; urgency=low + + * New Upstream Release. + * Changed default setting in lynx.cfg "SHOW_CURSOR:TRUE" for test. + There could be more smart way however. (Closes: #516726) + + -- Atsuhito KOHDA Sun, 22 Mar 2009 18:14:38 +0900 + +lynx-cur (2.8.7dev13-1) unstable; urgency=low + + * New Upstream Release. + * Stopped to apply patches/patch-2 which was unnecessary anymore. + + -- Atsuhito KOHDA Mon, 02 Feb 2009 19:57:58 +0900 + +lynx-cur (2.8.7dev12-2) unstable; urgency=low + + * Fixed broken UTF-8 displaying in local files with dev12. + The patch is fetched from lynx-dev ML and stored in patches/patch-2. + + -- Atsuhito KOHDA Tue, 20 Jan 2009 09:50:51 +0900 + +lynx-cur (2.8.7dev12-1) unstable; urgency=low + + * New Upstream Release. + * Removed unnecessary patch-2 and updated patch-1 + * Fixed Description, i.e. removed reference to lynx. (Closes: #509929) + * It seemed I forgot to close #258859 which was fixed long time ago. + (Closes: #258859) + * Clean up preinst a bit. + + -- Atsuhito KOHDA Fri, 02 Jan 2009 20:48:55 +0900 + +lynx-cur (2.8.7dev11-2) unstable; urgency=low + + * Fix HTFile.c with a patch of Thomas Dickey. (Closes: #509321) + * Fix lynx.cur.wrapper so that it will read the default lynx.cfg + (Closes: #509411) + + -- Atsuhito KOHDA Tue, 23 Dec 2008 17:08:55 +0900 + +lynx-cur (2.8.7dev11-1) unstable; urgency=low + + * New Upstream Release (2.8.7dev11). Also applied lynx2.8.7dev.11a.patch. + * A patch of Thomas Viehmann was merged in the upstream so removed it + from debian/patches/00list file. + + -- Atsuhito KOHDA Thu, 18 Dec 2008 22:03:36 +0900 + +lynx-cur (2.8.7dev10-5) unstable; urgency=low + + * Fixed postinst and now a handling of local.cfg should be correct. + (Closes: #492468) + + -- Atsuhito KOHDA Sun, 23 Nov 2008 07:51:09 +0900 + +lynx-cur (2.8.7dev10-4) unstable; urgency=low + + * Oops, I overlooked Thomas Viehmann's upload and fix. Sorry Thomas! + * Reduced Build-Dependency. (Closes: #506210) + * Added Homepage in control. (Closes: #506278) + + -- Atsuhito KOHDA Fri, 21 Nov 2008 09:02:02 +0900 + +lynx-cur (2.8.7dev10-3) unstable; urgency=low + + * Fixed postinst so that it didn't touch local.cfg if it wasn't a regular + file. (Closes: #492468) + + -- Atsuhito KOHDA Fri, 26 Sep 2008 12:38:16 +0900 + +lynx-cur (2.8.7dev10-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * fix src/tidy_tls.c X509_get_issuer_name to actually take the issuer + DN of the present certificate and not hope that it is the same as + taking the subject DN of the "next" certificate which + may or may not exist. Closes: #499945 + This is debian/patches/patch-3. + + -- Thomas Viehmann Fri, 03 Oct 2008 23:24:41 +0200 + +lynx-cur (2.8.7dev10-2) unstable; urgency=low + + * Installed new (dummy) lynx-cur-wrapper.postrm because an old version, + which was empty, caused an error. + + -- Atsuhito KOHDA Thu, 25 Sep 2008 08:11:00 +0900 + +lynx-cur (2.8.7dev10-1) unstable; urgency=low + + * New Upstream Release. + - modify initial active link in download-page (Closes: #376259) + - revise introductory comment written to ".lynxrc" (Closes: #461158) + - suppress computation in TrimmedLength() for source-view (Closes: #204515) + - adapt/extend parsdate.y from tin to improve parsing of cookie expiration + times (Closes: #480144) + + -- Atsuhito KOHDA Wed, 24 Sep 2008 11:55:24 +0900 + +lynx-cur (2.8.7dev9-2) unstable; urgency=low + + * Andreas' efforts keep this package in Debian. Thanks Andreas Metzler. + * Debconf translations: + - Japanese. Closes: #493674 + - Italian. Closes: #493959 + + -- Atsuhito KOHDA Tue, 02 Sep 2008 10:40:21 +0900 + +lynx-cur (2.8.7dev9-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Downgrade priority of debconf question for homepage to "low". + Closes: #489489 + * Disable debconf priority high note about existence of /etc/lynx.cfg. (Due + to debconf preconfiguration it would be shown even if upgrading the lynx + dummy package would correctly take care of the issue.) Closes: #489485 + * Build with --enable-ipv6. (Regression from lynx package and release + target.) Closes: #489484,#480414 + + -- Andreas Metzler Sat, 12 Jul 2008 09:31:43 +0000 + +lynx-cur (2.8.7dev9-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove local.cfg on purge instead of remove. Closes: #474928 + * Revamp handling of debconf managed configuration file local.cfg as + described in debconf-devel(7). + Closes: #474926 + * lynx-cur-wrapper: Simply ship the /etc/lynx-cur/lynx-??.cfg as dpkg + conffiles instead of generating (and removing) them in the + maintainerscripts. Closes: #481778,#481774 + * Add a dummy package lynx, which switches from lynx to lynx-cur. The old + stable codebase (lynx) is dead; upstream suggest using the lynx-cur + releases. + Closes: #369386 + * lynx-cur does not provide lynx anymore. It is not completely necessary + since the dummy package lynx pulls in lynx-cur. The provides broke + upgrades from lynx (installed ok) lynx-cur (deinstall ok config-files). + + -- Andreas Metzler Sat, 05 Jul 2008 10:21:38 +0200 + +lynx-cur (2.8.7dev9-1) unstable; urgency=low + + * New Upstream Release. + * Resurrect "--with-gnutls" option because it doesn't cause any license + problem now. + + -- Atsuhito KOHDA Mon, 5 May 2008 21:33:42 +0900 + +lynx-cur (2.8.7dev8-1) unstable; urgency=low + + * New Upstream Release. + * Fixed Section field of doc-base file. + + -- Atsuhito KOHDA Thu, 13 Mar 2008 00:03:36 +0900 + +lynx-cur (2.8.7dev7-4) unstable; urgency=low + + * Stop linking to gnutls library because its license (GPLv3+) conflicts + with that of lynx itself (GPLv2). (Closes: #468768) + + -- Atsuhito KOHDA Mon, 10 Mar 2008 22:09:36 +0900 + +lynx-cur (2.8.7dev7-3) unstable; urgency=low + + * Changed "exim4-daemon-light | mail-transport-agent" in Build-Depends. + * Fixed wrong changelog entry of 2.8.7dev7-2; removed wrong statement + referring to userdefs.h + + -- Atsuhito KOHDA Thu, 20 Sep 2007 17:58:05 +0900 + +lynx-cur (2.8.7dev7-2) unstable; urgency=low + + * Oops, with pbuilder, there is no bzip2, etc. unless we set them in + Build-Depends. I noticed this with a bug report from Ivan Avramovic + . Thanks Ivan! + For later reference: Added in Build-Depends: zip, unzip, sharutils, + bzip2, ncompress, telnet, openssh-client, exim4-daemon-light + This also should fix sendmail settings. (Closes: #398004, #439070) + + -- Atsuhito KOHDA Fri, 24 Aug 2007 14:10:08 +0900 + +lynx-cur (2.8.7dev7-1) unstable; urgency=low + + * New Upstream Release. (Closes: #428536) + * Follows the new menu hierarchy. + * Fixed lintian warnings (debian-rules-ignores-make-clean-error and + translated-default-field and also removed unnecessary COPYING.asc, + COPYHEADE.asc). + + -- Atsuhito KOHDA Fri, 03 Aug 2007 10:03:48 +0900 + +lynx-cur (2.8.7dev5-1) unstable; urgency=low + + * New Upstream Release. + * Build with pbuilder for the first time. + * Removed patch-2 because upstream's makefile.in was refined. + + -- Atsuhito KOHDA Sat, 19 May 2007 00:06:27 +0900 + +lynx-cur (2.8.7dev4-2) unstable; urgency=low + + * Added translations of debconf templates. (Closes: #418900, #420212) + - nl.po, thanks to "cobaco (aka Bart Cornelis)" + - pt.po, thanks to Miguel Figueiredo and + Traduz - Portuguese Translation Team . + + -- Atsuhito KOHDA Mon, 23 Apr 2007 07:16:20 +0900 + +lynx-cur (2.8.7dev4-1) unstable; urgency=low + + * New Upstream Release. This version fixed the following (Closes: #396949) + * Updated patch-1, patch-2 for this version. + + -- Atsuhito KOHDA Thu, 16 Nov 2006 08:39:02 +0900 + +lynx-cur (2.8.7dev2-1) unstable; urgency=low + + * New Upstream Release. + - modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to + ensure that they are files that are controlled only by the user. The + default values for these allow lynx to read configuration information + from the user's current directory at lynx's startup (Closes: #396949) + * Modified makefile.in slightly in order not scare people. + + -- Atsuhito KOHDA Tue, 7 Nov 2006 14:11:36 +0900 + +lynx-cur (2.8.7dev1-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Fri, 13 Oct 2006 09:48:33 +0900 + +lynx-cur (2.8.6pre5-1) unstable; urgency=low + + * New Upstream Release. + * Updated patch-1 to be appliable for the current lynx.cfg and + about_lynx.html + + -- Atsuhito KOHDA Wed, 4 Oct 2006 13:54:17 +0900 + +lynx-cur (2.8.6pre4-1) unstable; urgency=low + + * New Upstream Release. + * Oops, I forgot to update ca.po in the former package! + I updated certainly this time. Sorry and thanks to Jordà Polo + (Closes: #375969) + * Some bugs fixed already. + - Documented in manpage (Closes: #292393) + - 2006-05-29 (2.8.6dev.18) + * suppress OpenSSL URL from version message if it happens to be built + using GNU TLS -TD (Closes: #336741) + - documented in the lynx_url_support.html file (Closes: #303084) + + -- Atsuhito KOHDA Fri, 22 Sep 2006 11:22:23 +0900 + +lynx-cur (2.8.6pre3-1) unstable; urgency=low + + * New Upstream Release. + - if the side-effect of getfile() is unneeded, we restore the link number + as well as the line number (Closes: #386561) + + -- Atsuhito KOHDA Mon, 11 Sep 2006 20:28:52 +0900 + +lynx-cur (2.8.6pre2-1) unstable; urgency=low + + * New Upstream Release. + - add -stderr option to write error messages when doing a -dump -or -source. + (Closes: #375736) + - ensure the number of "extra" blanks in a line is greater than zero before + attempting to perform text-justification (Closes: #363538) + - fix a sign-extension in alignment case-statement in split_line() + (Closes: #360832, #372670) + * Upstream changed --enable-color-style enabled by default so I followed it. + * Updated translations of debconf templates. Thanks to all. + - fr.po, Philippe Batailler + - cs.po, Miroslav Kure + - ru.po, Yuri Kozlov + - de.po, Jens Nachtigall + - sv.po, Daniel Nylander + - pt_BR.po, Andre Luis Lopes + - vi.po, Clytie Siddall + - es.po, David Martínez Moreno + (Closes: #373615, #373998) + * There was no time to upload 2.8.6dev19 because 2.8.6pre2 was released + so soon. + + -- Atsuhito KOHDA Mon, 4 Sep 2006 11:04:25 +0900 + +lynx-cur (2.8.6dev18-2.1) unstable; urgency=low + + * Fixed rules more systematically. I guess this could fix FTBFS bug. + (Closes: #372075) + + -- Atsuhito KOHDA Tue, 13 Jun 2006 23:48:34 +0900 + +lynx-cur (2.8.6dev18-2) unstable; urgency=low + + * Fixed rules (added -A option to dh_installdirs). Thanks to + Benjamin Seidenberg + I'll fix this more systematically later. (Closes: #372075) + + -- Atsuhito KOHDA Tue, 13 Jun 2006 10:08:10 +0900 + +lynx-cur (2.8.6dev18-1) unstable; urgency=low + + * New upstream release. + * Adapted Elimar Riesebieter packaging. Thanks Elimar Riesebieter + (Closes: #352507) + - Change short description in templates. + - Added debconf-updatepo to the clean target in rules. + - Changed version according to upstream version. + - Don't upgrade via patches anymore. Upstream tarball used. + - Introduced dpatch. + - Bumped Standard version -- no changes needed. + - Reworked rules + - introduced DH_OPTIONS + - Cleaned up + - Reworked bashism in debian/postinst. + - Set compatibility to 4 in debian/compat. + - Corrected fsf adress in copyright. + - patch-2 was included upstream some versions ago, so commented in + patches/00list. + - There should be no more "Unreversed patch detected!" in the buildlogs + anymore. This was because the patches where applied to the diff file. + - Should be (almost) lintian clean now. + + -- Atsuhito KOHDA Sun, 4 Jun 2006 08:22:06 +0900 + +lynx-cur (2.8.6-20) unstable; urgency=low + + * Added "--enable-justify-elts" option and changed "JUSTIFY:TRUE" in lynx.cfg + * Reverted ncursesw again! This fixed broken utf-8 support. + (Closes: #252856, #240069) + + -- Atsuhito KOHDA Thu, 2 Feb 2006 14:39:06 +0900 + +lynx-cur (2.8.6-19) unstable; urgency=low + + * This is of 2.8.6dev.17 + - modify parsing of filename from Content-Disposition so that the name is not + truncated on embedded whitespace. (Closes: #291716) + - fixes to source-view of ftp:// and file:// URLs, i.e., eliminate redundant + PRE's, add DOCTYPE and meta tags (Closes: #347989) + - Upstream author taught us that a bug was fixed as a side-effect of + 2.8.6dev.14 (modify initialization so that "cat options.txt | lynx - " + will allow interactive use). (Closes: #284677) + * Oops, I mistyped dev version of a patch in 2.8.6-18. Fixed. + + -- Atsuhito KOHDA Fri, 27 Jan 2006 08:10:54 +0900 + +lynx-cur (2.8.6-18) unstable; urgency=low + + * This is of 2.8.6dev.16 + - print the contents of image maps, if any, at the end of a dump + (Closes: #335593) + - fix off-by-one line calculation that allowed the last page to be blank + (Closes: #330413) + - strip unneeded " " from translation when building info page using + wide curses (Closes: #342877) + + -- Atsuhito KOHDA Mon, 19 Dec 2005 09:01:05 +0900 + +lynx-cur (2.8.6-17) unstable; urgency=low + + * This is of 2.8.6dev.15 + * Corrected wrong dev number(dev.13 to dev.14) in 2.8.6-16 + + -- Atsuhito KOHDA Mon, 31 Oct 2005 21:07:59 +0900 + +lynx-cur (2.8.6-16) unstable; urgency=low + + * This is of 2.8.6dev.14 (closes: #334423) + - eliminate fixed-size buffers in LYExpandHostForURL() to guard against + buffer overflow resulting from too-long domain prefix/suffix data from + lynx.cfg (report by Ulf Harnhammar, CAN-2005-3120) -TD + * Added Swedish translation for debconf messages. Thanks to Daniel Nylander + (closes: #332360) + + -- Atsuhito KOHDA Tue, 18 Oct 2005 08:27:39 +0900 + +lynx-cur (2.8.6-15) unstable; urgency=low + + * Updated Build-Dependency on libgnutls-dev. + * Fixed Dependency on debconf (with ${misc:Depends}) suggested by + Joey Hess . + + -- Atsuhito KOHDA Wed, 3 Aug 2005 10:05:29 +0900 + +lynx-cur (2.8.6-14) unstable; urgency=low + + * This is of 2.8.6dev.13 + + -- Atsuhito KOHDA Wed, 8 Jun 2005 16:57:54 +0900 + +lynx-cur (2.8.6-13) unstable; urgency=low + + * This is of 2.8.6dev.12 + + -- Atsuhito KOHDA Sun, 5 Jun 2005 08:18:01 +0900 + +lynx-cur (2.8.6-12) unstable; urgency=low + + * Added Vietnamese translation for debconf messages. Thanks to Clytie + Siddall (Closes: #309056) + + -- Atsuhito KOHDA Mon, 16 May 2005 11:28:40 +0900 + +lynx-cur (2.8.6-11) unstable; urgency=low + + * Corrected `head -n 1' instead of `head -1' in postinst. Thanks to + Robert Luberda (Closes: #308845) + + -- Atsuhito KOHDA Fri, 13 May 2005 07:11:36 +0900 + +lynx-cur (2.8.6-10) unstable; urgency=low + + * Added Czech translation of debconf messages. Thanks to Miroslav Kure + (Closes: #308026) + + -- Atsuhito KOHDA Wed, 11 May 2005 11:04:43 +0900 + +lynx-cur (2.8.6-9) unstable; urgency=low + + * This is of 2.8.6dev.11 + * syslog'ing of URLs didn't seem to be an appropriate default setting and + it could be enabled with a setting in lynx.cfg or a command line option + if lynx was compiled with --enable-syslog. So I decided to compile lynx + with --enable-syslog but to set "SYSLOG_REQUESTED_URLS:FALSE" in lynx.cfg + You can enable it with a command line option "syslog-urls=on" or with + editting lynx.cfg appropriately. (Closes: #288480) + + -- Atsuhito KOHDA Thu, 6 Jan 2005 11:10:15 +0900 + +lynx-cur (2.8.6-8) unstable; urgency=low + + * This is of 2.8.6dev.10 + - syslog'ing of URLs was now an option in lynx.cfg or in command line. + (Closes: #282739) + - fixed gap in title from newline. (Closes: #284679) + - fixed can't climb to the root directory. (Closes: #285140) + + -- Atsuhito KOHDA Mon, 3 Jan 2005 11:05:58 +0900 + +lynx-cur (2.8.6-7) unstable; urgency=low + + * Fixed Build-Depends on libncurses5-dev (from wrong libncuresew5-dev). + (Closes: #282699) + * Removed duplicated changelog in 2.8.6-6 + + -- Atsuhito KOHDA Wed, 24 Nov 2004 09:35:06 +0900 + +lynx-cur (2.8.6-6) unstable; urgency=low + + * This is of 2.8.6dev.8 + * Changed --with-screen option from ncursesw to ncurses because there + was a problem with ncursesw and the patches since 2.8.6dev6 + * The followings were fixed with 2.8.6-5 which was not uploaded. + - modify template for temporary-directory name, adding "lynx" prefix + (Closes: #267356) + - add -listonly option and -nonumbers option (Closes: #255571) + - we should check #240069 and #254603 + * Updated de.po Thanks to Jens Nachtigall + (Closes: #276902) + * Fixed lynx-cur.1; removed (misplaced) Japanese characters. + + -- Atsuhito KOHDA Fri, 19 Nov 2004 09:32:29 +0900 + +lynx-cur (2.8.6-5) unstable; urgency=low + + * This is of 2.8.6dev.7 + * Fixed lynx-cur.1; removed (misplaced) Japanese characters. + * Changed options of configure a bit. + - added --enable-forms-options --enable-justify-elts --enable-partial + --enable-read-eta --enable-scrollbar --enable-syslog + + -- Atsuhito KOHDA Mon, 18 Oct 2004 07:46:37 +0900 + +lynx-cur (2.8.6-4) unstable; urgency=low + + * Fixed dependency on libgnutls. (Closes: #264755) + + -- Atsuhito KOHDA Tue, 10 Aug 2004 23:07:01 +0900 + +lynx-cur (2.8.6-3) unstable; urgency=low + + * This is of 2.8.6dev.5 + - lynx accepts multiple URLs on the command line (Closes: #177062) + + -- Atsuhito KOHDA Thu, 1 Jul 2004 10:05:58 +0900 + +lynx-cur (2.8.6-2) unstable; urgency=low + + * This is of 2.8.6dev.4 + - refined Japanes and UTF-8 support with --enable-japanese-utf8 + configure option. + - fixed a problem of unable to reach google. + + -- Atsuhito KOHDA Mon, 24 May 2004 11:21:14 +0900 + +lynx-cur (2.8.6-1) unstable; urgency=low + + * New upstream release. This is of 2.8.6dev.3 + * Added support for utf-8 to lynx-cur-wrapper experimentally. It would + work only with mlterm at present. + - added handling of *.utf-8 in debian/lynx script. + - added code for lynx-utf.cfg in lynx-cur-wrapper.{postinst,postrm} + * Refine update-alternatives for /usr/bin/lynx; used --slave for manual page. + - renamed lynx.1 to lynx.cur.1 in rules. + - lowered the priority because lynx used priority 20 + * Used update-alternatives for www-browser. (Closes: #238803) + - modified lynx-cur{-wrapper}.{postinst,prerm} + * Fixed menu (according to lintian error). + * Removed non-used conffiles, docs. + + -- Atsuhito KOHDA Thu, 10 May 2004 13:22:29 +0900 + +lynx-cur (2.8.5-20) unstable; urgency=low + + * This is of 2.8.5pre5 + * Updated po/da.po of upstream lynx-cur message catalogue. Thanks to Morten + Bo Johansen (Closes: #230633) + + -- Atsuhito KOHDA Wed, 4 Feb 2004 09:47:57 +0900 + +lynx-cur (2.8.5-19) unstable; urgency=low + + * This is of 2.8.5pre4 + * Improved long description a bit more. Thanks to Florent Rougon + + + -- Atsuhito KOHDA Thu, 29 Jan 2004 09:58:08 +0900 + +lynx-cur (2.8.5-18) unstable; urgency=low + + * This is of 2.8.5pre3 + * Improved the long description. (Closes: #229448) + + -- Atsuhito KOHDA Sun, 25 Jan 2004 18:31:44 +0900 + +lynx-cur (2.8.5-17) unstable; urgency=low + + * Added support for nested-tables (experimentally). + * Changed --with-screen option from ncurses to ncursesw. + + -- Atsuhito KOHDA Fri, 23 Jan 2004 11:18:20 +0900 + +lynx-cur (2.8.5-16) unstable; urgency=low + + * This is of 2.8.5pre1 and 2.8.5pre2 + * Updated copyright file. + * Cleaned up documents. Now almost all documents would be in docs + and removed lynx_help/COPYHEADER under /usr/share/doc/lynx-cur + So we modified about_lynx.html correspondingly. + + -- Atsuhito KOHDA Mon, 19 Jan 2004 22:18:34 +0900 + +lynx-cur (2.8.5-15) unstable; urgency=low + + * This is of dev.17 + * po/uk.po refused a patch so modified manually. This was a side-effect + of CVS maintenance and never an original problem ;) + * Added HTTPS support with gnutls, but this was yet experimental. + (Closes: #205438) + + -- Atsuhito KOHDA Mon, 12 Jan 2004 20:12:17 +0900 + +lynx-cur (2.8.5-14) unstable; urgency=low + + * New/updated ru.po, thanks to Ilgiz Kalmetev + (Closes: #214373) + + -- Atsuhito KOHDA Mon, 6 Oct 2003 21:59:37 +0900 + +lynx-cur (2.8.5-13) unstable; urgency=low + + * Added pt_BR.po, thanks to Andre Luis Lopes + (Closes: #197534) + + -- Atsuhito KOHDA Sat, 21 Jun 2003 21:18:53 +0900 + +lynx-cur (2.8.5-12) unstable; urgency=low + + * This is of dev.16 + + -- Atsuhito KOHDA Mon, 2 Jun 2003 15:01:43 +0900 + +lynx-cur (2.8.5-11) unstable; urgency=low + + * Oops, I forgot to update! This is of dev.15 + * Fixed fr.po (Closes: #190256) + + -- Atsuhito KOHDA Thu, 29 May 2003 16:25:53 +0900 + +lynx-cur (2.8.5-10) unstable; urgency=low + + * Removed ssl support because the licenses don't permit lynx with ssl. + (Closes: #187972) + + -- Atsuhito KOHDA Mon, 7 Apr 2003 21:00:53 +0900 + +lynx-cur (2.8.5-9) unstable; urgency=low + + * Updated fr.po, thanks to Philippe Batailler + (Closes: #186369) + * Now supported ssl. I suspected Replaces: lynx, lynx-ssl seemed too strong + so removed it now. (Closes: #186872) + * Fixed Build-Depends on debhelper with the correct version. + + -- Atsuhito KOHDA Mon, 7 Apr 2003 13:46:40 +0900 + +lynx-cur (2.8.5-8) unstable; urgency=low + + * Replaced templates.fr with the correct one, I hope. Thanks to + Denis Barbier (Closes: #183058) + * Changed default URL to www.debian.org + * Fixed config to avoid infinite loops. Thanks to Robert Luberda + (Closes: #183096) + + -- Atsuhito KOHDA Mon, 3 Mar 2003 07:28:43 +0900 + +lynx-cur (2.8.5-7) unstable; urgency=low + + * This is of dev.14 + + -- Atsuhito KOHDA Thu, 6 Feb 2003 08:16:00 +0900 + +lynx-cur (2.8.5-6) unstable; urgency=low + + * This is of dev.13 + + -- Atsuhito KOHDA Fri, 24 Jan 2003 10:30:16 +0900 + +lynx-cur (2.8.5-5) unstable; urgency=low + + * Moved lynx-cur-wrapper stuffs to binary-indep in rules. (Closes: #174372) + + -- Atsuhito KOHDA Fri, 27 Dec 2002 12:23:23 +0900 + +lynx-cur (2.8.5-4) unstable; urgency=low + + * This is of dev.12 and this fixed memory leak problem! + + -- Atsuhito KOHDA Thu, 19 Dec 2002 11:39:42 +0900 + +lynx-cur (2.8.5-3.5) unstable; urgency=low + + * This is of dev.11 (dev.10 was skipped in upstream) + + -- Atsuhito KOHDA Mon, 2 Dec 2002 17:01:52 +0900 + +lynx-cur (2.8.5-3.4) unstable; urgency=low + + * Fixed prerm so that "update-alternatives --remove" would not be called + at upgrade. + * Modified patch-1 according to modification of lynx.cfg with dev.9 patch. + + -- Atsuhito KOHDA Mon, 7 Oct 2002 12:58:42 +0900 + +lynx-cur (2.8.5-3.3) unstable; urgency=low + + * This is of dev.9 + + -- Atsuhito KOHDA Mon, 7 Oct 2002 10:24:12 +0900 + +lynx-cur (2.8.5-3.2) unstable; urgency=low + + * Fixed lintian warning; mv etc_lynx.cfg stuffs from postinst to config. + + -- Atsuhito KOHDA Tue, 24 Sep 2002 12:08:09 +0900 + +lynx-cur (2.8.5-3.1) unstable; urgency=low + + * Added support of gnome-terminal and jfbterm in lynx-cur-wrapper. + + -- Atsuhito KOHDA Tue, 13 Aug 2002 13:22:53 +0900 + +lynx-cur (2.8.5-3) unstable; urgency=low + + * Added new french translation of templates contributed by Philippe + Batailler (closes: #151720) + + -- Atsuhito KOHDA Sat, 6 Jul 2002 21:09:04 +0900 + +lynx-cur (2.8.5-2.6) unstable; urgency=low + + * This is of dev.8 and the patches of Hataguchi Takeshi was included + in dev.8 patch so we didn't apply patch-2 anymore. + * I reverted config.{guess,sub} to those of dev.8 because they were + updated and I believed this would not cause trouble with mips. + + -- Atsuhito KOHDA Sun, 2 Jun 2002 08:56:40 +0900 + +lynx-cur (2.8.5-2.5) unstable; urgency=low + + * Added catalan translation of templates contributed by Antoni Bella + (closes: #139735) + * Applied the patch of Hataguchi Takeshi + for hilighting problem found in lynx-dev (Sat, 9 Mar 2002); patch-2. + + -- Atsuhito KOHDA Tue, 26 Mar 2002 13:39:57 +0900 + +lynx-cur (2.8.5-2.4) unstable; urgency=low + + * Added --enable-default-colors to configure options. Thanks to + MATSUDA Yoh-ichi for reporting this. + * Applied the patch of Hataguchi Takeshi + for hilighting problem found in lynx-dev (Thu, 7 Feb 2002); patch-2. + + -- Atsuhito KOHDA Mon, 18 Feb 2002 17:03:58 +0900 + +lynx-cur (2.8.5-2.3) unstable; urgency=low + + * Replaced config.guess with that of autotools-dev so that lynx-cur + can be built in mips. (closes: #131056) + + -- Atsuhito KOHDA Sun, 27 Jan 2002 09:45:03 +0900 + +lynx-cur (2.8.5-2.2) unstable; urgency=low + + * This is of dev.7 + + -- Atsuhito KOHDA Tue, 8 Jan 2002 07:29:52 +0900 + +lynx-cur (2.8.5-2.1) unstable; urgency=low + + * This is of dev.6 + + -- Atsuhito KOHDA Wed, 2 Jan 2002 19:15:54 +0900 + +lynx-cur (2.8.5-2) unstable; urgency=low + + * This is of dev.5 + + -- Atsuhito KOHDA Tue, 20 Nov 2001 09:56:31 +0900 + +lynx-cur (2.8.5-1.9) unstable; urgency=low + + * This is of dev.4 + * Used ncurses instead of slang. This enables us to reduce a script lynx + substantially because we need not to fiddle with TERM any more. + * Added lynx-cur.1 to fix lintian error. + * Modified debian/config so that dpkg-reconfigure would work. + + -- Atsuhito KOHDA Fri, 9 Nov 2001 10:02:46 +0900 + +lynx-cur (2.8.5-1.7) unstable; urgency=low + + * Fixed lynx_help/about_lynx.html because we did not install "COPYING". + * Supported building with debugging information through the environment + variable `DEB_BUILD_OPTIONS' + * Also rewrote rules a bit substantially. + * Updated Standards-Version: 3.5.1 + + -- Atsuhito KOHDA Wed, 10 Oct 2001 10:35:58 +0900 + +lynx-cur (2.8.5-1.4) unstable; urgency=low + + * This is of dev.3 + * Fixed Priority (optional to extra). Conflict with lynx perhaps forced + this, I guessed. + * Closed bug really this time. (closes: #114387) + + -- Atsuhito KOHDA Sat, 6 Oct 2001 08:15:41 +0900 + +lynx-cur (2.8.5-1.3) unstable; urgency=low + + * Versioned up because of the former failure. + + -- Atsuhito KOHDA Fri, 5 Oct 2001 14:37:45 +0900 + +lynx-cur (2.8.5-1.2) unstable; urgency=low + + * Added russian translation of templates contributed by ilgiz kalmetev + (closes: #114387) + * Moved local.cfg.in from /etc/lynx-cur/ to doc/lynx-cur + * Added External application support to lynx.cfg, now you can see Tables + with w3m, for example, from lynx. + * Fixed lintian errors, updated Standards-Version: 3.2.1 and changed + debconf (>=0.5.00) in Depends field. + + -- Atsuhito KOHDA Thu, 4 Oct 2001 13:43:11 +0900 + +lynx-cur (2.8.5-1.1) unstable; urgency=low + + * This is of dev.2 + + -- Atsuhito KOHDA Thu, 16 Aug 2001 09:43:45 +0900 + +lynx-cur (2.8.5-1) unstable; urgency=low + + * New Upstream Release. This is of 2.8.5dev.1 and same as 2.8.4rel.1a + + -- Atsuhito KOHDA Wed, 25 Jul 2001 10:58:03 +0900 + +lynx-cur (2.8.4-4) unstable; urgency=low + + * This is of rel.1, that is, this is Lynx v2.8.4 release. + + -- Atsuhito KOHDA Thu, 19 Jul 2001 09:57:03 +0900 + +lynx-cur (2.8.4-3.8) unstable; urgency=low + + * This is of pre.5 + * Fixed typos in this file (pre.3 -> pre.4 in 3.7, filed -> field in 3.5). + + -- Atsuhito KOHDA Mon, 16 Jul 2001 09:03:05 +0900 + +lynx-cur (2.8.4-3.7) unstable; urgency=low + + * This is of pre.4 + * Modified patch-1 to eliminate warnings after pre.3 (Debian specific). + + -- Atsuhito KOHDA Wed, 11 Jul 2001 07:38:57 +0900 + +lynx-cur (2.8.4-3.6) unstable; urgency=low + + * This is of pre.3 + + -- Atsuhito KOHDA Tue, 10 Jul 2001 09:23:57 +0900 + +lynx-cur (2.8.4-3.5) unstable; urgency=low + + * This is of pre.2 + * Added gettext to Build-Depends: field. (closes: #100366) + + -- Atsuhito KOHDA Mon, 11 Jun 2001 14:46:22 +0900 + +lynx-cur (2.8.4-3.4) unstable; urgency=low + + * This is of dev.21 + pre.1 + + -- Atsuhito KOHDA Mon, 4 Jun 2001 07:39:27 +0900 + +lynx-cur (2.8.4-3.3) unstable; urgency=low + + * Added german translation of templates contributed by + . (closes: #94130) + * Changed deprecated 'isdefault' to 'seen' in debconf config. This is + borrowed from lynx, thanks Matthew Danish . + * Updated ja.po of http://www2.iro.umontreal.ca/~pinard/po/ (closes: #99091) + + -- Atsuhito KOHDA Thu, 19 Apr 2001 10:03:03 +0900 + +lynx-cur (2.8.4-3.2) unstable; urgency=low + + * This is of dev.20 and this version wouldn't need curses lib any more. + (closes: #88089) + * Adopted spanish translation of templates contributed by + Carlos Valdivia Yage . (closes: #92374) + * Refined handling of local.cfg a bit. + + -- Atsuhito KOHDA Mon, 2 Apr 2001 10:26:31 +0900 + +lynx-cur (2.8.4-3.1) unstable; urgency=low + + * This is of dev.19 + + -- Atsuhito KOHDA Tue, 27 Feb 2001 13:20:04 +0900 + +lynx-cur (2.8.4-3) unstable; urgency=low + + * Official Debian Release. (closes: #85798) + * Standards-Version: 3.1.1, at least. + + -- Atsuhito KOHDA Fri, 16 Feb 2001 16:41:56 +0900 + +lynx-cur (2.8.4-2.11) unstable; urgency=low + + * This is of dev.18 and aims to merge Debian. + * Separates wrapper part to lynx-cur-wrapper. + + -- Atsuhito KOHDA Mon, 12 Feb 2001 14:32:33 +0900 + +lynx-cur (2.8.4-2.9) unstable; urgency=low + + * This is of dev.16 and ja.po was included in original distribution now. + * Added docs/README.ssl + + -- Atsuhito KOHDA Wed, 3 Jan 2001 09:21:56 +0900 + +lynx-cur (2.8.4-2.8) unstable; urgency=low + + * This is of dev.15 and we used lynx2.8.4dev.15.tar.bz2 instead of patch. + * Updated ja.po of PO-Revision-Date: 2000-10-11 09:47+09:00 + + -- Atsuhito KOHDA Sat, 23 Dec 2000 10:03:22 +0900 + +lynx-cur (2.8.4-2.7) unstable; urgency=low + + * This is of dev.14. + + -- Atsuhito Kohda Sat, 4 Nov 2000 09:19:05 +0900 + +lynx-cur (2.8.4-2.6) unstable; urgency=low + + * This is of dev.13. + + -- Atsuhito Kohda Thu, 26 Oct 2000 07:56:58 +0900 + +lynx-cur (2.8.4-2.5) unstable; urgency=low + + * This is of dev.11. + + -- Atsuhito Kohda Thu, 19 Oct 2000 11:17:38 +0900 + +lynx-cur (2.8.4-2.4) unstable; urgency=low + + * This is of dev.10. + + -- Atsuhito Kohda Fri, 22 Sep 2000 13:46:58 +0900 + +lynx-cur (2.8.4-2.3) unstable; urgency=low + + * This is of dev.9. This fixes serious damage of dev.8. + + -- Atsuhito Kohda Sat, 2 Sep 2000 08:59:18 +0900 + +lynx-cur (2.8.4-2.2) unstable; urgency=low + + * This is of dev.8 and refined version of multibyte character patch for + status line by Takeshi Hataguchi is merged now. + + -- Atsuhito Kohda Fri, 25 Aug 2000 16:41:15 +0900 + +lynx-cur (2.8.4-2.1) unstable; urgency=low + + * Apply refined version of multibyte character patch for status line by + Takeshi Hataguchi + + -- Atsuhito Kohda Tue, 8 Aug 2000 11:36:23 +0900 + +lynx-cur (2.8.4-2) unstable; urgency=low + + * This is of dev.7 and multibyte character patch for status line by + Takeshi Hataguchi is merged now. + + -- Atsuhito Kohda Fri, 4 Aug 2000 07:24:05 +0900 + +lynx-cur (2.8.4-1.9) unstable; urgency=low + + * This is of dev.6 + + -- Atsuhito Kohda Tue, 18 Jul 2000 14:49:44 +0900 + +lynx-cur (2.8.4-1.8) unstable; urgency=low + + * Apply multibyte character patch for status line by Takeshi Hataguchi + + + -- Atsuhito Kohda Sun, 9 Jul 2000 07:55:50 +0900 + +lynx-cur (2.8.4-1.7) unstable; urgency=low + + * Add --without-included-gettext to configure option. + * Refine post{inst,rm} and preinst. + + -- Atsuhito Kohda Thu, 29 Jun 2000 11:27:42 +0900 + +lynx-cur (2.8.4-1.6) unstable; urgency=low + + * Add settings for da.po in lynx script, postinst etc. which I forgot + by mistake. + + -- Atsuhito Kohda Tue, 27 Jun 2000 07:38:51 +0900 + +lynx-cur (2.8.4-1.5) unstable; urgency=low + + * This is of dev.4 + + -- Atsuhito Kohda Sun, 25 Jun 2000 09:14:19 +0900 + +lynx-cur (2.8.4-1.4) unstable; urgency=low + + * Fix patch-1 so that warnings disappear in dev.3 + * Updated ru.po and added da.po + + -- Atsuhito Kohda Thu, 8 Jun 2000 09:38:54 +0900 + +lynx-cur (2.8.4-1.3) unstable; urgency=low + + * This is of dev.3 + * Disabled PREPEND_BASE_TO_SOURCE in default lynx.cfg as lynx of Debian + which I forgot in 1.1 (sorry). + * Updated ja.po ("PO-Revision-Date: 2000-05-29 09:47+09:00\n") which was + downloaded from; + http://www.iro.umontreal.ca/contrib/po/trans/ja/lynx-2.8.3.rel1.ja.po + + -- Atsuhito Kohda Tue, 23 May 2000 08:39:39 +0900 + +lynx-cur (2.8.4-1.2) unstable; urgency=low + + * Updated ja.po ("PO-Revision-Date: 2000-05-19 21:43+0900\n") + + -- Atsuhito Kohda Sun, 21 May 2000 08:38:15 +0900 + +lynx-cur (2.8.4-1.1) unstable; urgency=low + + * Refine lynx script according to the suggestions of Klaus Weide + and also of Kenshi Muto + and of "Ken N." . Thanks all. + * Use INCLUDE so that sizes of lynx-*.cfg etc. reduce according to the + suggestions of Klaus Weide . + * Remove --enable-charset-choice from configure option, this is also + suggested by Klaus Weide . + * Replace ja.po with that of Masayuki Hatta . + Thanks Masayuki Hatta. + * Add configure options used in lynx of Debian. + * Disabled PREPEND_BASE_TO_SOURCE in default lynx.cfg as lynx of Debian. + * Add '-rm -f intl/libintl.h' to rules unless 2nd time debuild fails. + * Replace cs, de, fr, nl, pt_BR, ru, sl po files with lynx 2.8.3 + + -- Atsuhito Kohda Thu, 18 May 2000 11:19:36 +0900 + +lynx-cur (2.8.4-1) unstable; urgency=low + + * New Upstream Release. This is of dev.1 + * Refine lynx script and post{inst, rm} so that they can be used both + lynx-ja and lynx-cur with little modification. + + -- Atsuhito Kohda Sat, 6 May 2000 09:31:50 +0900 + +lynx-cur (2.8.3-3.4) unstable; urgency=low + + * This is of rel.1 + + -- Atsuhito Kohda Mon, 24 Apr 2000 08:48:57 +0900 + +lynx-cur (2.8.3-3.3) unstable; urgency=low + + * This is of pre.7 + * Delete SITE_DEFS="-DSUPPORT_MULTIBYTE_EDIT" from rules. This is not + necessary any more. + + -- Atsuhito Kohda Fri, 21 Apr 2000 11:55:31 +0900 + +lynx-cur (2.8.3-3.2) unstable; urgency=low + + * This is of pre.6 and the patch of Hataguchi Takeshi + seems included. + + -- Atsuhito Kohda Wed, 19 Apr 2000 10:45:16 +0900 + +lynx-cur (2.8.3-3.1) unstable; urgency=low + + * This is of pre.5 + * Fix HELPFILE in lynx.cfg which is duplicated by mistake. + + -- Atsuhito Kohda Sat, 15 Apr 2000 10:02:42 +0900 + +lynx-cur (2.8.3-3) unstable; urgency=low + + * This is of pre.4 + + -- Atsuhito Kohda Wed, 12 Apr 2000 11:09:40 +0900 + +lynx-cur (2.8.3-2.10) unstable; urgency=low + + * This is of pre.3 + * Apply the patch of Hataguchi Takeshi + + -- Atsuhito Kohda Mon, 10 Apr 2000 07:44:41 +0900 + +lynx-cur (2.8.3-2.9) unstable; urgency=low + + * This is of pre.2 + + -- Atsuhito Kohda Tue, 4 Apr 2000 09:16:00 +0900 + +lynx-cur (2.8.3-2.8) unstable; urgency=low + + * Add README.jp which was forgotten by accident. + + -- Atsuhito Kohda Mon, 3 Apr 2000 07:18:25 +0900 + +lynx-cur (2.8.3-2.7) unstable; urgency=low + + * This is of pre.1 + + -- Atsuhito Kohda Sun, 2 Apr 2000 15:19:02 +0900 + +lynx-cur (2.8.3-2.6) unstable; urgency=low + + * This is of dev.23 + + -- Atsuhito Kohda Thu, 30 Mar 2000 17:39:14 +0900 + +lynx-cur (2.8.3-2.5) unstable; urgency=low + + * This is of dev.22 + + -- Atsuhito Kohda Tue, 14 Mar 2000 12:47:13 +0900 + +lynx-cur (2.8.3-2.4) unstable; urgency=low + + * This is of dev.21 + * Remove --enable-kanji following CHANGES. + + -- Atsuhito Kohda Wed, 1 Mar 2000 10:09:04 +0900 + +lynx-cur (2.8.3-2.3) frozen-jp unstable-jp; urgency=low + + * This is of dev.20; this version seems to improve handling of Japanese text + so into frozen-jp too but might be final for frozen-jp. + * Add "--enable-charset-choice --enable-kanji --enable-cjk" to configure. + + -- Atsuhito Kohda Fri, 25 Feb 2000 08:08:19 +0900 + +lynx-cur (2.8.3-2.2) frozen-jp unstable-jp; urgency=low + + * Add frozen-jp because this is BUG fix version of 2.8.3-1.9 which + is in frozen-jp. + * Change template of debconf a bit so that it will show an important + note on /etc/lynx.cnf to a user. + + -- Atsuhito Kohda Sat, 19 Feb 2000 08:59:46 +0900 + +lynx-cur (2.8.3-2.1) unstable; urgency=low + + * Fix configure option for new location of lynx.cfg (with --libdir). + + -- Atsuhito Kohda Tue, 1 Feb 2000 07:42:20 +0900 + +lynx-cur (2.8.3-2) unstable; urgency=low + + * Add debconf support. + * Move lynx-*.cfg and lynx.cfg* into /etc/lynx-cur directory. + (close Bug#JP/1137) + + -- Atsuhito Kohda Wed, 26 Jan 2000 08:22:58 +0900 + +lynx-cur (2.8.3-1.9) unstable; urgency=low + + * This is of dev.18 + * Update to Standards-Version: 3.0.0 + + -- Atsuhito Kohda Tue, 11 Jan 2000 16:35:55 +0900 + +lynx-cur (2.8.3-1.8) unstable; urgency=low + + * This is of dev.17 and lynx.cfg changed much so we change postinst + to reduce lynx-*.cfg and lynx.cfg.* + + -- Atsuhito Kohda Thu, 16 Dec 1999 15:31:30 +0900 + +lynx-cur (2.8.3-1.7) unstable; urgency=low + + * This is of dev.16 + + -- Atsuhito Kohda Sat, 11 Dec 1999 08:36:49 +0900 + +lynx-cur (2.8.3-1.6) unstable; urgency=low + + * This is of dev.15 and for unstable not for experimental as former one. + * Fix wrong lynx.cfg.blck because COLOR settings of original lynx.cfg of + 2.8.3 is quite different from that of 2.8.2 + * Delete --enable-default-colors configure option again. + + -- Atsuhito Kohda Thu, 18 Nov 1999 15:26:39 +0900 + +lynx-cur (2.8.3-1.5) experimental; urgency=low + + * This is of dev.14 + + -- Atsuhito Kohda Sun, 7 Nov 1999 09:09:45 +0900 + +lynx-cur (2.8.3-1.4) experimental; urgency=low + + * This is of dev.13 + + -- Atsuhito Kohda Fri, 29 Oct 1999 14:58:27 +0900 + +lynx-cur (2.8.3-1.3) experimental; urgency=low + + * This is of dev.12 + + -- Atsuhito Kohda Fri, 15 Oct 1999 08:19:06 +0900 + +lynx-cur (2.8.3-1.2.9) experimental; urgency=low + + * This is of dev.10 + * Change dhelp to doc-base + * Remove COPYING and CHANGES from doc/lynx-cur/ + and correspondingly change lynx_help/about_lynx.html + * Replace fr.po with that of 2.8.2 + + -- Atsuhito Kohda Mon, 4 Oct 1999 12:20:08 +0900 + +lynx-cur (2.8.3-1.2.8) experimental; urgency=low + + * This is of dev.9 + * Fix wrong HELPFILE entry of lynx.cfg for gzip-help. + + -- Atsuhito Kohda Wed, 15 Sep 1999 10:45:32 +0900 + +lynx-cur (2.8.3-1.2.7) experimental; urgency=low + + * This is of dev.8 + + -- Atsuhito Kohda Sun, 29 Aug 1999 08:17:44 +0900 + +lynx-cur (2.8.3-1.2.6) experimental; urgency=low + + * This is of dev.6 + + -- Atsuhito Kohda Sun, 15 Aug 1999 13:10:58 +0900 + +lynx-cur (2.8.3-1.2.5) experimental; urgency=low + + * Change wrong unstable to experimental. + + -- Atsuhito Kohda Mon, 2 Aug 1999 08:08:18 +0900 + +lynx-cur (2.8.3-1.2.4) unstable; urgency=low + + * Fix script lynx for TERM of krxvt entry. + + -- Atsuhito Kohda Sun, 1 Aug 1999 09:27:29 +0900 + +lynx-cur (2.8.3-1.2.3) experimental; urgency=low + + * This is of dev.5 + * Use slang again and add -DSUPPORT_MULTIBYTE_EDIT to option of make + + -- Atsuhito Kohda Sat, 31 Jul 1999 09:13:23 +0900 + +lynx-cur (2.8.3-1.2.2) experimental; urgency=low + + * Use slang-ja instead of slang + * Move /usr/doc/lynx-cur to /usr/share/doc/lynx-cur as per the FHS + also /usr/man to /usr/share/man + * Remove duplicated update-menu and update-mime from post{inst,rm} because + dh_installmenu and dh_installmime created them. + * Add dhelp support + * Remove "unset TERMCAP" and "export COLORTERM=kterm" from kterm entry in + script lynx. + * Add lynx.cfg.dflt for default color and use option --enable-default-colors. + * Add include directive for private alternation of options. + + -- Atsuhito Kohda Fri, 16 Jul 1999 13:10:38 +0900 + +lynx-cur (2.8.3-1.2) experimental; urgency=low + + * This is of dev.4 + * Add support of spanish, portguese and swedish but experimental. + * Refine script lynx a bit. + * Change de.po from original to http://www.slcc.edu/lynx/po/de.po + + -- Atsuhito Kohda Wed, 14 Jul 1999 16:47:48 +1000 + +lynx-cur (2.8.3-1.1) experimental; urgency=low + + * Modify script lynx slightly + + -- Atsuhito Kohda Thu, 8 Jul 1999 07:45:46 +1000 + +lynx-cur (2.8.3-1) experimental; urgency=low + + * Initial Release. This is of dev.3 + + -- Atsuhito Kohda Wed, 23 Jun 1999 11:35:02 +1000 + +Local variables: +mode: debian-changelog +End: --- lynx-cur-2.8.8dev.9.orig/debian/compat +++ lynx-cur-2.8.8dev.9/debian/compat @@ -0,0 +1 @@ +7 --- lynx-cur-2.8.8dev.9.orig/debian/control +++ lynx-cur-2.8.8dev.9/debian/control @@ -0,0 +1,37 @@ +Source: lynx-cur +Section: web +Priority: extra +Maintainer: Atsuhito KOHDA +Homepage: http://lynx.isc.org/ +Build-Depends: debhelper (>= 7), dpatch, libncursesw5-dev, zlib1g-dev, gettext, libgnutls-dev, sharutils, telnet, openssh-client, libbsd-dev, libidn11-dev +Standards-Version: 3.8.2 + +Package: lynx-cur +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: www-browser, news-reader +Conflicts: lynx (<< 2.8.7dev9-1.1), lynx-ssl, lynx-cur-wrapper (<< 2.8.8dev.8-2) +Recommends: mime-support +Description: Text-mode WWW Browser with NLS support (development version) + Lynx is a fully-featured World Wide Web (WWW) client for users running + cursor-addressable, character-cell display devices. + It is very fast and easy to use. It will display HTML documents + containing links to files residing on the local system, + as well as files residing on remote systems running Gopher, HTTP, FTP, + WAIS, and NNTP servers. + . + This package contains a development version of lynx. + +Package: lynx-cur-wrapper +Architecture: all +Depends: lynx-cur (>= ${source:Version}), ${misc:Depends} +Description: Wrapper for lynx-cur (transitional package) + This is a transitional package and can safely be removed; see the + lynx-cur package instead. + +Package: lynx +Architecture: all +Depends: lynx-cur (>= ${source:Version}), ${misc:Depends} +Description: Text-mode WWW Browser (transitional package) + This is a transitional package and can safely be removed; see the + lynx-cur package instead. --- lynx-cur-2.8.8dev.9.orig/debian/copyright +++ lynx-cur-2.8.8dev.9/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Atsuhito KOHDA on +Wed, 7 Jul 1999 07:29:50 +0900. + +It was downloaded from + +Upstream Author: lynx-dev + +Copyright: + +== from COPYHEADER == + +/* Copyright (C) 1995 University of Kansas. + + This file is part of Lynx, a text-based WWW browser. + + Lynx is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + Lynx is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Any licensing or usage questions should be directed to Michael + Grobe . +*/ + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in the `/usr/share/common-licenses' directory. --- lynx-cur-2.8.8dev.9.orig/debian/dirs +++ lynx-cur-2.8.8dev.9/debian/dirs @@ -0,0 +1 @@ +usr/bin --- lynx-cur-2.8.8dev.9.orig/debian/doc-base +++ lynx-cur-2.8.8dev.9/debian/doc-base @@ -0,0 +1,10 @@ +Document: lynx-cur +Title: Debian Lynx Manual +Author: Michael Grobe et al. +Abstract: This manual describes what lynx-cur is + and how it can be used on Debian systems. +Section: Network/Web Browsing + +Format: HTML +Index: /usr/share/doc/lynx-cur/lynx_help/lynx_help_main.html.gz +Files: /usr/share/doc/lynx-cur/lynx_help/*.html.gz --- lynx-cur-2.8.8dev.9.orig/debian/local.cfg +++ lynx-cur-2.8.8dev.9/debian/local.cfg @@ -0,0 +1,2 @@ +STARTFILE:http://www.debian.org/ +#NNTPSERVER:news.server.dom --- lynx-cur-2.8.8dev.9.orig/debian/lynx-cur-wrapper.preinst +++ lynx-cur-2.8.8dev.9/debian/lynx-cur-wrapper.preinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" 'lt-nl' '2.8.8dev.8-2' ; then + update-alternatives --remove lynx /usr/bin/lynx-cur + update-alternatives --remove www-browser /usr/bin/lynx-cur + fi + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.9.orig/debian/lynx.preinst +++ lynx-cur-2.8.8dev.9/debian/lynx.preinst @@ -0,0 +1,48 @@ +#!/bin/sh + +set -e + +# Inspired by +# http://wiki.debian.org/DpkgConffileHandling +# Remove a no-longer used conffile +rm_or_moveconffile() { + PKGNAME="$1" + CONFFILE="$2" + NEWDIR="$3" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + test -e "$NEWDIR" || mkdir -m 755 -p "$NEWDIR" + echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2 + if [ -e "$NEWDIR/`basename $CONFFILE`" ]; then + echo "replacement conffile $NEWDIR/`basename $CONFFILE` already exists." 1>&2 + echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2 + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Moving conffile $CONFFILE to new location $NEWDIR" 1>&2 + mv -f "$CONFFILE" "$NEWDIR/" + fi + else + echo "Removing obsolete conffile $CONFFILE ..." 1>&2 + rm -f "$CONFFILE" + fi + fi +} + + + +case "$1" in + install|upgrade) + # Upgrading from a a real, non-dummy lynx package. + if dpkg --compare-versions "$2" 'lt-nl' '2.8.7dev9-1.1' ; then + update-alternatives --quiet --remove www-browser /usr/bin/lynx + update-alternatives --quiet --remove lynx /usr/bin/lynx.stable + rm_or_moveconffile lynx /etc/lynx.cfg /etc/lynx-cur + rm_or_moveconffile lynx /etc/lynx.lss /etc/lynx-cur + fi + ;; + *) +esac + +#DEBHELPER# --- lynx-cur-2.8.8dev.9.orig/debian/lynx2.8.8dev.6a.patch +++ lynx-cur-2.8.8dev.9/debian/lynx2.8.8dev.6a.patch @@ -0,0 +1,908 @@ +# patch by Thomas E. Dickey +# created Mon Nov 1 23:11:54 UTC 2010 +# ------------------------------------------------------------------------------ +# CHANGES | 9 +++- +# PACKAGE/debian/changelog | 6 ++ +# PACKAGE/lynx.spec | 4 - +# WWW/Library/Implementation/HTAABrow.h | 43 ++++++++++---------- +# WWW/Library/Implementation/HTAAUtil.h | 5 +- +# WWW/Library/Implementation/HTFTP.c | 4 - +# WWW/Library/Implementation/HTFile.c | 5 +- +# WWW/Library/Implementation/HTFormat.h | 8 ++- +# WWW/Library/Implementation/HTNews.c | 3 - +# WWW/Library/Implementation/HTTCP.c | 5 -- +# WWW/Library/Implementation/HTUtils.h | 10 ++-- +# WWW/Library/Implementation/HTVMS_WaisUI.c | 6 +- +# WWW/Library/Implementation/LYexit.h | 22 +++++++--- +# WWW/Library/Implementation/tidy_tls.h | 5 +- +# WWW/Library/Implementation/www_tcp.h | 9 ++-- +# lib/dirent.c | 27 +++++------- +# lib/dirent.h | 59 +++++++++++++--------------- +# src/HTML.c | 6 +- +# src/LYCurses.c | 10 +--- +# src/LYCurses.h | 4 - +# src/LYForms.c | 4 - +# src/LYLocal.c | 11 ++--- +# src/LYPrettySrc.c | 5 +- +# src/LYSession.c | 9 ++-- +# src/LYUtils.c | 10 ++-- +# src/TRSTable.c | 5 +- +# src/UCAuto.c | 4 - +# src/UCdomap.c | 4 - +# src/parsdate.h | 4 - +# 29 files changed, 164 insertions(+), 142 deletions(-) +# ------------------------------------------------------------------------------ +Index: CHANGES +--- lynx2.8.8dev.6+/CHANGES 2010-10-04 08:19:06.000000000 +0000 ++++ lynx2.8.8dev.6a/CHANGES 2010-11-01 21:30:42.000000000 +0000 +@@ -1,8 +1,15 @@ +--- $LynxId: CHANGES,v 1.508 2010/10/04 08:19:06 tom Exp $ ++-- $LynxId: CHANGES,v 1.511 2010/11/01 21:30:42 tom Exp $ + =============================================================================== + Changes since Lynx 2.8 release + =============================================================================== + ++2010-11-01 (2.8.8dev.7) ++* restore \r to \n conversion in HTML_put_character(), broken in gcc warning ++ cleanup (report by FLWM) -TD ++* fix a double-free in make_argv() (report by FLWM) -TD ++* add a memset in RestoreSession(), fixes uninitialized memory reference for ++ the VLINK section -PBM ++ + 2010-10-04 (2.8.8dev.6) + * amend change for Debian #514897 to exclude XML documents (Debian #592883) -TD + * use HTParsePort() in a few places, e.g., HTFinger.c, to allow for IPv6 +Index: PACKAGE/debian/changelog +--- lynx2.8.8dev.6+/PACKAGE/debian/changelog 2010-09-19 16:22:57.000000000 +0000 ++++ lynx2.8.8dev.6a/PACKAGE/debian/changelog 2010-11-01 21:32:09.000000000 +0000 +@@ -1,3 +1,9 @@ ++lynx-dev (2.8.8dev.7) unstable; urgency=low ++ ++ * changes for dev.7 ++ ++ -- Thomas E. Dickey Mon, 01 Nov 2010 17:32:06 -0400 ++ + lynx-dev (2.8.8dev.6) unstable; urgency=low + + * add build-script for testing, adapted from Debian lynx-cur package. +Index: PACKAGE/lynx.spec +--- lynx2.8.8dev.6+/PACKAGE/lynx.spec 2010-09-21 23:18:23.000000000 +0000 ++++ lynx2.8.8dev.6a/PACKAGE/lynx.spec 2010-11-01 21:31:25.000000000 +0000 +@@ -1,8 +1,8 @@ +-# $LynxId: lynx.spec,v 1.6 2010/09/21 23:18:23 tom Exp $ ++# $LynxId: lynx.spec,v 1.7 2010/11/01 21:31:25 tom Exp $ + Summary: A text-based Web browser + Name: lynx + Version: 2.8.8 +-Release: dev.6 ++Release: dev.7 + License: GPLv2 + Group: Applications/Internet + Source: lynx%{version}%{release}.tgz +Index: WWW/Library/Implementation/HTAABrow.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTAABrow.h 2010-09-25 11:42:32.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTAABrow.h 2010-10-27 00:13:53.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTAABrow.h,v 1.15 2010/09/25 11:42:32 tom Exp $ ++ * $LynxId: HTAABrow.h,v 1.16 2010/10/27 00:13:53 tom Exp $ + * + * BROWSER SIDE ACCESS AUTHORIZATION MODULE + +@@ -40,8 +40,7 @@ + extern "C" { + #endif + /* +- +-Routines for Browser Side Recording of AA Info ++ Routines for Browser Side Recording of AA Info + + Most of the browser-side AA is done by the following two functions (which are called + from file HTTP.c so the browsers using libwww only need to be linked with the new +@@ -55,24 +54,26 @@ + HTAA_shouldRetryWithAuth() determines whether to retry the request with AA or with a + new AA (in case username or password was misspelled). + +- *//* PUBLIC HTAA_composeAuth() +- * +- * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE +- * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION +- * +- * ON ENTRY: +- * hostname is the hostname of the server. +- * portnumber is the portnumber in which the server runs. +- * docname is the pathname of the document (as in URL) +- * +- * ON EXIT: +- * returns NULL, if no authorization seems to be needed, or +- * if it is the entire Authorization: line, e.g. +- * +- * "Authorization: basic username:password" +- * +- * As usual, this string is automatically freed. +- */ extern char *HTAA_composeAuth(const char *hostname, ++ */ ++/* PUBLIC HTAA_composeAuth() ++ * ++ * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE ++ * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION ++ * ++ * ON ENTRY: ++ * hostname is the hostname of the server. ++ * portnumber is the portnumber in which the server runs. ++ * docname is the pathname of the document (as in URL) ++ * ++ * ON EXIT: ++ * returns NULL, if no authorization seems to be needed, or ++ * if it is the entire Authorization: line, e.g. ++ * ++ * "Authorization: basic username:password" ++ * ++ * As usual, this string is automatically freed. ++ */ ++ extern char *HTAA_composeAuth(const char *hostname, + const int portnumber, + const char *docname, + int IsProxy); +Index: WWW/Library/Implementation/HTAAUtil.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTAAUtil.h 2010-06-17 00:36:04.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTAAUtil.h 2010-10-27 00:09:52.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTAAUtil.h,v 1.12 2010/06/17 00:36:04 tom Exp $ ++ * $LynxId: HTAAUtil.h,v 1.13 2010/10/27 00:09:52 tom Exp $ + * + * Utilities for the Authorization parts of libwww + * COMMON PARTS OF AUTHORIZATION MODULE TO BOTH SERVER AND BROWSER +@@ -48,7 +48,8 @@ + #define MAX_FIELDNAME_LEN 16 /* @@ Longest field name in */ + /* protection setup file */ + #define MAX_PATHNAME_LEN 80 /* @@ Longest passwd/group file */ +-/* pathname to allow *//* ++/* pathname to allow */ ++/* + + Datatype definitions + +Index: WWW/Library/Implementation/HTFTP.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFTP.c 2010-09-25 00:05:51.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTFTP.c 2010-10-31 17:56:13.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFTP.c,v 1.98 2010/09/25 00:05:51 tom Exp $ ++ * $LynxId: HTFTP.c,v 1.99 2010/10/31 17:56:13 tom Exp $ + * + * File Transfer Protocol (FTP) Client + * for a WorldWideWeb browser +@@ -133,7 +133,7 @@ + #elif defined(SYS_HPUX) + # if defined(_XOPEN_SOURCE_EXTENDED) && defined(SO_PROTOTYPE) + # define LY_SOCKLEN socklen_t +-# else /* HPUX 10.20, etc. */ ++# else /* HPUX 10.20, etc. */ + # define LY_SOCKLEN int + # endif + #elif defined(SYS_TRU64) +Index: WWW/Library/Implementation/HTFile.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFile.c 2010-09-24 08:52:55.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTFile.c 2010-10-27 00:10:02.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFile.c,v 1.126 2010/09/24 08:52:55 tom Exp $ ++ * $LynxId: HTFile.c,v 1.127 2010/10/27 00:10:02 tom Exp $ + * + * File Access HTFile.c + * =========== +@@ -31,7 +31,8 @@ + #define LONG_LIST /* Define this for long style unix listings (ls -l), + the actual style is configurable from lynx.cfg */ + #endif +-/* #define NO_PARENT_DIR_REFERENCE *//* Define this for no parent links */ ++/* #define NO_PARENT_DIR_REFERENCE */ ++/* Define this for no parent links */ + #endif /* !VMS */ + + #if defined(DOSPATH) +Index: WWW/Library/Implementation/HTFormat.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFormat.h 2010-09-25 11:42:03.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTFormat.h 2010-10-27 00:13:53.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFormat.h,v 1.32 2010/09/25 11:42:03 tom Exp $ ++ * $LynxId: HTFormat.h,v 1.33 2010/10/27 00:13:53 tom Exp $ + * + * HTFormat: The format manager in the WWW Library + * MANAGE DIFFERENT DOCUMENT FORMATS +@@ -44,7 +44,11 @@ + useful for diagnostics, and for users who want to see the original, whatever + it is. + +- *//* Internal ones *//* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ extern HTAtom *WWW_SOURCE; ++ */ ++/* Internal ones */ ++/* #define WWW_SOURCE HTAtom_for("www/source") */ ++/* Whatever it was originally */ ++ extern HTAtom *WWW_SOURCE; + /* calculated once, heavy used */ + + /* +Index: WWW/Library/Implementation/HTNews.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTNews.c 2010-09-25 00:42:40.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTNews.c 2010-10-27 00:10:51.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTNews.c,v 1.66 2010/09/25 00:42:40 tom Exp $ ++ * $LynxId: HTNews.c,v 1.67 2010/10/27 00:10:51 tom Exp $ + * + * NEWS ACCESS HTNews.c + * =========== +@@ -94,7 +94,6 @@ + static int HTCanPost = FALSE; /* Current POST permission */ + static char response_text[LINE_LENGTH + 1]; /* Last response */ + +-/* static HText * HT; *//* the new hypertext */ + static HTStructured *target; /* The output sink */ + static HTStructuredClass targetClass; /* Copy of fn addresses */ + static HTStream *rawtarget = NULL; /* The output sink for rawtext */ +Index: WWW/Library/Implementation/HTTCP.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTTCP.c 2010-09-25 11:32:53.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTTCP.c 2010-10-27 00:11:11.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTTCP.c,v 1.104 2010/09/25 11:32:53 tom Exp $ ++ * $LynxId: HTTCP.c,v 1.105 2010/10/27 00:11:11 tom Exp $ + * + * Generic Communication Code HTTCP.c + * ========================== +@@ -77,9 +77,6 @@ + unsigned long socks_bind_remoteAddr; /* for long Rbind */ + #endif /* SOCKS */ + +-/* PUBLIC SockA HTHostAddress; *//* The internet address of the host */ +- /* Valid after call to HTHostName() */ +- + /* Encode INET status (as in sys/errno.h) inet_status() + * ------------------ + * +Index: WWW/Library/Implementation/HTUtils.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTUtils.h 2010-09-25 15:32:56.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTUtils.h 2010-10-27 00:08:52.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTUtils.h,v 1.102 2010/09/25 15:32:56 tom Exp $ ++ * $LynxId: HTUtils.h,v 1.103 2010/10/27 00:08:52 tom Exp $ + * + * Utility macros for the W3 code library + * MACROS FOR GENERAL USE +@@ -157,12 +157,12 @@ + #define LY_MAXPATH 256 + #endif + +-#ifndef GCC_NORETURN +-#define GCC_NORETURN /* nothing */ ++#ifndef GCC_NORETURN ++#define GCC_NORETURN /* nothing */ + #endif + +-#ifndef GCC_UNUSED +-#define GCC_UNUSED /* nothing */ ++#ifndef GCC_UNUSED ++#define GCC_UNUSED /* nothing */ + #endif + + #if defined(__GNUC__) && defined(_FORTIFY_SOURCE) +Index: WWW/Library/Implementation/HTVMS_WaisUI.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTVMS_WaisUI.c 2010-09-25 00:32:18.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/HTVMS_WaisUI.c 2010-10-29 21:10:14.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTVMS_WaisUI.c,v 1.16 2010/09/25 00:32:18 tom Exp $ ++ * $LynxId: HTVMS_WaisUI.c,v 1.17 2010/10/29 21:10:14 tom Exp $ + * HTVMS_WAISUI.c + * + * Adaptation for Lynx by F.Macrides (macrides@sci.wfeb.edu) +@@ -695,7 +695,7 @@ + query->DatabaseNames = (char **) s_realloc((char *) query->DatabaseNames, + (size_t) (sizeof(char + *) * +- (i + 2))); ++ (i + 2))); + + query->DatabaseNames[i] = s_strdup(ptr); + query->DatabaseNames[i + 1] = NULL; +@@ -713,7 +713,7 @@ + query->ElementSetNames = (char **) s_realloc((char *) query->ElementSetNames, + (size_t) (sizeof(char + *) * +- (i + 2))); ++ (i + 2))); + + query->ElementSetNames[i] = s_strdup(ptr); + query->ElementSetNames[i + 1] = NULL; +Index: WWW/Library/Implementation/LYexit.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/LYexit.h 2005-01-02 23:49:58.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/LYexit.h 2010-10-27 00:13:53.000000000 +0000 +@@ -39,15 +39,23 @@ + #define exit(code) LYexit(code) + #define atexit LYatexit + #define ATEXITSIZE 50 ++ + /* + * Data structures +- *//* +- * Global variable declarations +- *//* +- * Macros +- *//* +- * Function declarations +- */ extern void outofmem(const char *fname, const char *func); ++ */ ++ ++/* ++ * Global variable declarations ++ */ ++ ++/* ++ * Macros ++ */ ++ ++/* ++ * Function declarations ++ */ ++ extern void outofmem(const char *fname, const char *func); + extern void reset_signals(void); + extern void exit_immediately(int status) GCC_NORETURN; + extern void LYexit(int status) GCC_NORETURN; +Index: WWW/Library/Implementation/tidy_tls.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/tidy_tls.h 2008-04-27 22:50:39.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/tidy_tls.h 2010-10-27 00:07:26.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: tidy_tls.h,v 1.1 2008/04/27 22:50:39 tom Exp $ ++ * $LynxId: tidy_tls.h,v 1.2 2010/10/27 00:07:26 tom Exp $ + * Copyright 2008, Thomas E. Dickey + */ + #ifndef TIDY_TLS_H +@@ -103,7 +103,7 @@ + /* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options + * are 'ored' with SSL_VERIFY_PEER if they are desired */ + #define SSL_VERIFY_PEER 0x01 +- ++/* *INDENT-OFF* */ + extern SSL *SSL_new(SSL_CTX * ctx); + extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl); + extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method); +@@ -134,5 +134,6 @@ + extern void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, int (*verify_callback) (int, X509_STORE_CTX *)); + extern void SSL_free(SSL * ssl); + extern void SSL_load_error_strings(void); ++/* *INDENT-ON* */ + + #endif /* TIDY_TLS_H */ +Index: WWW/Library/Implementation/www_tcp.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/www_tcp.h 2010-09-25 16:24:45.000000000 +0000 ++++ lynx2.8.8dev.6a/WWW/Library/Implementation/www_tcp.h 2010-10-31 17:56:16.000000000 +0000 +@@ -1,5 +1,5 @@ + /* System dependencies in the W3 library +- * $LynxId: www_tcp.h,v 1.45 2010/09/25 16:24:45 tom Exp $ ++ * $LynxId: www_tcp.h,v 1.47 2010/10/31 17:56:16 tom Exp $ + * + SYSTEM DEPENDENCIES + +@@ -159,7 +159,8 @@ + /* For debugging + #include + #define TOASCII(c) (assert((c)>=0 && (c)<256), un_IBM1047[c]) +-*//* for production */ ++*/ ++/* for production */ + #define TOASCII(c) (un_IBM1047[c]) + + #define FROMASCII(c) (IBM1047[c]) +@@ -746,10 +747,10 @@ + + # ifdef HAVE_LIMITS_H + # include +-# endif /* HAVE_LIMITS_H */ ++# endif /* HAVE_LIMITS_H */ + # if !defined(MAXINT) && defined(INT_MAX) + # define MAXINT INT_MAX +-# endif /* !MAXINT && INT_MAX */ ++# endif /* !MAXINT && INT_MAX */ + + #else + +Index: lib/dirent.c +Prereq: 1.4 +--- lynx2.8.8dev.6+/lib/dirent.c 2009-03-11 00:31:33.000000000 +0000 ++++ lynx2.8.8dev.6a/lib/dirent.c 2010-10-31 17:56:17.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: dirent.c,v 1.3 2009/03/11 00:31:33 tom Exp $ ++ * $LynxId: dirent.c,v 1.4 2010/10/31 17:56:17 tom Exp $ + * + * dir.c for MS-DOS by Samuel Lam , June/87 + */ +@@ -20,7 +20,6 @@ + * Changes made by Gordon Chaffee (chaffee@bugs-bunny.cs.berkeley.edu) + */ + +- + /*Includes: + * crt + */ +@@ -123,6 +122,7 @@ + return NULL; + } + dirp = malloc(sizeof(DIR)); ++ + if (dirp == NULL) { + return dirp; + } +@@ -153,7 +153,7 @@ + } + do { + if (((dp = malloc(sizeof(struct _dircontents))) == NULL) || +- ((dp->_d_entry = malloc(strlen(s) + 1)) == NULL)) { ++ ((dp->_d_entry = malloc(strlen(s) + 1)) == NULL)) { + if (dp) + free(dp); + free_dircontents(dirp->dd_contents); +@@ -180,13 +180,13 @@ + return opendirx(name, "*"); + } + +-void closedir(DIR * dirp) ++void closedir(DIR *dirp) + { + free_dircontents(dirp->dd_contents); + free(dirp); + } + +-struct dirent *readdir(DIR * dirp) ++struct dirent *readdir(DIR *dirp) + { + /* static struct dirent dp; */ + if (dirp->dd_cp == NULL) +@@ -204,25 +204,23 @@ + dirp->dd_cp = dirp->dd_cp->_d_next; + dirp->dd_loc++; + +- + return &dp; + } + +-void seekdir(DIR * dirp, long off) ++void seekdir(DIR *dirp, long off) + { + long i = off; + struct _dircontents *dp; + + if (off >= 0) { +- for (dp = dirp->dd_contents; --i >= 0 && dp; dp = dp->_d_next); ++ for (dp = dirp->dd_contents; --i >= 0 && dp; dp = dp->_d_next) ; + + dirp->dd_loc = off - (i + 1); + dirp->dd_cp = dp; + } + } + +- +-long telldir(DIR * dirp) ++long telldir(DIR *dirp) + { + return dirp->dd_loc; + } +@@ -263,14 +261,12 @@ + } + /* end of getdirent() */ + +-struct passwd *_cdecl +- getpwnam(char *name) ++struct passwd *_cdecl getpwnam(char *name) + { + return NULL; + } + +-struct passwd *_cdecl +- getpwuid(int uid) ++struct passwd *_cdecl getpwuid(int uid) + { + return NULL; + } +@@ -280,8 +276,7 @@ + return 0; + } + +-void _cdecl +- endpwent(void) ++void _cdecl endpwent(void) + { + } + +Index: lib/dirent.h +Prereq: 2.0 +--- lynx2.8.8dev.6+/lib/dirent.h 1999-07-14 16:44:55.000000000 +0000 ++++ lynx2.8.8dev.6a/lib/dirent.h 2010-10-31 17:56:17.000000000 +0000 +@@ -14,43 +14,40 @@ + * changed d_name to char * instead of array, removed non-std extensions + * + * Cleanup, other hackery, Summer '92, Brian Moran , brianmo@microsoft.com +- */ ++ */ + + #ifndef _DIRENT + #define _DIRENT + + #include + +-struct dirent +-{ +- ino_t d_ino; /* a bit of a farce */ +- short d_reclen; /* more farce */ +- short d_namlen; /* length of d_name */ +- char *d_name; +-}; +- +-struct _dircontents +-{ +- char *_d_entry; +- struct _dircontents *_d_next; +-}; +- +-typedef struct _dirdesc +-{ +- int dd_id; /* uniquely identify each open directory*/ +- long dd_loc; /* where we are in directory entry */ +- struct _dircontents *dd_contents; /* pointer to contents of dir */ +- struct _dircontents *dd_cp; /* pointer to current position */ +-} +-DIR; +- +-extern DIR *opendir(char *); +-extern struct dirent *readdir(DIR *); +-extern void seekdir(DIR *, long); +-extern long telldir(DIR *); +-extern void closedir(DIR *); +-#define rewinddir(dirp) seekdir(dirp, 0L) ++struct dirent { ++ ino_t d_ino; /* a bit of a farce */ ++ short d_reclen; /* more farce */ ++ short d_namlen; /* length of d_name */ ++ char *d_name; ++}; ++ ++struct _dircontents { ++ char *_d_entry; ++ struct _dircontents *_d_next; ++}; ++ ++typedef struct _dirdesc { ++ int dd_id; /* uniquely identify each open directory */ ++ long dd_loc; /* where we are in directory entry */ ++ struct _dircontents *dd_contents; /* pointer to contents of dir */ ++ struct _dircontents *dd_cp; /* pointer to current position */ ++} DIR; ++ ++extern DIR *opendir(char *); ++extern struct dirent *readdir(DIR *); ++extern void seekdir(DIR *, long); ++extern long telldir(DIR *); ++extern void closedir(DIR *); ++ ++#define rewinddir(dirp) seekdir(dirp, 0L) + + #endif /* _DIRENT */ + +-/* end of dirent.h */ ++/* end of dirent.h */ +Index: src/HTML.c +--- lynx2.8.8dev.6+/src/HTML.c 2010-09-25 17:00:36.000000000 +0000 ++++ lynx2.8.8dev.6a/src/HTML.c 2010-11-01 22:19:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTML.c,v 1.146 2010/09/25 17:00:36 tom Exp $ ++ * $LynxId: HTML.c,v 1.148 2010/11/01 22:19:09 tom Exp $ + * + * Structured stream to Rich hypertext converter + * ============================================ +@@ -312,8 +312,10 @@ + return; + } + me->lastraw = c; +- if (c == '\r') ++ if (c == '\r') { + c = '\n'; ++ uc = UCH(c); ++ } + + /* + * Handle SGML_LITTERAL tags that have HTChunk elements. - FM +Index: src/LYCurses.c +--- lynx2.8.8dev.6+/src/LYCurses.c 2010-09-25 00:48:03.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYCurses.c 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYCurses.c,v 1.156 2010/09/25 00:48:03 tom Exp $ */ ++/* $LynxId: LYCurses.c,v 1.158 2010/10/31 17:56:18 tom Exp $ */ + #include + #include + +@@ -1138,7 +1138,7 @@ + when the keypad is switched on, some keybindings may be overriden. */ + keypad(LYwin, TRUE); + keypad_on = 1; +-# endif /* HAVE_KEYPAD */ ++# endif /* HAVE_KEYPAD */ + + if (-1 == lynx_initialize_keymaps()) { + endwin(); +@@ -1245,8 +1245,6 @@ + #endif /* __DJGPP__ */ + #endif /* not VMS */ + +-/* nonl(); *//* seems to slow things down */ +- + #ifdef VMS + crmode(); + raw(); +@@ -1488,7 +1486,7 @@ + + #ifdef __DJGPP__ + ScreenClear(); +-#elif !defined(PDCURSES) /* some flavor of win32? */ ++#elif !defined(PDCURSES) /* some flavor of win32? */ + clrscr(); + #endif /* win32 */ + +@@ -1781,7 +1779,7 @@ + wbkgd(my_subwindow, (chtype) (b | ' ')); + } + LynxWChangeStyle(my_subwindow, s_menu_bg, STACK_OFF); +-#elif defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ ++#elif defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ + wbkgd(my_subwindow, getbkgd(LYwin)); + #endif + #endif +Index: src/LYCurses.h +--- lynx2.8.8dev.6+/src/LYCurses.h 2010-10-04 08:56:09.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYCurses.h 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYCurses.h,v 1.86 2010/10/04 08:56:09 tom Exp $ */ ++/* $LynxId: LYCurses.h,v 1.87 2010/10/31 17:56:18 tom Exp $ */ + #ifndef LYCURSES_H + #define LYCURSES_H + +@@ -260,7 +260,7 @@ + # include + # else + # include /* everything else */ +-# endif /* VMS && __GNUC__ */ ++# endif /* VMS && __GNUC__ */ + #endif /* HAVE_CONFIG_H */ + + /* +Index: src/LYForms.c +--- lynx2.8.8dev.6+/src/LYForms.c 2010-09-24 09:40:44.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYForms.c 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYForms.c,v 1.86 2010/09/24 09:40:44 tom Exp $ */ ++/* $LynxId: LYForms.c,v 1.87 2010/10/31 17:56:18 tom Exp $ */ + #include + #include + #include +@@ -528,7 +528,7 @@ + MyEdit.dirty = TRUE; + } + } else +-# endif /* NCURSES || PDCURSES */ ++# endif /* NCURSES || PDCURSES */ + #endif /* USE_MOUSE */ + + { +Index: src/LYLocal.c +--- lynx2.8.8dev.6+/src/LYLocal.c 2010-09-25 16:26:16.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYLocal.c 2010-11-01 08:46:02.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYLocal.c,v 1.112 2010/09/25 16:26:16 tom Exp $ ++ * $LynxId: LYLocal.c,v 1.114 2010/11/01 08:46:02 tom Exp $ + * + * Routines to manipulate the local filesystem. + * Written by: Rick Mallett, Carleton University +@@ -386,6 +386,7 @@ + va_list ap; + + va_start(ap, command); ++ result[0] = 0; + StrAllocCopy(result[argc++], command); + do { + result[argc] = 0; +@@ -1756,7 +1757,7 @@ + } + return buffer; + } +-# endif /* OK_GZIP */ ++# endif /* OK_GZIP */ + if ((arg = match_op("UNTAR_Z", line)) != 0) { + #define FMT_UNTAR_Z "cd %s; %s %s | %s %s %s" + if ((program = HTGetProgramPath(ppZCAT)) != NULL) { +@@ -1781,7 +1782,7 @@ + HTEndParam(&buffer, FMT_UNTAR, 4); + return buffer; + } +-# endif /* !ARCHIVE_ONLY */ ++# endif /* !ARCHIVE_ONLY */ + + # ifdef OK_GZIP + if ((arg = match_op("TAR_GZ", line)) != 0) { +@@ -1800,7 +1801,7 @@ + } + return buffer; + } +-# endif /* OK_GZIP */ ++# endif /* OK_GZIP */ + + if ((arg = match_op("TAR_Z", line)) != 0) { + #define FMT_TAR_Z "cd %s; %s %s %s %s | %s >%s%s" +@@ -1882,7 +1883,7 @@ + } + return buffer; + } +-# endif /* !ARCHIVE_ONLY */ ++# endif /* !ARCHIVE_ONLY */ + #endif /* OK_ZIP */ + + if ((arg = match_op("COMPRESS", line)) != 0) { +Index: src/LYPrettySrc.c +--- lynx2.8.8dev.6+/src/LYPrettySrc.c 2010-09-24 22:06:29.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYPrettySrc.c 2010-10-27 00:15:12.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYPrettySrc.c,v 1.24 2010/09/24 22:06:29 tom Exp $ ++ * $LynxId: LYPrettySrc.c,v 1.25 2010/10/27 00:15:12 tom Exp $ + * + * HTML source syntax highlighting + * by Vlad Harchev +@@ -159,7 +159,8 @@ + int n = tag->number_of_attributes; + attr *attrs = tag->attributes; + +-/*.... *//* this is not implemented though it's easy */ ++/*.... */ ++/* this is not implemented though it's easy */ + # endif + + hcode = hash_code_aggregate_char('.', hcode); +Index: src/LYSession.c +--- lynx2.8.8dev.6+/src/LYSession.c 2008-07-02 21:24:27.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYSession.c 2010-10-31 18:15:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYSession.c,v 1.6 2008/07/02 21:24:27 Paul.B.Mahol Exp $ */ ++/* $LynxId: LYSession.c,v 1.7 2010/10/31 18:15:33 Paul.B.Mahol Exp $ */ + + #include + +@@ -63,11 +63,12 @@ + DocInfo doc; + VisitedLink *vl; + int i = 0; +- short errors = 10; /* how many syntax errors are allowed in */ +- +- /* session file before aborting. */ ++ short errors = 10; /* how many syntax errors are allowed in ++ * session file before aborting. */ + char *value1, *value2, *rsline, *linktext, *rslevel; + ++ memset(&doc, 0, sizeof(doc)); ++ + /* + * This should be done only once, here: iff USE_SESSIONS is defined or: + * in mainloop(), otherwise history entries are lost +Index: src/LYUtils.c +--- lynx2.8.8dev.6+/src/LYUtils.c 2010-10-04 09:00:23.000000000 +0000 ++++ lynx2.8.8dev.6a/src/LYUtils.c 2010-10-31 17:56:21.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYUtils.c,v 1.204 2010/10/04 09:00:23 tom Exp $ ++ * $LynxId: LYUtils.c,v 1.205 2010/10/31 17:56:21 tom Exp $ + */ + #include + #include +@@ -2978,9 +2978,9 @@ + # else + # ifdef HAVE_TERMIO_H + # include +-# endif /* HAVE_TERMIO_H */ +-# endif /* HAVE_TERMIOS_H */ +-# endif /* TERMIO_AND_TERMIOS */ ++# endif /* HAVE_TERMIO_H */ ++# endif /* HAVE_TERMIOS_H */ ++# endif /* TERMIO_AND_TERMIOS */ + #endif /* TERMIO_AND_CURSES */ + + void size_change(int sig GCC_UNUSED) +@@ -7574,7 +7574,7 @@ + return 0; + } + +-# endif /* !defined(WIN_EX) && defined(HAVE_POPEN) */ ++# endif /* !defined(WIN_EX) && defined(HAVE_POPEN) */ + + #endif /* __EMX__ */ + +Index: src/TRSTable.c +--- lynx2.8.8dev.6+/src/TRSTable.c 2010-09-25 12:47:08.000000000 +0000 ++++ lynx2.8.8dev.6a/src/TRSTable.c 2010-10-27 00:15:10.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: TRSTable.c,v 1.28 2010/09/25 12:47:08 tom Exp $ ++ * $LynxId: TRSTable.c,v 1.29 2010/10/27 00:15:10 tom Exp $ + * Simple table object + * =================== + * Authors +@@ -1322,7 +1322,8 @@ + } + + /* Fake at BOL */ +-/* Stbl_finishCellInTable(lineno, 0, 0); *//* Needed? */ ++ /* Stbl_finishCellInTable(lineno, 0, 0); */ ++ /* Needed? */ + + /* Fake at BOL */ + if (Stbl_addRowToTable(me, al, lineno) < 0) { +Index: src/UCAuto.c +--- lynx2.8.8dev.6+/src/UCAuto.c 2010-09-25 00:51:53.000000000 +0000 ++++ lynx2.8.8dev.6a/src/UCAuto.c 2010-10-31 17:56:21.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCAuto.c,v 1.45 2010/09/25 00:51:53 tom Exp $ ++ * $LynxId: UCAuto.c,v 1.46 2010/10/31 17:56:21 tom Exp $ + * + * This file contains code for changing the Linux console mode. + * Currently some names for font files are hardwired in here. +@@ -788,7 +788,7 @@ + CTRACE((tfp, "Display font set to '%s'.\n", name)); + return ord; + } +-# endif /* __EMX__ */ ++# endif /* __EMX__ */ + + int Switch_Display_Charset(const int ord, const enum switch_display_charset_t really) + { +Index: src/UCdomap.c +--- lynx2.8.8dev.6+/src/UCdomap.c 2010-09-25 15:31:34.000000000 +0000 ++++ lynx2.8.8dev.6a/src/UCdomap.c 2010-10-31 17:56:22.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCdomap.c,v 1.86 2010/09/25 15:31:34 tom Exp $ ++ * $LynxId: UCdomap.c,v 1.87 2010/10/31 17:56:22 tom Exp $ + * + * UCdomap.c + * ========= +@@ -2171,7 +2171,7 @@ + CTRACE((tfp, "Found %i.\n", ret)); + return ret; + } +-# endif /* __EMX__ */ ++# endif /* __EMX__ */ + #endif /* CAN_AUTODETECT_DISPLAY_CHARSET */ + #endif /* EXP_CHARTRANS_AUTOSWITCH */ + +Index: src/parsdate.h +--- lynx2.8.8dev.6+/src/parsdate.h 2008-06-29 23:23:45.000000000 +0000 ++++ lynx2.8.8dev.6a/src/parsdate.h 2010-10-31 17:56:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: parsdate.h,v 1.1 2008/06/29 23:23:45 tom Exp $ */ ++/* $LynxId: parsdate.h,v 1.2 2010/10/31 17:56:22 tom Exp $ */ + #ifndef PARSDATE_H + #define PARSDATE_H + +@@ -7,7 +7,7 @@ + #endif + #include + #define ARRAY_SIZE(array) ((int) (sizeof(array) / sizeof(array[0]))) +- typedef struct _TIMEINFO { ++ typedef struct _TIMEINFO { + time_t time; + long usec; + long tzone; --- lynx-cur-2.8.8dev.9.orig/debian/menu +++ lynx-cur-2.8.8dev.9/debian/menu @@ -0,0 +1,2 @@ +?package(lynx-cur):needs="text" section="Applications/Network/Web Browsing"\ + title="Lynx-cur" command="lynx" --- lynx-cur-2.8.8dev.9.orig/debian/mime +++ lynx-cur-2.8.8dev.9/debian/mime @@ -0,0 +1,2 @@ +text/html; /usr/bin/lynx -force_html %s; needsterminal; description=HTML Text; nametemplate=%s.html; priority=3 +text/html; /usr/bin/lynx -dump -force_html %s; copiousoutput; description=HTML Text; nametemplate=%s.html; priority=2 --- lynx-cur-2.8.8dev.9.orig/debian/postinst +++ lynx-cur-2.8.8dev.9/debian/postinst @@ -0,0 +1,22 @@ +#!/bin/sh +# postinst script for lynx-beta +pack=lynx-cur +cnfdir=/etc/${pack} +CONFIGFILE=${cnfdir}/local.cfg + +set -e + +if [ "$1" != configure ]; then exit 0; fi + +update-alternatives --install /usr/bin/www-browser www-browser \ + /usr/bin/lynx 40 \ + --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz \ + /usr/share/man/man1/lynx.1.gz + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.9.orig/debian/postrm +++ lynx-cur-2.8.8dev.9/debian/postrm @@ -0,0 +1,16 @@ +#! /bin/sh +# postrm script for lynx-cur +pack=lynx-cur +cnfdir=/etc/${pack} + +set -e + +if [ "$1" = "purge" ]; then + rm -f ${cnfdir}/local.cfg +fi + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- lynx-cur-2.8.8dev.9.orig/debian/preinst +++ lynx-cur-2.8.8dev.9/debian/preinst @@ -0,0 +1,29 @@ +#!/bin/sh +pack=lynx-cur + +set -e + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" 'lt-nl' '2.8.8dev.8-2' ; then + update-alternatives --remove lynx /usr/bin/lynx.cur + update-alternatives --remove www-browser /usr/bin/lynx.cur + fi + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.9.orig/debian/prerm +++ lynx-cur-2.8.8dev.9/debian/prerm @@ -0,0 +1,26 @@ +#! /bin/sh +# prerm script for lynx-cur +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|deconfigure) + update-alternatives --remove www-browser /usr/bin/lynx +# update-alternatives --remove lynx /usr/bin/lynx + ;; + failed-upgrade|upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.9.orig/debian/rules +++ lynx-cur-2.8.8dev.9/debian/rules @@ -0,0 +1,147 @@ +#!/usr/bin/make -f +#-*- makefile -*- +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Christoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Uncomment this to turn on debug mode. +#export DEB_BUILD_OPTIONS="debug nostrip" + +#export DH_COMPAT=4 +export DH_OPTIONS= + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +DEBOP=--enable-debug +else +DEBOP= +endif + +PACKAGE := $(shell dpkg-parsechangelog| \ + sed -n 's/^Source: \(.*\)$$/\1/p') +DSTDIR := $(CURDIR)/debian/$(PACKAGE) +BINDIR := $(DSTDIR)/usr/bin +DOCDIR := $(DSTDIR)/usr/share/doc/$(PACKAGE) +SUBPACK := $(PACKAGE)-wrapper +SUBDIR := $(CURDIR)/debian/$(SUBPACK) + +include /usr/share/dpatch/dpatch.make + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \ + COMPRESS=/usr/bin/compress BZIP2=/bin/bzip2 UNZIP=/usr/bin/unzip \ + ZIP=/usr/bin/zip \ + LIBS="-lbsd" \ + ./configure --prefix=/usr --libexecdir=/usr/lib \ + --sysconfdir=/etc/lynx-cur --localstatedir=/var \ + --libdir=/etc/lynx-cur --enable-8bit-toupper --enable-externs \ + --enable-nsl-fork --enable-cgi-links --enable-exec-links \ + --enable-exec-scripts --enable-persistent-cookies --enable-nls \ + --enable-gzip-help --enable-prettysrc --enable-source-cache \ + --enable-cjk --enable-default-colors --enable-nested-tables \ + --enable-japanese-utf8 --enable-ipv6 \ + --enable-forms-options --enable-justify-elts --enable-partial \ + --enable-read-eta --enable-scrollbar --enable-syslog \ + --with-zlib --without-included-gettext \ + --with-screen=ncursesw --enable-justify-elts \ + --with-gnutls=/usr --enable-ipv6 --enable-persistent-cookies \ + ${DEBOP} +# --with-nss-compat --with-gnutls=/usr --enable-gnutls-compat +# --enable-color-style --enable-charset-choice --enable-font-switch + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f makefile ] || $(MAKE) distclean + -rm -f intl/libintl.h + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_prep + dh_installdirs -i + +install-arch: + dh_testdir + dh_testroot + dh_prep -s + dh_installdirs -s +# chmod +x scripts/*.sh + # Add here commands to install the package into debian/$(package). + $(MAKE) install-full prefix=$(DSTDIR)/usr \ + libdir=$(DSTDIR)/etc/$(PACKAGE) \ + sysconfdir=$(DSTDIR)/etc/$(PACKAGE) docdir=$(DOCDIR) \ + helpdir=$(DOCDIR)/lynx_help \ + mandir=$(DSTDIR)/usr/share/man/man1 + cd $(DOCDIR) ; rm -rf samples test + cd $(DOCDIR) ; rm -f COPYING lynx_help/COPYING lynx_help/COPYHEADER \ + CHANGES COPYING.asc COPYHEADER.asc +# cd $(DSTDIR)/usr/share/man/man1 ; mv lynx.1 lynx.cur.1 + +# Build architecture-independent files here. +# for lynx-cur-wrapper +binary-indep: DH_OPTIONS=-i +binary-indep: build install-indep + dh_testdir + dh_testroot + dh_installdocs +# dh_installman debian/lynx-cur.1 + dh_installchangelogs + dh_install + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-a +binary-arch: build install-arch + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installmenu + dh_installmime + dh_installchangelogs CHANGES + dh_install + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- lynx-cur-2.8.8dev.9.orig/debian/patches/00list +++ lynx-cur-2.8.8dev.9/debian/patches/00list @@ -0,0 +1,3 @@ +patch-1 +patch-2 +#patch-3 --- lynx-cur-2.8.8dev.9.orig/debian/patches/patch-1 +++ lynx-cur-2.8.8dev.9/debian/patches/patch-1 @@ -0,0 +1,222 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Align the manpage to Debian behaviour + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p0 < $0 && patch -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +--- lynx.cfg.orig 2010-06-26 12:06:05.000000000 +0900 ++++ lynx.cfg 2010-06-26 14:13:18.000000000 +0900 +@@ -90,7 +90,7 @@ + # + # Normally we expect you will connect to a remote site, e.g., the Lynx starting + # site: +-STARTFILE:http://lynx.isc.org/ ++#STARTFILE:http://lynx.isc.org/ + # + # As an alternative, you may want to use a local URL. A good choice for this is + # the user's home directory: +@@ -114,9 +114,10 @@ + # This definition will be overridden if the "LYNX_HELPFILE" environment + # variable has been set. + # +-HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html ++#HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html + .ex +-#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html ++##HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html ++HELPFILE:file://localhost/usr/share/doc/lynx-cur/lynx_help/lynx_help_main.html + + .h2 DEFAULT_INDEX_FILE + # DEFAULT_INDEX_FILE is the default file retrieved when the +@@ -426,7 +427,7 @@ + # Find RFC 1345 at + .url http://tools.ietf.org/html/rfc1345 + # +-#CHARACTER_SET:iso-8859-1 ++CHARACTER_SET:iso-8859-1 + + .h2 LOCALE_CHARSET + # LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to +@@ -437,6 +438,7 @@ + # happens to give useful values, but other implementations are not guaranteed + # to do this. + #LOCALE_CHARSET:FALSE ++LOCALE_CHARSET:TRUE + + .h2 HTML5_CHARSETS + # HTML5_CHARSETS is an alternative to ASSUME_CHARSET and ASSUME_LOCAL_CHARSET. +@@ -534,7 +536,7 @@ + # compatibility problems with other browsers, see also PREPEND_BASE_TO_SOURCE. + # Note that the prepending is not done for -source dumps. + # +-#PREPEND_CHARSET_TO_SOURCE:TRUE ++PREPEND_CHARSET_TO_SOURCE:FALSE + + .h2 NCR_IN_BOOKMARKS + # NCR_IN_BOOKMARKS:TRUE allows you to save 8-bit characters in bookmark titles +@@ -586,7 +588,7 @@ + # the 'o'ptions menu and save that preference in their RC file. + # This may be a comma-separated list of languages in decreasing preference. + # +-#PREFERRED_LANGUAGE:en ++PREFERRED_LANGUAGE:en + + .h2 PREFERRED_CHARSET + # PREFERRED_CHARSET specifies the character set in MIME notation (e.g., +@@ -776,7 +778,7 @@ + # 'o'ptions menu and saved in the RC file, and always can be toggled + # via the -show_cursor command line switch. + # +-#SHOW_CURSOR:FALSE ++SHOW_CURSOR:TRUE + + .h2 UNDERLINE_LINKS + # UNDERLINE_LINKS controls whether links are underlined by default, or shown +@@ -961,8 +963,8 @@ + # executed. This is much less dangerous than enabling all execution + # links, but can still be dangerous. + # +-#LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE +-#LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE ++LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE ++LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE + + .h2 TRUSTED_EXEC + # If LOCAL_EXECUTION_LINK_ON_BUT_NOT_REMOTE is TRUE, and no TRUSTED_EXEC +@@ -1009,7 +1011,7 @@ + # as well (i.e., they will only be able to access lynxexec or lynxprog + # URLs which meet any ALWAYS_TRUSTED_EXEC rules). + # +-#TRUSTED_EXEC:none ++TRUSTED_EXEC:none + + .h2 ALWAYS_TRUSTED_EXEC + # If EXEC_LINKS was defined, any lynxexec or lynxprog URL can be made +@@ -1030,7 +1032,7 @@ + # + # The default ALWAYS_TRUSTED_EXEC rule is "none". + # +-#ALWAYS_TRUSTED_EXEC:none ++ALWAYS_TRUSTED_EXEC:none + + .h2 TRUSTED_LYNXCGI + # Unix: +@@ -1049,7 +1051,7 @@ + # + # The default TRUSTED_LYNXCGI rule is "none". + # +-#TRUSTED_LYNXCGI:none ++TRUSTED_LYNXCGI:none + + .h2 LYNXCGI_ENVIRONMENT + # Unix: +@@ -1369,7 +1371,7 @@ + # The default is FALSE, so that the feature needs to be enabled here + # explicitly if you want it. + # +-#PERSISTENT_COOKIES:FALSE ++PERSISTENT_COOKIES:FALSE + + .h2 COOKIE_FILE + # COOKIE_FILE is the default file from which persistent cookies are read +@@ -1816,7 +1818,7 @@ + # and not forced TRUE, the user can regulate it via the 'o'ptions menu (and + # may save the preference in the RC file). + # +-#NO_DOT_FILES:TRUE ++NO_DOT_FILES:FALSE + + .h1 Internal Behavior + +@@ -2081,13 +2083,13 @@ + # + # Unix: + # ==== +-#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types ++GLOBAL_EXTENSION_MAP:/etc/mime.types + # VMS: + # === + #GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types + # + # Unix (sought in user's home directory): +-#PERSONAL_EXTENSION_MAP:.mime.types ++PERSONAL_EXTENSION_MAP:.mime.types + # VMS (sought in user's sys$login directory): + #PERSONAL_EXTENSION_MAP:mime.types + +@@ -2222,6 +2224,8 @@ + #SUFFIX:.dms:application/x-dms + #SUFFIX:.html:text/html + #SUFFIX:.txt:text/plain ++SUFFIX:.tgz:application/octet-stream ++SUFFIX:.deb:application/octet-stream + + .h2 XLOADIMAGE_COMMAND + # VMS: +@@ -2325,13 +2329,13 @@ + # + # Unix: + # ==== +-#GLOBAL_MAILCAP:/usr/local/lib/mosaic/mailcap ++GLOBAL_MAILCAP:/etc/mailcap + # VMS: + # === + #GLOBAL_MAILCAP:Lynx_Dir:mailcap + # + # Sought in user's home (Unix) or sys$login (VMS) directory. +-#PERSONAL_MAILCAP:.mailcap ++PERSONAL_MAILCAP:.mailcap + + .h2 PREFERRED_MEDIA_TYPES + # When doing a GET, lynx lists the MIME types which it knows how to present +@@ -3517,7 +3521,7 @@ + # should accept, in case the $SSL_CERT_FILE environment variable is not set, + # e.g., + # +-#SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt ++SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt + #SSL_CERT_FILE:NULL + + .h1 Appearance +@@ -3541,7 +3545,7 @@ + + .h2 SYSLOG_REQUESTED_URLS + # Log the requested URLs using the syslog interface. +-#SYSLOG_REQUESTED_URLS:TRUE ++SYSLOG_REQUESTED_URLS:FALSE + + .h2 SYSLOG_TEXT + # Add the given text to calls made to syslog, to distinguish Lynx from other +@@ -3638,3 +3642,19 @@ + # + # See also BLAT_MAIL and SYSTEM_MAIL flags. + #ALT_BLAT_MAIL:FALSE ++ ++# external ++EXTERNAL:ftp:w3m %s:TRUE ++EXTERNAL:file:w3m %s:TRUE ++EXTERNAL:http:w3m %s:TRUE ++EXTERNAL:http:wget %s:TRUE ++EXTERNAL:http:wget -r %s:TRUE ++EXTERNAL:ftp:x-www-browser %s:TRUE ++EXTERNAL:file:x-www-browser %s:TRUE ++EXTERNAL:http:x-www-browser %s:TRUE ++# include ++INCLUDE:/etc/lynx-cur/local.cfg ++INCLUDE:~/.lynx/colors:COLOR ++INCLUDE:~/.lynx/keymap:KEYMAP ++INCLUDE:~/.lynx/viewers:VIEWER ++INCLUDE:~/.lynx/external:EXTERNAL --- lynx-cur-2.8.8dev.9.orig/debian/patches/patch-2 +++ lynx-cur-2.8.8dev.9/debian/patches/patch-2 @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: a patch for SSL_CERT_FILE + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p0 < $0 && patch -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +--- lynx_help/about_lynx.html.orgl Tue Oct 9 12:34:06 2001 ++++ lynx_help/about_lynx.html Tue Oct 9 12:35:16 2001 +@@ -54,10 +54,9 @@ + is the work of developers on the + lynx-dev mailing list. + It is distributed +-without restrictions on usage or redistribution +-under the GNU +-General Public License (Version 2). ++without restrictions on usage or redistribution ++under the GNU ++General Public License (Version 2). + +

Lynx was built over an early version of the Common Code Library + developed by the CERN WWW Project. That code is copyrighted by CERN. --- lynx-cur-2.8.8dev.9.orig/debian/patches/patch-3 +++ lynx-cur-2.8.8dev.9/debian/patches/patch-3 @@ -0,0 +1,2829 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch for 2.8.8dev.6 from lynx-dev ML (lynx2.8.8dev.6b.patch) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +# patch by Thomas E. Dickey +# created Mon Nov 8 10:15:37 UTC 2010 +# ------------------------------------------------------------------------------ +# BUILD/VS2003/lynx/lynx_cfg.h | 12 - +# BUILD/VS2005X/lynx/lynx_cfg.h | 12 - +# CHANGES | 12 - +# PACKAGE/debian/changelog | 6 +# PACKAGE/lynx.spec | 4 +# WWW/Library/Implementation/HTAABrow.h | 43 +-- +# WWW/Library/Implementation/HTAAUtil.h | 5 +# WWW/Library/Implementation/HTFTP.c | 4 +# WWW/Library/Implementation/HTFile.c | 5 +# WWW/Library/Implementation/HTFormat.c | 10 +# WWW/Library/Implementation/HTFormat.h | 8 +# WWW/Library/Implementation/HTNews.c | 3 +# WWW/Library/Implementation/HTString.c | 3 +# WWW/Library/Implementation/HTTCP.c | 7 +# WWW/Library/Implementation/HTTP.c | 7 +# WWW/Library/Implementation/HTUtils.h | 10 +# WWW/Library/Implementation/HTVMS_WaisUI.c | 6 +# WWW/Library/Implementation/LYexit.h | 22 + +# WWW/Library/Implementation/SGML.c | 4 +# WWW/Library/Implementation/UCAux.h | 8 +# WWW/Library/Implementation/tidy_tls.h | 5 +# WWW/Library/Implementation/www_tcp.h | 9 +# lib/dirent.c | 27 -- +# lib/dirent.h | 59 ++--- +# src/GridText.c | 16 - +# src/HTAlert.c | 13 - +# src/HTML.c | 6 +# src/LYCharUtils.c | 3 +# src/LYCookie.c | 12 - +# src/LYCurses.c | 10 +# src/LYCurses.h | 4 +# src/LYForms.c | 4 +# src/LYKeymap.c | 4 +# src/LYLocal.c | 11 +# src/LYPrettySrc.c | 5 +# src/LYReadCFG.c | 4 +# src/LYSession.c | 9 +# src/LYSignal.h | 4 +# src/LYUtils.c | 12 - +# src/LYmktime.c | 11 +# src/TRSTable.c | 5 +# src/UCAuto.c | 4 +# src/UCAux.c | 4 +# src/UCdomap.c | 14 - +# src/mktime.c | 3 +# src/parsdate.c | 315 ++++++++++++---------------- +# src/parsdate.h | 4 +# src/parsdate.y | 239 +++++++++------------ +# src/tidy_tls.c | 4 +# userdefs.h | 4 +# 50 files changed, 497 insertions(+), 518 deletions(-) +# ------------------------------------------------------------------------------ +Index: BUILD/VS2003/lynx/lynx_cfg.h +--- lynx2.8.8dev.6+/BUILD/VS2003/lynx/lynx_cfg.h 2009-11-21 16:33:41.000000000 +0000 ++++ lynx2.8.8dev.6b/BUILD/VS2003/lynx/lynx_cfg.h 2010-11-06 13:37:00.000000000 +0000 +@@ -1,4 +1,4 @@ +-// $LynxId: lynx_cfg.h,v 1.4 2009/11/21 16:33:41 tom Exp $ ++// $LynxId: lynx_cfg.h,v 1.5 2010/11/06 13:37:00 tom Exp $ + // definitions abstracted from makefile.msc + + #ifndef LYNX_CFG_H +@@ -6,7 +6,7 @@ + + #define __WIN32__ + #define _WINDOWS +-#define _WIN32_WINNT 0x0400 ++#define _WIN32_WINNT 0x0400 + + #define ACCESS_AUTH 1 + #define CJK_EX 1 +@@ -61,8 +61,8 @@ + #define FANCY_CURSES 1 + #endif + +-#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */ +-#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */ +-#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */ ++#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */ ++#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */ ++#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */ + +-#endif /* LYNX_CFG_H */ +\ No newline at end of file ++#endif /* LYNX_CFG_H */ +Index: BUILD/VS2005X/lynx/lynx_cfg.h +--- lynx2.8.8dev.6+/BUILD/VS2005X/lynx/lynx_cfg.h 2009-11-21 16:33:41.000000000 +0000 ++++ lynx2.8.8dev.6b/BUILD/VS2005X/lynx/lynx_cfg.h 2010-11-06 13:37:00.000000000 +0000 +@@ -1,4 +1,4 @@ +-// $LynxId: lynx_cfg.h,v 1.3 2009/11/21 16:33:41 tom Exp $ ++// $LynxId: lynx_cfg.h,v 1.4 2010/11/06 13:37:00 tom Exp $ + // definitions abstracted from makefile.msc + + #ifndef LYNX_CFG_H +@@ -62,9 +62,9 @@ + #define FANCY_CURSES 1 + #endif + +-#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */ +-#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */ +-#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */ +-#pragma warning (disable : 4996) /* 'xxx': This function or variable may be unsafe. Consider using yyy instead. */ ++#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */ ++#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */ ++#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */ ++#pragma warning (disable : 4996) /* 'xxx': This function or variable may be unsafe. Consider using yyy instead. */ + +-#endif /* LYNX_CFG_H */ +\ No newline at end of file ++#endif /* LYNX_CFG_H */ +Index: CHANGES +--- lynx2.8.8dev.6+/CHANGES 2010-10-04 08:19:06.000000000 +0000 ++++ lynx2.8.8dev.6b/CHANGES 2010-11-08 10:12:13.000000000 +0000 +@@ -1,8 +1,18 @@ +--- $LynxId: CHANGES,v 1.508 2010/10/04 08:19:06 tom Exp $ ++-- $LynxId: CHANGES,v 1.514 2010/11/08 10:12:13 tom Exp $ + =============================================================================== + Changes since Lynx 2.8 release + =============================================================================== + ++2010-11-08 (2.8.8dev.7) ++* undo a cleanup change to link-types from dev.6 which broke some uses of ++ input-anchors (report by FLWM) -TD ++* minor formatting improvements to sources using cindent 2.0-20101107 -TD ++* restore \r to \n conversion in HTML_put_character(), broken in gcc warning ++ cleanup (report by FLWM) -TD ++* fix a double-free in make_argv() (report by FLWM) -TD ++* add a memset in RestoreSession(), fixes uninitialized memory reference for ++ the VLINK section -PBM ++ + 2010-10-04 (2.8.8dev.6) + * amend change for Debian #514897 to exclude XML documents (Debian #592883) -TD + * use HTParsePort() in a few places, e.g., HTFinger.c, to allow for IPv6 +Index: PACKAGE/debian/changelog +--- lynx2.8.8dev.6+/PACKAGE/debian/changelog 2010-09-19 16:22:57.000000000 +0000 ++++ lynx2.8.8dev.6b/PACKAGE/debian/changelog 2010-11-01 21:32:09.000000000 +0000 +@@ -1,3 +1,9 @@ ++lynx-dev (2.8.8dev.7) unstable; urgency=low ++ ++ * changes for dev.7 ++ ++ -- Thomas E. Dickey Mon, 01 Nov 2010 17:32:06 -0400 ++ + lynx-dev (2.8.8dev.6) unstable; urgency=low + + * add build-script for testing, adapted from Debian lynx-cur package. +Index: PACKAGE/lynx.spec +--- lynx2.8.8dev.6+/PACKAGE/lynx.spec 2010-09-21 23:18:23.000000000 +0000 ++++ lynx2.8.8dev.6b/PACKAGE/lynx.spec 2010-11-01 21:31:25.000000000 +0000 +@@ -1,8 +1,8 @@ +-# $LynxId: lynx.spec,v 1.6 2010/09/21 23:18:23 tom Exp $ ++# $LynxId: lynx.spec,v 1.7 2010/11/01 21:31:25 tom Exp $ + Summary: A text-based Web browser + Name: lynx + Version: 2.8.8 +-Release: dev.6 ++Release: dev.7 + License: GPLv2 + Group: Applications/Internet + Source: lynx%{version}%{release}.tgz +Index: WWW/Library/Implementation/HTAABrow.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTAABrow.h 2010-09-25 11:42:32.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTAABrow.h 2010-10-27 00:13:53.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTAABrow.h,v 1.15 2010/09/25 11:42:32 tom Exp $ ++ * $LynxId: HTAABrow.h,v 1.16 2010/10/27 00:13:53 tom Exp $ + * + * BROWSER SIDE ACCESS AUTHORIZATION MODULE + +@@ -40,8 +40,7 @@ + extern "C" { + #endif + /* +- +-Routines for Browser Side Recording of AA Info ++ Routines for Browser Side Recording of AA Info + + Most of the browser-side AA is done by the following two functions (which are called + from file HTTP.c so the browsers using libwww only need to be linked with the new +@@ -55,24 +54,26 @@ + HTAA_shouldRetryWithAuth() determines whether to retry the request with AA or with a + new AA (in case username or password was misspelled). + +- *//* PUBLIC HTAA_composeAuth() +- * +- * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE +- * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION +- * +- * ON ENTRY: +- * hostname is the hostname of the server. +- * portnumber is the portnumber in which the server runs. +- * docname is the pathname of the document (as in URL) +- * +- * ON EXIT: +- * returns NULL, if no authorization seems to be needed, or +- * if it is the entire Authorization: line, e.g. +- * +- * "Authorization: basic username:password" +- * +- * As usual, this string is automatically freed. +- */ extern char *HTAA_composeAuth(const char *hostname, ++ */ ++/* PUBLIC HTAA_composeAuth() ++ * ++ * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE ++ * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION ++ * ++ * ON ENTRY: ++ * hostname is the hostname of the server. ++ * portnumber is the portnumber in which the server runs. ++ * docname is the pathname of the document (as in URL) ++ * ++ * ON EXIT: ++ * returns NULL, if no authorization seems to be needed, or ++ * if it is the entire Authorization: line, e.g. ++ * ++ * "Authorization: basic username:password" ++ * ++ * As usual, this string is automatically freed. ++ */ ++ extern char *HTAA_composeAuth(const char *hostname, + const int portnumber, + const char *docname, + int IsProxy); +Index: WWW/Library/Implementation/HTAAUtil.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTAAUtil.h 2010-06-17 00:36:04.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTAAUtil.h 2010-10-27 00:09:52.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTAAUtil.h,v 1.12 2010/06/17 00:36:04 tom Exp $ ++ * $LynxId: HTAAUtil.h,v 1.13 2010/10/27 00:09:52 tom Exp $ + * + * Utilities for the Authorization parts of libwww + * COMMON PARTS OF AUTHORIZATION MODULE TO BOTH SERVER AND BROWSER +@@ -48,7 +48,8 @@ + #define MAX_FIELDNAME_LEN 16 /* @@ Longest field name in */ + /* protection setup file */ + #define MAX_PATHNAME_LEN 80 /* @@ Longest passwd/group file */ +-/* pathname to allow *//* ++/* pathname to allow */ ++/* + + Datatype definitions + +Index: WWW/Library/Implementation/HTFTP.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFTP.c 2010-09-25 00:05:51.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTFTP.c 2010-10-31 17:56:13.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFTP.c,v 1.98 2010/09/25 00:05:51 tom Exp $ ++ * $LynxId: HTFTP.c,v 1.99 2010/10/31 17:56:13 tom Exp $ + * + * File Transfer Protocol (FTP) Client + * for a WorldWideWeb browser +@@ -133,7 +133,7 @@ + #elif defined(SYS_HPUX) + # if defined(_XOPEN_SOURCE_EXTENDED) && defined(SO_PROTOTYPE) + # define LY_SOCKLEN socklen_t +-# else /* HPUX 10.20, etc. */ ++# else /* HPUX 10.20, etc. */ + # define LY_SOCKLEN int + # endif + #elif defined(SYS_TRU64) +Index: WWW/Library/Implementation/HTFile.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFile.c 2010-09-24 08:52:55.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTFile.c 2010-10-27 00:10:02.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFile.c,v 1.126 2010/09/24 08:52:55 tom Exp $ ++ * $LynxId: HTFile.c,v 1.127 2010/10/27 00:10:02 tom Exp $ + * + * File Access HTFile.c + * =========== +@@ -31,7 +31,8 @@ + #define LONG_LIST /* Define this for long style unix listings (ls -l), + the actual style is configurable from lynx.cfg */ + #endif +-/* #define NO_PARENT_DIR_REFERENCE *//* Define this for no parent links */ ++/* #define NO_PARENT_DIR_REFERENCE */ ++/* Define this for no parent links */ + #endif /* !VMS */ + + #if defined(DOSPATH) +Index: WWW/Library/Implementation/HTFormat.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFormat.c 2010-09-24 09:11:25.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTFormat.c 2010-11-07 21:20:56.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFormat.c,v 1.72 2010/09/24 09:11:25 tom Exp $ ++ * $LynxId: HTFormat.c,v 1.73 2010/11/07 21:20:56 tom Exp $ + * + * Manage different file formats HTFormat.c + * ============================= +@@ -1089,7 +1089,7 @@ + + (*targetClass.put_block) (sink, input_buffer, status); + bytes += status; +- HTReadProgress(bytes, (off_t) - 1); ++ HTReadProgress(bytes, (off_t) -1); + HTDisplayPartial(); + + if (HTCheckForInterrupt()) { +@@ -1191,7 +1191,7 @@ + if (len > 0) { + (*targetClass.put_block) (sink, output_buffer, len); + bytes += len; +- HTReadProgress(bytes, (off_t) - 1); ++ HTReadProgress(bytes, (off_t) -1); + HTDisplayPartial(); + } + rv = HT_LOADED; +@@ -1220,7 +1220,7 @@ + + (*targetClass.put_block) (sink, output_buffer, len); + bytes += len; +- HTReadProgress(bytes, (off_t) - 1); ++ HTReadProgress(bytes, (off_t) -1); + HTDisplayPartial(); + + if (HTCheckForInterrupt()) { +@@ -1295,7 +1295,7 @@ + + (*targetClass.put_block) (sink, input_buffer, status); + bytes += status; +- HTReadProgress(bytes, (off_t) - 1); ++ HTReadProgress(bytes, (off_t) -1); + HTDisplayPartial(); + + if (HTCheckForInterrupt()) { +Index: WWW/Library/Implementation/HTFormat.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTFormat.h 2010-09-25 11:42:03.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTFormat.h 2010-10-27 00:13:53.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTFormat.h,v 1.32 2010/09/25 11:42:03 tom Exp $ ++ * $LynxId: HTFormat.h,v 1.33 2010/10/27 00:13:53 tom Exp $ + * + * HTFormat: The format manager in the WWW Library + * MANAGE DIFFERENT DOCUMENT FORMATS +@@ -44,7 +44,11 @@ + useful for diagnostics, and for users who want to see the original, whatever + it is. + +- *//* Internal ones *//* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ extern HTAtom *WWW_SOURCE; ++ */ ++/* Internal ones */ ++/* #define WWW_SOURCE HTAtom_for("www/source") */ ++/* Whatever it was originally */ ++ extern HTAtom *WWW_SOURCE; + /* calculated once, heavy used */ + + /* +Index: WWW/Library/Implementation/HTNews.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTNews.c 2010-09-25 00:42:40.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTNews.c 2010-10-27 00:10:51.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTNews.c,v 1.66 2010/09/25 00:42:40 tom Exp $ ++ * $LynxId: HTNews.c,v 1.67 2010/10/27 00:10:51 tom Exp $ + * + * NEWS ACCESS HTNews.c + * =========== +@@ -94,7 +94,6 @@ + static int HTCanPost = FALSE; /* Current POST permission */ + static char response_text[LINE_LENGTH + 1]; /* Last response */ + +-/* static HText * HT; *//* the new hypertext */ + static HTStructured *target; /* The output sink */ + static HTStructuredClass targetClass; /* Copy of fn addresses */ + static HTStream *rawtarget = NULL; /* The output sink for rawtext */ +Index: WWW/Library/Implementation/HTString.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTString.c 2010-09-25 11:32:30.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTString.c 2010-11-07 21:20:58.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTString.c,v 1.64 2010/09/25 11:32:30 tom Exp $ ++ * $LynxId: HTString.c,v 1.65 2010/11/07 21:20:58 tom Exp $ + * + * Case-independent string comparison HTString.c + * +@@ -777,6 +777,7 @@ + + else if (type == 'Z') + VA_INTGR(size_t); ++ + else + VA_INTGR(int); + +Index: WWW/Library/Implementation/HTTCP.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTTCP.c 2010-09-25 11:32:53.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTTCP.c 2010-11-07 21:20:58.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTTCP.c,v 1.104 2010/09/25 11:32:53 tom Exp $ ++ * $LynxId: HTTCP.c,v 1.106 2010/11/07 21:20:58 tom Exp $ + * + * Generic Communication Code HTTCP.c + * ========================== +@@ -77,9 +77,6 @@ + unsigned long socks_bind_remoteAddr; /* for long Rbind */ + #endif /* SOCKS */ + +-/* PUBLIC SockA HTHostAddress; *//* The internet address of the host */ +- /* Valid after call to HTHostName() */ +- + /* Encode INET status (as in sys/errno.h) inet_status() + * ------------------ + * +@@ -2105,7 +2102,7 @@ + #ifdef USE_READPROGRESS + CTRACE2(TRACE_TIMING, (tfp, "...HTDoRead returns %d (%" PRI_time_t + " seconds)\n", +- result, CAST_time_t(time((time_t *) 0) - start))); ++ result, CAST_time_t (time((time_t *)0) - start))); + #endif + return result; + } +Index: WWW/Library/Implementation/HTTP.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTTP.c 2010-09-25 11:31:46.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTTP.c 2010-11-07 21:20:58.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTTP.c,v 1.120 2010/09/25 11:31:46 tom Exp $ ++ * $LynxId: HTTP.c,v 1.121 2010/11/07 21:20:58 tom Exp $ + * + * HyperText Tranfer Protocol - Client implementation HTTP.c + * ========================== +@@ -170,6 +170,7 @@ + } + /* Seed in time (mod_ssl does this) */ + RAND_seed((unsigned char *) &t, (int) sizeof(time_t)); ++ + /* Seed in pid (mod_ssl does this) */ + RAND_seed((unsigned char *) &pid, (int) sizeof(pid)); + /* Initialize system's random number generator */ +@@ -1048,12 +1049,12 @@ + if (pres->quality < 1.0) { + if (pres->maxbytes > 0) { + sprintf(temp, ";q=%4.3f;mxb=%" PRI_off_t "", +- pres->quality, CAST_off_t(pres->maxbytes)); ++ pres->quality, CAST_off_t (pres->maxbytes)); + } else { + sprintf(temp, ";q=%4.3f", pres->quality); + } + } else if (pres->maxbytes > 0) { +- sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t(pres->maxbytes)); ++ sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t (pres->maxbytes)); + } else { + temp[0] = '\0'; + } +Index: WWW/Library/Implementation/HTUtils.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTUtils.h 2010-09-25 15:32:56.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTUtils.h 2010-10-27 00:08:52.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTUtils.h,v 1.102 2010/09/25 15:32:56 tom Exp $ ++ * $LynxId: HTUtils.h,v 1.103 2010/10/27 00:08:52 tom Exp $ + * + * Utility macros for the W3 code library + * MACROS FOR GENERAL USE +@@ -157,12 +157,12 @@ + #define LY_MAXPATH 256 + #endif + +-#ifndef GCC_NORETURN +-#define GCC_NORETURN /* nothing */ ++#ifndef GCC_NORETURN ++#define GCC_NORETURN /* nothing */ + #endif + +-#ifndef GCC_UNUSED +-#define GCC_UNUSED /* nothing */ ++#ifndef GCC_UNUSED ++#define GCC_UNUSED /* nothing */ + #endif + + #if defined(__GNUC__) && defined(_FORTIFY_SOURCE) +Index: WWW/Library/Implementation/HTVMS_WaisUI.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/HTVMS_WaisUI.c 2010-09-25 00:32:18.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/HTVMS_WaisUI.c 2010-10-29 21:10:14.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTVMS_WaisUI.c,v 1.16 2010/09/25 00:32:18 tom Exp $ ++ * $LynxId: HTVMS_WaisUI.c,v 1.17 2010/10/29 21:10:14 tom Exp $ + * HTVMS_WAISUI.c + * + * Adaptation for Lynx by F.Macrides (macrides@sci.wfeb.edu) +@@ -695,7 +695,7 @@ + query->DatabaseNames = (char **) s_realloc((char *) query->DatabaseNames, + (size_t) (sizeof(char + *) * +- (i + 2))); ++ (i + 2))); + + query->DatabaseNames[i] = s_strdup(ptr); + query->DatabaseNames[i + 1] = NULL; +@@ -713,7 +713,7 @@ + query->ElementSetNames = (char **) s_realloc((char *) query->ElementSetNames, + (size_t) (sizeof(char + *) * +- (i + 2))); ++ (i + 2))); + + query->ElementSetNames[i] = s_strdup(ptr); + query->ElementSetNames[i + 1] = NULL; +Index: WWW/Library/Implementation/LYexit.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/LYexit.h 2005-01-02 23:49:58.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/LYexit.h 2010-10-27 00:13:53.000000000 +0000 +@@ -39,15 +39,23 @@ + #define exit(code) LYexit(code) + #define atexit LYatexit + #define ATEXITSIZE 50 ++ + /* + * Data structures +- *//* +- * Global variable declarations +- *//* +- * Macros +- *//* +- * Function declarations +- */ extern void outofmem(const char *fname, const char *func); ++ */ ++ ++/* ++ * Global variable declarations ++ */ ++ ++/* ++ * Macros ++ */ ++ ++/* ++ * Function declarations ++ */ ++ extern void outofmem(const char *fname, const char *func); + extern void reset_signals(void); + extern void exit_immediately(int status) GCC_NORETURN; + extern void LYexit(int status) GCC_NORETURN; +Index: WWW/Library/Implementation/SGML.c +--- lynx2.8.8dev.6+/WWW/Library/Implementation/SGML.c 2010-10-04 00:04:12.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/SGML.c 2010-11-07 21:20:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: SGML.c,v 1.140 2010/10/04 00:04:12 tom Exp $ ++ * $LynxId: SGML.c,v 1.141 2010/11/07 21:20:59 tom Exp $ + * + * General SGML Parser code SGML.c + * ======================== +@@ -2153,7 +2153,7 @@ + uck < 256) { + CTRACE((tfp, "UCTransUniChar returned 0x%.2" PRI_UCode_t + ":'%c'.\n", +- uck, FROMASCII((char) uck))); ++ uck, FROMASCII((char)uck))); + /* + * We got one octet from the conversions, so use it. - FM + */ +Index: WWW/Library/Implementation/UCAux.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/UCAux.h 2010-09-24 00:14:04.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/UCAux.h 2010-11-07 21:20:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCAux.h,v 1.17 2010/09/24 00:14:04 tom Exp $ ++ * $LynxId: UCAux.h,v 1.18 2010/11/07 21:20:59 tom Exp $ + */ + #ifndef UCAUX_H + #define UCAUX_H +@@ -59,11 +59,11 @@ + int vert_in, + int hori_in); + +- typedef void putc_func_t(HTStream *me, +- int ch); ++ typedef void putc_func_t (HTStream *me, ++ int ch); + + extern BOOL UCPutUtf8_charstring(HTStream *target, +- putc_func_t * actions, ++ putc_func_t *actions, + UCode_t code); + + extern BOOL UCConvertUniToUtf8(UCode_t code, +Index: WWW/Library/Implementation/tidy_tls.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/tidy_tls.h 2008-04-27 22:50:39.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/tidy_tls.h 2010-10-27 00:07:26.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: tidy_tls.h,v 1.1 2008/04/27 22:50:39 tom Exp $ ++ * $LynxId: tidy_tls.h,v 1.2 2010/10/27 00:07:26 tom Exp $ + * Copyright 2008, Thomas E. Dickey + */ + #ifndef TIDY_TLS_H +@@ -103,7 +103,7 @@ + /* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options + * are 'ored' with SSL_VERIFY_PEER if they are desired */ + #define SSL_VERIFY_PEER 0x01 +- ++/* *INDENT-OFF* */ + extern SSL *SSL_new(SSL_CTX * ctx); + extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl); + extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method); +@@ -134,5 +134,6 @@ + extern void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, int (*verify_callback) (int, X509_STORE_CTX *)); + extern void SSL_free(SSL * ssl); + extern void SSL_load_error_strings(void); ++/* *INDENT-ON* */ + + #endif /* TIDY_TLS_H */ +Index: WWW/Library/Implementation/www_tcp.h +--- lynx2.8.8dev.6+/WWW/Library/Implementation/www_tcp.h 2010-09-25 16:24:45.000000000 +0000 ++++ lynx2.8.8dev.6b/WWW/Library/Implementation/www_tcp.h 2010-10-31 17:56:16.000000000 +0000 +@@ -1,5 +1,5 @@ + /* System dependencies in the W3 library +- * $LynxId: www_tcp.h,v 1.45 2010/09/25 16:24:45 tom Exp $ ++ * $LynxId: www_tcp.h,v 1.47 2010/10/31 17:56:16 tom Exp $ + * + SYSTEM DEPENDENCIES + +@@ -159,7 +159,8 @@ + /* For debugging + #include + #define TOASCII(c) (assert((c)>=0 && (c)<256), un_IBM1047[c]) +-*//* for production */ ++*/ ++/* for production */ + #define TOASCII(c) (un_IBM1047[c]) + + #define FROMASCII(c) (IBM1047[c]) +@@ -746,10 +747,10 @@ + + # ifdef HAVE_LIMITS_H + # include +-# endif /* HAVE_LIMITS_H */ ++# endif /* HAVE_LIMITS_H */ + # if !defined(MAXINT) && defined(INT_MAX) + # define MAXINT INT_MAX +-# endif /* !MAXINT && INT_MAX */ ++# endif /* !MAXINT && INT_MAX */ + + #else + +Index: lib/dirent.c +Prereq: 1.4 +--- lynx2.8.8dev.6+/lib/dirent.c 2009-03-11 00:31:33.000000000 +0000 ++++ lynx2.8.8dev.6b/lib/dirent.c 2010-10-31 17:56:17.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: dirent.c,v 1.3 2009/03/11 00:31:33 tom Exp $ ++ * $LynxId: dirent.c,v 1.4 2010/10/31 17:56:17 tom Exp $ + * + * dir.c for MS-DOS by Samuel Lam , June/87 + */ +@@ -20,7 +20,6 @@ + * Changes made by Gordon Chaffee (chaffee@bugs-bunny.cs.berkeley.edu) + */ + +- + /*Includes: + * crt + */ +@@ -123,6 +122,7 @@ + return NULL; + } + dirp = malloc(sizeof(DIR)); ++ + if (dirp == NULL) { + return dirp; + } +@@ -153,7 +153,7 @@ + } + do { + if (((dp = malloc(sizeof(struct _dircontents))) == NULL) || +- ((dp->_d_entry = malloc(strlen(s) + 1)) == NULL)) { ++ ((dp->_d_entry = malloc(strlen(s) + 1)) == NULL)) { + if (dp) + free(dp); + free_dircontents(dirp->dd_contents); +@@ -180,13 +180,13 @@ + return opendirx(name, "*"); + } + +-void closedir(DIR * dirp) ++void closedir(DIR *dirp) + { + free_dircontents(dirp->dd_contents); + free(dirp); + } + +-struct dirent *readdir(DIR * dirp) ++struct dirent *readdir(DIR *dirp) + { + /* static struct dirent dp; */ + if (dirp->dd_cp == NULL) +@@ -204,25 +204,23 @@ + dirp->dd_cp = dirp->dd_cp->_d_next; + dirp->dd_loc++; + +- + return &dp; + } + +-void seekdir(DIR * dirp, long off) ++void seekdir(DIR *dirp, long off) + { + long i = off; + struct _dircontents *dp; + + if (off >= 0) { +- for (dp = dirp->dd_contents; --i >= 0 && dp; dp = dp->_d_next); ++ for (dp = dirp->dd_contents; --i >= 0 && dp; dp = dp->_d_next) ; + + dirp->dd_loc = off - (i + 1); + dirp->dd_cp = dp; + } + } + +- +-long telldir(DIR * dirp) ++long telldir(DIR *dirp) + { + return dirp->dd_loc; + } +@@ -263,14 +261,12 @@ + } + /* end of getdirent() */ + +-struct passwd *_cdecl +- getpwnam(char *name) ++struct passwd *_cdecl getpwnam(char *name) + { + return NULL; + } + +-struct passwd *_cdecl +- getpwuid(int uid) ++struct passwd *_cdecl getpwuid(int uid) + { + return NULL; + } +@@ -280,8 +276,7 @@ + return 0; + } + +-void _cdecl +- endpwent(void) ++void _cdecl endpwent(void) + { + } + +Index: lib/dirent.h +Prereq: 2.0 +--- lynx2.8.8dev.6+/lib/dirent.h 1999-07-14 16:44:55.000000000 +0000 ++++ lynx2.8.8dev.6b/lib/dirent.h 2010-10-31 17:56:17.000000000 +0000 +@@ -14,43 +14,40 @@ + * changed d_name to char * instead of array, removed non-std extensions + * + * Cleanup, other hackery, Summer '92, Brian Moran , brianmo@microsoft.com +- */ ++ */ + + #ifndef _DIRENT + #define _DIRENT + + #include + +-struct dirent +-{ +- ino_t d_ino; /* a bit of a farce */ +- short d_reclen; /* more farce */ +- short d_namlen; /* length of d_name */ +- char *d_name; +-}; +- +-struct _dircontents +-{ +- char *_d_entry; +- struct _dircontents *_d_next; +-}; +- +-typedef struct _dirdesc +-{ +- int dd_id; /* uniquely identify each open directory*/ +- long dd_loc; /* where we are in directory entry */ +- struct _dircontents *dd_contents; /* pointer to contents of dir */ +- struct _dircontents *dd_cp; /* pointer to current position */ +-} +-DIR; +- +-extern DIR *opendir(char *); +-extern struct dirent *readdir(DIR *); +-extern void seekdir(DIR *, long); +-extern long telldir(DIR *); +-extern void closedir(DIR *); +-#define rewinddir(dirp) seekdir(dirp, 0L) ++struct dirent { ++ ino_t d_ino; /* a bit of a farce */ ++ short d_reclen; /* more farce */ ++ short d_namlen; /* length of d_name */ ++ char *d_name; ++}; ++ ++struct _dircontents { ++ char *_d_entry; ++ struct _dircontents *_d_next; ++}; ++ ++typedef struct _dirdesc { ++ int dd_id; /* uniquely identify each open directory */ ++ long dd_loc; /* where we are in directory entry */ ++ struct _dircontents *dd_contents; /* pointer to contents of dir */ ++ struct _dircontents *dd_cp; /* pointer to current position */ ++} DIR; ++ ++extern DIR *opendir(char *); ++extern struct dirent *readdir(DIR *); ++extern void seekdir(DIR *, long); ++extern long telldir(DIR *); ++extern void closedir(DIR *); ++ ++#define rewinddir(dirp) seekdir(dirp, 0L) + + #endif /* _DIRENT */ + +-/* end of dirent.h */ ++/* end of dirent.h */ +Index: src/GridText.c +--- lynx2.8.8dev.6+/src/GridText.c 2010-10-03 17:47:23.000000000 +0000 ++++ lynx2.8.8dev.6b/src/GridText.c 2010-11-08 09:57:30.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: GridText.c,v 1.204 2010/10/03 17:47:23 tom Exp $ ++ * $LynxId: GridText.c,v 1.206 2010/11/08 09:57:30 tom Exp $ + * + * Character grid hypertext object + * =============================== +@@ -2299,7 +2299,7 @@ + */ + if (Anchor_ptr->show_anchor + && non_empty(hi_string) +- && (Anchor_ptr->link_type == HYPERTEXT_ANCHOR)) { ++ && (Anchor_ptr->link_type & HYPERTEXT_ANCHOR)) { + int count; + char *s; + +@@ -4628,7 +4628,7 @@ + /* + * oldpos, newpos: allocate space for two int arrays. + */ +- oldpos = typecallocn(int, 2 * (size_t) ncols); ++ oldpos = typecallocn(int, 2 * (size_t)ncols); + if (!oldpos) + return -1; + else +@@ -5884,7 +5884,7 @@ + * is not yet done with it. - kw + */ + if (!anchor_ptr->extent && anchor_ptr->number && +- (anchor_ptr->link_type == HYPERTEXT_ANCHOR) && ++ (anchor_ptr->link_type & HYPERTEXT_ANCHOR) && + !anchor_ptr->show_anchor && + anchor_ptr->number == text->last_anchor_number) + continue; +@@ -5918,7 +5918,7 @@ + * Strip off any spaces or SpecialAttrChars at the beginning, + * if they exist, but only on HYPERTEXT_ANCHORS. + */ +- if (anchor_ptr->link_type == HYPERTEXT_ANCHOR) { ++ if (anchor_ptr->link_type & HYPERTEXT_ANCHOR) { + ch = UCH(line_ptr->data[anchor_ptr->line_pos]); + while (isspace(ch) || + IsSpecialAttrChar(ch)) { +@@ -6017,7 +6017,7 @@ + /*handle LY_SOFT_NEWLINEs -VH */ + hi_offset += remove_special_attr_chars(hi_string); + +- if (anchor_ptr->link_type == HYPERTEXT_ANCHOR) { ++ if (anchor_ptr->link_type & HYPERTEXT_ANCHOR) { + LYTrimTrailing(hi_string); + } + if (non_empty(hi_string)) { +@@ -6036,7 +6036,7 @@ + + hilite_str = LYGetHiTextStr(anchor_ptr, 0); + remove_special_attr_chars(hilite_str); +- if (anchor_ptr->link_type == HYPERTEXT_ANCHOR) { ++ if (anchor_ptr->link_type & HYPERTEXT_ANCHOR) { + LYTrimTrailing(hilite_str); + } + +@@ -7195,7 +7195,7 @@ + BOOL result = FALSE; + + if (Anchor_ptr->show_anchor +- && (Anchor_ptr->link_type == HYPERTEXT_ANCHOR)) { ++ && (Anchor_ptr->link_type & HYPERTEXT_ANCHOR)) { + result = TRUE; + } else if (Anchor_ptr->link_type == INPUT_ANCHOR + && Anchor_ptr->input_field->type != F_HIDDEN_TYPE) { +Index: src/HTAlert.c +--- lynx2.8.8dev.6+/src/HTAlert.c 2010-09-26 16:36:38.000000000 +0000 ++++ lynx2.8.8dev.6b/src/HTAlert.c 2010-11-07 21:21:00.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTAlert.c,v 1.93 2010/09/26 16:36:38 tom Exp $ ++ * $LynxId: HTAlert.c,v 1.94 2010/11/07 21:21:00 tom Exp $ + * + * Displaying messages and getting input for Lynx Browser + * ========================================================== +@@ -178,15 +178,16 @@ + + if (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) { + if (n >= 10 * kb_units) { +- sprintf(s, "%" PRI_off_t, CAST_off_t(n / kb_units)); ++ sprintf(s, "%" PRI_off_t, CAST_off_t (n / kb_units)); + } else if (n > 999) { /* Avoid switching between 1016b/s and 1K/s */ + sprintf(s, "%.2g", ((double) n) / (double) kb_units); + } else { +- sprintf(s, "%" PRI_off_t, CAST_off_t(n)); ++ sprintf(s, "%" PRI_off_t, CAST_off_t (n)); ++ + u = HTProgressUnits(rateBYTES); + } + } else { +- sprintf(s, "%" PRI_off_t, CAST_off_t(n)); ++ sprintf(s, "%" PRI_off_t, CAST_off_t (n)); + } + + if (!was_units || was_units != u) +@@ -307,8 +308,8 @@ + + CTRACE((tfp, "rateBAR: bytes: %" PRI_off_t ", total: " + "%" PRI_off_t "\n", +- CAST_off_t(bytes), +- CAST_off_t(total))); ++ CAST_off_t (bytes), ++ CAST_off_t (total))); + CTRACE((tfp, "meter = %d\n", meter)); + + HTSprintf0(&line, "%d%% ", (int) (percent * 100)); +Index: src/HTML.c +--- lynx2.8.8dev.6+/src/HTML.c 2010-09-25 17:00:36.000000000 +0000 ++++ lynx2.8.8dev.6b/src/HTML.c 2010-11-01 22:19:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: HTML.c,v 1.146 2010/09/25 17:00:36 tom Exp $ ++ * $LynxId: HTML.c,v 1.148 2010/11/01 22:19:09 tom Exp $ + * + * Structured stream to Rich hypertext converter + * ============================================ +@@ -312,8 +312,10 @@ + return; + } + me->lastraw = c; +- if (c == '\r') ++ if (c == '\r') { + c = '\n'; ++ uc = UCH(c); ++ } + + /* + * Handle SGML_LITTERAL tags that have HTChunk elements. - FM +Index: src/LYCharUtils.c +--- lynx2.8.8dev.6+/src/LYCharUtils.c 2010-09-24 09:56:59.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYCharUtils.c 2010-11-07 21:21:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYCharUtils.c,v 1.108 2010/09/24 09:56:59 tom Exp $ ++ * $LynxId: LYCharUtils.c,v 1.109 2010/11/07 21:21:01 tom Exp $ + * + * Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM + * ========================================================================== +@@ -1754,6 +1754,7 @@ + !(HTPassEightBitRaw && + UCH(*p) >= lowest_8)) { + sprintf(replace_buf, "U%.2" PRI_UCode_t "", code); ++ + state = S_got_outstring; + } else { + puni = p; +Index: src/LYCookie.c +--- lynx2.8.8dev.6+/src/LYCookie.c 2010-09-24 23:53:47.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYCookie.c 2010-11-07 21:21:02.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYCookie.c,v 1.105 2010/09/24 23:53:47 tom Exp $ ++ * $LynxId: LYCookie.c,v 1.106 2010/11/07 21:21:02 tom Exp $ + * + * Lynx Cookie Support LYCookie.c + * =================== +@@ -1061,7 +1061,7 @@ + } else { + cur_cookie->expires = (time(NULL) + temp); + CTrace((tfp, "LYSetCookie: expires %" PRI_time_t ", %s", +- CAST_time_t(cur_cookie->expires), ++ CAST_time_t (cur_cookie->expires), + ctime(&cur_cookie->expires))); + } + flags |= FLAGS_MAXAGE_ATTR; +@@ -1082,7 +1082,7 @@ + cur_cookie->expires = LYmktime(value, FALSE); + if (cur_cookie->expires > 0) { + CTrace((tfp, "LYSetCookie: expires %" PRI_time_t ", %s", +- CAST_time_t(cur_cookie->expires), ++ CAST_time_t (cur_cookie->expires), + ctime(&cur_cookie->expires))); + } + } +@@ -1723,7 +1723,7 @@ + (co->value ? co->value : "[no value]"))); + if (co->expires > 0) { + CTrace((tfp, " expires: %" PRI_time_t ", %s\n", +- CAST_time_t(co->expires), ++ CAST_time_t (co->expires), + ctime(&co->expires))); + } + if (isHTTPS_URL(address) && +@@ -2098,7 +2098,7 @@ + continue; + + CTrace((tfp, "LYStoreCookies: %" PRI_time_t " cf %" PRI_time_t " ", +- CAST_time_t(now), CAST_time_t(co->expires))); ++ CAST_time_t (now), CAST_time_t (co->expires))); + + if ((co->flags & COOKIE_FLAG_DISCARD)) { + CTrace((tfp, "not stored - DISCARD\n")); +@@ -2124,7 +2124,7 @@ + (de->domain[0] == '.') ? "TRUE" : "FALSE", + co->path, + co->flags & COOKIE_FLAG_SECURE ? "TRUE" : "FALSE", +- CAST_time_t(co->expires), co->name, ++ CAST_time_t (co->expires), co->name, + (co->quoted ? "\"" : ""), + NonNull(co->value), + (co->quoted ? "\"" : "")); +Index: src/LYCurses.c +--- lynx2.8.8dev.6+/src/LYCurses.c 2010-09-25 00:48:03.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYCurses.c 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYCurses.c,v 1.156 2010/09/25 00:48:03 tom Exp $ */ ++/* $LynxId: LYCurses.c,v 1.158 2010/10/31 17:56:18 tom Exp $ */ + #include + #include + +@@ -1138,7 +1138,7 @@ + when the keypad is switched on, some keybindings may be overriden. */ + keypad(LYwin, TRUE); + keypad_on = 1; +-# endif /* HAVE_KEYPAD */ ++# endif /* HAVE_KEYPAD */ + + if (-1 == lynx_initialize_keymaps()) { + endwin(); +@@ -1245,8 +1245,6 @@ + #endif /* __DJGPP__ */ + #endif /* not VMS */ + +-/* nonl(); *//* seems to slow things down */ +- + #ifdef VMS + crmode(); + raw(); +@@ -1488,7 +1486,7 @@ + + #ifdef __DJGPP__ + ScreenClear(); +-#elif !defined(PDCURSES) /* some flavor of win32? */ ++#elif !defined(PDCURSES) /* some flavor of win32? */ + clrscr(); + #endif /* win32 */ + +@@ -1781,7 +1779,7 @@ + wbkgd(my_subwindow, (chtype) (b | ' ')); + } + LynxWChangeStyle(my_subwindow, s_menu_bg, STACK_OFF); +-#elif defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ ++#elif defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ + wbkgd(my_subwindow, getbkgd(LYwin)); + #endif + #endif +Index: src/LYCurses.h +--- lynx2.8.8dev.6+/src/LYCurses.h 2010-10-04 08:56:09.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYCurses.h 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYCurses.h,v 1.86 2010/10/04 08:56:09 tom Exp $ */ ++/* $LynxId: LYCurses.h,v 1.87 2010/10/31 17:56:18 tom Exp $ */ + #ifndef LYCURSES_H + #define LYCURSES_H + +@@ -260,7 +260,7 @@ + # include + # else + # include /* everything else */ +-# endif /* VMS && __GNUC__ */ ++# endif /* VMS && __GNUC__ */ + #endif /* HAVE_CONFIG_H */ + + /* +Index: src/LYForms.c +--- lynx2.8.8dev.6+/src/LYForms.c 2010-09-24 09:40:44.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYForms.c 2010-10-31 17:56:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYForms.c,v 1.86 2010/09/24 09:40:44 tom Exp $ */ ++/* $LynxId: LYForms.c,v 1.87 2010/10/31 17:56:18 tom Exp $ */ + #include + #include + #include +@@ -528,7 +528,7 @@ + MyEdit.dirty = TRUE; + } + } else +-# endif /* NCURSES || PDCURSES */ ++# endif /* NCURSES || PDCURSES */ + #endif /* USE_MOUSE */ + + { +Index: src/LYKeymap.c +--- lynx2.8.8dev.6+/src/LYKeymap.c 2010-09-25 12:44:34.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYKeymap.c 2010-11-07 21:21:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYKeymap.c,v 1.72 2010/09/25 12:44:34 tom Exp $ */ ++/* $LynxId: LYKeymap.c,v 1.73 2010/11/07 21:21:04 tom Exp $ */ + #include + #include + #include +@@ -1274,7 +1274,7 @@ + return 0; + } + +-static char *format_binding(LYKeymap_t * table, int i) ++static char *format_binding(LYKeymap_t *table, int i) + { + LYKeymapCode the_key = (LYKeymapCode) table[i]; + char *buf = 0; +Index: src/LYLocal.c +--- lynx2.8.8dev.6+/src/LYLocal.c 2010-09-25 16:26:16.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYLocal.c 2010-11-01 08:46:02.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYLocal.c,v 1.112 2010/09/25 16:26:16 tom Exp $ ++ * $LynxId: LYLocal.c,v 1.114 2010/11/01 08:46:02 tom Exp $ + * + * Routines to manipulate the local filesystem. + * Written by: Rick Mallett, Carleton University +@@ -386,6 +386,7 @@ + va_list ap; + + va_start(ap, command); ++ result[0] = 0; + StrAllocCopy(result[argc++], command); + do { + result[argc] = 0; +@@ -1756,7 +1757,7 @@ + } + return buffer; + } +-# endif /* OK_GZIP */ ++# endif /* OK_GZIP */ + if ((arg = match_op("UNTAR_Z", line)) != 0) { + #define FMT_UNTAR_Z "cd %s; %s %s | %s %s %s" + if ((program = HTGetProgramPath(ppZCAT)) != NULL) { +@@ -1781,7 +1782,7 @@ + HTEndParam(&buffer, FMT_UNTAR, 4); + return buffer; + } +-# endif /* !ARCHIVE_ONLY */ ++# endif /* !ARCHIVE_ONLY */ + + # ifdef OK_GZIP + if ((arg = match_op("TAR_GZ", line)) != 0) { +@@ -1800,7 +1801,7 @@ + } + return buffer; + } +-# endif /* OK_GZIP */ ++# endif /* OK_GZIP */ + + if ((arg = match_op("TAR_Z", line)) != 0) { + #define FMT_TAR_Z "cd %s; %s %s %s %s | %s >%s%s" +@@ -1882,7 +1883,7 @@ + } + return buffer; + } +-# endif /* !ARCHIVE_ONLY */ ++# endif /* !ARCHIVE_ONLY */ + #endif /* OK_ZIP */ + + if ((arg = match_op("COMPRESS", line)) != 0) { +Index: src/LYPrettySrc.c +--- lynx2.8.8dev.6+/src/LYPrettySrc.c 2010-09-24 22:06:29.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYPrettySrc.c 2010-10-27 00:15:12.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYPrettySrc.c,v 1.24 2010/09/24 22:06:29 tom Exp $ ++ * $LynxId: LYPrettySrc.c,v 1.25 2010/10/27 00:15:12 tom Exp $ + * + * HTML source syntax highlighting + * by Vlad Harchev +@@ -159,7 +159,8 @@ + int n = tag->number_of_attributes; + attr *attrs = tag->attributes; + +-/*.... *//* this is not implemented though it's easy */ ++/*.... */ ++/* this is not implemented though it's easy */ + # endif + + hcode = hash_code_aggregate_char('.', hcode); +Index: src/LYReadCFG.c +--- lynx2.8.8dev.6+/src/LYReadCFG.c 2010-09-27 10:45:02.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYReadCFG.c 2010-11-07 21:21:06.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYReadCFG.c,v 1.156 2010/09/27 10:45:02 tom Exp $ ++ * $LynxId: LYReadCFG.c,v 1.157 2010/11/07 21:21:06 tom Exp $ + */ + #ifndef NO_RULES + #include +@@ -1904,7 +1904,7 @@ + const char *parent_filename, + int nesting_level, + FILE *fp0, +- optidx_set_t * allowed) ++ optidx_set_t *allowed) + { + FILE *fp; + char *buffer = 0; +Index: src/LYSession.c +--- lynx2.8.8dev.6+/src/LYSession.c 2008-07-02 21:24:27.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYSession.c 2010-10-31 18:15:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYSession.c,v 1.6 2008/07/02 21:24:27 Paul.B.Mahol Exp $ */ ++/* $LynxId: LYSession.c,v 1.7 2010/10/31 18:15:33 Paul.B.Mahol Exp $ */ + + #include + +@@ -63,11 +63,12 @@ + DocInfo doc; + VisitedLink *vl; + int i = 0; +- short errors = 10; /* how many syntax errors are allowed in */ +- +- /* session file before aborting. */ ++ short errors = 10; /* how many syntax errors are allowed in ++ * session file before aborting. */ + char *value1, *value2, *rsline, *linktext, *rslevel; + ++ memset(&doc, 0, sizeof(doc)); ++ + /* + * This should be done only once, here: iff USE_SESSIONS is defined or: + * in mainloop(), otherwise history entries are lost +Index: src/LYSignal.h +--- lynx2.8.8dev.6+/src/LYSignal.h 2005-01-02 23:49:58.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYSignal.h 2010-11-07 21:21:07.000000000 +0000 +@@ -16,10 +16,10 @@ + #endif /* VMS */ + + #ifdef HAVE_SIGACTION +- typedef void LYSigHandlerFunc_t(int); ++ typedef void LYSigHandlerFunc_t (int); + + /* implementation in LYUtils.c */ +- extern void LYExtSignal(int sig, LYSigHandlerFunc_t * handler); ++ extern void LYExtSignal(int sig, LYSigHandlerFunc_t *handler); + + #else + #define LYExtSignal(sig,h) signal(sig, h) +Index: src/LYUtils.c +--- lynx2.8.8dev.6+/src/LYUtils.c 2010-10-04 09:00:23.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYUtils.c 2010-11-07 21:21:08.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: LYUtils.c,v 1.204 2010/10/04 09:00:23 tom Exp $ ++ * $LynxId: LYUtils.c,v 1.206 2010/11/07 21:21:08 tom Exp $ + */ + #include + #include +@@ -2891,7 +2891,7 @@ + * ignored anyway.) - kw + */ + void LYExtSignal(int sig, +- LYSigHandlerFunc_t * handler) ++ LYSigHandlerFunc_t *handler) + { + #ifdef SIGWINCH + /* add more cases to if(condition) if required... */ +@@ -2978,9 +2978,9 @@ + # else + # ifdef HAVE_TERMIO_H + # include +-# endif /* HAVE_TERMIO_H */ +-# endif /* HAVE_TERMIOS_H */ +-# endif /* TERMIO_AND_TERMIOS */ ++# endif /* HAVE_TERMIO_H */ ++# endif /* HAVE_TERMIOS_H */ ++# endif /* TERMIO_AND_TERMIOS */ + #endif /* TERMIO_AND_CURSES */ + + void size_change(int sig GCC_UNUSED) +@@ -7574,7 +7574,7 @@ + return 0; + } + +-# endif /* !defined(WIN_EX) && defined(HAVE_POPEN) */ ++# endif /* !defined(WIN_EX) && defined(HAVE_POPEN) */ + + #endif /* __EMX__ */ + +Index: src/LYmktime.c +--- lynx2.8.8dev.6+/src/LYmktime.c 2010-09-25 00:51:53.000000000 +0000 ++++ lynx2.8.8dev.6b/src/LYmktime.c 2010-11-07 21:21:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: LYmktime.c,v 1.11 2010/09/25 00:51:53 tom Exp $ */ ++/* $LynxId: LYmktime.c,v 1.12 2010/11/07 21:21:08 tom Exp $ */ + + #include + #include +@@ -69,7 +69,7 @@ + } + if (result != 0) { + CTRACE((tfp, "LYmktime: clock=%" PRI_time_t ", ctime=%s", +- CAST_time_t(result), ++ CAST_time_t (result), + ctime(&result))); + } + } +@@ -304,7 +304,7 @@ + clock2 = (time_t) 0; + if (clock2 > 0) + CTRACE((tfp, "LYmktime: clock=%" PRI_time_t ", ctime=%s", +- CAST_time_t(clock2), ++ CAST_time_t (clock2), + ctime(&clock2))); + + return (clock2); +@@ -318,8 +318,9 @@ + time_t after = parsedate(source, 0); + + printf("TEST %s\n", source); +- printf("\t%" PRI_time_t " %s", CAST_time_t(before), ctime(&before)); +- printf("\t%" PRI_time_t " %s", CAST_time_t(after), ctime(&after)); ++ printf("\t%" PRI_time_t " %s", CAST_time_t (before), ctime(&before)); ++ printf("\t%" PRI_time_t " %s", CAST_time_t (after), ctime(&after)); ++ + if (before != after) + printf("\t****\n"); + } +Index: src/TRSTable.c +--- lynx2.8.8dev.6+/src/TRSTable.c 2010-09-25 12:47:08.000000000 +0000 ++++ lynx2.8.8dev.6b/src/TRSTable.c 2010-10-27 00:15:10.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: TRSTable.c,v 1.28 2010/09/25 12:47:08 tom Exp $ ++ * $LynxId: TRSTable.c,v 1.29 2010/10/27 00:15:10 tom Exp $ + * Simple table object + * =================== + * Authors +@@ -1322,7 +1322,8 @@ + } + + /* Fake at BOL */ +-/* Stbl_finishCellInTable(lineno, 0, 0); *//* Needed? */ ++ /* Stbl_finishCellInTable(lineno, 0, 0); */ ++ /* Needed? */ + + /* Fake at BOL */ + if (Stbl_addRowToTable(me, al, lineno) < 0) { +Index: src/UCAuto.c +--- lynx2.8.8dev.6+/src/UCAuto.c 2010-09-25 00:51:53.000000000 +0000 ++++ lynx2.8.8dev.6b/src/UCAuto.c 2010-10-31 17:56:21.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCAuto.c,v 1.45 2010/09/25 00:51:53 tom Exp $ ++ * $LynxId: UCAuto.c,v 1.46 2010/10/31 17:56:21 tom Exp $ + * + * This file contains code for changing the Linux console mode. + * Currently some names for font files are hardwired in here. +@@ -788,7 +788,7 @@ + CTRACE((tfp, "Display font set to '%s'.\n", name)); + return ord; + } +-# endif /* __EMX__ */ ++# endif /* __EMX__ */ + + int Switch_Display_Charset(const int ord, const enum switch_display_charset_t really) + { +Index: src/UCAux.c +--- lynx2.8.8dev.6+/src/UCAux.c 2010-09-25 15:36:51.000000000 +0000 ++++ lynx2.8.8dev.6b/src/UCAux.c 2010-11-07 21:21:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCAux.c,v 1.43 2010/09/25 15:36:51 tom Exp $ ++ * $LynxId: UCAux.c,v 1.44 2010/11/07 21:21:09 tom Exp $ + */ + #include + +@@ -464,7 +464,7 @@ + #define PUTC(ch) ((*myPutc)(target, (char)(ch))) + #define PUTC2(ch) ((*myPutc)(target,(char)(0x80|(0x3f &(ch))))) + +-BOOL UCPutUtf8_charstring(HTStream *target, putc_func_t * myPutc, UCode_t code) ++BOOL UCPutUtf8_charstring(HTStream *target, putc_func_t *myPutc, UCode_t code) + { + if (code < 128) + return NO; /* indicate to caller we didn't handle it */ +Index: src/UCdomap.c +--- lynx2.8.8dev.6+/src/UCdomap.c 2010-09-25 15:31:34.000000000 +0000 ++++ lynx2.8.8dev.6b/src/UCdomap.c 2010-11-07 21:21:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: UCdomap.c,v 1.86 2010/09/25 15:31:34 tom Exp $ ++ * $LynxId: UCdomap.c,v 1.89 2010/11/07 21:21:09 tom Exp $ + * + * UCdomap.c + * ========= +@@ -81,7 +81,7 @@ + #include /* RFC 1345 Mnemonic */ + #include /* NeXT character set */ + #include /* RFC 1345 w/o Intro */ +-/* #include *//* UNICODE UTF 8 */ ++/* #include */ /* UNICODE UTF 8 */ + #include /* Vietnamese (VISCII) */ + #include /* Ukrainian Cyrillic (866) */ + #include /* Ukrainian Cyrillic (koi8-u */ +@@ -978,14 +978,14 @@ + */ + HTSprintf0(&tocode, "%s//TRANSLIT", LYCharSet_UC[charset_out].MIMEname); + cd = iconv_open(tocode, "UTF-16BE"); +- if (cd == (iconv_t) - 1) { ++ if (cd == (iconv_t) -1) { + /* + * Try again, without TRANSLIT + */ + HTSprintf0(&tocode, "%s", LYCharSet_UC[charset_out].MIMEname); + cd = iconv_open(tocode, "UTF-16BE"); + +- if (cd == (iconv_t) - 1) { ++ if (cd == (iconv_t) -1) { + CTRACE((tfp, + "Warning: Cannot transcode form charset %s to %s!\n", + "UTF-16BE", tocode)); +@@ -993,7 +993,7 @@ + } + FREE(tocode); + +- if (cd != (iconv_t) - 1) { ++ if (cd != (iconv_t) -1) { + rc = (int) iconv(cd, (ICONV_CONST char **) &pin, &inleft, + &pout, &outleft); + iconv_close(cd); +@@ -2171,7 +2171,7 @@ + CTRACE((tfp, "Found %i.\n", ret)); + return ret; + } +-# endif /* __EMX__ */ ++# endif /* __EMX__ */ + #endif /* CAN_AUTODETECT_DISPLAY_CHARSET */ + #endif /* EXP_CHARTRANS_AUTOSWITCH */ + +@@ -2210,7 +2210,7 @@ + UC_CHARSET_SETUP_big5; /*** Taipei (Big5) */ + + UC_CHARSET_SETUP_viscii; /* Vietnamese (VISCII) */ +- UC_CHARSET_SETUP; /* us-ascii *//* 7 bit approximations */ ++ UC_CHARSET_SETUP; /* us-ascii */ /* 7 bit approximations */ + + UC_CHARSET_SETUP_x_transparent; /*** Transparent */ + +Index: src/mktime.c +--- lynx2.8.8dev.6+/src/mktime.c 2010-04-29 09:10:58.000000000 +0000 ++++ lynx2.8.8dev.6b/src/mktime.c 2010-11-07 22:40:25.000000000 +0000 +@@ -58,8 +58,7 @@ + * if tm_isdst >= 0 use it, else compute it + */ + +-time_t +-mktime(struct tm * t) ++time_t mktime(struct tm * t) + { + time_t result; + +Index: src/parsdate.c +Prereq: 1.9 +--- lynx2.8.8dev.6+/src/parsdate.c 2010-09-22 21:18:46.000000000 +0000 ++++ lynx2.8.8dev.6b/src/parsdate.c 2010-11-08 01:41:03.000000000 +0000 +@@ -17,8 +17,9 @@ + #define YYPURE 0 + + #line 2 "./parsdate.y" ++ + /* +- * $LynxId: parsdate.c,v 1.9 2010/09/22 21:18:46 tom Exp $ ++ * $LynxId: parsdate.c,v 1.10 2010/11/08 01:41:03 tom Exp $ + * + * This module is adapted and extended from tin, to use for LYmktime(). + * +@@ -69,7 +70,7 @@ + #define IS7BIT(x) ((unsigned) TO_ASCII(x) < 128) + #define CTYPE(isXXXXX, c) (IS7BIT(c) && isXXXXX(((unsigned char)c))) + +-typedef char *PD_STRING; ++typedef char *PD_STRING; + + extern int date_parse(void); + +@@ -77,7 +78,6 @@ + #define yylex date_lex + #define yyerror date_error + +- + /* See the LeapYears table in Convert. */ + #define EPOCH 1970 + #define END_OF_TIME 2038 +@@ -91,7 +91,6 @@ + #define LPAREN '(' + #define RPAREN ')' + +- + /* + ** Daylight-savings mode: on, off, or not yet known. + */ +@@ -106,35 +105,35 @@ + MERam, MERpm, MER24 + } MERIDIAN; + +- + /* + ** Global variables. We could get rid of most of them by using a yacc + ** union, but this is more efficient. (This routine predates the + ** yacc %union construct.) + */ +-static char *yyInput; +-static DSTMODE yyDSTmode; +-static int yyHaveDate; +-static int yyHaveRel; +-static int yyHaveTime; +-static time_t yyTimezone; +-static time_t yyDay; +-static time_t yyHour; +-static time_t yyMinutes; +-static time_t yyMonth; +-static time_t yySeconds; +-static time_t yyYear; +-static MERIDIAN yyMeridian; +-static time_t yyRelMonth; +-static time_t yyRelSeconds; +- +-static time_t ToSeconds(time_t, time_t, time_t, MERIDIAN); +-static time_t Convert(time_t, time_t, time_t, time_t, time_t, time_t, MERIDIAN, DSTMODE); +-static time_t DSTcorrect(time_t, time_t); +-static time_t RelativeMonth(time_t, time_t); +-static int LookupWord(char *, int); +-static int date_lex(void); +-static int GetTimeInfo(TIMEINFO *Now); ++static char *yyInput; ++static DSTMODE yyDSTmode; ++static int yyHaveDate; ++static int yyHaveRel; ++static int yyHaveTime; ++static time_t yyTimezone; ++static time_t yyDay; ++static time_t yyHour; ++static time_t yyMinutes; ++static time_t yyMonth; ++static time_t yySeconds; ++static time_t yyYear; ++static MERIDIAN yyMeridian; ++static time_t yyRelMonth; ++static time_t yyRelSeconds; ++ ++static time_t ToSeconds(time_t, time_t, time_t, MERIDIAN); ++static time_t Convert(time_t, time_t, time_t, time_t, time_t, time_t, ++ MERIDIAN, DSTMODE); ++static time_t DSTcorrect(time_t, time_t); ++static time_t RelativeMonth(time_t, time_t); ++static int LookupWord(char *, int); ++static int date_lex(void); ++static int GetTimeInfo(TIMEINFO * Now); + + /* + * The 'date_error()' function is declared here to work around a defect in +@@ -143,18 +142,17 @@ + * 'const' on the parameter to quiet gcc's -Wwrite-strings warning. + */ + /*ARGSUSED*/ +-static void +-date_error(const char GCC_UNUSED *s) ++static void date_error(const char GCC_UNUSED *s) + { +- /*NOTREACHED*/ ++ /*NOTREACHED */ + } + +-#line 136 "./parsdate.y" ++#line 134 "./parsdate.y" + typedef union { + time_t Number; + enum _MERIDIAN Meridian; + } YYSTYPE; +-#line 157 "y.tab.c" ++#line 155 "y.tab.c" + /* compatibility with bison */ + #ifdef YYPARSE_PARAM + /* compatibility with FreeBSD */ +@@ -388,11 +386,13 @@ + + /* variables for the parser stack */ + static YYSTACKDATA yystack; +-#line 358 "./parsdate.y" ++#line 356 "./parsdate.y" ++ + + /* + ** An entry in the lexical lookup table. + */ ++/* *INDENT-OFF* */ + typedef struct _TABLE { + const char *name; + int type; +@@ -557,13 +557,9 @@ + { "hdt", tDAYZONE, HOUR(10) }, /* -- expired 1986 */ + #endif /* 0 */ + }; ++/* *INDENT-ON* */ + +-static time_t +-ToSeconds( +- time_t Hours, +- time_t Minutes, +- time_t Seconds, +- MERIDIAN Meridian) ++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds, MERIDIAN Meridian) + { + if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 61) + return -1; +@@ -572,34 +568,29 @@ + return -1; + } else { + if (Hours < 1 || Hours > 12) +- return -1; ++ return -1; + if (Hours == 12) +- Hours = 0; ++ Hours = 0; + if (Meridian == MERpm) +- Hours += 12; ++ Hours += 12; + } + return (Hours * 60L + Minutes) * 60L + Seconds; + } + +- +-static time_t +-Convert( +- time_t Month, +- time_t Day, +- time_t Year, +- time_t Hours, +- time_t Minutes, +- time_t Seconds, +- MERIDIAN Meridian, +- DSTMODE dst) ++static time_t Convert(time_t Month, time_t Day, time_t Year, time_t Hours, ++ time_t Minutes, time_t Seconds, MERIDIAN Meridian, ++ DSTMODE dst) + { +- static const int DaysNormal[13] = { ++ static const int DaysNormal[13] = ++ { + 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }; +- static const int DaysLeap[13] = { ++ static const int DaysLeap[13] = ++ { + 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }; +- static const int LeapYears[] = { ++ static const int LeapYears[] = ++ { + 1972, 1976, 1980, 1984, 1988, 1992, 1996, + 2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036 + }; +@@ -612,7 +603,7 @@ + if (Year < 0) + Year = -Year; + if (Year < 70) +- Year += 2000; ++ Year += 2000; + if (Year < 100) + Year += 1900; + if (Year < EPOCH) +@@ -623,9 +614,10 @@ + break; + } + if (Year < EPOCH || Year > END_OF_TIME +- || Month < 1 || Month > 12 +- /* NOSTRICT */ /* conversion from long may lose accuracy */ +- || Day < 1 || Day > mp[(int)Month]) { ++ || Month < 1 || Month > 12 ++ /* NOSTRICT */ ++ /* conversion from long may lose accuracy */ ++ || Day < 1 || Day > mp[(int) Month]) { + return -1; + } + +@@ -648,50 +640,40 @@ + return Julian; + } + +- +-static time_t +-DSTcorrect( +- time_t Start, +- time_t Future) ++static time_t DSTcorrect(time_t Start, time_t Future) + { +- time_t StartDay; +- time_t FutureDay; ++ time_t StartDay; ++ time_t FutureDay; + + StartDay = (localtime(&Start)->tm_hour + 1) % 24; + FutureDay = (localtime(&Future)->tm_hour + 1) % 24; + return (Future - Start) + (StartDay - FutureDay) * DST_OFFSET * 60 * 60; + } + +- +-static time_t +-RelativeMonth( +- time_t Start, +- time_t RelMonth) ++static time_t RelativeMonth(time_t Start, time_t RelMonth) + { +- struct tm *tm; +- time_t Month; +- time_t Year; ++ struct tm *tm; ++ time_t Month; ++ time_t Year; + + tm = localtime(&Start); + Month = 12 * tm->tm_year + tm->tm_mon + RelMonth; + Year = Month / 12 + 1900; + Month = Month % 12 + 1; + return DSTcorrect(Start, +- Convert(Month, (time_t)tm->tm_mday, Year, +- (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec, +- MER24, DSTmaybe)); ++ Convert(Month, (time_t) tm->tm_mday, Year, ++ (time_t) tm->tm_hour, (time_t) tm->tm_min, ++ (time_t) tm->tm_sec, ++ MER24, DSTmaybe)); + } + +- +-static int +-LookupWord( +- char *buff, +- int length) ++static int LookupWord(char *buff, ++ int length) + { +- char *p; ++ char *p; + const char *q; + const TABLE *tp; +- int c; ++ int c; + + p = buff; + c = p[0]; +@@ -717,14 +699,14 @@ + /* Try for a timezone. */ + for (tp = TimezoneTable; tp < ENDOF(TimezoneTable); tp++) { + if (c == tp->name[0] && p[1] == tp->name[1] +- && strcmp(p, tp->name) == 0) { ++ && strcmp(p, tp->name) == 0) { + yylval.Number = tp->value; + return tp->type; + } + } + + if (strcmp(buff, "dst") == 0) +- return tDST; ++ return tDST; + + /* Try the units table. */ + for (tp = UnitsTable; tp < ENDOF(UnitsTable); tp++) { +@@ -749,7 +731,7 @@ + length++; + + /* Drop out any periods. */ +- for (p = buff, q = (PD_STRING)buff; *q; q++) { ++ for (p = buff, q = (PD_STRING) buff; *q; q++) { + if (*q != '.') + *p++ = *q; + } +@@ -772,7 +754,7 @@ + c = buff[0]; + for (p = buff, tp = TimezoneTable; tp < ENDOF(TimezoneTable); tp++) { + if (c == tp->name[0] && p[1] == tp->name[1] +- && strcmp(p, tp->name) == 0) { ++ && strcmp(p, tp->name) == 0) { + yylval.Number = tp->value; + return tp->type; + } +@@ -784,7 +766,6 @@ + return tZONE; + } + +- + /* + * This returns characters as-is (the ones that are not part of some token), + * and codes greater than 256 (the token values). +@@ -798,19 +779,18 @@ + * + * The TO_ASCII() function is the inverse of TO_LOCAL(). + */ +-static int +-date_lex(void) ++static int date_lex(void) + { +- int c; +- char *p; +- char buff[20]; +- int sign; +- int i; +- int nesting; ++ int c; ++ char *p; ++ char buff[20]; ++ int sign; ++ int i; ++ int nesting; + +- for(;;) { ++ for (;;) { + /* Get first character after the whitespace. */ +- for(;;) { ++ for (;;) { + while (CTYPE(isspace, *yyInput)) + yyInput++; + c = *yyInput; +@@ -820,13 +800,13 @@ + break; + for (nesting = 1; + (c = *++yyInput) != RPAREN || --nesting; +- ) { ++ ) { + if (c == LPAREN) { + nesting++; + } else if (!IS7BIT(c) || c == '\0' || c == '\r' +- || (c == '\\' +- && ((c = *++yyInput) == '\0' +- || !IS7BIT(c)))) { ++ || (c == '\\' ++ && ((c = *++yyInput) == '\0' ++ || !IS7BIT(c)))) { + /* Lexical error: bad comment. */ + return '?'; + } +@@ -849,7 +829,7 @@ + } + for (p = buff; + (c = *yyInput++) != '\0' && CTYPE(isdigit, c); +- ) { ++ ) { + if (p < &buff[sizeof buff - 1]) + *p++ = (char) c; + } +@@ -865,7 +845,7 @@ + if (CTYPE(isalpha, c)) { + for (p = buff; + (c = *yyInput++) == '.' || CTYPE(isalpha, c); +- ) { ++ ) { + if (p < &buff[sizeof buff - 1]) + *p++ = (char) (CTYPE(isupper, c) ? tolower(c) : c); + } +@@ -878,31 +858,29 @@ + } + } + +- +-static int +-GetTimeInfo( +- TIMEINFO *Now) ++static int GetTimeInfo(TIMEINFO * Now) + { +- static time_t LastTime; +- static long LastTzone; +- struct tm *tm; ++ static time_t LastTime; ++ static long LastTzone; ++ struct tm *tm; ++ + #if defined(HAVE_GETTIMEOFDAY) +- struct timeval tv; +-#endif /* defined(HAVE_GETTIMEOFDAY) */ ++ struct timeval tv; ++#endif /* defined(HAVE_GETTIMEOFDAY) */ + #if defined(DONT_HAVE_TM_GMTOFF) +- struct tm local; +- struct tm gmt; +-#endif /* !defined(DONT_HAVE_TM_GMTOFF) */ ++ struct tm local; ++ struct tm gmt; ++#endif /* !defined(DONT_HAVE_TM_GMTOFF) */ + + /* Get the basic time. */ + #if defined(HAVE_GETTIMEOFDAY) +- if (gettimeofday(&tv, (struct timezone *)NULL) == -1) ++ if (gettimeofday(&tv, (struct timezone *) NULL) == -1) + return -1; + Now->time = tv.tv_sec; + Now->usec = tv.tv_usec; + #else + /* Can't check for -1 since that might be a time, I guess. */ +- (void)time(&Now->time); ++ (void) time(&Now->time); + Now->usec = 0; + #endif /* defined(HAVE_GETTIMEOFDAY) */ + +@@ -932,27 +910,24 @@ + LastTzone *= 60; + LastTzone += gmt.tm_min - local.tm_min; + #else +- LastTzone = (0 - tm->tm_gmtoff) / 60; +-#endif /* defined(DONT_HAVE_TM_GMTOFF) */ ++ LastTzone = (0 - tm->tm_gmtoff) / 60; ++#endif /* defined(DONT_HAVE_TM_GMTOFF) */ + } + Now->tzone = LastTzone; + return 0; + } + +- +-time_t +-parsedate( +- char *p, +- TIMEINFO *now) ++time_t parsedate(char *p, ++ TIMEINFO * now) + { +- struct tm *tm; +- TIMEINFO ti; +- time_t Start; ++ struct tm *tm; ++ TIMEINFO ti; ++ time_t Start; + + yyInput = p; + if (now == NULL) { + now = &ti; +- (void)GetTimeInfo(&ti); ++ (void) GetTimeInfo(&ti); + } + + tm = localtime(&now->time); +@@ -960,8 +935,8 @@ + yyMonth = tm->tm_mon + 1; + yyDay = tm->tm_mday; + yyTimezone = now->tzone; +- if (tm->tm_isdst) /* Correct timezone offset for DST */ +- yyTimezone += DST_OFFSET * 60; ++ if (tm->tm_isdst) /* Correct timezone offset for DST */ ++ yyTimezone += DST_OFFSET * 60; + yyDSTmode = DSTmaybe; + yyHour = 0; + yyMinutes = 0; +@@ -978,7 +953,7 @@ + + if (yyHaveDate || yyHaveTime) { + Start = Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds, +- yyMeridian, yyDSTmode); ++ yyMeridian, yyDSTmode); + if (Start < 0) + return -1; + } else { +@@ -995,7 +970,7 @@ + * from the error return value. (Alternately could set errno on error.) */ + return Start == -1 ? 0 : Start; + } +-#line 998 "y.tab.c" ++#line 973 "y.tab.c" + + #if YYDEBUG + #include /* needed for printf */ +@@ -1206,7 +1181,7 @@ + switch (yyn) + { + case 3: +-#line 154 "./parsdate.y" ++#line 152 "./parsdate.y" + { + yyHaveTime++; + #if defined(lint) +@@ -1218,27 +1193,27 @@ + } + break; + case 4: +-#line 163 "./parsdate.y" ++#line 161 "./parsdate.y" + { + yyHaveTime++; + yyTimezone = yystack.l_mark[0].Number; + } + break; + case 5: +-#line 167 "./parsdate.y" ++#line 165 "./parsdate.y" + { + yyHaveDate++; + } + break; + case 6: +-#line 170 "./parsdate.y" ++#line 168 "./parsdate.y" + { + yyHaveDate++; + yyHaveTime++; + } + break; + case 7: +-#line 174 "./parsdate.y" ++#line 172 "./parsdate.y" + { + yyHaveDate++; + yyHaveTime++; +@@ -1246,13 +1221,13 @@ + } + break; + case 8: +-#line 179 "./parsdate.y" ++#line 177 "./parsdate.y" + { + yyHaveRel = 1; + } + break; + case 9: +-#line 184 "./parsdate.y" ++#line 182 "./parsdate.y" + { + if (yystack.l_mark[-1].Number < 100) { + yyHour = yystack.l_mark[-1].Number; +@@ -1267,7 +1242,7 @@ + } + break; + case 10: +-#line 196 "./parsdate.y" ++#line 194 "./parsdate.y" + { + yyHour = yystack.l_mark[-3].Number; + yyMinutes = yystack.l_mark[-1].Number; +@@ -1276,7 +1251,7 @@ + } + break; + case 11: +-#line 202 "./parsdate.y" ++#line 200 "./parsdate.y" + { + yyHour = yystack.l_mark[-3].Number; + yyMinutes = yystack.l_mark[-1].Number; +@@ -1286,7 +1261,7 @@ + } + break; + case 12: +-#line 209 "./parsdate.y" ++#line 207 "./parsdate.y" + { + yyHour = yystack.l_mark[-5].Number; + yyMinutes = yystack.l_mark[-3].Number; +@@ -1295,7 +1270,7 @@ + } + break; + case 13: +-#line 215 "./parsdate.y" ++#line 213 "./parsdate.y" + { + yyHour = yystack.l_mark[-5].Number; + yyMinutes = yystack.l_mark[-3].Number; +@@ -1306,28 +1281,28 @@ + } + break; + case 14: +-#line 225 "./parsdate.y" ++#line 223 "./parsdate.y" + { + yyval.Number = yystack.l_mark[0].Number; + yyDSTmode = DSToff; + } + break; + case 15: +-#line 229 "./parsdate.y" ++#line 227 "./parsdate.y" + { + yyval.Number = yystack.l_mark[0].Number; + yyDSTmode = DSTon; + } + break; + case 16: +-#line 233 "./parsdate.y" ++#line 231 "./parsdate.y" + { + yyTimezone = yystack.l_mark[-1].Number; + yyDSTmode = DSTon; + } + break; + case 17: +-#line 237 "./parsdate.y" ++#line 235 "./parsdate.y" + { + /* Only allow "GMT+300" and "GMT-0800" */ + if (yystack.l_mark[-1].Number != 0) { +@@ -1338,14 +1313,14 @@ + } + break; + case 18: +-#line 245 "./parsdate.y" ++#line 243 "./parsdate.y" + { + yyval.Number = yystack.l_mark[0].Number; + yyDSTmode = DSToff; + } + break; + case 19: +-#line 251 "./parsdate.y" ++#line 249 "./parsdate.y" + { + int i; + +@@ -1367,14 +1342,14 @@ + } + break; + case 20: +-#line 272 "./parsdate.y" ++#line 270 "./parsdate.y" + { + yyMonth = yystack.l_mark[-2].Number; + yyDay = yystack.l_mark[0].Number; + } + break; + case 21: +-#line 276 "./parsdate.y" ++#line 274 "./parsdate.y" + { + if (yystack.l_mark[-4].Number > 100) { + yyYear = yystack.l_mark[-4].Number; +@@ -1389,14 +1364,14 @@ + } + break; + case 22: +-#line 288 "./parsdate.y" ++#line 286 "./parsdate.y" + { + yyMonth = yystack.l_mark[-1].Number; + yyDay = yystack.l_mark[0].Number; + } + break; + case 23: +-#line 292 "./parsdate.y" ++#line 290 "./parsdate.y" + { + yyMonth = yystack.l_mark[-3].Number; + yyDay = yystack.l_mark[-2].Number; +@@ -1404,14 +1379,14 @@ + } + break; + case 24: +-#line 297 "./parsdate.y" ++#line 295 "./parsdate.y" + { + yyDay = yystack.l_mark[-1].Number; + yyMonth = yystack.l_mark[0].Number; + } + break; + case 25: +-#line 301 "./parsdate.y" ++#line 299 "./parsdate.y" + { + yyDay = yystack.l_mark[-2].Number; + yyMonth = yystack.l_mark[-1].Number; +@@ -1419,7 +1394,7 @@ + } + break; + case 26: +-#line 306 "./parsdate.y" ++#line 304 "./parsdate.y" + { + yyDay = yystack.l_mark[-2].Number; + yyMonth = yystack.l_mark[-1].Number; +@@ -1427,7 +1402,7 @@ + } + break; + case 27: +-#line 311 "./parsdate.y" ++#line 309 "./parsdate.y" + { + yyDay = yystack.l_mark[-3].Number; + yyMonth = yystack.l_mark[-1].Number; +@@ -1435,7 +1410,7 @@ + } + break; + case 28: +-#line 316 "./parsdate.y" ++#line 314 "./parsdate.y" + { + yyDay = yystack.l_mark[-2].Number; + yyMonth = -yystack.l_mark[-1].Number; +@@ -1445,7 +1420,7 @@ + } + break; + case 29: +-#line 325 "./parsdate.y" ++#line 323 "./parsdate.y" + { + yyMonth = yystack.l_mark[-7].Number; + yyDay = yystack.l_mark[-6].Number; +@@ -1456,42 +1431,42 @@ + } + break; + case 30: +-#line 335 "./parsdate.y" ++#line 333 "./parsdate.y" + { + yyRelSeconds += yystack.l_mark[-1].Number * yystack.l_mark[0].Number; + } + break; + case 31: +-#line 338 "./parsdate.y" ++#line 336 "./parsdate.y" + { + yyRelSeconds += yystack.l_mark[-1].Number * yystack.l_mark[0].Number; + } + break; + case 32: +-#line 341 "./parsdate.y" ++#line 339 "./parsdate.y" + { + yyRelMonth += yystack.l_mark[-1].Number * yystack.l_mark[0].Number; + } + break; + case 33: +-#line 344 "./parsdate.y" ++#line 342 "./parsdate.y" + { + yyRelMonth += yystack.l_mark[-1].Number * yystack.l_mark[0].Number; + } + break; + case 34: +-#line 349 "./parsdate.y" ++#line 347 "./parsdate.y" + { + yyval.Meridian = MER24; + } + break; + case 35: +-#line 352 "./parsdate.y" ++#line 350 "./parsdate.y" + { + yyval.Meridian = yystack.l_mark[0].Meridian; + } + break; +-#line 1494 "y.tab.c" ++#line 1469 "y.tab.c" + } + yystack.s_mark -= yym; + yystate = *yystack.s_mark; +Index: src/parsdate.h +--- lynx2.8.8dev.6+/src/parsdate.h 2008-06-29 23:23:45.000000000 +0000 ++++ lynx2.8.8dev.6b/src/parsdate.h 2010-10-31 17:56:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $LynxId: parsdate.h,v 1.1 2008/06/29 23:23:45 tom Exp $ */ ++/* $LynxId: parsdate.h,v 1.2 2010/10/31 17:56:22 tom Exp $ */ + #ifndef PARSDATE_H + #define PARSDATE_H + +@@ -7,7 +7,7 @@ + #endif + #include + #define ARRAY_SIZE(array) ((int) (sizeof(array) / sizeof(array[0]))) +- typedef struct _TIMEINFO { ++ typedef struct _TIMEINFO { + time_t time; + long usec; + long tzone; +Index: src/parsdate.y +--- lynx2.8.8dev.6+/src/parsdate.y 2010-09-22 21:18:43.000000000 +0000 ++++ lynx2.8.8dev.6b/src/parsdate.y 2010-11-07 22:32:51.000000000 +0000 +@@ -1,6 +1,7 @@ + %{ ++ + /* +- * $LynxId: parsdate.y,v 1.13 2010/09/22 21:18:43 tom Exp $ ++ * $LynxId: parsdate.y,v 1.17 2010/11/07 22:32:51 tom Exp $ + * + * This module is adapted and extended from tin, to use for LYmktime(). + * +@@ -51,7 +52,7 @@ + #define IS7BIT(x) ((unsigned) TO_ASCII(x) < 128) + #define CTYPE(isXXXXX, c) (IS7BIT(c) && isXXXXX(((unsigned char)c))) + +-typedef char *PD_STRING; ++typedef char *PD_STRING; + + extern int date_parse(void); + +@@ -59,7 +60,6 @@ + #define yylex date_lex + #define yyerror date_error + +- + /* See the LeapYears table in Convert. */ + #define EPOCH 1970 + #define END_OF_TIME 2038 +@@ -73,7 +73,6 @@ + #define LPAREN '(' + #define RPAREN ')' + +- + /* + ** Daylight-savings mode: on, off, or not yet known. + */ +@@ -88,35 +87,35 @@ + MERam, MERpm, MER24 + } MERIDIAN; + +- + /* + ** Global variables. We could get rid of most of them by using a yacc + ** union, but this is more efficient. (This routine predates the + ** yacc %union construct.) + */ +-static char *yyInput; +-static DSTMODE yyDSTmode; +-static int yyHaveDate; +-static int yyHaveRel; +-static int yyHaveTime; +-static time_t yyTimezone; +-static time_t yyDay; +-static time_t yyHour; +-static time_t yyMinutes; +-static time_t yyMonth; +-static time_t yySeconds; +-static time_t yyYear; +-static MERIDIAN yyMeridian; +-static time_t yyRelMonth; +-static time_t yyRelSeconds; +- +-static time_t ToSeconds(time_t, time_t, time_t, MERIDIAN); +-static time_t Convert(time_t, time_t, time_t, time_t, time_t, time_t, MERIDIAN, DSTMODE); +-static time_t DSTcorrect(time_t, time_t); +-static time_t RelativeMonth(time_t, time_t); +-static int LookupWord(char *, int); +-static int date_lex(void); +-static int GetTimeInfo(TIMEINFO *Now); ++static char *yyInput; ++static DSTMODE yyDSTmode; ++static int yyHaveDate; ++static int yyHaveRel; ++static int yyHaveTime; ++static time_t yyTimezone; ++static time_t yyDay; ++static time_t yyHour; ++static time_t yyMinutes; ++static time_t yyMonth; ++static time_t yySeconds; ++static time_t yyYear; ++static MERIDIAN yyMeridian; ++static time_t yyRelMonth; ++static time_t yyRelSeconds; ++ ++static time_t ToSeconds(time_t, time_t, time_t, MERIDIAN); ++static time_t Convert(time_t, time_t, time_t, time_t, time_t, time_t, ++ MERIDIAN, DSTMODE); ++static time_t DSTcorrect(time_t, time_t); ++static time_t RelativeMonth(time_t, time_t); ++static int LookupWord(char *, int); ++static int date_lex(void); ++static int GetTimeInfo(TIMEINFO * Now); + + /* + * The 'date_error()' function is declared here to work around a defect in +@@ -125,10 +124,9 @@ + * 'const' on the parameter to quiet gcc's -Wwrite-strings warning. + */ + /*ARGSUSED*/ +-static void +-date_error(const char GCC_UNUSED *s) ++static void date_error(const char GCC_UNUSED *s) + { +- /*NOTREACHED*/ ++ /*NOTREACHED */ + } + + %} +@@ -356,9 +354,11 @@ + + %% + ++ + /* + ** An entry in the lexical lookup table. + */ ++/* *INDENT-OFF* */ + typedef struct _TABLE { + const char *name; + int type; +@@ -523,13 +523,9 @@ + { "hdt", tDAYZONE, HOUR(10) }, /* -- expired 1986 */ + #endif /* 0 */ + }; ++/* *INDENT-ON* */ + +-static time_t +-ToSeconds( +- time_t Hours, +- time_t Minutes, +- time_t Seconds, +- MERIDIAN Meridian) ++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds, MERIDIAN Meridian) + { + if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 61) + return -1; +@@ -538,34 +534,29 @@ + return -1; + } else { + if (Hours < 1 || Hours > 12) +- return -1; ++ return -1; + if (Hours == 12) +- Hours = 0; ++ Hours = 0; + if (Meridian == MERpm) +- Hours += 12; ++ Hours += 12; + } + return (Hours * 60L + Minutes) * 60L + Seconds; + } + +- +-static time_t +-Convert( +- time_t Month, +- time_t Day, +- time_t Year, +- time_t Hours, +- time_t Minutes, +- time_t Seconds, +- MERIDIAN Meridian, +- DSTMODE dst) ++static time_t Convert(time_t Month, time_t Day, time_t Year, time_t Hours, ++ time_t Minutes, time_t Seconds, MERIDIAN Meridian, ++ DSTMODE dst) + { +- static const int DaysNormal[13] = { ++ static const int DaysNormal[13] = ++ { + 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }; +- static const int DaysLeap[13] = { ++ static const int DaysLeap[13] = ++ { + 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }; +- static const int LeapYears[] = { ++ static const int LeapYears[] = ++ { + 1972, 1976, 1980, 1984, 1988, 1992, 1996, + 2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036 + }; +@@ -578,7 +569,7 @@ + if (Year < 0) + Year = -Year; + if (Year < 70) +- Year += 2000; ++ Year += 2000; + if (Year < 100) + Year += 1900; + if (Year < EPOCH) +@@ -589,9 +580,10 @@ + break; + } + if (Year < EPOCH || Year > END_OF_TIME +- || Month < 1 || Month > 12 +- /* NOSTRICT */ /* conversion from long may lose accuracy */ +- || Day < 1 || Day > mp[(int)Month]) { ++ || Month < 1 || Month > 12 ++ /* NOSTRICT */ ++ /* conversion from long may lose accuracy */ ++ || Day < 1 || Day > mp[(int) Month]) { + return -1; + } + +@@ -614,50 +606,40 @@ + return Julian; + } + +- +-static time_t +-DSTcorrect( +- time_t Start, +- time_t Future) ++static time_t DSTcorrect(time_t Start, time_t Future) + { +- time_t StartDay; +- time_t FutureDay; ++ time_t StartDay; ++ time_t FutureDay; + + StartDay = (localtime(&Start)->tm_hour + 1) % 24; + FutureDay = (localtime(&Future)->tm_hour + 1) % 24; + return (Future - Start) + (StartDay - FutureDay) * DST_OFFSET * 60 * 60; + } + +- +-static time_t +-RelativeMonth( +- time_t Start, +- time_t RelMonth) ++static time_t RelativeMonth(time_t Start, time_t RelMonth) + { +- struct tm *tm; +- time_t Month; +- time_t Year; ++ struct tm *tm; ++ time_t Month; ++ time_t Year; + + tm = localtime(&Start); + Month = 12 * tm->tm_year + tm->tm_mon + RelMonth; + Year = Month / 12 + 1900; + Month = Month % 12 + 1; + return DSTcorrect(Start, +- Convert(Month, (time_t)tm->tm_mday, Year, +- (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec, +- MER24, DSTmaybe)); ++ Convert(Month, (time_t) tm->tm_mday, Year, ++ (time_t) tm->tm_hour, (time_t) tm->tm_min, ++ (time_t) tm->tm_sec, ++ MER24, DSTmaybe)); + } + +- +-static int +-LookupWord( +- char *buff, +- int length) ++static int LookupWord(char *buff, ++ int length) + { +- char *p; ++ char *p; + const char *q; + const TABLE *tp; +- int c; ++ int c; + + p = buff; + c = p[0]; +@@ -683,14 +665,14 @@ + /* Try for a timezone. */ + for (tp = TimezoneTable; tp < ENDOF(TimezoneTable); tp++) { + if (c == tp->name[0] && p[1] == tp->name[1] +- && strcmp(p, tp->name) == 0) { ++ && strcmp(p, tp->name) == 0) { + yylval.Number = tp->value; + return tp->type; + } + } + + if (strcmp(buff, "dst") == 0) +- return tDST; ++ return tDST; + + /* Try the units table. */ + for (tp = UnitsTable; tp < ENDOF(UnitsTable); tp++) { +@@ -715,7 +697,7 @@ + length++; + + /* Drop out any periods. */ +- for (p = buff, q = (PD_STRING)buff; *q; q++) { ++ for (p = buff, q = (PD_STRING) buff; *q; q++) { + if (*q != '.') + *p++ = *q; + } +@@ -738,7 +720,7 @@ + c = buff[0]; + for (p = buff, tp = TimezoneTable; tp < ENDOF(TimezoneTable); tp++) { + if (c == tp->name[0] && p[1] == tp->name[1] +- && strcmp(p, tp->name) == 0) { ++ && strcmp(p, tp->name) == 0) { + yylval.Number = tp->value; + return tp->type; + } +@@ -750,7 +732,6 @@ + return tZONE; + } + +- + /* + * This returns characters as-is (the ones that are not part of some token), + * and codes greater than 256 (the token values). +@@ -764,19 +745,18 @@ + * + * The TO_ASCII() function is the inverse of TO_LOCAL(). + */ +-static int +-date_lex(void) ++static int date_lex(void) + { +- int c; +- char *p; +- char buff[20]; +- int sign; +- int i; +- int nesting; ++ int c; ++ char *p; ++ char buff[20]; ++ int sign; ++ int i; ++ int nesting; + +- for(;;) { ++ for (;;) { + /* Get first character after the whitespace. */ +- for(;;) { ++ for (;;) { + while (CTYPE(isspace, *yyInput)) + yyInput++; + c = *yyInput; +@@ -786,13 +766,13 @@ + break; + for (nesting = 1; + (c = *++yyInput) != RPAREN || --nesting; +- ) { ++ ) { + if (c == LPAREN) { + nesting++; + } else if (!IS7BIT(c) || c == '\0' || c == '\r' +- || (c == '\\' +- && ((c = *++yyInput) == '\0' +- || !IS7BIT(c)))) { ++ || (c == '\\' ++ && ((c = *++yyInput) == '\0' ++ || !IS7BIT(c)))) { + /* Lexical error: bad comment. */ + return '?'; + } +@@ -815,7 +795,7 @@ + } + for (p = buff; + (c = *yyInput++) != '\0' && CTYPE(isdigit, c); +- ) { ++ ) { + if (p < &buff[sizeof buff - 1]) + *p++ = (char) c; + } +@@ -831,7 +811,7 @@ + if (CTYPE(isalpha, c)) { + for (p = buff; + (c = *yyInput++) == '.' || CTYPE(isalpha, c); +- ) { ++ ) { + if (p < &buff[sizeof buff - 1]) + *p++ = (char) (CTYPE(isupper, c) ? tolower(c) : c); + } +@@ -844,31 +824,29 @@ + } + } + +- +-static int +-GetTimeInfo( +- TIMEINFO *Now) ++static int GetTimeInfo(TIMEINFO * Now) + { +- static time_t LastTime; +- static long LastTzone; +- struct tm *tm; ++ static time_t LastTime; ++ static long LastTzone; ++ struct tm *tm; ++ + #if defined(HAVE_GETTIMEOFDAY) +- struct timeval tv; +-#endif /* defined(HAVE_GETTIMEOFDAY) */ ++ struct timeval tv; ++#endif /* defined(HAVE_GETTIMEOFDAY) */ + #if defined(DONT_HAVE_TM_GMTOFF) +- struct tm local; +- struct tm gmt; +-#endif /* !defined(DONT_HAVE_TM_GMTOFF) */ ++ struct tm local; ++ struct tm gmt; ++#endif /* !defined(DONT_HAVE_TM_GMTOFF) */ + + /* Get the basic time. */ + #if defined(HAVE_GETTIMEOFDAY) +- if (gettimeofday(&tv, (struct timezone *)NULL) == -1) ++ if (gettimeofday(&tv, (struct timezone *) NULL) == -1) + return -1; + Now->time = tv.tv_sec; + Now->usec = tv.tv_usec; + #else + /* Can't check for -1 since that might be a time, I guess. */ +- (void)time(&Now->time); ++ (void) time(&Now->time); + Now->usec = 0; + #endif /* defined(HAVE_GETTIMEOFDAY) */ + +@@ -898,27 +876,24 @@ + LastTzone *= 60; + LastTzone += gmt.tm_min - local.tm_min; + #else +- LastTzone = (0 - tm->tm_gmtoff) / 60; +-#endif /* defined(DONT_HAVE_TM_GMTOFF) */ ++ LastTzone = (0 - tm->tm_gmtoff) / 60; ++#endif /* defined(DONT_HAVE_TM_GMTOFF) */ + } + Now->tzone = LastTzone; + return 0; + } + +- +-time_t +-parsedate( +- char *p, +- TIMEINFO *now) ++time_t parsedate(char *p, ++ TIMEINFO * now) + { +- struct tm *tm; +- TIMEINFO ti; +- time_t Start; ++ struct tm *tm; ++ TIMEINFO ti; ++ time_t Start; + + yyInput = p; + if (now == NULL) { + now = &ti; +- (void)GetTimeInfo(&ti); ++ (void) GetTimeInfo(&ti); + } + + tm = localtime(&now->time); +@@ -926,8 +901,8 @@ + yyMonth = tm->tm_mon + 1; + yyDay = tm->tm_mday; + yyTimezone = now->tzone; +- if (tm->tm_isdst) /* Correct timezone offset for DST */ +- yyTimezone += DST_OFFSET * 60; ++ if (tm->tm_isdst) /* Correct timezone offset for DST */ ++ yyTimezone += DST_OFFSET * 60; + yyDSTmode = DSTmaybe; + yyHour = 0; + yyMinutes = 0; +@@ -944,7 +919,7 @@ + + if (yyHaveDate || yyHaveTime) { + Start = Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds, +- yyMeridian, yyDSTmode); ++ yyMeridian, yyDSTmode); + if (Start < 0) + return -1; + } else { +Index: src/tidy_tls.c +--- lynx2.8.8dev.6+/src/tidy_tls.c 2010-06-20 19:25:46.000000000 +0000 ++++ lynx2.8.8dev.6b/src/tidy_tls.c 2010-11-07 21:21:10.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: tidy_tls.c,v 1.5 2010/06/20 19:25:46 tom Exp $ ++ * $LynxId: tidy_tls.c,v 1.6 2010/11/07 21:21:10 tom Exp $ + * Copyright 2008, Thomas E. Dickey + * with fix Copyright 2008 by Thomas Viehmann + * +@@ -27,7 +27,7 @@ + gnutls_x509_crt_get_issuer_dn_by_oid(xcert, oid, 0, 0, target, &len) + + /* thewhat: which DN to get 0 = subject, 1 = issuer */ +-static int ExtractCertificate(const gnutls_datum_t * cert, X509_NAME * result, int thewhat) ++static int ExtractCertificate(const gnutls_datum_t *cert, X509_NAME * result, int thewhat) + { + gnutls_x509_crt_t xcert; + int rc; +Index: userdefs.h +--- lynx2.8.8dev.6+/userdefs.h 2010-10-04 09:53:59.000000000 +0000 ++++ lynx2.8.8dev.6b/userdefs.h 2010-11-06 13:34:13.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * $LynxId: userdefs.h,v 1.256 2010/06/19 18:23:03 tom Exp $ ++ * $LynxId: userdefs.h,v 1.260 2010/11/06 13:34:13 tom Exp $ + * + * Lynx - Hypertext navigation system + * +@@ -1184,7 +1184,7 @@ + * + * NOTE: This can generate A REAL LOT of mail, be warned!!! + */ +-/* #define ALERTMAIL "webmaster@localhost" *//*error recipient if no owner */ ++/* #define ALERTMAIL "webmaster@localhost" */ /*error recipient if no owner */ + + /********************************* + * If CHECKMAIL is set to TRUE, the user will be informed (via a status line