[src/trunk]: src/lib/libedit Make the default editrc file be $EDITRC (from en...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/62040d8db0ab
branches:  trunk
changeset: 354722:62040d8db0ab
user:      kre <kre%NetBSD.org@localhost>
date:      Tue Jun 27 00:47:37 2017 +0000

description:
Make the default editrc file be $EDITRC (from env) if set, falling back
to $HOME/.editrc otherwise.    Better support for this in sh coming.

diffstat:

 lib/libedit/el.c |  31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r e54b1a0d6b3e -r 62040d8db0ab lib/libedit/el.c
--- a/lib/libedit/el.c  Mon Jun 26 22:09:16 2017 +0000
+++ b/lib/libedit/el.c  Tue Jun 27 00:47:37 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: el.c,v 1.92 2016/05/22 19:44:26 christos Exp $ */
+/*     $NetBSD: el.c,v 1.93 2017/06/27 00:47:37 kre Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)el.c       8.2 (Berkeley) 1/3/94";
 #else
-__RCSID("$NetBSD: el.c,v 1.92 2016/05/22 19:44:26 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.93 2017/06/27 00:47:37 kre Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -524,18 +524,22 @@
        fp = NULL;
        if (fname == NULL) {
 #ifdef HAVE_ISSETUGID
-               static const char elpath[] = "/.editrc";
-               size_t plen = sizeof(elpath);
-
                if (issetugid())
                        return -1;
-               if ((ptr = getenv("HOME")) == NULL)
-                       return -1;
-               plen += strlen(ptr);
-               if ((path = el_malloc(plen * sizeof(*path))) == NULL)
-                       return -1;
-               (void)snprintf(path, plen, "%s%s", ptr, elpath);
-               fname = path;
+
+               if ((fname = getenv("EDITRC")) == NULL) {
+                       static const char elpath[] = "/.editrc";
+                       size_t plen = sizeof(elpath);
+
+                       if ((ptr = getenv("HOME")) == NULL)
+                               return -1;
+                       plen += strlen(ptr);
+                       if ((path = el_malloc(plen * sizeof(*path))) == NULL)
+                               return -1;
+                       (void)snprintf(path, plen, "%s%s", ptr,
+                               elpath + (*ptr == '\0'));
+                       fname = path;
+               }
 #else
                /*
                 * If issetugid() is missing, always return an error, in order
@@ -545,6 +549,9 @@
                return -1;
 #endif
        }
+       if (fname[0] == '\0')
+               return -1;
+
        if (fp == NULL)
                fp = fopen(fname, "r");
        if (fp == NULL) {