w3m

commit 5ff77139c905640bfcdd8989026f9559b3a62d98
parent 80c28caf12e1dceba16bdce8765d341d093e94a4
Author: ukai <ukai>
Date:   Mon,  9 Dec 2002 15:27:43 +0000

[w3m-dev 03543] External URI loader (Debian closes: Bug#169962)
* file.c (loadGeneralFile): rewrite SCM_UNKNOWN
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
file.c
 | 
17
+++++++++--------

2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 2002-12-10  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03543] External URI loader (Debian closes: Bug#169962)
+	* file.c (loadGeneralFile): rewrite SCM_UNKNOWN
+
+2002-12-10  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03542] news support
 	* file.c (loadGeneralFile): NNTP as well as NEWS
 	* indep.c (url_unquote_char): check % hex hex
diff --git a/file.c b/file.c
@@ -1567,19 +1567,20 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 		}
 	    }
 	    break;
-#ifdef USE_EXTERNAL_URI_LOADER
 	case SCM_UNKNOWN:
+#ifdef USE_EXTERNAL_URI_LOADER
 	    tmp = searchURIMethods(&pu);
-	    if (tmp != NULL) {
-		b = loadGeneralFile(tmp->ptr, NULL, NO_REFERER, 0, request);
-		if (b != NO_BUFFER)
-		    return b;
+	    if (tmp != NULL)
+		b = loadGeneralFile(tmp->ptr, current, referer, flag, request);
+		if (b != NULL && b != NO_BUFFER)
+		    copyParsedURL(&b->currentURL, &pu);
+		return b;
 	    }
-	    break;
 #endif
+	    disp_err_message(Sprintf("Unknown URI: %s",
+				     parsedURL2Str(&pu)->ptr)->ptr, FALSE);
+	    break;
 	}
-	disp_err_message(Sprintf("Unknown URI: %s",
-				 parsedURL2Str(&pu)->ptr)->ptr, FALSE);
 	return NULL;
     }