diff options
| author | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
|---|---|---|
| committer | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
| commit | bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb (patch) | |
| tree | e7632ff276fbfed9e41e487bad1375f46c1f4fa7 /rc.c | |
| parent | replace pclose passed to localcgi_post/get() with fclose in openURL() (diff) | |
| download | w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.tar.gz w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.zip | |
apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.
Diffstat (limited to '')
| -rw-r--r-- | rc.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.99 2004/08/02 15:40:50 ukai Exp $ */ +/* $Id: rc.c,v 1.100 2006/04/05 14:18:54 inu Exp $ */ /* * Initialization file etc. */ @@ -192,6 +192,7 @@ static int OptionEncode = FALSE; #endif /* USE_SSL */ #ifdef USE_COOKIE #define CMT_USECOOKIE N_("Enable cookie processing") +#define CMT_SHOWCOOKIE N_("Print a message when receiving a cookie") #define CMT_ACCEPTCOOKIE N_("Accept cookies") #define CMT_ACCEPTBADCOOKIE N_("Action to be taken on invalid cookie") #define CMT_COOKIE_REJECT_DOMAINS N_("Domains to reject cookies from") @@ -301,9 +302,7 @@ static struct sel_c dnsorders[] = { #ifdef USE_COOKIE static struct sel_c badcookiestr[] = { {N_S(ACCEPT_BAD_COOKIE_DISCARD), N_("discard")}, -#if 0 {N_S(ACCEPT_BAD_COOKIE_ACCEPT), N_("accept")}, -#endif {N_S(ACCEPT_BAD_COOKIE_ASK), N_("ask")}, {0, NULL, NULL} }; @@ -552,6 +551,8 @@ struct param_ptr params7[] = { #ifdef USE_COOKIE struct param_ptr params8[] = { {"use_cookie", P_INT, PI_ONOFF, (void *)&use_cookie, CMT_USECOOKIE, NULL}, + {"show_cookie", P_INT, PI_ONOFF, (void *)&show_cookie, + CMT_SHOWCOOKIE, NULL}, {"accept_cookie", P_INT, PI_ONOFF, (void *)&accept_cookie, CMT_ACCEPTCOOKIE, NULL}, {"accept_bad_cookie", P_INT, PI_SEL_C, (void *)&accept_bad_cookie, @@ -1111,7 +1112,11 @@ do_mkdir(const char *dir, long mode) return mkdir(abs, mode); } #else /* not __EMX__ */ +#ifdef __MINGW32_VERSION +#define do_mkdir(dir,mode) mkdir(dir) +#else #define do_mkdir(dir,mode) mkdir(dir,mode) +#endif /* not __MINW32_VERSION */ #endif /* not __EMX__ */ void |