talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make more pass +linenumber to vi (and emacs), even if $EDITOR is used. 

Closes PR#441, but with a more generic method.
This commit is contained in:
Peter Wemm 1995-10-04 09:33:39 +00:00
parent 4c1a35b2a6
commit 7b47e45310
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/more/command.c
View File

@ -39,6 +39,7 @@ static char sccsid[] = "@(#)command.c 8.1 (Berkeley) 6/6/93";
#include <sys/param.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <less.h>
#include "pathnames.h"
@ -594,16 +595,25 @@ editfile()
extern char *current_file;
static int dolinenumber;
static char *editor;
char *base;
int c;
char buf[MAXPATHLEN * 2 + 20], *getenv();
if (editor == NULL) {
editor = getenv("EDITOR");
/* pass the line number to vi */
if (editor == NULL || *editor == '\0') {
/* default editor is vi */
if (editor == NULL || *editor == '\0')
editor = _PATH_VI;
/* check last component in case of full path */
base = strrchr(editor, '/');
if (!base)
base = editor;
/* emacs also accepts vi-style +nnnn */
if (strcmp(base, "vi") == 0 || strcmp(base, "emacs") == 0)
dolinenumber = 1;
}
else
dolinenumber = 0;
}