diff options
| -rw-r--r-- | src/common/util.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/common/util.c b/src/common/util.c index ebaab563..3b2b372e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -252,30 +252,30 @@ expand_homedir (char *file) char *ret, *user; struct passwd *pw; - if (*file == '~') + if (file[0] == '~') { - if (file[1] != '\0' && file[1] != '/') - { - user = strdup(file); - if (strchr(user,'/') != NULL) - *(strchr(user,'/')) = '\0'; - if ((pw = getpwnam(user + 1)) == NULL) - { - free(user); - return strdup(file); - } - free(user); - user = strchr(file, '/') != NULL ? strchr(file,'/') : file; - ret = malloc(strlen(user) + strlen(pw->pw_dir) + 1); - strcpy(ret, pw->pw_dir); - strcat(ret, user); - } + if (file[1] == '\0' || file[1] == '/') + return g_strconcat (g_get_home_dir (), &file[1], NULL); + + char *slash_pos; + + user = g_strdup(file); + + slash_pos = strchr(user, '/'); + if (slash_pos != NULL) + *slash_pos = '\0'; + + pw = getpwnam(user + 1); + g_free(user); + + if (pw == NULL) + return g_strdup(file); + + slash_pos = strchr(file, '/'); + if (slash_pos == NULL) + return g_strdup (pw->pw_dir); else - { - ret = malloc (strlen (file) + strlen (g_get_home_dir ()) + 1); - sprintf (ret, "%s%s", g_get_home_dir (), file + 1); - } - return ret; + return g_strconcat (pw->pw_dir, slash_pos, NULL); } #endif return g_strdup (file); |