iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed expand_homedir to handle paths like "~user" correctly.

Browse Source
This commit is contained in:
Arnavion 2014-07-19 17:09:50 -07:00 committed by TingPing
parent 6540c0ff68
commit 2d62edc5af
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/util.c
View File

@ -436,30 +436,30 @@ expand_homedir (char *file)
char *ret, *user; char *ret, *user;
struct passwd *pw; struct passwd *pw;
if (*file == '~') if (file[0] == '~')
{ {
if (file[1] != '\0' && file[1] != '/') if (file[1] == '\0' || file[1] == '/')
{ return g_strconcat (g_get_home_dir (), &file[1], NULL);
user = strdup(file);
if (strchr(user,'/') != NULL) char *slash_pos;
*(strchr(user,'/')) = '\0';
if ((pw = getpwnam(user + 1)) == NULL) user = g_strdup(file);
{
free(user); slash_pos = strchr(user, '/');
return strdup(file); if (slash_pos != NULL)
} *slash_pos = '\0';
free(user);
user = strchr(file, '/') != NULL ? strchr(file,'/') : file; pw = getpwnam(user + 1);
ret = malloc(strlen(user) + strlen(pw->pw_dir) + 1); g_free(user);
strcpy(ret, pw->pw_dir);
strcat(ret, user); if (pw == NULL)
} return g_strdup(file);
slash_pos = strchr(file, '/');
if (slash_pos == NULL)
return g_strdup (pw->pw_dir);
else else
{ return g_strconcat (pw->pw_dir, slash_pos, NULL);
ret = malloc (strlen (file) + strlen (g_get_home_dir ()) + 1);
sprintf (ret, "%s%s", g_get_home_dir (), file + 1);
}
return ret;
} }
#endif #endif
return g_strdup (file); return g_strdup (file);