d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not read editrc file from '.'. This can be as unsafe as having

Browse Source 
. first in root's path.

While I'm here:
	o Add $FreeBSD$
	o Get errno from <errno.h>, but extern int errno.

Submitted by: Tim Vanderhoek
This commit is contained in:
Warner Losh 2000-05-22 05:55:22 +00:00
parent 95e529fd59
commit 4d1c36051e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=60772
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libedit/editline.3
View File

@ -381,8 +381,6 @@ If
is
.Dv NULL ,
try
.Pa $PWD/.editrc
then
.Pa $HOME/.editrc .
Refer to
.Xr editrc 5

21
lib/libedit/el.c
View File

@ -34,9 +34,13 @@
* SUCH DAMAGE.
*/
#if !defined(lint) && !defined(SCCSID)
#if !defined(lint)
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#endif /* not lint && not SCCSID */
#endif
static const char rcsid[] =
"$FreeBSD$"
#endif /* not lint */
/*
* el.c: EditLine interface functions
@ -45,6 +49,7 @@ static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#include <sys/types.h>
#include <sys/param.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#if __STDC__
@ -80,7 +85,6 @@ el_init(prog, fin, fout)
if (issetugid() == 0 && (tty = getenv("DEBUGTTY")) != NULL) {
el->el_errfile = fopen(tty, "w");
if (el->el_errfile == NULL) {
extern errno;
(void) fprintf(stderr, "Cannot open %s (%s).\n",
tty, strerror(errno));
return NULL;
@ -290,13 +294,10 @@ el_source(el, fname)
char *ptr, path[MAXPATHLEN];
if (fname == NULL) {
fname = &elpath[1];
if ((fp = fopen(fname, "r")) == NULL) {
if (issetugid() != 0 || (ptr = getenv("HOME")) == NULL)
return -1;
(void)snprintf(path, sizeof(path), "%s%s", ptr, elpath);
fname = path;
}
if (issetugid() != 0 || (ptr = getenv("HOME")) == NULL)
return -1;
(void) snprintf(path, sizeof(path), "%s%s", ptr, elpath);
fname = path;
}
if ((fp = fopen(fname, "r")) == NULL)