src/usr.bin/rcs/diff3.c - diff

Return to diff3.c CVS log

Up to [local] / src / usr.bin / rcs

version 1.32, 2011/04/20 19:34:16

version 1.33, 2012/03/04 04:05:15

Line 131

static int duplicate(struct range *, struct range *);

static int edit(struct diff *, int, int);

static char *getchange(FILE *);

static char *getline(FILE *, size_t *);

static char *get_line(FILE *, size_t *);

static int number(char **);

static ssize_t readin(char *, struct diff **);

static int skip(int, int, char *);

Line 612

{

char *line;

while ((line = getline(b, NULL))) {

while ((line = get_line(b, NULL))) {

if (isdigit((unsigned char)line[0]))

return (line);

}

Line 621

}

static char *

getline(FILE *b, size_t *n)

get_line(FILE *b, size_t *n)

{

char *cp;

size_t len;

Line 823

char *line;

for (n = 0; cline[i] < from - 1; n += j) {

if ((line = getline(fp[i], &j)) == NULL)

if ((line = get_line(fp[i], &j)) == NULL)

return (-1);

if (pr != NULL)

diff_output("%s%s", pr, line);