[w3m-dev 03390] some fixes related with form

* form.c (input_textarea): goto input_end
		unlink(tmpf);
* main.c (_followForm): s/TEXT/Password/
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

3 files changed, 15 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 19c8be8..6c1336d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2002-11-09  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03390] some fixes related with form
+	* form.c (input_textarea): goto input_end
+			unlink(tmpf);
+	* main.c (_followForm): s/TEXT/Password/
+
+2002-11-09  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03388] meta refresh problem
 	* fm.h (AL_IMPLICIT_DONE): 3->4
 		(AL_ONCE): 8
@@ -4428,4 +4435,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.487 2002/11/08 16:01:18 ukai Exp $
+$Id: ChangeLog,v 1.488 2002/11/08 16:07:03 ukai Exp $
diff --git a/form.c b/form.c
index bdaa08d..53b471e 100644
--- a/form.c
+++ b/form.c
@@ -1,4 +1,4 @@
-/* $Id: form.c,v 1.18 2002/11/06 03:27:04 ukai Exp $ */
+/* $Id: form.c,v 1.19 2002/11/08 16:07:06 ukai Exp $ */
 /* 
  * HTML forms
  */
@@ -484,11 +484,11 @@ input_textarea(FormItemList *fi)
     fmInit();
 
     if (fi->readonly)
-	return;
+	goto input_end;
     f = fopen(tmpf, "r");
     if (f == NULL) {
 	disp_err_message("Can't open temporary file", FALSE);
-	return;
+	goto input_end;
     }
     fi->value = Strnew();
     while (tmp = Strfgets(f), tmp->length > 0) {
@@ -508,6 +508,7 @@ input_textarea(FormItemList *fi)
 	Strcat(fi->value, tmp);
     }
     fclose(f);
+  input_end:
     unlink(tmpf);
 }
 
diff --git a/main.c b/main.c
index 5a0d083..29f7f91 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.122 2002/11/08 16:01:21 ukai Exp $ */
+/* $Id: main.c,v 1.123 2002/11/08 16:07:07 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -3091,7 +3091,8 @@ _followForm(int submit)
 	    disp_message_nsec("Read only field!", FALSE, 1, TRUE, FALSE);
 	    return;
 	}
-	p = inputLine("TEXT:", fi->value ? fi->value->ptr : NULL, IN_PASSWORD);
+	p = inputLine("Password:", fi->value ? fi->value->ptr : NULL,
+		      IN_PASSWORD);
 	if (p == NULL)
 	    return;
 	fi->value = Strnew_charp(p);