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

Update to w3m-0.2.1-inu-1.6.

Browse Source
This commit is contained in:
Akinori Ito
2001-11-15 00:32:13 +00:00
parent 6c63633545
commit 85da7ee692
82 changed files with 10900 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
local.c
View File

@@ -16,6 +16,9 @@
#define CGIFN_NORMAL 0
#define CGIFN_DROOT 1
#define CGIFN_CGIBIN 2
#define CGIFN_MODE(x) ((x)&3)
#define CGIFN_CONTAIN_SLASH 4
/* setup cookie for local CGI */
void
@@ -167,8 +170,14 @@ check_local_cgi(char *file, int status)
{
struct stat st;
if (status & CGIFN_CONTAIN_SLASH) {
/* local CGI file must be just under /cgi-bin/
or /$LIB/
*/
return -1;
}
#ifdef __EMX__
if (status != CGIFN_CGIBIN) {
if (CGIFN_MODE(status) != CGIFN_CGIBIN) {
char tmp[_MAX_PATH];
int len;
@@ -183,7 +192,7 @@ check_local_cgi(char *file, int status)
return -1;
}
#else /* not __EMX__ */
if (status != CGIFN_CGIBIN) {
if (CGIFN_MODE(status) != CGIFN_CGIBIN) {
char *tmp = Strnew_charp(lib_dir)->ptr;
int len = strlen(tmp);
@@ -212,7 +221,8 @@ void
set_environ(char *var, char *value)
{
#ifdef HAVE_SETENV
setenv(var, value, 1);
if ( var != NULL && value != NULL )
setenv(var, value, 1);
#else /* not HAVE_SETENV */
#ifdef HAVE_PUTENV
Str tmp = Strnew_m_charp(var, "=", value, NULL);
@@ -298,6 +308,8 @@ cgi_filename(char *fn, int *status)
struct stat st;
if (cgi_bin != NULL && strncmp(fn, "/cgi-bin/", 9) == 0) {
*status = CGIFN_CGIBIN;
if (strchr(fn+9,'/'))
*status |= CGIFN_CONTAIN_SLASH;
tmp = checkPath(fn + 9, cgi_bin);
if (tmp == NULL)
return fn;
@@ -307,6 +319,8 @@ cgi_filename(char *fn, int *status)
*status = CGIFN_NORMAL;
tmp = Strnew_charp(lib_dir);
fn += 5;
if (strchr(fn+1,'/'))
*status |= CGIFN_CONTAIN_SLASH;
if (Strlastchar(tmp) == '/')
fn++;
Strcat_charp(tmp, fn);
@@ -314,6 +328,8 @@ cgi_filename(char *fn, int *status)
}
if (*fn == '/' && document_root != NULL && stat(fn, &st) < 0) {
*status = CGIFN_DROOT;
if (strchr(fn+1,'/'))
*status |= CGIFN_CONTAIN_SLASH;
tmp = Strnew_charp(document_root);
if (Strlastchar(tmp) != '/')
Strcat_char(tmp, '/');
@@ -373,21 +389,15 @@ localcgi_popen_r(FILE **p_fp)
}
FILE *
localcgi_post(char *uri, FormList * request, char *referer)
localcgi_post(char *uri, char *qstr, FormList * request, char *referer)
{
FILE *f, *f1;
Str tmp1;
int status;
pid_t pid;
char *name, *file, *qstr;
char *file;
if ((qstr = strchr(uri, '?'))) {
name = allocStr(uri, qstr - uri);
qstr = allocStr(qstr + 1, 0);
}
else
name = uri;
file = cgi_filename(name, &status);
file = cgi_filename(uri, &status);
if (check_local_cgi(file, status) < 0)
return NULL;
tmp1 = tmpfname(TMPF_DFL, NULL);
@@ -399,7 +409,12 @@ localcgi_post(char *uri, FormList * request, char *referer)
fclose(f1);
return pid > 0 ? f : NULL;
}
set_cgi_environ(Strnew_charp(name)->ptr, file, Strnew_charp(uri)->ptr);
if (qstr == NULL) {
set_cgi_environ(uri, file, uri);
} else {
set_cgi_environ(uri, file,
Strnew_m_charp(uri, "?", qstr, NULL)->ptr);
}
set_environ("REQUEST_METHOD", "POST");
if (qstr)
set_environ("QUERY_STRING", qstr);