From 772973c9a587064edc238704006acbbe18f39bda Mon Sep 17 00:00:00 2001 From: kre Date: Mon, 31 Jan 2022 18:15:45 +0000 Subject: [PATCH] When we initialize libedit (editline) always call ourselves "sh" no matter what $0 is (or is not) set to. This means that editrc(5) lines that start "sh:" are used (in addition to those with no prefix, which will usually be most of them), regardless of the name or manner in which we were invoked. OK christos@ --- bin/sh/histedit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 1b7e0f5131da..f1bd1c570c18 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -1,4 +1,4 @@ -/* $NetBSD: histedit.c,v 1.58 2022/01/31 16:54:28 kre Exp $ */ +/* $NetBSD: histedit.c,v 1.59 2022/01/31 18:15:45 kre Exp $ */ /*- * Copyright (c) 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: histedit.c,v 1.58 2022/01/31 16:54:28 kre Exp $"); +__RCSID("$NetBSD: histedit.c,v 1.59 2022/01/31 18:15:45 kre Exp $"); #endif #endif /* not lint */ @@ -115,7 +115,7 @@ histedit(void) /* * turn editing on */ - char *term, *shname; + char *term; INTOFF; if (el_in == NULL) @@ -151,10 +151,7 @@ histedit(void) setenv("TERM", term, 1); else unsetenv("TERM"); - shname = arg0; - if (shname[0] == '-') - shname++; - el = el_init(shname, el_in, el_out, el_err); + el = el_init("sh", el_in, el_out, el_err); if (el != NULL) { if (hist) el_set(el, EL_HIST, history, hist);