summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-21 17:15:34 -0500
committerJune McEnroe <june@causal.agency>2019-11-21 17:15:34 -0500
commit911f6055e5b8addb94befa5577413c37d9e069fb (patch)
tree6d9baa7367773154f008cd8da489078483c83792
parentRevert "Set default ENV to ~/.config/cash/cashrc" (diff)
downloadsrc-911f6055e5b8addb94befa5577413c37d9e069fb.tar.gz
src-911f6055e5b8addb94befa5577413c37d9e069fb.zip
Do not apply expansion to HISTFILE
-rw-r--r--bin/1sh/histedit.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c
index 32e798e3..ae24c1be 100644
--- a/bin/1sh/histedit.c
+++ b/bin/1sh/histedit.c
@@ -177,26 +177,18 @@ sethistfile(const char *hf)
 static void
 history_load(const char *hf) {
 	HistEvent he;
-	const char *ehf;
 
-	ehf = expandstr(hf);
-	if (ehf == NULL)
-		return;
-	if (history(hist, &he, H_LOAD, ehf) == -1)
-		warning("%s: %s", he.str, ehf);
+	if (history(hist, &he, H_LOAD, hf) == -1)
+		warning("%s: %s", he.str, hf);
 }
 
 
 static void
 history_save(const char *hf) {
 	HistEvent he;
-	const char *ehf;
 
-	ehf = expandstr(hf);
-	if (ehf == NULL)
-		return;
-	if (history(hist, &he, H_SAVE, ehf) == -1)
-		warning("%s: %s", he.str, ehf);
+	if (history(hist, &he, H_SAVE, hf) == -1)
+		warning("%s: %s", he.str, hf);
 }