version 1.23, 2003/07/21 22:57:17 |
version 1.24, 2003/07/21 23:28:00 |
|
|
diffit(dent1, path1, dirlen1, path2, dirlen2); |
diffit(dent1, path1, dirlen1, path2, dirlen2); |
else if (lflag) |
else if (lflag) |
dent1->d_status |= D_ONLY; |
dent1->d_status |= D_ONLY; |
else if (format == D_NORMAL || format == D_CONTEXT || |
else |
format == D_UNIFIED || format == D_BRIEF) |
|
/* XXX GNU diff always prints this XXX */ |
|
printf("Only in %.*s: %s\n", (int)(dirlen1 - 1), |
printf("Only in %.*s: %s\n", (int)(dirlen1 - 1), |
path1, dent1->d_name); |
path1, dent1->d_name); |
dp1++; |
dp1++; |
|
|
diffit(dent2, path1, dirlen1, path2, dirlen2); |
diffit(dent2, path1, dirlen1, path2, dirlen2); |
else if (lflag) |
else if (lflag) |
dent2->d_status |= D_ONLY; |
dent2->d_status |= D_ONLY; |
else if (format == D_NORMAL || format == D_CONTEXT || |
else |
format == D_UNIFIED || format == D_BRIEF) |
|
/* XXX GNU diff always prints this XXX */ |
|
printf("Only in %.*s: %s\n", (int)(dirlen2 - 1), |
printf("Only in %.*s: %s\n", (int)(dirlen2 - 1), |
path2, dent2->d_name); |
path2, dent2->d_name); |
dp2++; |
dp2++; |
|
|
diffdir(path1, path2); |
diffdir(path1, path2); |
else if (lflag) |
else if (lflag) |
dp->d_status |= D_COMMON; |
dp->d_status |= D_COMMON; |
else if (format != D_EDIT) |
else |
/* XXX GNU diff always prints this for dirs XXX */ |
|
printf("Common subdirectories: %s and %s\n", |
printf("Common subdirectories: %s and %s\n", |
path1, path2); |
path1, path2); |
return; |
return; |