aw/surf
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt loaduri()

Browse Source 
Better handling of different URIs. Filter out “about:” scheme, dont
touch URI if it contains a complete scheme (we assume "://", denotes
one), else test if given path is an actual reachable file on the
filesystem, else prepend arbitrary http:// scheme.
This commit is contained in:
Quentin Rameau 2015-11-20 16:39:53 +01:00
parent 5def2e51da
commit 84611a5d29
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
surf.c
View File

@ -162,7 +162,7 @@ static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
guint modifiers, Client *c); guint modifiers, Client *c);
static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
static void loaduri(Client *c, const Arg *arg); static void loaduri(Client *c, const Arg *a);
static void navigate(Client *c, const Arg *a); static void navigate(Client *c, const Arg *a);
static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h); static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
static Client *newclient(Client *c); static Client *newclient(Client *c);
@ -825,38 +825,35 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
} }
void void
loaduri(Client *c, const Arg *arg) loaduri(Client *c, const Arg *a)
{ {
char *u = NULL, *rp;
const char *uri = (char *)arg->v;
Arg a = { .b = FALSE };
struct stat st; struct stat st;
char *url, *path;
const char *uri = (char *)a->v;
if (strcmp(uri, "") == 0) if (g_strcmp0(uri, "") == 0)
return; return;
/* In case it's a file path. */ if (g_strrstr(uri, "://") || g_str_has_prefix(uri, "about:")) {
if (stat(uri, &st) == 0) { url = g_strdup(uri);
rp = realpath(uri, NULL); } else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
u = g_strdup_printf("file://%s", rp); url = g_strdup_printf("file://%s", path);
free(rp); free(path);
} else { } else {
u = g_strrstr(uri, "://") ? g_strdup(uri) url = g_strdup_printf("http://%s", uri);
: g_strdup_printf("http://%s", uri);
} }
setatom(c, AtomUri, uri); setatom(c, AtomUri, url);
/* prevents endless loop */ if (strcmp(url, geturi(c)) == 0) {
if (strcmp(u, geturi(c)) == 0) { reload(c, a);
reload(c, &a);
} else { } else {
webkit_web_view_load_uri(c->view, u); webkit_web_view_load_uri(c->view, url);
c->progress = 0; c->title = geturi(c);
c->title = copystr(&c->title, u);
updatetitle(c); updatetitle(c);
} }
g_free(u);
g_free(url);
} }
void void