w3m

commit 48f183ce2c93c189617727132ab3d82d46f636ef
parent a9e04cb8a70ee802cac6f0e3a2e8a9c2caff2342
Author: ukai <ukai>
Date:   Tue,  5 Nov 2002 16:03:12 +0000

* etc.c (PASS_IS_READABLE_MSG): deleted
	(FILE_IS_READABLE_MSG): added
	(openPasswdFile): deleted
	(openSecretFile): delete error_msg arg
	(loadPasswd): use openSecretFile()
* form.c (next_token): delete unused static decl
	(FILE_IS_READABLE_MSG): deleted
	(loadPreForm): no need pass error_msg
* proto.h (openSecretFile): delete error_msg arg
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
12
++++++++++++
M
etc.c
 | 
13
++++++-------
M
form.c
 | 
6
+-----
M
proto.h
 | 
2
+-

4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-06  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* etc.c (PASS_IS_READABLE_MSG): deleted
+		(FILE_IS_READABLE_MSG): added
+		(openPasswdFile): deleted
+		(openSecretFile): delete error_msg arg
+		(loadPasswd): use openSecretFile()
+	* form.c (next_token): delete unused static decl
+		(FILE_IS_READABLE_MSG): deleted
+		(loadPreForm): no need pass error_msg
+	* proto.h (openSecretFile): delete error_msg arg
+
 2002-11-06  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03373] setting form on loading
diff --git a/etc.c b/etc.c
@@ -1033,11 +1033,10 @@ parsePasswd(FILE * fp, int netrc)
     add_auth_pass_entry(&ent, netrc);
 }
 
-#define PASS_IS_READABLE_MSG "SECURITY NOTE: passwd file must not be accessible by others"
-#define openPasswdFile(fname) openSecretFile(fname, PASS_IS_READABLE_MSG)
+#define FILE_IS_READABLE_MSG "SECURITY NOTE: file %s must not be accessible by others"
 
 FILE *
-openSecretFile(char *fname, char *error_msg)
+openSecretFile(char *fname)
 {
     struct stat st;
     if (fname == NULL)
@@ -1050,11 +1049,11 @@ openSecretFile(char *fname, char *error_msg)
      */
     if ((st.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
 	if (fmInitialized) {
-	    message(error_msg, 0, 0);
+	    message(Sprintf(FILE_IS_READABLE_MSG, fname)->ptr, 0, 0);
 	    refresh();
 	}
 	else {
-	    fputs(error_msg, stderr);
+	    fputs(Sprintf(FILE_IS_READABLE_MSG, fname)->ptr, stderr);
 	    fputc('\n', stderr);
 	}
 	sleep(2);
@@ -1068,14 +1067,14 @@ void
 loadPasswd(void)
 {
     FILE *fp;
-    fp = openPasswdFile(passwd_file);
+    fp = openSecretFile(passwd_file);
     if (fp != NULL) {
 	parsePasswd(fp, 0);
 	fclose(fp);
     }
 
     /* for FTP */
-    fp = openPasswdFile("~/.netrc");
+    fp = openSecretFile("~/.netrc");
     if (fp != NULL) {
 	parsePasswd(fp, 1);
 	fclose(fp);
diff --git a/form.c b/form.c
@@ -671,7 +671,6 @@ struct pre_form {
     struct pre_form *next;
 };
 
-static Str next_token(Str arg);
 static struct pre_form *PreForm = NULL;
 
 static struct pre_form *
@@ -727,8 +726,6 @@ radio <name> <value>
 submit [<name>]
 */
 
-#define FILE_IS_READABLE_MSG "SECURITY NOTE: file %s must not be accessible by others"
-
 void
 loadPreForm(void)
 {
@@ -737,8 +734,7 @@ loadPreForm(void)
     struct pre_form *pf = NULL;
     struct pre_form_item *pi = NULL;
 
-    fp = openSecretFile(pre_form_file, Sprintf(FILE_IS_READABLE_MSG,
-					       pre_form_file)->ptr);
+    fp = openSecretFile(pre_form_file);
     if (fp == NULL) {
 	PreForm = NULL;
 	return;
diff --git a/proto.h b/proto.h
@@ -521,7 +521,7 @@ extern Buffer *dirBuffer(char *dirname);
 extern void set_environ(char *var, char *value);
 extern FILE *localcgi_post(char *, char *, FormList *, char *);
 extern FILE *localcgi_get(char *, char *, char *);
-extern FILE *openSecretFile(char *fname, char *error_msg);
+extern FILE *openSecretFile(char *fname);
 extern void loadPasswd(void);
 extern void loadPreForm(void);
 extern int find_auth_user_passwd(ParsedURL *pu, char *realm,