w3m

commit 74644bc96321816da6f0b5453701dee99dbb6607
parent 34bf8f7310a880979501403b3b42fd9130e4142b
Author: ukai <ukai>
Date:   Thu, 31 Jan 2002 18:40:14 +0000

[w3m-dev 02961] halfdump image is not consistent
* file.c (flushline): check f
* file.c (do_blankline): fix blanklink conditions
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
file.c
 | 
11
+++++------

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-01  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 02961] halfdump image is not consistent
+	* file.c (flushline): check f
+	* file.c (do_blankline): fix blanklink conditions
+
 2002-02-01  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* gcc -Wall -Werror safe
diff --git a/file.c b/file.c
@@ -2504,7 +2504,7 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
 	    h_env->maxlimit = lbuf->pos;
 	if (buf)
 	    pushTextLine(buf, lbuf);
-	else {
+	else if (f) {
 	    Strfputs(lbuf->line, f);
 	    fputc('\n', f);
 	}
@@ -2520,15 +2520,16 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
 #define APPEND(str) \
 	if (buf) \
 	    appendTextLine(buf,(str),0); \
-	else \
+	else if (f) \
 	    Strfputs((str),f)
 
 	while (*p) {
 	    q = p;
 	    if (sloppy_parse_line(&p)) {
 		Strcat_charp_n(tmp, q, p - q);
-		if (force == 2)
+		if (force == 2) {
 		    APPEND(tmp);
+		}
 		else
 		    Strcat(tmp2, tmp);
 		Strclear(tmp);
@@ -2624,9 +2625,7 @@ void
 do_blankline(struct html_feed_environ *h_env, struct readbuffer *obuf,
 	     int indent, int indent_incr, int width)
 {
-    if (h_env->buf && h_env->blank_lines == 0)
-	flushline(h_env, obuf, indent, 1, width);
-    else if (h_env->f)
+    if (h_env->blank_lines == 0)
 	flushline(h_env, obuf, indent, 1, width);
 }