snapshot of project "lynx", label v2-8-8dev_17

9 files changed, 259 insertions, 163 deletions

diff --git a/CHANGES b/CHANGES
index 12f53875..3507b63b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.699 2013/11/28 11:38:14 tom Exp $
+-- $LynxId: CHANGES,v 1.700 2013/11/28 19:19:29 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2013-11-28 (2.8.8dev.17)
+* revise/update counts in README.metrics, using a script replacing a manual
+  procedure -TD
 * amend check for magic header bytes from 2.8.8dev.3 for "deflate" to limit it
   to the 3-bit block header described in RFC-1951 -TD
 * install the sample-files in the dpkg test-script -TD
diff --git a/docs/README.metrics b/docs/README.metrics
index 4f3a55d6..939e6950 100644
--- a/docs/README.metrics
+++ b/docs/README.metrics
@@ -1,4 +1,4 @@
--- $LynxId: README.metrics,v 1.5 2009/07/05 23:15:28 tom Exp $
+-- $LynxId: README.metrics,v 1.6 2013/11/28 20:01:44 tom Exp $
 
 This is a short summary of code metrics showing how lynx has grown from
 release to release.  It also shows how the original codebase has
@@ -19,14 +19,22 @@ Release         Current                 Original
 2.8.3           248646  166833          29035   26346    11      15
 2.8.4           310436  168108          28364   25751     9      15
 2.8.5           362834  167358          26900   24355     7      14
-2.8.6           395237  169885          26423   23565     7      13
-                                        16053   13195     4       8
-2.8.7           439742  181073          25621   22786     6      12
-                                        15916   13081     4       7
+2.8.6           395894  170006          25866   23880     6.5    14.0
+                                        15573   13587     3.9     8.0
+2.8.7           441453  180674          25064   23101     5.7    12.8
+                                        15436   13473     3.5     7.5
+2.8.8dev.17     464771  184804          24028   22288     5.2    12.1
+                                        14604   12864     3.1     7.0
 
-Beginning with 2.8.6, the fraction of remaining original codebase is shown as a
-range (computed by comparing against 2.4.2 indented, or original), since all C
-source code is automatically indented using the indent.sh script.
+Beginning with 2.8.6, the percentage of the remaining original codebase is
+shown on two lines (i.e., comparing against 2.4.2 indented to use the current
+coding style, or using only the original source).  Comparisons using the
+original source give lower estimates of untouched code, though either must be
+viewed taking into account insignificant similarities (such as blank lines).
+
+Starting in 2.8.6dev.3, all C source code has been routinely indented using
+the lnx-indent script from
+    http://invisible-island.net/cindent/
 
 Current lynx releases contain a large amount of text other than C code.
 That includes plain text, html, message libraries, custom and generated
@@ -37,138 +45,224 @@ scripts.
 Here is a count of contributions (from CHANGES and docs/CHANGES2.8) since the
 start of the 2.8 series:
 
-    0.5	AJL
-    3  	Al Gilman
-    1  	Alexei Anatski
-    2  	Alexey Dobriyan
-    2  	Andrew Belov
-    3.5	Andrey A Chernov
-    1  	Arkadiusz Miskiewicz
-    1  	Arnaud Giersch
-    2  	Atsuhito Kohda
-   23.5	Bela Lubkin
-    1  	Bill Nottingham
-    3.5	Bill Schiavo
-    2  	Binh Do
-    1  	Brett Lymn
-   46.3	Brian J Pardy
-    1  	Carlton Anderson
-    1  	Charles Karney
-    1  	Chris Adams
-    1  	Christian Hudon
-    1  	Christian Jensen
-    2.5	Christian Weisgerber
-    1  	Chuck Houpt
-    1  	Crouton
-    1  	Dan Jacobson
-    1  	Daniel Dickman
-    1  	David Combs
-    1  	David Henderson
-    0.5	David Woolley
-    1  	Dick Wesseling
-  127.7	Doug Kaufman
-    1  	Duncan Simpson
-    2.5	Eduardo Chappa
-    2  	Emanuele Giaquinta
-    1  	Eric Brun
-   39  	External
-    1  	Fabian Fingerle
-  280.5	Foteos Macrides
-    1  	Frank Heckenbach
-    4.3	Frederic L W Meunier
-    1  	Frederick P Herrmann
-    1  	Georg Drenkhahn
-    1  	George Lindholm
-   21  	Gisle Vanem
-    1  	Glenn Nielsen
-   26  	Hataguchi Takeshi
-    1  	Heikki Kantola
-    0.5	Helen Sommer
-   23  	Henry Nelson
-    1  	Hiram Lester Jr
-    8.5	Hiroyuki Senshu
-    3  	Hynek Med
-    0.3	Igor B Poretsky
-   84.8	Ilya Zakharevich
-    6.5	Ismael Cordeiro
-    2  	J Kevin Ternes
-    1  	Jacob Poon
-   27.5	James E Spath
-    1  	Jan Hlavacek
-    2.5	Jason F McBrayer
-    1  	Jean-Yves Levesque
-    1  	Jeffrey C Honig
-    1  	Jens Schmalzing
-    1  	Jens Seidel
-    1  	Jerome Lauret
-    2  	Joey Schulze
-    0.3	Johannes Hromadka
-   35  	John Bley
-    6  	John E Davis
-    1  	John Hawkinson
-    1  	John Nowlin
-    2  	Jonathan Sergent
-    2  	Julian Coleman
-    3  	Karl Eichwalder
-    1  	Karl-Andre Skevik
-   29.3	Kim DeVaughn
-  706.3	Klaus Weide
-    1  	Lalo Martins
-    1  	Larry Virden
-   15.8	Larry W Virden
-   11  	Laura Eaves
-  342.3	Leonid Pauzner
-    1  	Liam Davis
-    1  	Marc Huber
-    0.3	Marek Kubita
-    2  	Masashi Fujita
-    1  	Masayasu Ishikawa
-    1  	Masayuki Hatta
-    1  	Matt Kraal
-    1  	Michael Sobolev
-    6.5	Michael Warner
-    1  	Michel Such
-    1  	Mike Castle
-    1  	Mike Knight
-    2  	Munechika Sumikawa
-    1  	Nigel Horne
-    1  	Pat Walsh
-   11.5	Paul B Mahol
-    1  	Paul D Smith
-   52.5	Paul Gilmartin
-    1  	Peter Canning
-    1  	Phil Pennock
-   27.3	Philip Webb
-   14  	Philippe De Muyter
-    5.5	Rado Smiljanic
-    1  	Randall
-    1  	Risto Widenius
-    1  	Rob Cameron
-    1  	Ryan Nielsen
-    2  	Scott Bigham
-    1  	Sergej Kvachonok
-    6  	Sergey Svishchev
-    1  	Serhii Hlodin
-   15  	Sinan Kaan Yerli
-    7.8	Stefan Caunter
-    1  	Stepan Kasal
-    1  	Tadayoshi Okuma
-    1  	Takao Fujiwara
-    1  	Thomas Braun
- 1810.3	Thomas E Dickey
-    0.5	Thomas Klausner
-    1  	Thomas Viehmann
-   15.5	Thorsten Glaser
-    1  	Tim Chase
-    4  	Tim Larson
-    1  	Timur Birsh
-    2  	Tomas Vanhala
-    1.5	Ulf Harnhammar
-    6.5	Victor Schneider
-    2  	Ville Herva
-   86  	Vlad Harchev
-   37.5	Wayne Buttles
-    1  	Wesley Morgan
-    1  	Zdenek Prikryl
-    1.5	nsh@horae.dti.ne.jp
- 4096  	Total
+    0.5 AJL
+    3   Al Gilman
+    1   Alexei Anatski
+    2   Alexey Dobriyan
+    2   Andrew Belov
+    3.5 Andrey A Chernov
+    1   Arkadiusz Miskiewicz
+    1   Arnaud Giersch
+    2   Atsuhito Kohda
+    1   Bake Timmons
+   25.5 Bela Lubkin
+    1   Bill Nottingham
+    3.5 Bill Schiavo
+    2   Binh Do
+    1   Brett Lymn
+   46.3 Brian J Pardy
+    1   Carlton Anderson
+    1   Charles Karney
+    1   Chris Adams
+    1   Christian Hudon
+    1   Christian Jensen
+    2.5 Christian Weisgerber
+    1   Christoph J Gartmann
+    1   Chuck Houpt
+    1   Crouton
+    1   Dan Jacobson
+    1   Daniel Dickman
+    1   David Combs
+    1   David Henderson
+    0.5 David Woolley
+    1   Dick Wesseling
+    1   Diego Elio Petteno
+  129.7 Doug Kaufman
+    1   Duncan Simpson
+    2.5 Eduardo Chappa
+    2   Emanuele Giaquinta
+    1   Eric Brun
+   51   External
+    1   Fabian Fingerle
+  280.5 Foteos Macrides
+    2   Frank Heckenbach
+    4.3 Frederic L W Meunier
+    1   Frederick P Herrmann
+    1   Georg Drenkhahn
+    1   George Lindholm
+   21   Gisle Vanem
+    1   Glenn Nielsen
+    1   Hans Wurst
+   26.5 Hataguchi Takeshi
+    1   Heikki Kantola
+    0.5 Helen Sommer
+   23   Henry Nelson
+    1   Hiram Lester Jr
+    8.5 Hiroyuki Senshu
+    3   Hynek Med
+    0.3 Igor B Poretsky
+   84.8 Ilya Zakharevich
+    6.5 Ismael Cordeiro
+    2   J Kevin Ternes
+    1   Jacob Poon
+   27.5 James E Spath
+    1   Jamie Strandboge
+    1   Jan Hlavacek
+    2.5 Jason F McBrayer
+    1   Jean-Yves Levesque
+    1   Jeffrey C Honig
+    1   Jens Schmalzing
+    1   Jens Seidel
+    1   Jerome Lauret
+    2   Joey Schulze
+    0.3 Johannes Hromadka
+   35   John Bley
+    6   John E Davis
+    1   John Hawkinson
+    1   John Nowlin
+    2   Jonathan Sergent
+    1   Josef Sontgen
+    2   Julian Coleman
+    1   Kamil Dudka
+    3   Karl Eichwalder
+    1   Karl-Andre Skevik
+    3   Kihara Hideto
+   29.3 Kim DeVaughn
+  706.3 Klaus Weide
+    1   Lalo Martins
+    1   Larry Virden
+   15.8 Larry W Virden
+   11   Laura Eaves
+  342.3 Leonid Pauzner
+    1   Liam Davis
+    1   Marc Huber
+    0.3 Marek Kubita
+    2   Masashi Fujita
+    1   Masayasu Ishikawa
+    1   Masayuki Hatta
+    1   Matt Kraal
+    1   Michael Sobolev
+    6.5 Michael Warner
+    1   Michel Such
+    1   Mike Castle
+    2   Munechika Sumikawa
+    1   Nigel Horne
+    0.5 Nikos Chantziaras
+    1   OpenBSD CVS
+    1   Owen Leibman
+    1   Pat Walsh
+   13.5 Paul B Mahol
+    1   Paul D Smith
+   52.5 Paul Gilmartin
+    1   Peter Canning
+    1   Phil Pennock
+   27.3 Philip Webb
+   14   Philippe De Muyter
+    5.5 Rado Smiljanic
+    2   Ralph Babel
+    1   Randall
+    1   Risto Widenius
+    1   Rob Cameron
+    1   Ryan Nielsen
+    2   Scott Bigham
+    1   Sergej Kvachonok
+    6   Sergey Svishchev
+    1   Serhii Hlodin
+   15   Sinan Kaan Yerli
+    7.8 Stefan Caunter
+    1   Stepan Kasal
+    1   Tadayoshi Okuma
+    1   Takao Fujiwara
+    1   Thomas Braun
+ 2027.3 Thomas E Dickey
+    0.5 Thomas Klausner
+    1   Thomas Viehmann
+   16.5 Thorsten Glaser
+    1   Tim Chase
+    4   Tim Larson
+    1   Timur Birsh
+    2   Tomas Vanhala
+    1.5 Ulf Harnhammar
+    6.5 Victor Schneider
+    2   Ville Herva
+   86   Vlad Harchev
+   37.5 Wayne Buttles
+    1   Wesley Morgan
+    1   Zdenek Prikryl
+    1.5 nsh@horae.dti.ne.jp
+ 4349   Total
+
+-------------------------------------------------------------------------------
+
+Older attributions are problematic for several reasons:
+  + some contributors were not credited,
+  + some changes were not recorded,
+  + the level of importance of changes in the older logs differs noticeably
+    from the newer logs.
+There is neither a source repository nor a mailing-list archive to consult to
+resolve these issues.
+
+However, some information can be gleaned from the existing change-logs
+to show the principal contributors for each release:
+
+** credits from CHANGES docs/CHANGES2.8 (4297.6 changes)
+  1.1 Brian J Pardy
+  3.0 Doug Kaufman
+  6.5 Foteos Macrides
+  2.0 Ilya Zakharevich
+ 16.4 Klaus Weide
+  8.0 Leonid Pauzner
+  1.2 Paul Gilmartin
+ 47.2 Thomas E Dickey
+  2.0 Vlad Harchev
+** credits from CHANGES docs/CHANGES* (5764.6 changes)
+  2.3 Doug Kaufman
+ 23.7 Foteos Macrides
+  1.5 Ilya Zakharevich
+ 12.5 Klaus Weide
+  5.9 Leonid Pauzner
+ 35.2 Thomas E Dickey
+  1.5 Vlad Harchev
+  3.6 unknown
+** credits from CHANGES (3377.6 changes)
+  1.4 Brian J Pardy
+  3.5 Doug Kaufman
+  2.5 Ilya Zakharevich
+  1.0 John Bley
+ 13.0 Klaus Weide
+  9.3 Leonid Pauzner
+  1.6 Paul Gilmartin
+ 52.5 Thomas E Dickey
+  2.5 Vlad Harchev
+** credits from docs/CHANGES2.8 (920 changes)
+  1.2 Doug Kaufman
+ 30.5 Foteos Macrides
+ 29.0 Klaus Weide
+  3.2 Leonid Pauzner
+  1.4 Philippe De Muyter
+ 27.4 Thomas E Dickey
+  2.6 Wayne Buttles
+** credits from docs/CHANGES2.7 (233 changes)
+ 77.3 Foteos Macrides
+  3.4 Hiram Lester Jr
+  5.2 Klaus Weide
+  1.3 LWV
+  3.4 unknown
+** credits from docs/CHANGES2.6 (240 changes)
+ 83.8 Foteos Macrides
+  1.2 Klaus Weide
+  2.1 LWV
+  5.8 unknown
+** credits from docs/CHANGES2.5 (554 changes)
+  1.3 DT
+  1.4 David Woolley
+ 82.3 Foteos Macrides
+  4.7 unknown
+** credits from docs/CHANGES2.4 (328 changes)
+ 75.9 Foteos Macrides
+  3.0 GL
+ 16.2 unknown
+** credits from docs/CHANGES2.3 (112 changes)
+  1.8 David Trueman
+  1.8 Foteos Macrides
+ 94.6 unknown
diff --git a/lynx.cfg b/lynx.cfg
index 93e4df3f..9973a772 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.229 2013/10/21 09:11:04 tom Exp $
+# $LynxId: lynx.cfg,v 1.230 2013/11/29 00:52:56 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -7,7 +7,7 @@
 #PRCS LYNX_VERSION "2.8.8dev.17"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Mon, 29 Jul 2013 14:38:35 -0700"
+#PRCS LYNX_DATE "Thu, 28 Nov 2013 16:52:56 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/src/LYExtern.c b/src/LYExtern.c
index 846b652c..bed345f3 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYExtern.c,v 1.53 2013/11/28 11:18:33 tom Exp $
+ * $LynxId: LYExtern.c,v 1.54 2013/11/29 00:21:20 tom Exp $
  *
  External application support.
  This feature allows lynx to pass a given URL to an external program.
@@ -167,7 +167,7 @@ static char *format_command(char *command,
     char pram_string[LY_MAXPATH];
     char *escaped = NULL;
 
-    if (strnicmp("file://localhost/", param, 17) == 0) {
+    if (strncasecomp("file://localhost/", param, 17) == 0) {
 	/* decode local path parameter for programs to be
 	   able to interpret - TH */
 	LYStrNCpy(pram_string, param, sizeof(pram_string) - 1);
@@ -181,7 +181,7 @@ static char *format_command(char *command,
 
     if (isMAILTO_URL(param)) {
 	format(&cmdbuf, command, param + 7);
-    } else if (strnicmp("telnet://", param, 9) == 0) {
+    } else if (strncasecomp("telnet://", param, 9) == 0) {
 	char host[sizeof(pram_string)];
 	int last_pos;
 
@@ -191,7 +191,7 @@ static char *format_command(char *command,
 	    host[last_pos] = '\0';
 
 	format(&cmdbuf, command, host);
-    } else if (strnicmp("file://localhost/", param, 17) == 0) {
+    } else if (strncasecomp("file://localhost/", param, 17) == 0) {
 	char e_buff[LY_MAXPATH], *p;
 
 	p = param + 17;
@@ -388,7 +388,7 @@ BOOL run_external(char *param,
 	    }
 	}
 
-	if (strnicmp(cmdbuf, "start ", 6) == 0)
+	if (strncasecomp(cmdbuf, "start ", 6) == 0)
 	    redraw_flag = FALSE;
 	else
 	    redraw_flag = TRUE;
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index b4008041..382591e1 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.181 2013/11/28 11:21:09 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.182 2013/11/29 00:21:45 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -586,8 +586,8 @@ static int character_set_fun(char *value)
     if (i < 0) {
 #ifdef CAN_AUTODETECT_DISPLAY_CHARSET
 	if (auto_display_charset >= 0
-	    && (!strnicmp(value, "AutoDetect ", 11)
-		|| !strnicmp(value, "AutoDetect-2 ", 13)))
+	    && (!strncasecomp(value, "AutoDetect ", 11)
+		|| !strncasecomp(value, "AutoDetect-2 ", 13)))
 	    current_char_set = auto_display_charset;
 #endif
 	/* do nothing here: so fallback to userdefs.h */
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 0a1a9141..cf549e62 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.261 2013/11/28 11:35:34 tom Exp $
+ * $LynxId: LYUtils.c,v 1.262 2013/11/29 00:04:25 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -8009,7 +8009,7 @@ static int is_device(char *fname)
 
     i = 0;
     while (black_list[i] != NULL) {
-	if (stricmp(fname, black_list[i]) == 0) {
+	if (strcasecomp(fname, black_list[i]) == 0) {
 	    return 1;		/* device file */
 	}
 	i++;
@@ -8055,7 +8055,7 @@ int unsafe_filename(const char *fname)
 
     i = 0;
     while (device_list[i] != NULL) {
-	if (stricmp(fname, device_list[i]) == 0) {
+	if (strcasecomp(fname, device_list[i]) == 0) {
 	    return 0;		/* device file (open OK) */
 	}
 	i++;
diff --git a/src/UCAuto.c b/src/UCAuto.c
index 81765f36..d6c064c9 100644
--- a/src/UCAuto.c
+++ b/src/UCAuto.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAuto.c,v 1.52 2013/11/28 11:22:53 tom Exp $
+ * $LynxId: UCAuto.c,v 1.53 2013/11/29 00:22:00 tom Exp $
  *
  *  This file contains code for changing the Linux console mode.
  *  Currently some names for font files are hardwired in here.
@@ -624,7 +624,7 @@ int Find_Best_Display_Charset(int ord)
 	    break;
 	}
 	/* At start of the source name */
-	if (source && !strnicmp(name, s, n) && StrChr(" \t,", s[n])) {	/* Found! */
+	if (source && !strncasecomp(name, s, n) && StrChr(" \t,", s[n])) {	/* Found! */
 	    source = 0;
 	    s += n;
 	    continue;		/* Look for the replacement */
diff --git a/src/Xsystem.c b/src/Xsystem.c
index d5ee53c4..ac977c8a 100644
--- a/src/Xsystem.c
+++ b/src/Xsystem.c
@@ -1,4 +1,4 @@
-/* $LynxId: Xsystem.c,v 1.27 2013/07/21 00:18:04 tom Exp $
+/* $LynxId: Xsystem.c,v 1.28 2013/11/29 00:22:00 tom Exp $
  *	like system("cmd") but return with exit code of "cmd"
  *	for Turbo-C/MS-C/LSI-C
  *  This code is in the public domain.
@@ -123,7 +123,7 @@ static int NEAR is_builtin_command(char *s)
 	if (strcasecomp(s, cmdtab[i]) == 0)
 	    return 1;
 	lc = strlen(cmdtab[i]);
-	if (lc < l && strnicmp(s, cmdtab[i], lc) == 0 && issep2(s[lc]))
+	if (lc < l && strncasecomp(s, cmdtab[i], lc) == 0 && issep2(s[lc]))
 	    return 1;
     }
     return 0;
diff --git a/userdefs.h b/userdefs.h
index 02ea1a0d..b1279241 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.278 2013/10/23 22:26:08 tom Exp $
+ * $LynxId: userdefs.h,v 1.279 2013/11/29 00:52:56 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,7 +1442,7 @@
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Mon, 29 Jul 2013 14:38:35 -0700"
+#define LYNX_DATE "Thu, 28 Nov 2013 16:52:56 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */