nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow tilde expansion in loaduri

Browse source 
also fixed a bug that ~foo/ was expanded to /home/fo/o/
This commit is contained in:
nzl 2018-03-15 03:46:52 +08:00 committed by Quentin Rameau
parent d6954e1541
commit befe481a9b
1 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
surf.c
View file

@ -146,6 +146,7 @@ static void sigchld(int unused);
static void sighup(int unused); static void sighup(int unused);
static char *buildfile(const char *path); static char *buildfile(const char *path);
static char *buildpath(const char *path); static char *buildpath(const char *path);
static char *untildepath(const char *path);
static const char *getuserhomedir(const char *user); static const char *getuserhomedir(const char *user);
static const char *getcurrentuserhomedir(void); static const char *getcurrentuserhomedir(void);
static Client *newclient(Client *c); static Client *newclient(Client *c);
@ -470,26 +471,12 @@ getcurrentuserhomedir(void)
char * char *
buildpath(const char *path) buildpath(const char *path)
{ {
char *apath, *name, *p, *fpath; char *apath, *fpath;
const char *homedir;
if (path[0] == '~') { if (path[0] == '~')
if (path[1] == '/' || path[1] == '\0') { apath = untildepath(path);
p = (char *)&path[1]; else
homedir = getcurrentuserhomedir();
} else {
if ((p = strchr(path, '/')))
name = g_strndup(&path[1], --p - path);
else
name = g_strdup(&path[1]);
homedir = getuserhomedir(name);
g_free(name);
}
apath = g_build_filename(homedir, p, NULL);
} else {
apath = g_strdup(path); apath = g_strdup(path);
}
/* creating directory */ /* creating directory */
if (g_mkdir_with_parents(apath, 0700) < 0) if (g_mkdir_with_parents(apath, 0700) < 0)
@ -501,6 +488,28 @@ buildpath(const char *path)
return fpath; return fpath;
} }
char *
untildepath(const char *path)
{
char *apath, *name, *p;
const char *homedir;
if (path[1] == '/' || path[1] == '\0') {
p = (char *)&path[1];
homedir = getcurrentuserhomedir();
} else {
if ((p = strchr(path, '/')))
name = g_strndup(&path[1], p - (path + 1));
else
name = g_strdup(&path[1]);
homedir = getuserhomedir(name);
g_free(name);
}
apath = g_build_filename(homedir, p, NULL);
return apath;
}
Client * Client *
newclient(Client *rc) newclient(Client *rc)
{ {
@ -522,7 +531,7 @@ void
loaduri(Client *c, const Arg *a) loaduri(Client *c, const Arg *a)
{ {
struct stat st; struct stat st;
char *url, *path; char *url, *path, *apath;
const char *uri = a->v; const char *uri = a->v;
if (g_strcmp0(uri, "") == 0) if (g_strcmp0(uri, "") == 0)
@ -533,11 +542,19 @@ loaduri(Client *c, const Arg *a)
g_str_has_prefix(uri, "file://") || g_str_has_prefix(uri, "file://") ||
g_str_has_prefix(uri, "about:")) { g_str_has_prefix(uri, "about:")) {
url = g_strdup(uri); url = g_strdup(uri);
} else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
url = g_strdup_printf("file://%s", path);
free(path);
} else { } else {
url = g_strdup_printf("http://%s", uri); if (uri[0] == '~')
apath = untildepath(uri);
else
apath = (char *)uri;
if (!stat(apath, &st) && (path = realpath(apath, NULL))) {
url = g_strdup_printf("file://%s", path);
free(path);
} else {
url = g_strdup_printf("http://%s", uri);
}
if (apath != uri)
free(apath);
} }
setatom(c, AtomUri, url); setatom(c, AtomUri, url);