version 1.80, 2006/02/26 18:35:08 |
version 1.81, 2006/03/23 13:09:09 |
|
|
static void sort(struct line *, int); |
static void sort(struct line *, int); |
static int ignoreline(char *); |
static int ignoreline(char *); |
static int asciifile(FILE *); |
static int asciifile(FILE *); |
static int fetch(long *, int, int, FILE *, int, int); |
static void fetch(long *, int, int, FILE *, int, int); |
static int newcand(int, int, int); |
static int newcand(int, int, int); |
static int search(int *, int, int); |
static int search(int *, int, int); |
static int skipline(FILE *); |
static int skipline(FILE *); |
|
|
if (a <= b && c <= d && diff_format == D_NORMAL) |
if (a <= b && c <= d && diff_format == D_NORMAL) |
diff_output("---\n"); |
diff_output("---\n"); |
} |
} |
i = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0); |
fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0); |
if (inifdef) { |
if (inifdef) { |
diff_output("#endif /* %s */\n", ifdefname); |
diff_output("#endif /* %s */\n", ifdefname); |
inifdef = 0; |
inifdef = 0; |
} |
} |
} |
} |
|
|
static int |
static void |
fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile) |
fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile) |
{ |
{ |
int i, j, c, lastc, col, nc; |
int i, j, c, lastc, col, nc; |
|
|
diff_output("%c", getc(lb)); |
diff_output("%c", getc(lb)); |
} |
} |
if (a > b) |
if (a > b) |
return (0); |
return; |
if (diff_format == D_IFDEF) { |
if (diff_format == D_IFDEF) { |
if (inifdef) { |
if (inifdef) { |
diff_output("#else /* %s%s */\n", |
diff_output("#else /* %s%s */\n", |
|
|
else |
else |
diff_output("\n\\ No newline at end of " |
diff_output("\n\\ No newline at end of " |
"file"); |
"file"); |
return (0); |
return; |
} |
} |
if ((c == '\t') && (tflag == 1)) { |
if ((c == '\t') && (tflag == 1)) { |
do { |
do { |
|
|
} |
} |
} |
} |
} |
} |
return (0); |
|
} |
} |
|
|
/* |
/* |