From 1627e0f36b0891815d53b4f27e3289ec0065d8df Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 13 Nov 2018 17:38:00 +0100 Subject: Bug 692592: Handle relative file links. The core library doesn't know where a document comes from, since we can open it as a stream, etc. Let the viewer handle relative file URLs. --- platform/gl/gl-main.c | 16 +++++++++++++++- platform/x11/pdfapp.c | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) (limited to 'platform') diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c index e153a75e..1910f1b3 100644 --- a/platform/gl/gl-main.c +++ b/platform/gl/gl-main.c @@ -12,7 +12,7 @@ #endif #ifndef _WIN32 -#include /* for fork and exec */ +#include /* for fork, exec, and getcwd */ #else char *realpath(const char *path, char *resolved_path); /* in gl-file.c */ #endif @@ -50,6 +50,20 @@ enum static void open_browser(const char *uri) { + char buf[PATH_MAX]; + + /* Relative file:// URI, make it absolute! */ + if (!strncmp(uri, "file://", 7) && uri[7] != '/') + { + char buf_base[PATH_MAX]; + char buf_cwd[PATH_MAX]; + fz_dirname(buf_base, filename, sizeof buf_base); + getcwd(buf_cwd, sizeof buf_cwd); + fz_snprintf(buf, sizeof buf, "file://%s/%s/%s", buf_cwd, buf_base, uri+7); + fz_cleanname(buf+7); + uri = buf; + } + #ifdef _WIN32 ShellExecuteA(NULL, "open", uri, 0, 0, SW_SHOWNORMAL); #else diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index bc044062..e4d05b48 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -8,6 +8,10 @@ #include #include +#ifndef _WIN32 +#include /* for getcwd */ +#endif + #define BEYOND_THRESHHOLD 40 #ifndef PATH_MAX @@ -997,6 +1001,20 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai static void pdfapp_gotouri(pdfapp_t *app, char *uri) { + char buf[PATH_MAX]; + + /* Relative file:// URI, make it absolute! */ + if (!strncmp(uri, "file://", 7) && uri[7] != '/') + { + char buf_base[PATH_MAX]; + char buf_cwd[PATH_MAX]; + fz_dirname(buf_base, app->docpath, sizeof buf_base); + getcwd(buf_cwd, sizeof buf_cwd); + fz_snprintf(buf, sizeof buf, "file://%s/%s/%s", buf_cwd, buf_base, uri+7); + fz_cleanname(buf+7); + uri = buf; + } + winopenuri(app, uri); } -- cgit v1.2.3