src/usr.bin/cvs/diff_internals.c - diff

Return to diff_internals.c CVS log

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

Diff for /src/usr.bin/cvs/diff_internals.c between version 1.21 and 1.22

version 1.21, 2008/04/24 19:13:56

version 1.22, 2008/05/30 11:06:17

Line 201

int diff_format = D_NORMAL;

int diff_iflag = 0;

int diff_pflag = 0;

char *diff_file = NULL;

const char *diff_file1 = NULL;

const char *diff_file2 = NULL;

RCSNUM *diff_rev1 = NULL;

RCSNUM *diff_rev2 = NULL;

char diffargs[128];

Line 300

Line 301

FILE *f1, *f2;

int i, rval, fd1, fd2;

diff_file1 = file1;

diff_file2 = file2;

f1 = f2 = NULL;

rval = D_SAME;

anychange = 0;

Line 887

Line 890

(void)strftime(buf, sizeof(buf), "%b %G %H:%M:%S -0000", t);

diff_output("%s %s %d %s", diff_format == D_CONTEXT ?

"***" : "---", diff_file, t->tm_mday, buf);

"***" : "---", diff_file1, t->tm_mday, buf);

if (diff_rev1 != NULL) {

rcsnum_tostr(diff_rev1, buf, sizeof(buf));

Line 900

Line 903

(void)strftime(buf, sizeof(buf), "%b %G %H:%M:%S -0000", t);

diff_output("%s %s %d %s", diff_format == D_CONTEXT ?

"---" : "+++", diff_file, t->tm_mday, buf);

"---" : "+++", diff_file2, t->tm_mday, buf);

if (diff_rev2 != NULL) {

rcsnum_tostr(diff_rev2, buf, sizeof(buf));

Line 931

Line 934

t = gmtime(&stb1.st_atime);

} else {

rcsnum_tostr(diff_rev1, buf, sizeof(buf));

diff_output("%s:%s", diff_file, buf);

diff_output("%s:%s", diff_file1, buf);

}

(void)strftime(buf, sizeof(buf), "%a %b %e %H:%M:%S %G", t);

Line 947

Line 950

(void)strftime(buf, sizeof(buf), "%a %b %e %H:%M:%S %G", t);

diff_output("%s %s %s\n", diff_format == D_CONTEXT ? "---" : "+++",

diff_file, buf);

diff_file2, buf);

}