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

file.c (loadGeneralFile): return NULL, not NO_BUFFER

Browse Source
This commit is contained in:
Fumitoshi UKAI
2002-01-15 03:45:02 +00:00
parent 0b5a17e5c0
commit 522460b2e2
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5 -1
View File
@@ -1,3 +1,7 @@
2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp>
* file.c (loadGeneralFile): return NULL, not NO_BUFFER
2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp> 2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02833] ssl_forbid_method in SSL Setting * [w3m-dev 02833] ssl_forbid_method in SSL Setting
@@ -1922,4 +1926,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.215 2002/01/14 16:31:26 ukai Exp $ $Id: ChangeLog,v 1.216 2002/01/15 03:45:02 ukai Exp $
file.c
+9 -9
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.43 2002/01/14 15:59:17 ukai Exp $ */ /* $Id: file.c,v 1.44 2002/01/15 03:45:02 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -1052,7 +1052,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
{ {
struct stat st; struct stat st;
if (stat(pu.real_file, &st) < 0) if (stat(pu.real_file, &st) < 0)
return NO_BUFFER; return NULL;
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
if (UseExternalDirBuffer) { if (UseExternalDirBuffer) {
Str cmd = Strnew_charp(DirBufferCommand); Str cmd = Strnew_charp(DirBufferCommand);
@@ -1069,7 +1069,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
else { else {
b = dirBuffer(pu.real_file); b = dirBuffer(pu.real_file);
if (b == NULL) if (b == NULL)
return NO_BUFFER; return NULL;
t = "text/html"; t = "text/html";
b->real_scheme = pu.scheme; b->real_scheme = pu.scheme;
goto loaded; goto loaded;
@@ -1090,7 +1090,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
} }
disp_err_message(Sprintf("Unknown URI: %s", disp_err_message(Sprintf("Unknown URI: %s",
parsedURL2Str(&pu)->ptr)->ptr, FALSE); parsedURL2Str(&pu)->ptr)->ptr, FALSE);
return NO_BUFFER; return NULL;
} }
/* openURL() succeeded */ /* openURL() succeeded */
@@ -1103,7 +1103,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (b) if (b)
discardBuffer(b); discardBuffer(b);
UFclose(&f); UFclose(&f);
return NO_BUFFER; return NULL;
} }
b = NULL; b = NULL;
@@ -1140,7 +1140,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (IStype(f.stream) == IST_SSL) { if (IStype(f.stream) == IST_SSL) {
Str s = ssl_get_certificate(f.stream, pu.host); Str s = ssl_get_certificate(f.stream, pu.host);
if (s == NULL) if (s == NULL)
return NO_BUFFER; return NULL;
else else
t_buf->ssl_certificate = s->ptr; t_buf->ssl_certificate = s->ptr;
} }
@@ -1200,7 +1200,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
/* abort */ /* abort */
UFclose(&f); UFclose(&f);
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
return NO_BUFFER; return NULL;
} }
UFclose(&f); UFclose(&f);
add_auth_cookie_flag = 1; add_auth_cookie_flag = 1;
@@ -1221,7 +1221,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
/* abort */ /* abort */
UFclose(&f); UFclose(&f);
signal(SIGINT, prevtrap); signal(SIGINT, prevtrap);
return NO_BUFFER; return NULL;
} }
UFclose(&f); UFclose(&f);
status = HTST_NORMAL; status = HTST_NORMAL;
@@ -1438,7 +1438,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (IStype(f.stream) == IST_SSL) { if (IStype(f.stream) == IST_SSL) {
Str s = ssl_get_certificate(f.stream, pu.host); Str s = ssl_get_certificate(f.stream, pu.host);
if (s == NULL) if (s == NULL)
return NO_BUFFER; return NULL;
else else
t_buf->ssl_certificate = s->ptr; t_buf->ssl_certificate = s->ptr;
} }