storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org

Browse Source 
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=366284#5
* rc.c
(init_rc): check config_file is NULL or not.
(panel_set_option): check config_file instead of no_rc_dir.
This commit is contained in:
Ito Hiroyuki
2010-07-19 12:19:54 +00:00
parent 459e010eed
commit c71e7b7393
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,10 @@
2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=366284#5
* rc.c (init_rc): check config_file is NULL or not.
(panel_set_option): check config_file instead of no_rc_dir.
2010-07-19 d+w3m@vdr.jp 2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org * [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
@@ -8998,4 +9005,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1011 2010/07/19 12:08:41 htrb Exp $ $Id: ChangeLog,v 1.1012 2010/07/19 12:19:54 htrb Exp $

10
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.108 2010/07/19 12:08:41 htrb Exp $ */ /* $Id: rc.c,v 1.109 2010/07/19 12:19:54 htrb Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -1256,7 +1256,7 @@ init_rc(void)
interpret_rc(f); interpret_rc(f);
fclose(f); fclose(f);
} }
if ((f = fopen(config_file, "rt")) != NULL) { if (config_file && (f = fopen(config_file, "rt")) != NULL) {
interpret_rc(f); interpret_rc(f);
fclose(f); fclose(f);
} }
@@ -1268,6 +1268,8 @@ init_rc(void)
((tmp_dir = getenv("TMP")) == NULL || *tmp_dir == '\0') && ((tmp_dir = getenv("TMP")) == NULL || *tmp_dir == '\0') &&
((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0')) ((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0'))
tmp_dir = "/tmp"; tmp_dir = "/tmp";
create_option_search_table();
goto open_rc;
} }
@@ -1449,8 +1451,8 @@ panel_set_option(struct parsed_tagarg *arg)
FILE *f = NULL; FILE *f = NULL;
char *p; char *p;
if (no_rc_dir) { if (config_file == NULL) {
disp_message("There's no ~/.w3m directory... config not saved", FALSE); disp_message("There's no config file... config not saved", FALSE);
} }
else { else {
f = fopen(config_file, "wt"); f = fopen(config_file, "wt");