diff options
author | ahoka <ahoka> | 2009-10-03 10:14:18 +0000 |
---|---|---|
committer | ahoka <ahoka> | 2009-10-03 10:14:18 +0000 |
commit | 47db949c0c2217c948b7555c8d33d6dfa1405acf (patch) | |
tree | 29afbcb2390b37b3030338487e678c4f9f9e663f | |
parent | ada3643921b52af313674e8a151403fbe47012e7 (diff) | |
download | pkgsrc-47db949c0c2217c948b7555c8d33d6dfa1405acf.tar.gz |
Avoid getline breakage.
Now with the patch actually committed.
-rw-r--r-- | editors/elvis/patches/patch-ref.c | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/editors/elvis/patches/patch-ref.c b/editors/elvis/patches/patch-ref.c new file mode 100644 index 00000000000..09b7878c71a --- /dev/null +++ b/editors/elvis/patches/patch-ref.c @@ -0,0 +1,49 @@ +$NetBSD: patch-ref.c,v 1.1 2009/10/03 10:14:18 ahoka Exp $ + +--- ref.c.orig 2003-10-21 04:32:25.000000000 +0200 ++++ ref.c +@@ -42,7 +42,7 @@ typedef enum + + #if USE_PROTOTYPES + static void usage(char *argv0); +-static char *getline(FILE *fp); ++static char *_getline(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 *_getline(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 = _getline(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 = _getline(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 = _getline(fp)) != NULL + && (lc = classify(line, lc)) == LC_PARTIAL) + { + puts(line); |