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

4 files changed, 28 insertions, 20 deletions

diff --git a/CHANGES b/CHANGES
index 0c8be0a6..0fc7f627 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,13 @@
--- $LynxId: CHANGES,v 1.727 2014/01/19 15:21:18 tom Exp $
+-- $LynxId: CHANGES,v 1.729 2014/02/03 00:28:12 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2014-01-19 (2.8.8pre.4)
+2014-02-02 (2.8.8pre.4)
+* fix two bugs in print-to-file from 2.8.8dev.10 changes -TD
+  + suggested filename suffix for text/html was ".html" rather than ".txt"
+  + using ^U to clear the filename to print to did not cancel the prompt
+  (report by Klaus-Peter Wegge)
 * disable EXP_JAPANESEUTF8_SUPPORT if the system has no iconv support -TD
 * modify makefiles to perform the src/chrtrans rules from the top-level rather
   than via the src-level, solving the issue of "makefile races" -TD
diff --git a/docs/README.metrics b/docs/README.metrics
index e9a69277..800cce0d 100644
--- a/docs/README.metrics
+++ b/docs/README.metrics
@@ -1,4 +1,4 @@
--- $LynxId: README.metrics,v 1.8 2013/12/16 00:14:10 tom Exp $
+-- $LynxId: README.metrics,v 1.9 2014/02/03 00:34:01 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
@@ -23,8 +23,8 @@ Release         Current                 Original
                                         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.8pre.2      464871  184810          24027   22288     5.2    12.1
-                                        14603   12864     3.1     7.0
+2.8.8pre.4      465760  184841          24026   22288     5.2    12.1
+                                        14602   12864     3.1     7.0
 
 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
@@ -205,34 +205,34 @@ 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)
+** credits from CHANGES docs/CHANGES2.8 (4319.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
+  7.9 Leonid Pauzner
   1.2 Paul Gilmartin
- 47.2 Thomas E Dickey
+ 47.4 Thomas E Dickey
   2.0 Vlad Harchev
-** credits from CHANGES docs/CHANGES* (5764.6 changes)
+** credits from CHANGES docs/CHANGES* (5786.6 changes)
   2.3 Doug Kaufman
- 23.7 Foteos Macrides
+ 23.6 Foteos Macrides
   1.5 Ilya Zakharevich
  12.5 Klaus Weide
   5.9 Leonid Pauzner
- 35.2 Thomas E Dickey
+ 35.4 Thomas E Dickey
   1.5 Vlad Harchev
   3.6 unknown
-** credits from CHANGES (3377.6 changes)
+** credits from CHANGES (3399.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
+ 12.9 Klaus Weide
+  9.2 Leonid Pauzner
+  1.5 Paul Gilmartin
+ 52.8 Thomas E Dickey
   2.5 Vlad Harchev
 ** credits from docs/CHANGES2.8 (920 changes)
   1.2 Doug Kaufman
diff --git a/src/LYPrint.c b/src/LYPrint.c
index 781eca02..c68faeda 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYPrint.c,v 1.102 2013/11/28 11:21:09 tom Exp $
+ * $LynxId: LYPrint.c,v 1.103 2014/02/03 00:17:07 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -137,16 +137,18 @@ static void SetupFilename(bstring **filename,
 {
     HTFormat format;
     HTAtom *encoding;
+    char *cp;
 
     BStrCopy0(*filename, sug_filename);		/* add suggestion info */
     BStrAlloc(*filename, LY_MAXPATH);	/* FIXME */
     change_sug_filename((*filename)->str);
     if (!(HTisDocumentSource())
-	&& strrchr((*filename)->str, '.') != NULL) {
+	&& (cp = strrchr((*filename)->str, '.')) != NULL) {
 	format = HTFileFormat((*filename)->str, &encoding, NULL);
 	CTRACE((tfp, "... format %s\n", format->name));
 	if (!strcasecomp(format->name, "text/html") ||
 	    !IsUnityEnc(encoding)) {
+	    (*filename)->len = (cp - (*filename)->str);
 	    BStrCat0(*filename, TEXT_SUFFIX);
 	}
     }
@@ -181,7 +183,7 @@ static int RecallFilename(bstring **filename,
     recall = ((*total >= 1) ? RECALL_URL : NORECALL);
 
     if ((ch = LYgetBString(filename, FALSE, 0, recall)) < 0 ||
-	*filename == '\0' || ch == UPARROW_KEY || ch == DNARROW_KEY) {
+	isBEmpty(*filename) || ch == UPARROW_KEY || ch == DNARROW_KEY) {
 	if (recall && ch == UPARROW_KEY) {
 	    if (*first) {
 		*first = FALSE;
diff --git a/src/LYUtils.c b/src/LYUtils.c
index e573ccab..07590801 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.263 2013/12/09 11:21:42 tom Exp $
+ * $LynxId: LYUtils.c,v 1.264 2014/02/03 00:17:39 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -6839,6 +6839,8 @@ int LYValidateOutput(char *filename)
 {
     int c;
 
+    CTRACE((tfp, "LYValidateOutput '%s'\n", filename));
+
     /*
      * Assume we can write to a pipe
      */