aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-12-09 15:27:43 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-12-09 15:27:43 +0000
commit946089ac81a111a257e29bc5dc1d9fa1bae824f6 (patch)
tree66d5e64f5bbb6e6187aa5be9f503689403bf6001
parent[w3m-dev 03542] news support (diff)
downloadw3m-946089ac81a111a257e29bc5dc1d9fa1bae824f6.tar.gz
w3m-946089ac81a111a257e29bc5dc1d9fa1bae824f6.zip
[w3m-dev 03543] External URI loader (Debian closes: Bug#169962)
* file.c (loadGeneralFile): rewrite SCM_UNKNOWN From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
-rw-r--r--ChangeLog7
-rw-r--r--file.c19
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2620cc1..083e752 100644
--- 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
@@ -5596,4 +5601,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.601 2002/12/09 15:24:00 ukai Exp $
+$Id: ChangeLog,v 1.602 2002/12/09 15:27:43 ukai Exp $
diff --git a/file.c b/file.c
index f764ff7..7a91332 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.153 2002/12/09 15:24:02 ukai Exp $ */
+/* $Id: file.c,v 1.154 2002/12/09 15:27:44 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -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;
}