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

[w3m-dev 03146] Re: header option

Browse Source 
* main.c (make_optional_header_string): cleanups
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-03-27 15:35:06 +00:00
parent 067d72b5da
commit f63662d330
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6 -1
View File
@@ -1,3 +1,8 @@
2002-03-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03146] Re: header option
* main.c (make_optional_header_string): cleanups
2002-03-28 Yuuichi Teranishi <teranisi@gohome.org> 2002-03-28 Yuuichi Teranishi <teranisi@gohome.org>
* [w3m-dev 03145] header option * [w3m-dev 03145] header option
@@ -3292,4 +3297,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.361 2002/03/27 15:26:09 ukai Exp $ $Id: ChangeLog,v 1.362 2002/03/27 15:35:06 ukai Exp $
main.c
+11 -14
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.93 2002/03/27 15:26:09 ukai Exp $ */ /* $Id: main.c,v 1.94 2002/03/27 15:35:06 ukai Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -323,21 +323,18 @@ make_optional_header_string(char *s)
char *p; char *p;
Str hs; Str hs;
if (strchr(s, '\n') || strchr(s, '\r'))
return NULL;
for (p = s; *p && *p != ':'; p++) ; for (p = s; *p && *p != ':'; p++) ;
if (*p != ':' || p == s) if (*p != ':' || p == s)
return NULL; return NULL;
if (strchr(s, '\n')) { hs = Strnew_size(strlen(s) + 3);
return NULL; Strcopy_charp_n(hs, s, p - s);
} if (!Strcasecmp_charp(hs, "content-type"))
hs = Strnew_size(p - s);
strncpy(hs->ptr, s, p - s);
hs->length = p - s;
if (!Strcasecmp_charp(hs, "content-type")) {
override_content_type = TRUE; override_content_type = TRUE;
}
Strcat_charp(hs, ": "); Strcat_charp(hs, ": ");
if (*(p + 1)) { /* not null header */ if (*(++p)) { /* not null header */
for (p = p + 1; isspace(*p); p++) ; /* skip white spaces */ SKIP_BLANKS(p); /* skip white spaces */
Strcat_charp(hs, p); Strcat_charp(hs, p);
} }
Strcat_charp(hs, "\r\n"); Strcat_charp(hs, "\r\n");
@@ -627,9 +624,9 @@ MAIN(int argc, char **argv, char **envp)
Strcat(header_string, hs); Strcat(header_string, hs);
} }
while (argv[i][0]) { while (argv[i][0]) {
argv[i][0] = '\0'; argv[i][0] = '\0';
argv[i]++; argv[i]++;
} }
} }
#ifdef USE_MOUSE #ifdef USE_MOUSE
else if (!strcmp("-no-mouse", argv[i])) { else if (!strcmp("-no-mouse", argv[i])) {