iFixing the last patch to the surf style. - surf - Surf web browser.	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
1Log	/scm/surf//log.gph	gopher.r-36.net	70
1Files	/scm/surf//files.gph	gopher.r-36.net	70
1Refs	/scm/surf//refs.gph	gopher.r-36.net	70
1README	/scm/surf//file/README.gph	gopher.r-36.net	70
1LICENSE	/scm/surf//file/LICENSE.gph	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1commit 31ec0fb93d84e7d9f324340de790076e78911b11	/scm/surf//commit/31ec0fb93d84e7d9f324340de790076e78911b11.gph	gopher.r-36.net	70
1parent 1308872b8bd7a2516d0626955abe391af076e711	/scm/surf//commit/1308872b8bd7a2516d0626955abe391af076e711.gph	gopher.r-36.net	70
hAuthor: Christoph Lohmann <20h@r-36.net>	URL:mailto:20h@r-36.net	gopher.r-36.net	70
iDate:   Fri,  3 Jun 2016 15:14:53 +0200	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iFixing the last patch to the surf style.	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iDiffstat:	Err	gopher.r-36.net	70
i  surf.c                              |      33 +++++++++++++++++--------------	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
i1 file changed, 18 insertions(+), 15 deletions(-)	Err	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1diff --git a/surf.c b/surf.c	/scm/surf//file/surf.c.gph	gopher.r-36.net	70
i@@ -115,6 +115,8 @@ static void addaccelgroup(Client *c);	Err	gopher.r-36.net	70
i static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,	Err	gopher.r-36.net	70
i                           WebKitWebResource *r, WebKitNetworkRequest *req,	Err	gopher.r-36.net	70
i                           WebKitNetworkResponse *resp, Client *c);	Err	gopher.r-36.net	70
i+static const char *getuserhomedir(const char *user);	Err	gopher.r-36.net	70
i+static const char *getcurrentuserhomedir(void);	Err	gopher.r-36.net	70
i static char *buildfile(const char *path);	Err	gopher.r-36.net	70
i static char *buildpath(const char *path);	Err	gopher.r-36.net	70
i static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c);	Err	gopher.r-36.net	70
i@@ -288,34 +290,35 @@ buildfile(const char *path)	Err	gopher.r-36.net	70
i }	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i static const char*	Err	gopher.r-36.net	70
i-get_user_homedir(const char *user) {	Err	gopher.r-36.net	70
i+getuserhomedir(const char *user)	Err	gopher.r-36.net	70
i+{	Err	gopher.r-36.net	70
i         struct passwd *pw = getpwnam(user);	Err	gopher.r-36.net	70
i-        if (!pw) {	Err	gopher.r-36.net	70
i-                die("Can't get user `%s' home directory.\n", user);	Err	gopher.r-36.net	70
i-        }	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i+        if (!pw)	Err	gopher.r-36.net	70
i+                die("Can't get user %s login information.\n", user);	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i         return pw->pw_dir;	Err	gopher.r-36.net	70
i }	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i static const char*	Err	gopher.r-36.net	70
i-get_current_user_homedir() {	Err	gopher.r-36.net	70
i+getcurrentuserhomedir(void)	Err	gopher.r-36.net	70
i+{	Err	gopher.r-36.net	70
i         const char *homedir;	Err	gopher.r-36.net	70
i         const char *user;	Err	gopher.r-36.net	70
i         struct passwd *pw;	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         homedir = getenv("HOME");	Err	gopher.r-36.net	70
i-        if (homedir) {	Err	gopher.r-36.net	70
i+        if (homedir)	Err	gopher.r-36.net	70
i                 return homedir;	Err	gopher.r-36.net	70
i-        }	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         user = getenv("USER");	Err	gopher.r-36.net	70
i-        if (user) {	Err	gopher.r-36.net	70
i-                return get_user_homedir(user);	Err	gopher.r-36.net	70
i-        }	Err	gopher.r-36.net	70
i+        if (user)	Err	gopher.r-36.net	70
i+                return getuserhomedir(user);	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         pw = getpwuid(getuid());	Err	gopher.r-36.net	70
i-        if (!pw) {	Err	gopher.r-36.net	70
i+        if (!pw)	Err	gopher.r-36.net	70
i                 die("Can't get current user home directory\n");	Err	gopher.r-36.net	70
i-        }	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i         return pw->pw_dir;	Err	gopher.r-36.net	70
i }	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i@@ -323,19 +326,19 @@ char *	Err	gopher.r-36.net	70
i buildpath(const char *path)	Err	gopher.r-36.net	70
i {	Err	gopher.r-36.net	70
i         char *apath, *name, *p, *fpath;	Err	gopher.r-36.net	70
i+        const char *homedir;	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         if (path[0] == '~') {	Err	gopher.r-36.net	70
i-                const char *homedir;	Err	gopher.r-36.net	70
i                 if (path[1] == '/' || path[1] == '\0') {	Err	gopher.r-36.net	70
i                         p = (char *)&path[1];	Err	gopher.r-36.net	70
i-                        homedir = get_current_user_homedir();	Err	gopher.r-36.net	70
i+                        homedir = getcurrentuserhomedir();	Err	gopher.r-36.net	70
i                 } else {	Err	gopher.r-36.net	70
i                         if ((p = strchr(path, '/')))	Err	gopher.r-36.net	70
i                                 name = g_strndup(&path[1], --p - path);	Err	gopher.r-36.net	70
i                         else	Err	gopher.r-36.net	70
i                                 name = g_strdup(&path[1]);	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i-                        homedir = get_user_homedir(name);	Err	gopher.r-36.net	70
i+                        homedir = getuserhomedir(name);	Err	gopher.r-36.net	70
i                         g_free(name);	Err	gopher.r-36.net	70
i                 }	Err	gopher.r-36.net	70
i                 apath = g_build_filename(homedir, p, NULL);	Err	gopher.r-36.net	70
.