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

Retry if loading of a file fails

Browse Source 
This fixes GH issue #210, Debian BTS #537761[1] and obsoletes Debian
BTS #946440[2].

File names like 'a#a.html', 'b?b.html' or 'c%20.html' can not be opened
without using '-o argv_is_url=1' as the file name is interpreted as a
local URL.

If everything fails and argv_is_url is not set retry as a local file.

[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537761
[2]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946440
This commit is contained in:
Rene Kita
2022-04-25 09:58:12 +02:00
parent c515ea8a47
commit 8f3fcecc43
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.c
+6
View File
@@ -1012,9 +1012,11 @@ main(int argc, char **argv)
SearchHeader = search_header; SearchHeader = search_header;
DefaultType = default_type; DefaultType = default_type;
char *url; char *url;
int retry = 0;
url = load_argv[i]; url = load_argv[i];
if (getURLScheme(&url) == SCM_MISSING && !ArgvIsURL) if (getURLScheme(&url) == SCM_MISSING && !ArgvIsURL)
retry_as_local_file:
url = file_to_url(load_argv[i]); url = file_to_url(load_argv[i]);
else else
url = url_encode(conv_from_system(load_argv[i]), NULL, 0); url = url_encode(conv_from_system(load_argv[i]), NULL, 0);
@@ -1053,6 +1055,10 @@ main(int argc, char **argv)
newbuf = loadGeneralFile(url, NULL, NO_REFERER, 0, request); newbuf = loadGeneralFile(url, NULL, NO_REFERER, 0, request);
} }
if (newbuf == NULL) { if (newbuf == NULL) {
if (ArgvIsURL && !retry) {
retry = 1;
goto retry_as_local_file;
}
/* FIXME: gettextize? */ /* FIXME: gettextize? */
Strcat(err_msg, Strcat(err_msg,
Sprintf("w3m: Can't load %s.\n", load_argv[i])); Sprintf("w3m: Can't load %s.\n", load_argv[i]));