cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getline -> get_line and drop USE_GROFF, from Donovan Watteau

Browse Source
This commit is contained in:
sthen 2012-03-17 12:40:01 +00:00
parent f987af8fa6
commit cdc97e4bcd
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/elvis/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2011/12/02 14:36:14 espie Exp $
# $OpenBSD: Makefile,v 1.20 2012/03/17 12:40:01 sthen Exp $
COMMENT= clone of the ex/vi text editor
DISTNAME= elvis-2.2_0
PKGNAME= ${DISTNAME:S/_/./}
REVISION= 0
REVISION= 1
CATEGORIES= editors
HOMEPAGE= http://elvis.the-little-red-haired-girl.org/
@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --with-x \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
CFLAGS+= -I${X11BASE}/include/freetype2
USE_GROFF = Yes
WANTLIB+= X11 Xft Xpm pthread-stubs xcb
.endif

48
editors/elvis/patches/patch-ref_c Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-ref_c,v 1.1 2012/03/17 12:40:01 sthen Exp $
--- ref.c.orig Tue Oct 21 04:32:25 2003
+++ ref.c Sat Mar 17 12:28:41 2012
@@ -42,7 +42,7 @@ typedef enum
#if USE_PROTOTYPES
static void usage(char *argv0);
-static char *getline(FILE *fp);
+static char *get_line(FILE *fp);
static void store(char *line, char **list);
static LINECLS classify(char *line, LINECLS prev);
static void lookup(TAG *tag);
@@ -171,7 +171,7 @@ ELVBOOL ioclose()
/* This function reads a single line, and replaces the terminating newline with
* a '\0' byte. The string will be in a static buffer. Returns NULL at EOF.
*/
-static char *getline(fp)
+static char *get_line(fp)
FILE *fp;
{
int ch;
@@ -348,7 +348,7 @@ static void lookup(tag)
}
/* for each line... */
- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
+ for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
{
/* is this the tag definition? */
if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
@@ -377,7 +377,7 @@ static void lookup(tag)
{
if (strchr(line, '(') != NULL)
{
- while ((line = getline(fp)) != NULL
+ while ((line = get_line(fp)) != NULL
&& *line
&& ((*line != '#' && *line != '{')
|| line[strlen(line) - 1] == '\\'))
@@ -387,7 +387,7 @@ static void lookup(tag)
}
else if ((lc = classify(line, lc)) == LC_PARTIAL)
{
- while ((line = getline(fp)) != NULL
+ while ((line = get_line(fp)) != NULL
&& (lc = classify(line, lc)) == LC_PARTIAL)
{
puts(line);