xref: /freebsd/usr.bin/diff/diffdir.c (revision 3931c072c63d5a51d83157009e7f7510e08da80c)
13bbe3f67SBaptiste Daroussin /*	$OpenBSD: diffdir.c,v 1.45 2015/10/05 20:15:00 millert Exp $	*/
23bbe3f67SBaptiste Daroussin 
33bbe3f67SBaptiste Daroussin /*
43bbe3f67SBaptiste Daroussin  * Copyright (c) 2003, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
53bbe3f67SBaptiste Daroussin  *
63bbe3f67SBaptiste Daroussin  * Permission to use, copy, modify, and distribute this software for any
73bbe3f67SBaptiste Daroussin  * purpose with or without fee is hereby granted, provided that the above
83bbe3f67SBaptiste Daroussin  * copyright notice and this permission notice appear in all copies.
93bbe3f67SBaptiste Daroussin  *
103bbe3f67SBaptiste Daroussin  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
113bbe3f67SBaptiste Daroussin  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
123bbe3f67SBaptiste Daroussin  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
133bbe3f67SBaptiste Daroussin  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
143bbe3f67SBaptiste Daroussin  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
153bbe3f67SBaptiste Daroussin  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
163bbe3f67SBaptiste Daroussin  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
173bbe3f67SBaptiste Daroussin  *
183bbe3f67SBaptiste Daroussin  * Sponsored in part by the Defense Advanced Research Projects
193bbe3f67SBaptiste Daroussin  * Agency (DARPA) and Air Force Research Laboratory, Air Force
203bbe3f67SBaptiste Daroussin  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
213bbe3f67SBaptiste Daroussin  */
223bbe3f67SBaptiste Daroussin 
233bbe3f67SBaptiste Daroussin #include <sys/cdefs.h>
243bbe3f67SBaptiste Daroussin __FBSDID("$FreeBSD$");
253bbe3f67SBaptiste Daroussin 
263bbe3f67SBaptiste Daroussin #include <sys/stat.h>
273bbe3f67SBaptiste Daroussin 
283bbe3f67SBaptiste Daroussin #include <dirent.h>
293bbe3f67SBaptiste Daroussin #include <err.h>
303bbe3f67SBaptiste Daroussin #include <errno.h>
313bbe3f67SBaptiste Daroussin #include <fnmatch.h>
323bbe3f67SBaptiste Daroussin #include <stdio.h>
333bbe3f67SBaptiste Daroussin #include <stdlib.h>
343bbe3f67SBaptiste Daroussin #include <string.h>
353bbe3f67SBaptiste Daroussin #include <limits.h>
36f4be3645STom Jones #include <unistd.h>
373bbe3f67SBaptiste Daroussin 
383bbe3f67SBaptiste Daroussin #include "diff.h"
393bbe3f67SBaptiste Daroussin 
403bbe3f67SBaptiste Daroussin static int selectfile(const struct dirent *);
41*3931c072STom Jones static void diffit(struct dirent *, char *, size_t, struct dirent *,
42*3931c072STom Jones 	char *, size_t, int);
43e43df07eSPiotr Pawel Stefaniak static void print_only(const char *, size_t, const char *);
443bbe3f67SBaptiste Daroussin 
453bbe3f67SBaptiste Daroussin #define d_status	d_type		/* we need to store status for -l */
463bbe3f67SBaptiste Daroussin 
473bbe3f67SBaptiste Daroussin /*
483bbe3f67SBaptiste Daroussin  * Diff directory traversal. Will be called recursively if -r was specified.
493bbe3f67SBaptiste Daroussin  */
503bbe3f67SBaptiste Daroussin void
513bbe3f67SBaptiste Daroussin diffdir(char *p1, char *p2, int flags)
523bbe3f67SBaptiste Daroussin {
533bbe3f67SBaptiste Daroussin 	struct dirent *dent1, **dp1, **edp1, **dirp1 = NULL;
543bbe3f67SBaptiste Daroussin 	struct dirent *dent2, **dp2, **edp2, **dirp2 = NULL;
553bbe3f67SBaptiste Daroussin 	size_t dirlen1, dirlen2;
563bbe3f67SBaptiste Daroussin 	char path1[PATH_MAX], path2[PATH_MAX];
573bbe3f67SBaptiste Daroussin 	int pos;
583bbe3f67SBaptiste Daroussin 
59d5b187aeSBaptiste Daroussin 	edp1 = edp2 = NULL;
60d5b187aeSBaptiste Daroussin 
613bbe3f67SBaptiste Daroussin 	dirlen1 = strlcpy(path1, *p1 ? p1 : ".", sizeof(path1));
623bbe3f67SBaptiste Daroussin 	if (dirlen1 >= sizeof(path1) - 1) {
633bbe3f67SBaptiste Daroussin 		warnc(ENAMETOOLONG, "%s", p1);
64e620f7fbSBaptiste Daroussin 		status |= 2;
653bbe3f67SBaptiste Daroussin 		return;
663bbe3f67SBaptiste Daroussin 	}
673bbe3f67SBaptiste Daroussin 	if (path1[dirlen1 - 1] != '/') {
683bbe3f67SBaptiste Daroussin 		path1[dirlen1++] = '/';
693bbe3f67SBaptiste Daroussin 		path1[dirlen1] = '\0';
703bbe3f67SBaptiste Daroussin 	}
713bbe3f67SBaptiste Daroussin 	dirlen2 = strlcpy(path2, *p2 ? p2 : ".", sizeof(path2));
723bbe3f67SBaptiste Daroussin 	if (dirlen2 >= sizeof(path2) - 1) {
733bbe3f67SBaptiste Daroussin 		warnc(ENAMETOOLONG, "%s", p2);
74e620f7fbSBaptiste Daroussin 		status |= 2;
753bbe3f67SBaptiste Daroussin 		return;
763bbe3f67SBaptiste Daroussin 	}
773bbe3f67SBaptiste Daroussin 	if (path2[dirlen2 - 1] != '/') {
783bbe3f67SBaptiste Daroussin 		path2[dirlen2++] = '/';
793bbe3f67SBaptiste Daroussin 		path2[dirlen2] = '\0';
803bbe3f67SBaptiste Daroussin 	}
813bbe3f67SBaptiste Daroussin 
823bbe3f67SBaptiste Daroussin 	/*
833bbe3f67SBaptiste Daroussin 	 * Get a list of entries in each directory, skipping "excluded" files
843bbe3f67SBaptiste Daroussin 	 * and sorting alphabetically.
853bbe3f67SBaptiste Daroussin 	 */
863bbe3f67SBaptiste Daroussin 	pos = scandir(path1, &dirp1, selectfile, alphasort);
873bbe3f67SBaptiste Daroussin 	if (pos == -1) {
883bbe3f67SBaptiste Daroussin 		if (errno == ENOENT && (Nflag || Pflag)) {
893bbe3f67SBaptiste Daroussin 			pos = 0;
903bbe3f67SBaptiste Daroussin 		} else {
913bbe3f67SBaptiste Daroussin 			warn("%s", path1);
923bbe3f67SBaptiste Daroussin 			goto closem;
933bbe3f67SBaptiste Daroussin 		}
943bbe3f67SBaptiste Daroussin 	}
953bbe3f67SBaptiste Daroussin 	dp1 = dirp1;
963bbe3f67SBaptiste Daroussin 	edp1 = dirp1 + pos;
973bbe3f67SBaptiste Daroussin 
983bbe3f67SBaptiste Daroussin 	pos = scandir(path2, &dirp2, selectfile, alphasort);
993bbe3f67SBaptiste Daroussin 	if (pos == -1) {
1003bbe3f67SBaptiste Daroussin 		if (errno == ENOENT && Nflag) {
1013bbe3f67SBaptiste Daroussin 			pos = 0;
1023bbe3f67SBaptiste Daroussin 		} else {
1033bbe3f67SBaptiste Daroussin 			warn("%s", path2);
1043bbe3f67SBaptiste Daroussin 			goto closem;
1053bbe3f67SBaptiste Daroussin 		}
1063bbe3f67SBaptiste Daroussin 	}
1073bbe3f67SBaptiste Daroussin 	dp2 = dirp2;
1083bbe3f67SBaptiste Daroussin 	edp2 = dirp2 + pos;
1093bbe3f67SBaptiste Daroussin 
1103bbe3f67SBaptiste Daroussin 	/*
1113bbe3f67SBaptiste Daroussin 	 * If we were given a starting point, find it.
1123bbe3f67SBaptiste Daroussin 	 */
1133bbe3f67SBaptiste Daroussin 	if (start != NULL) {
1143bbe3f67SBaptiste Daroussin 		while (dp1 != edp1 && strcmp((*dp1)->d_name, start) < 0)
1153bbe3f67SBaptiste Daroussin 			dp1++;
1163bbe3f67SBaptiste Daroussin 		while (dp2 != edp2 && strcmp((*dp2)->d_name, start) < 0)
1173bbe3f67SBaptiste Daroussin 			dp2++;
1183bbe3f67SBaptiste Daroussin 	}
1193bbe3f67SBaptiste Daroussin 
1203bbe3f67SBaptiste Daroussin 	/*
1213bbe3f67SBaptiste Daroussin 	 * Iterate through the two directory lists, diffing as we go.
1223bbe3f67SBaptiste Daroussin 	 */
1233bbe3f67SBaptiste Daroussin 	while (dp1 != edp1 || dp2 != edp2) {
1243bbe3f67SBaptiste Daroussin 		dent1 = dp1 != edp1 ? *dp1 : NULL;
1253bbe3f67SBaptiste Daroussin 		dent2 = dp2 != edp2 ? *dp2 : NULL;
1263bbe3f67SBaptiste Daroussin 
1273bbe3f67SBaptiste Daroussin 		pos = dent1 == NULL ? 1 : dent2 == NULL ? -1 :
1283bbe3f67SBaptiste Daroussin 		    ignore_file_case ? strcasecmp(dent1->d_name, dent2->d_name) :
1293bbe3f67SBaptiste Daroussin 		    strcmp(dent1->d_name, dent2->d_name) ;
1303bbe3f67SBaptiste Daroussin 		if (pos == 0) {
1313bbe3f67SBaptiste Daroussin 			/* file exists in both dirs, diff it */
132*3931c072STom Jones 			diffit(dent1, path1, dirlen1, dent2, path2, dirlen2, flags);
1333bbe3f67SBaptiste Daroussin 			dp1++;
1343bbe3f67SBaptiste Daroussin 			dp2++;
1353bbe3f67SBaptiste Daroussin 		} else if (pos < 0) {
1363bbe3f67SBaptiste Daroussin 			/* file only in first dir, only diff if -N */
137e620f7fbSBaptiste Daroussin 			if (Nflag) {
138*3931c072STom Jones 				diffit(dent1, path1, dirlen1, dent2, path2,
139*3931c072STom Jones 					dirlen2, flags);
140e620f7fbSBaptiste Daroussin 			} else {
1413bbe3f67SBaptiste Daroussin 				print_only(path1, dirlen1, dent1->d_name);
142e620f7fbSBaptiste Daroussin 				status |= 1;
1432d920b13SEnji Cooper 			}
1443bbe3f67SBaptiste Daroussin 			dp1++;
1453bbe3f67SBaptiste Daroussin 		} else {
1463bbe3f67SBaptiste Daroussin 			/* file only in second dir, only diff if -N or -P */
1473bbe3f67SBaptiste Daroussin 			if (Nflag || Pflag)
148*3931c072STom Jones 				diffit(dent2, path1, dirlen1, dent1, path2,
149*3931c072STom Jones 					dirlen2, flags);
1502d920b13SEnji Cooper 			else {
1513bbe3f67SBaptiste Daroussin 				print_only(path2, dirlen2, dent2->d_name);
152e620f7fbSBaptiste Daroussin 				status |= 1;
1532d920b13SEnji Cooper 			}
1543bbe3f67SBaptiste Daroussin 			dp2++;
1553bbe3f67SBaptiste Daroussin 		}
1563bbe3f67SBaptiste Daroussin 	}
1573bbe3f67SBaptiste Daroussin 
1583bbe3f67SBaptiste Daroussin closem:
1593bbe3f67SBaptiste Daroussin 	if (dirp1 != NULL) {
1603bbe3f67SBaptiste Daroussin 		for (dp1 = dirp1; dp1 < edp1; dp1++)
1613bbe3f67SBaptiste Daroussin 			free(*dp1);
1623bbe3f67SBaptiste Daroussin 		free(dirp1);
1633bbe3f67SBaptiste Daroussin 	}
1643bbe3f67SBaptiste Daroussin 	if (dirp2 != NULL) {
1653bbe3f67SBaptiste Daroussin 		for (dp2 = dirp2; dp2 < edp2; dp2++)
1663bbe3f67SBaptiste Daroussin 			free(*dp2);
1673bbe3f67SBaptiste Daroussin 		free(dirp2);
1683bbe3f67SBaptiste Daroussin 	}
1693bbe3f67SBaptiste Daroussin }
1703bbe3f67SBaptiste Daroussin 
1713bbe3f67SBaptiste Daroussin /*
1723bbe3f67SBaptiste Daroussin  * Do the actual diff by calling either diffreg() or diffdir().
1733bbe3f67SBaptiste Daroussin  */
1743bbe3f67SBaptiste Daroussin static void
175*3931c072STom Jones diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2,
176*3931c072STom Jones 	char *path2, size_t plen2, int flags)
1773bbe3f67SBaptiste Daroussin {
1783bbe3f67SBaptiste Daroussin 	flags |= D_HEADER;
1793bbe3f67SBaptiste Daroussin 	strlcpy(path1 + plen1, dp->d_name, PATH_MAX - plen1);
180*3931c072STom Jones 
181*3931c072STom Jones 	/*
182*3931c072STom Jones 	 * If we are ignoring file case, use dent2s name here if both names are
183*3931c072STom Jones 	 * the same apart from case.
184*3931c072STom Jones 	 */
185*3931c072STom Jones 	if (ignore_file_case && strcasecmp(dp2->d_name, dp2->d_name) == 0)
186*3931c072STom Jones 		strlcpy(path2 + plen2, dp2->d_name, PATH_MAX - plen2);
187*3931c072STom Jones 	else
188f4be3645STom Jones 		strlcpy(path2 + plen2, dp->d_name, PATH_MAX - plen2);
189f4be3645STom Jones 
190f4be3645STom Jones 	if (noderef) {
191f4be3645STom Jones 		if (lstat(path1, &stb1) != 0) {
192f4be3645STom Jones 			if (!(Nflag || Pflag) || errno != ENOENT) {
193f4be3645STom Jones 				warn("%s", path1);
194f4be3645STom Jones 				return;
195f4be3645STom Jones 			}
196f4be3645STom Jones 			flags |= D_EMPTY1;
197f4be3645STom Jones 			memset(&stb1, 0, sizeof(stb1));
198f4be3645STom Jones 		}
199f4be3645STom Jones 
200f4be3645STom Jones 		if (lstat(path2, &stb2) != 0) {
201f4be3645STom Jones 			if (!Nflag || errno != ENOENT) {
202f4be3645STom Jones 				warn("%s", path2);
203f4be3645STom Jones 				return;
204f4be3645STom Jones 			}
205f4be3645STom Jones 			flags |= D_EMPTY2;
206f4be3645STom Jones 			memset(&stb2, 0, sizeof(stb2));
207f4be3645STom Jones 			stb2.st_mode = stb1.st_mode;
208f4be3645STom Jones 		}
209f4be3645STom Jones 		if (stb1.st_mode == 0)
210f4be3645STom Jones 			stb1.st_mode = stb2.st_mode;
211f4be3645STom Jones 		if (S_ISLNK(stb1.st_mode) || S_ISLNK(stb2.st_mode)) {
212f4be3645STom Jones 			if  (S_ISLNK(stb1.st_mode) && S_ISLNK(stb2.st_mode)) {
213f4be3645STom Jones 				char buf1[PATH_MAX];
214f4be3645STom Jones 				char buf2[PATH_MAX];
215f4be3645STom Jones 				ssize_t len1 = 0;
216f4be3645STom Jones 				ssize_t len2 = 0;
217f4be3645STom Jones 
218f4be3645STom Jones 				len1 = readlink(path1, buf1, sizeof(buf1));
219f4be3645STom Jones 				len2 = readlink(path2, buf2, sizeof(buf2));
220f4be3645STom Jones 
221f4be3645STom Jones 				if (len1 < 0 || len2 < 0) {
222f4be3645STom Jones 					perror("reading links");
223f4be3645STom Jones 					return;
224f4be3645STom Jones 				}
225f4be3645STom Jones 				buf1[len1] = '\0';
226f4be3645STom Jones 				buf2[len2] = '\0';
227f4be3645STom Jones 
228f4be3645STom Jones 				if (len1 != len2 || strncmp(buf1, buf2, len1) != 0) {
229f4be3645STom Jones 					printf("Symbolic links %s and %s differ\n",
230f4be3645STom Jones 						path1, path2);
231f4be3645STom Jones 					status |= 1;
232f4be3645STom Jones 				}
233f4be3645STom Jones 
234f4be3645STom Jones 				return;
235f4be3645STom Jones 			}
236f4be3645STom Jones 
237f4be3645STom Jones 			printf("File %s is a %s while file %s is a %s\n",
238f4be3645STom Jones 				path1, S_ISLNK(stb1.st_mode) ? "symbolic link" :
239f4be3645STom Jones 					(S_ISDIR(stb1.st_mode) ? "directory" :
240f4be3645STom Jones 					(S_ISREG(stb1.st_mode) ? "file" : "error")),
241f4be3645STom Jones 				path2, S_ISLNK(stb2.st_mode) ? "symbolic link" :
242f4be3645STom Jones 					(S_ISDIR(stb2.st_mode) ? "directory" :
243f4be3645STom Jones 					(S_ISREG(stb2.st_mode) ? "file" : "error")));
244f4be3645STom Jones 			status |= 1;
245f4be3645STom Jones 			return;
246f4be3645STom Jones 		}
247f4be3645STom Jones 	} else {
2483bbe3f67SBaptiste Daroussin 		if (stat(path1, &stb1) != 0) {
2493bbe3f67SBaptiste Daroussin 			if (!(Nflag || Pflag) || errno != ENOENT) {
2503bbe3f67SBaptiste Daroussin 				warn("%s", path1);
2513bbe3f67SBaptiste Daroussin 				return;
2523bbe3f67SBaptiste Daroussin 			}
2533bbe3f67SBaptiste Daroussin 			flags |= D_EMPTY1;
2543bbe3f67SBaptiste Daroussin 			memset(&stb1, 0, sizeof(stb1));
2553bbe3f67SBaptiste Daroussin 		}
2563bbe3f67SBaptiste Daroussin 
2573bbe3f67SBaptiste Daroussin 		if (stat(path2, &stb2) != 0) {
2583bbe3f67SBaptiste Daroussin 			if (!Nflag || errno != ENOENT) {
2593bbe3f67SBaptiste Daroussin 				warn("%s", path2);
2603bbe3f67SBaptiste Daroussin 				return;
2613bbe3f67SBaptiste Daroussin 			}
2623bbe3f67SBaptiste Daroussin 			flags |= D_EMPTY2;
2633bbe3f67SBaptiste Daroussin 			memset(&stb2, 0, sizeof(stb2));
2643bbe3f67SBaptiste Daroussin 			stb2.st_mode = stb1.st_mode;
2653bbe3f67SBaptiste Daroussin 		}
2663bbe3f67SBaptiste Daroussin 		if (stb1.st_mode == 0)
2673bbe3f67SBaptiste Daroussin 			stb1.st_mode = stb2.st_mode;
268f4be3645STom Jones 	}
2693bbe3f67SBaptiste Daroussin 	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
2703bbe3f67SBaptiste Daroussin 		if (rflag)
2713bbe3f67SBaptiste Daroussin 			diffdir(path1, path2, flags);
2723bbe3f67SBaptiste Daroussin 		else
2733bbe3f67SBaptiste Daroussin 			printf("Common subdirectories: %s and %s\n",
2743bbe3f67SBaptiste Daroussin 			    path1, path2);
2753bbe3f67SBaptiste Daroussin 		return;
2763bbe3f67SBaptiste Daroussin 	}
2773bbe3f67SBaptiste Daroussin 	if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
2783bbe3f67SBaptiste Daroussin 		dp->d_status = D_SKIPPED1;
2793bbe3f67SBaptiste Daroussin 	else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
2803bbe3f67SBaptiste Daroussin 		dp->d_status = D_SKIPPED2;
2813bbe3f67SBaptiste Daroussin 	else
2823bbe3f67SBaptiste Daroussin 		dp->d_status = diffreg(path1, path2, flags, 0);
2833bbe3f67SBaptiste Daroussin 	print_status(dp->d_status, path1, path2, "");
2843bbe3f67SBaptiste Daroussin }
2853bbe3f67SBaptiste Daroussin 
2863bbe3f67SBaptiste Daroussin /*
2873bbe3f67SBaptiste Daroussin  * Returns 1 if the directory entry should be included in the
2883bbe3f67SBaptiste Daroussin  * diff, else 0.  Checks the excludes list.
2893bbe3f67SBaptiste Daroussin  */
2903bbe3f67SBaptiste Daroussin static int
2913bbe3f67SBaptiste Daroussin selectfile(const struct dirent *dp)
2923bbe3f67SBaptiste Daroussin {
2933bbe3f67SBaptiste Daroussin 	struct excludes *excl;
2943bbe3f67SBaptiste Daroussin 
2953bbe3f67SBaptiste Daroussin 	if (dp->d_fileno == 0)
2963bbe3f67SBaptiste Daroussin 		return (0);
2973bbe3f67SBaptiste Daroussin 
2983bbe3f67SBaptiste Daroussin 	/* always skip "." and ".." */
2993bbe3f67SBaptiste Daroussin 	if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' ||
3003bbe3f67SBaptiste Daroussin 	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
3013bbe3f67SBaptiste Daroussin 		return (0);
3023bbe3f67SBaptiste Daroussin 
3033bbe3f67SBaptiste Daroussin 	/* check excludes list */
3043bbe3f67SBaptiste Daroussin 	for (excl = excludes_list; excl != NULL; excl = excl->next)
3053bbe3f67SBaptiste Daroussin 		if (fnmatch(excl->pattern, dp->d_name, FNM_PATHNAME) == 0)
3063bbe3f67SBaptiste Daroussin 			return (0);
3073bbe3f67SBaptiste Daroussin 
3083bbe3f67SBaptiste Daroussin 	return (1);
3093bbe3f67SBaptiste Daroussin }
310e43df07eSPiotr Pawel Stefaniak 
311e43df07eSPiotr Pawel Stefaniak void
312e43df07eSPiotr Pawel Stefaniak print_only(const char *path, size_t dirlen, const char *entry)
313e43df07eSPiotr Pawel Stefaniak {
314e43df07eSPiotr Pawel Stefaniak 	if (dirlen > 1)
315e43df07eSPiotr Pawel Stefaniak 		dirlen--;
316e43df07eSPiotr Pawel Stefaniak 	printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
317e43df07eSPiotr Pawel Stefaniak }
318