diff options
| author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-04 02:47:13 +0100 |
|---|---|---|
| committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-04 02:47:13 +0100 |
| commit | 41dc897f6dcf7b0be0832f95d624ef91b68f7edf (patch) | |
| tree | 05401ccc808b86ba8e93bff0b081d5ca9e213c11 /src | |
| parent | c51dd419f9d40facf516558510704891c0cf66b6 (diff) | |
| download | ratpoison-41dc897f6dcf7b0be0832f95d624ef91b68f7edf.zip | |
Use get_homedir anywhere we can.
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions.c | 8 | ||||
| -rw-r--r-- | src/history.c | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/actions.c b/src/actions.c index 3fe97a8..a378a0f 100644 --- a/src/actions.c +++ b/src/actions.c @@ -4264,14 +4264,14 @@ cmd_getenv (int interactive UNUSED, struct cmdarg **args) cmdret * cmd_chdir (int interactive UNUSED, struct cmdarg **args) { - char *dir; + const char *dir; if (args[0] == NULL) { - dir = getenv ("HOME"); - if (dir == NULL || *dir == '\0') + dir = get_homedir (); + if (dir == NULL) { - return cmdret_new (RET_FAILURE, "chdir: HOME not set"); + return cmdret_new (RET_FAILURE, "chdir: unable to find your HOME directory"); } } else diff --git a/src/history.c b/src/history.c index 10496d2..cf8bfad 100644 --- a/src/history.c +++ b/src/history.c @@ -32,13 +32,18 @@ static char * get_history_filename (void) { - char *homedir = getenv ("HOME"); + const char *homedir; char *filename; + homedir = get_homedir (); + if (homedir) { - filename = xmalloc (strlen (homedir) + strlen ("/" HISTORY_FILE) + 1); - sprintf (filename, "%s/" HISTORY_FILE, homedir); + struct sbuf *buf; + + buf = sbuf_new (0); + sbuf_printf (buf, "%s/%s", homedir, HISTORY_FILE); + filename = sbuf_free_struct (buf); } else { |