Lines Matching defs:diff
91 struct diff {
112 static struct diff *d13;
113 static struct diff *d23;
120 static struct diff *de;
140 static int edit(struct diff *, bool, int, int);
143 static int readin(int fd, struct diff **);
167 #define DIFF_PATH "/usr/bin/diff"
181 { "diff-program", required_argument, NULL, DIFFPROG_OPT },
203 err(1, "error in diff output");
208 * Read diff hunks into the array pointed to by *dd.
210 * The output from `diff foo bar` consists of a series of hunks describing
246 readin(int fd, struct diff **dd)
271 errx(1, "error in diff output");
279 errx(1, "error in diff output");
283 errx(1, "error in diff output");
291 errx(1, "diff output out of order");
314 err(2, "could not execute diff: %s", diffprog);
362 struct diff *d1, *d2, *d3;
519 * No difference was reported by diff between file 1 (or 2) and file 3,
603 edit(struct diff *diff, bool dup, int j, int difftype)
617 de[j].line = strdup(diff->line);
620 de[j].old.from = diff->old.from;
621 de[j].old.to = diff->old.to;
622 de[j].new.from = diff->new.from;
623 de[j].new.to = diff->new.to;
859 printf("Error: Unhandled diff type - exiting\n");
893 struct diff *p;
1104 errx(2, "diff exited abnormally");
1106 errx(2, "diff killed by signal %d",