Annotation of src/usr.bin/diff/diffdir.c, Revision 1.28
1.28 ! millert 1: /* $OpenBSD: diffdir.c,v 1.27 2004/03/16 00:40:34 millert Exp $ */
1.2 deraadt 2:
3: /*
1.19 millert 4: * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
1.2 deraadt 5: *
1.19 millert 6: * Permission to use, copy, modify, and distribute this software for any
7: * purpose with or without fee is hereby granted, provided that the above
8: * copyright notice and this permission notice appear in all copies.
1.2 deraadt 9: *
1.19 millert 10: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17: *
18: * Sponsored in part by the Defense Advanced Research Projects
19: * Agency (DARPA) and Air Force Research Laboratory, Air Force
20: * Materiel Command, USAF, under agreement number F39502-99-1-0512.
1.2 deraadt 21: */
22:
1.19 millert 23: #ifndef lint
1.28 ! millert 24: static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.27 2004/03/16 00:40:34 millert Exp $";
1.19 millert 25: #endif /* not lint */
26:
27: #include <sys/param.h>
28: #include <sys/stat.h>
1.3 tedu 29:
1.12 millert 30: #include <dirent.h>
1.19 millert 31: #include <err.h>
1.12 millert 32: #include <errno.h>
33: #include <fcntl.h>
1.19 millert 34: #include <fnmatch.h>
35: #include <paths.h>
1.8 tedu 36: #include <stdio.h>
1.3 tedu 37: #include <stdlib.h>
1.12 millert 38: #include <string.h>
1.3 tedu 39: #include <unistd.h>
1.1 deraadt 40:
41: #include "diff.h"
1.3 tedu 42:
1.19 millert 43: static int dircompare(const void *, const void *);
44: static int excluded(const char *);
1.20 millert 45: static struct dirent **slurpdir(char *, char **, int);
1.19 millert 46: static void diffit(struct dirent *, char *, size_t, char *, size_t);
1.3 tedu 47:
1.22 millert 48: #define d_status d_type /* we need to store status for -l */
49:
1.1 deraadt 50: /*
1.26 otto 51: * Diff directory traversal. Will be called recursively if -r was specified.
1.1 deraadt 52: */
1.19 millert 53: void
54: diffdir(char *p1, char *p2)
55: {
56: struct dirent **dirp1, **dirp2, **dp1, **dp2;
57: struct dirent *dent1, *dent2;
58: size_t dirlen1, dirlen2;
59: char path1[MAXPATHLEN], path2[MAXPATHLEN];
60: char *dirbuf1, *dirbuf2;
61: int pos;
62:
63: dirlen1 = strlcpy(path1, *p1 ? p1 : ".", sizeof(path1));
64: if (dirlen1 >= sizeof(path1) - 1) {
65: warnx("%s: %s", p1, strerror(ENAMETOOLONG));
66: status = 2;
67: return;
68: }
69: if (path1[dirlen1 - 1] != '/') {
70: path1[dirlen1++] = '/';
71: path1[dirlen1] = '\0';
72: }
73: dirlen2 = strlcpy(path2, *p2 ? p2 : ".", sizeof(path2));
74: if (dirlen2 >= sizeof(path2) - 1) {
75: warnx("%s: %s", p2, strerror(ENAMETOOLONG));
76: status = 2;
77: return;
78: }
79: if (path2[dirlen2 - 1] != '/') {
80: path2[dirlen2++] = '/';
81: path2[dirlen2] = '\0';
82: }
1.1 deraadt 83:
1.19 millert 84: /* get a list of the entries in each directory */
1.20 millert 85: dp1 = dirp1 = slurpdir(path1, &dirbuf1, Nflag + Pflag);
86: dp2 = dirp2 = slurpdir(path2, &dirbuf2, Nflag);
1.19 millert 87: if (dirp1 == NULL || dirp2 == NULL)
88: return;
1.1 deraadt 89:
1.19 millert 90: /*
91: * If we were given a starting point, find it.
92: */
93: if (start != NULL) {
94: while (*dp1 != NULL && strcmp((*dp1)->d_name, start) < 0)
95: dp1++;
96: while (*dp2 != NULL && strcmp((*dp2)->d_name, start) < 0)
97: dp2++;
98: }
1.8 tedu 99:
1.19 millert 100: /*
101: * Iterate through the two directory lists, diffing as we go.
102: */
103: while (*dp1 != NULL || *dp2 != NULL) {
104: dent1 = *dp1;
105: dent2 = *dp2;
106:
107: pos = dent1 == NULL ? 1 : dent2 == NULL ? -1 :
108: strcmp(dent1->d_name, dent2->d_name);
109: if (pos == 0) {
110: /* file exists in both dirs, diff it */
111: diffit(dent1, path1, dirlen1, path2, dirlen2);
112: dp1++;
113: dp2++;
114: } else if (pos < 0) {
115: /* file only in first dir, only diff if -N */
116: if (Nflag)
117: diffit(dent1, path1, dirlen1, path2, dirlen2);
1.22 millert 118: else if (lflag)
119: dent1->d_status |= D_ONLY;
1.24 millert 120: else
1.25 millert 121: print_only(path1, dirlen1, dent1->d_name);
1.19 millert 122: dp1++;
1.1 deraadt 123: } else {
1.20 millert 124: /* file only in second dir, only diff if -N or -P */
125: if (Nflag || Pflag)
1.19 millert 126: diffit(dent2, path1, dirlen1, path2, dirlen2);
1.22 millert 127: else if (lflag)
128: dent2->d_status |= D_ONLY;
1.24 millert 129: else
1.25 millert 130: print_only(path2, dirlen2, dent2->d_name);
1.19 millert 131: dp2++;
1.1 deraadt 132: }
133: }
1.22 millert 134: if (lflag) {
1.23 millert 135: path1[dirlen1] = '\0';
136: path2[dirlen2] = '\0';
1.22 millert 137: for (dp1 = dirp1; (dent1 = *dp1) != NULL; dp1++) {
138: print_status(dent1->d_status, path1, path2,
139: dent1->d_name);
140: }
141: for (dp2 = dirp2; (dent2 = *dp2) != NULL; dp2++) {
142: if (dent2->d_status == D_ONLY)
143: print_status(dent2->d_status, path2, NULL,
144: dent2->d_name);
145: }
146: }
1.19 millert 147:
148: if (dirbuf1 != NULL) {
149: free(dirp1);
150: free(dirbuf1);
151: }
152: if (dirbuf2 != NULL) {
153: free(dirp2);
154: free(dirbuf2);
1.1 deraadt 155: }
156: }
157:
1.19 millert 158: /*
159: * Read in a whole directory's worth of struct dirents, culling
160: * out the "excluded" ones.
161: * Returns an array of struct dirent *'s that point into the buffer
162: * returned via bufp. Caller is responsible for free()ing both of these.
163: */
164: static struct dirent **
1.20 millert 165: slurpdir(char *path, char **bufp, int enoentok)
1.1 deraadt 166: {
1.19 millert 167: char *buf, *ebuf, *cp;
168: size_t bufsize;
169: long base;
170: int fd, nbytes, entries;
171: struct stat sb;
172: struct dirent **dirlist, *dp;
173:
174: *bufp = NULL;
175: if ((fd = open(path, O_RDONLY, 0644)) == -1) {
176: static struct dirent *dummy;
177:
1.20 millert 178: if (!enoentok || errno != ENOENT) {
1.19 millert 179: warn("%s", path);
180: return (NULL);
181: }
182: return (&dummy);
183: }
184: fstat(fd, &sb);
1.1 deraadt 185:
1.28 ! millert 186: bufsize = 0;
! 187: ebuf = buf = NULL;
! 188: do {
! 189: bufsize += roundup(MAX(sb.st_size, sb.st_blksize),
! 190: sizeof(struct dirent));
! 191: if (buf == NULL)
! 192: buf = ebuf = emalloc(bufsize);
! 193: else {
! 194: cp = erealloc(buf, bufsize);
! 195: ebuf = cp + (ebuf - buf);
! 196: buf = cp;
! 197: }
! 198: nbytes = getdirentries(fd, ebuf, bufsize, &base);
! 199: if (nbytes == -1) {
! 200: free(buf);
! 201: warn("%s", path);
! 202: return (NULL);
! 203: }
! 204: ebuf += nbytes;
! 205: } while (nbytes == bufsize);
1.19 millert 206: close(fd);
1.1 deraadt 207:
1.19 millert 208: /*
209: * We now have all the directory entries in our buffer.
210: * However, in order to easily sort them we need to convert
211: * the buffer into an array.
212: */
213: for (entries = 0, cp = buf; cp < ebuf; ) {
214: dp = (struct dirent *)cp;
215: if (dp->d_fileno != 0 && dp->d_type != DT_WHT)
216: entries++;
217: if (dp->d_reclen <= 0)
218: break;
219: cp += dp->d_reclen;
220: }
221: dirlist = emalloc(sizeof(struct dirent *) * (entries + 1));
222: for (entries = 0, cp = buf; cp < ebuf; ) {
223: dp = (struct dirent *)cp;
224: if (dp->d_fileno != 0 && dp->d_type != DT_WHT &&
1.22 millert 225: !excluded(dp->d_name)) {
226: dp->d_status = 0;
1.19 millert 227: dirlist[entries++] = dp;
1.22 millert 228: }
1.19 millert 229: if (dp->d_reclen <= 0)
230: break;
231: cp += dp->d_reclen;
232: }
233: dirlist[entries] = NULL;
1.1 deraadt 234:
1.19 millert 235: qsort(dirlist, entries, sizeof(struct dir *), dircompare);
1.1 deraadt 236:
1.19 millert 237: *bufp = buf;
238: return (dirlist);
1.1 deraadt 239: }
240:
1.19 millert 241: /*
242: * Compare d_name in two dirent structures; for qsort(3).
243: */
1.8 tedu 244: static int
1.19 millert 245: dircompare(const void *vp1, const void *vp2)
1.1 deraadt 246: {
1.19 millert 247: struct dirent *dp1 = *((struct dirent **) vp1);
248: struct dirent *dp2 = *((struct dirent **) vp2);
1.8 tedu 249:
1.19 millert 250: return (strcmp(dp1->d_name, dp2->d_name));
1.1 deraadt 251: }
252:
1.19 millert 253: /*
254: * Do the actual diff by calling either diffreg() or diffdir().
255: */
1.3 tedu 256: static void
1.19 millert 257: diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2)
1.1 deraadt 258: {
1.19 millert 259: int flags = D_HEADER;
260:
261: strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1);
262: if (stat(path1, &stb1) != 0) {
1.20 millert 263: if (!(Nflag || Pflag) || errno != ENOENT) {
1.19 millert 264: warn("%s", path1);
265: return;
1.1 deraadt 266: }
1.19 millert 267: flags |= D_EMPTY1;
268: memset(&stb1, 0, sizeof(stb1));
1.1 deraadt 269: }
270:
1.19 millert 271: strlcpy(path2 + plen2, dp->d_name, MAXPATHLEN - plen2);
272: if (stat(path2, &stb2) != 0) {
273: if (!Nflag || errno != ENOENT) {
274: warn("%s", path2);
275: return;
276: }
277: flags |= D_EMPTY2;
278: memset(&stb2, 0, sizeof(stb2));
279: stb2.st_mode = stb1.st_mode;
280: }
281: if (stb1.st_mode == 0)
282: stb1.st_mode = stb2.st_mode;
283:
284: if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
1.20 millert 285: if (rflag)
286: diffdir(path1, path2);
1.22 millert 287: else if (lflag)
288: dp->d_status |= D_COMMON;
1.24 millert 289: else
1.19 millert 290: printf("Common subdirectories: %s and %s\n",
291: path1, path2);
292: return;
1.1 deraadt 293: }
1.27 millert 294: if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
295: dp->d_status = D_SKIPPED1;
296: else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
297: dp->d_status = D_SKIPPED2;
298: else
299: dp->d_status = diffreg(path1, path2, flags);
1.23 millert 300: if (!lflag)
301: print_status(dp->d_status, path1, path2, NULL);
1.1 deraadt 302: }
303:
1.19 millert 304: /*
305: * Exclude the given directory entry?
306: */
307: static int
308: excluded(const char *entry)
1.1 deraadt 309: {
1.19 millert 310: struct excludes *excl;
1.15 tedu 311:
1.19 millert 312: /* always skip "." and ".." */
313: if (entry[0] == '.' &&
314: (entry[1] == '\0' || (entry[1] == '.' && entry[2] == '\0')))
1.15 tedu 315: return (1);
1.1 deraadt 316:
1.19 millert 317: /* check excludes list */
318: for (excl = excludes_list; excl != NULL; excl = excl->next)
319: if (fnmatch(excl->pattern, entry, FNM_PATHNAME) == 0)
320: return (1);
1.1 deraadt 321:
322: return (0);
323: }
![[BACK]](/icons/back.gif){kind=icon}
Return to diffdir.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / diff