mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tilde expansion in command strings work even if it isn't terminated by /.

Browse Source
This commit is contained in:
nicm
2013-10-10 12:14:09 +00:00
parent 10c38436aa
commit 165aa59760
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd-string.c
View File

@@ -318,10 +318,13 @@ cmd_string_expand_tilde(const char *s, size_t *p)
{ {
struct passwd *pw; struct passwd *pw;
struct environ_entry *envent; struct environ_entry *envent;
char *home, *path, *username; char *home, *path, *user, *cp;
int last;
home = NULL; home = NULL;
if (cmd_string_getc(s, p) == '/') {
last = cmd_string_getc(s, p);
if (last == EOF || last == '/' || last == ' '|| last == '\t') {
envent = environ_find(&global_environ, "HOME"); envent = environ_find(&global_environ, "HOME");
if (envent != NULL && *envent->value != '\0') if (envent != NULL && *envent->value != '\0')
home = envent->value; home = envent->value;
@@ -329,15 +332,27 @@ cmd_string_expand_tilde(const char *s, size_t *p)
home = pw->pw_dir; home = pw->pw_dir;
} else { } else {
cmd_string_ungetc(p); cmd_string_ungetc(p);
if ((username = cmd_string_string(s, p, '/', 0)) == NULL)
return (NULL); cp = user = xmalloc(strlen(s));
if ((pw = getpwnam(username)) != NULL) for (;;) {
home = pw->pw_dir; last = cmd_string_getc(s, p);
free(username); if (last == EOF || last == '/' || last == ' '|| last == '\t')
break;
*cp++ = last;
} }
*cp = '\0';
if ((pw = getpwnam(user)) != NULL)
home = pw->pw_dir;
free(user);
}
if (home == NULL) if (home == NULL)
return (NULL); return (NULL);
xasprintf(&path, "%s/", home); if (last != EOF)
xasprintf(&path, "%s%c", home, last);
else
xasprintf(&path, "%s", home);
return (path); return (path);
} }