src/usr.bin/diff/diffreg.c - diff

Return to diffreg.c CVS log

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

Diff for /src/usr.bin/diff/diffreg.c between version 1.60 and 1.61

version 1.60, 2004/11/27 19:16:25

version 1.61, 2004/12/09 18:56:10

Line 214

static void unsort(struct line *, int, int *);

static void change(char *, FILE *, char *, FILE *, int, int, int, int);

static void sort(struct line *, int);

static void print_header(const char *, const char *);

static int ignoreline(char *);

static int asciifile(FILE *);

static int fetch(long *, int, int, FILE *, int, int);

Line 1048

Line 1049

* Print the context/unidiff header first time through.

if (label != NULL)

print_header(file1, file2);

printf("%s %s\n",

format == D_CONTEXT ? "***" : "---", label);

else

printf("%s %s\t%s",

format == D_CONTEXT ? "***" : "---", file1,

ctime(&stb1.st_mtime));

printf("%s %s\t%s",

format == D_CONTEXT ? "---" : "+++", file2,

ctime(&stb2.st_mtime));

anychange = 1;

} else if (a > context_vec_ptr->b + (2 * context) + 1 &&

c > context_vec_ptr->d + (2 * context) + 1) {

Line 1509

Line 1501

fetch(ixnew, d + 1, upd, f2, ' ', 0);

context_vec_ptr = context_vec_start - 1;

}

static void

print_header(const char *file1, const char *file2)

{

if (label[0] != NULL)

printf("%s %s\n", format == D_CONTEXT ? "***" : "---",

label[0]);

else

printf("%s %s\t%s", format == D_CONTEXT ? "***" : "---",

file1, ctime(&stb1.st_mtime));

if (label[1] != NULL)

printf("%s %s\n", format == D_CONTEXT ? "---" : "+++",

label[1]);

else

printf("%s %s\t%s", format == D_CONTEXT ? "---" : "+++",

file2, ctime(&stb2.st_mtime));

}