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

Return to diff3prog.c CVS log

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

version 1.11, 2009/10/27 23:59:37

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

Line 124

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

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

char *getchange(FILE *);

char *getline(FILE *, size_t *);

char *get_line(FILE *, size_t *);

int number(char **);

int readin(char *, struct diff **);

int skip(int, int, char *);

Line 253

{

char *line;

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

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

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

return (line);

}

Line 261

}

char *

getline(FILE *b, size_t *n)

get_line(FILE *b, size_t *n)

{

char *cp;

size_t len;

Line 456

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)

trouble();

if (pr != NULL)

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