$B2,ED$G$9!#(B
w3m-0.1.11-pre-kokb15 $B$K(B [w3m-dev 01053] $B$N%Q%C%A$r<h$j9~$s$G2<$5$C$F(B
$B$"$j$,$H$&$4$6$$$^$9!#$3$N%Q%C%A$N=$@5HG$rE:IU$7$^$9$N$G!"%^!<%8$7$F$$(B
$B$?$@$1$k$H=u$+$j$^$9!#(B
$BJQ99E@$O(B
$B!&(Bmydirname $B$N%P%0=$@5$H4X?t@k8@$NDI2C(B
$B!&(BSERVER_NAME $B$r@_Dj$9$k$h$&$KJQ99(B
$B!&(B[w3m-dev-en 00234] $B$r;29M$K(B GATEWAY_INTERFACE $B$r@_Dj$9$k$h$&$KJQ99(B
$B!&(Bcurrent working directory $B$rJQ99$7$F(B popen $B$9$k!"$h$j$^$H$b$J<BAu(B
$B$G$9!#(B
w3m-0.1.11-pre $B$K2,It$5$s$N(B w3m-0.1.11-pre-kokb15 $B$rEv$F$?$b$N$+$i$N:9(B
$BJ,$G$9!#(B
-- Tsutomu Okada <okada@furuno.co.jp>*** w3m-0.1.11-pre-kokb15/etc.c Tue Oct 10 17:31:43 2000 --- w3m/etc.c Tue Oct 10 17:12:40 2000 *************** *** 592,602 **** char *p = s; while (*p) p++; ! while (s <= p && *p != '/') p--; if (*p != '/') ! p = NULL; ! return allocStr(s, strlen(s) - strlen(p)); } #ifndef STRERROR --- 593,609 ---- char *p = s; while (*p) p++; ! if (s != p) ! p--; ! while (s != p && *p == '/') ! p--; ! while (s != p && *p != '/') p--; if (*p != '/') ! return "."; ! while (s != p && *p == '/') ! p--; ! return allocStr(s, strlen(s) - strlen(p) + 1); } #ifndef STRERROR *** w3m-0.1.11-pre-kokb15/local.c Tue Oct 10 17:31:47 2000 --- w3m/local.c Tue Oct 10 17:01:38 2000 *************** *** 228,236 **** { set_environ("SERVER_SOFTWARE", version); set_environ("SERVER_PROTOCOL", "HTTP/1.0"); set_environ("REMOTE_HOST", "localhost"); set_environ("REMOTE_ADDR", "127.0.0.1"); ! set_environ("SERVER_PORT", "80"); /* dummy */ set_environ("SCRIPT_NAME", name); set_environ("SCRIPT_FILENAME", fn); --- 228,238 ---- { set_environ("SERVER_SOFTWARE", version); set_environ("SERVER_PROTOCOL", "HTTP/1.0"); + set_environ("SERVER_NAME", "localhost"); + set_environ("SERVER_PORT", "80"); /* dummy */ set_environ("REMOTE_HOST", "localhost"); set_environ("REMOTE_ADDR", "127.0.0.1"); ! set_environ("GATEWAY_INTERFACE", "CGI/1.1"); set_environ("SCRIPT_NAME", name); set_environ("SCRIPT_FILENAME", fn); *************** *** 294,307 **** localcgi_post(char *file, FormList * request) { FILE *f; ! Str name, tmp1, tmp2; int status; ! name = Strnew_charp(file); file = cgi_filename(file, &status); if (check_local_cgi(file, status) < 0) return NULL; ! set_cgi_environ(name->ptr, file, name->ptr); set_environ("REQUEST_METHOD", "POST"); set_environ("CONTENT_LENGTH", Sprintf("%d", request->length)->ptr); if (request->enctype == FORM_ENCTYPE_MULTIPART) { --- 296,309 ---- localcgi_post(char *file, FormList * request) { FILE *f; ! Str tmp1, tmp2; int status; ! tmp1 = Strnew_charp(file); file = cgi_filename(file, &status); if (check_local_cgi(file, status) < 0) return NULL; ! set_cgi_environ(tmp1->ptr, file, tmp1->ptr); set_environ("REQUEST_METHOD", "POST"); set_environ("CONTENT_LENGTH", Sprintf("%d", request->length)->ptr); if (request->enctype == FORM_ENCTYPE_MULTIPART) { *************** *** 330,359 **** fputs(request->body, f); } fclose(f); ! tmp2 = Sprintf("cd %s; %s < %s", mydirname(file), file, tmp1->ptr); ! return popen(tmp2->ptr, "r"); } FILE * localcgi_get(char *file, char *request) { ! Str name, tmp; int status; ! ! name = Strnew_charp(file); file = cgi_filename(file, &status); if (check_local_cgi(file, status) < 0) return NULL; ! if (!strcmp(request, "")) ! set_cgi_environ(name->ptr, file, name->ptr); ! else { ! Str req_uri; ! ! req_uri = Strnew_m_charp(name->ptr, "?", request, NULL); ! set_cgi_environ(name->ptr, file, req_uri->ptr); } set_environ("REQUEST_METHOD", "GET"); set_environ("QUERY_STRING", request); ! tmp = Sprintf("cd %s; %s", mydirname(file), file); ! return popen(tmp->ptr, "r"); } --- 332,376 ---- fputs(request->body, f); } fclose(f); ! tmp2 = Sprintf("%s < %s", file, tmp1->ptr); ! #ifdef __EMX__ ! f = popen(tmp2->ptr, "r"); ! #else ! tmp1 = Strnew_charp(currentdir()); ! chdir(mydirname(file)); ! f = popen(tmp2->ptr, "r"); ! chdir(tmp1->ptr); ! #endif ! return f; } FILE * localcgi_get(char *file, char *request) { ! FILE *f; ! Str tmp1, tmp2; int status; ! ! tmp1 = Strnew_charp(file); file = cgi_filename(file, &status); if (check_local_cgi(file, status) < 0) return NULL; ! if (!strcmp(request, "")) { ! set_cgi_environ(tmp1->ptr, file, tmp1->ptr); ! } else { ! set_cgi_environ(tmp1->ptr, file, ! Strnew_m_charp(tmp1->ptr, "?", request, NULL)->ptr); } set_environ("REQUEST_METHOD", "GET"); set_environ("QUERY_STRING", request); ! tmp2 = Sprintf("%s", file); ! #ifdef __EMX__ ! f = popen(tmp2->ptr, "r"); ! #else ! tmp1 = Strnew_charp(currentdir()); ! chdir(mydirname(file)); ! f = popen(tmp2->ptr, "r"); ! chdir(tmp1->ptr); ! #endif ! return f; } *** w3m-0.1.11-pre-kokb15/proto.h Tue Oct 10 17:31:49 2000 --- w3m/proto.h Tue Oct 10 16:58:05 2000 *************** *** 201,206 **** --- 203,209 ---- extern Str Strkconv(Str s, int fcode, int tcode); #endif /* JP_CHARSET */ extern char *mybasename(char *s); + extern char *mydirname(char *s); extern int next_status(char c, int *status); extern int read_token(Str buf, char **instr, int *status, int pre, int append); extern int forwardSearch(Buffer * buf, char *str);
This archive was generated by hypermail 2b29 : Tue Oct 10 2000 - 04:27:12 CDT