diff options
| author | nicm <nicm> | 2015-10-28 09:51:55 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-10-28 09:51:55 +0000 |
| commit | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (patch) | |
| tree | 533de8449d76a2bb151f883f99f80ba73f0c987e /cmd-string.c | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
| download | rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.tar.gz rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.tar.bz2 rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.zip | |
Like options, move the environ struct into environ.c.
Diffstat (limited to 'cmd-string.c')
| -rw-r--r-- | cmd-string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-string.c b/cmd-string.c index db1723cb..51554800 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -126,7 +126,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file, whitespace = argv[0] + strcspn(argv[0], " \t"); if (equals == NULL || equals > whitespace) break; - environ_put(&global_environ, argv[0]); + environ_put(global_environ, argv[0]); argc--; memmove(argv, argv + 1, argc * (sizeof *argv)); } @@ -303,7 +303,7 @@ cmd_string_variable(const char *s, size_t *p) buf = xrealloc(buf, len + 1); buf[len] = '\0'; - envent = environ_find(&global_environ, buf); + envent = environ_find(global_environ, buf); free(buf); if (envent == NULL) return (xstrdup("")); @@ -326,7 +326,7 @@ cmd_string_expand_tilde(const char *s, size_t *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') home = envent->value; else if ((pw = getpwuid(getuid())) != NULL) |