From 8f3fcecc43ef1895994924c83f0f505a66932c98 Mon Sep 17 00:00:00 2001
From: Rene Kita <mail@rkta.de>
Date: Mon, 25 Apr 2022 09:58:12 +0200
Subject: [PATCH] Retry if loading of a file fails

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
---
 main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main.c b/main.c
index 45f5a4b..9502edb 100644
--- a/main.c
+++ b/main.c
@@ -1012,9 +1012,11 @@ main(int argc, char **argv)
 	    SearchHeader = search_header;
 	    DefaultType = default_type;
 	    char *url;
+	    int retry = 0;
 
 	    url = load_argv[i];
 	    if (getURLScheme(&url) == SCM_MISSING && !ArgvIsURL)
+	  retry_as_local_file:
 		url = file_to_url(load_argv[i]);
 	    else
 		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);
 	    }
 	    if (newbuf == NULL) {
+		if (ArgvIsURL && !retry) {
+		    retry = 1;
+		    goto retry_as_local_file;
+		}
 		/* FIXME: gettextize? */
 		Strcat(err_msg,
 		       Sprintf("w3m: Can't load %s.\n", load_argv[i]));