Re: NEW: libc getdelim(3) and getline(3)

[Steffen Daode Nurpmeso]

diff3(1).

--steffen

Index: usr.bin/diff3/diff3prog.c
===================================================================
RCS file: /Users/steffen/arena/code.openbsd/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.11
diff -a -p -u -r1.11 diff3prog.c
--- usr.bin/diff3/diff3prog.c   27 Oct 2009 23:59:37 -0000      1.11
+++ usr.bin/diff3/diff3prog.c   25 Feb 2012 13:44:05 -0000
@@ -124,7 +124,7 @@ char f1mark[40], f3mark[40];        /* markers 
 int duplicate(struct range *, struct range *);
 int edit(struct diff *, int, int);
 char *getchange(FILE *);
-char *getline(FILE *, size_t *);
+char *xgetline(FILE *, size_t *);
 int number(char **);
 int readin(char *, struct diff **);
 int skip(int, int, char *);
@@ -253,7 +253,7 @@ getchange(FILE *b)
 {
        char *line;
 
-       while ((line = getline(b, NULL))) {
+       while ((line = xgetline(b, NULL))) {
                if (isdigit((unsigned char)line[0]))
                        return (line);
        }
@@ -261,7 +261,7 @@ getchange(FILE *b)
 }
 
 char *
-getline(FILE *b, size_t *n)
+xgetline(FILE *b, size_t *n)
 {
        char *cp;
        size_t len;
@@ -456,7 +456,7 @@ skip(int i, int from, char *pr)
        char *line;
 
        for (n = 0; cline[i] < from - 1; n += j) {
-               if ((line = getline(fp[i], &j)) == NULL)
+               if ((line = xgetline(fp[i], &j)) == NULL)
                        trouble();
                if (pr != NULL)
                        printf("%s%s", pr, line);