Date: Wed, 20 Jun 2012 05:23:08 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237969 - in soc2012/jhagewood/diff: . diff Message-ID: <20120620052308.A1523106566B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Wed Jun 20 05:23:07 2012 New Revision: 237969 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237969 Log: Modified: soc2012/jhagewood/diff/diff/diffdir.c soc2012/jhagewood/diff/diff/pathnames.h soc2012/jhagewood/diff/hagewood-diff.patch Modified: soc2012/jhagewood/diff/diff/diffdir.c ============================================================================== --- soc2012/jhagewood/diff/diff/diffdir.c Wed Jun 20 04:11:34 2012 (r237968) +++ soc2012/jhagewood/diff/diff/diffdir.c Wed Jun 20 05:23:07 2012 (r237969) @@ -20,14 +20,13 @@ #include <sys/cdefs.h> -#ifndef lint #if 0 -__RCSID("$OpenBSD: diffdir.c,v 1.32 2007/06/09 05:16:21 ray Exp $"); -#else -__FBSDID("$FreeBSD$"); +#ifndef lint +static char sccsid[] = "@(#)diffdir.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ - +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> @@ -57,12 +56,12 @@ void diffdir(char *p1, char *p2) { - struct dirent **dirp1, **dirp2, **dp1, **dp2; - struct dirent *dent1, *dent2; - size_t dirlen1, dirlen2; - char path1[MAXPATHLEN], path2[MAXPATHLEN]; - char *dirbuf1, *dirbuf2; - int pos; + struct dirent **dirp1, **dirp2, **dp1, **dp2; + struct dirent *dent1, *dent2; + size_t dirlen1, dirlen2; + char path1[MAXPATHLEN], path2[MAXPATHLEN]; + char *dirbuf1, *dirbuf2; + int pos; dirlen1 = strlcpy(path1, *p1 ? p1 : ".", sizeof(path1)); if (dirlen1 >= sizeof(path1) - 1) { @@ -255,8 +254,8 @@ static int dircompare(const void *vp1, const void *vp2) { - struct dirent *dp1 = *((struct dirent **) vp1); - struct dirent *dp2 = *((struct dirent **) vp2); + struct dirent *dp1 = *((struct dirent **) vp1); + struct dirent *dp2 = *((struct dirent **) vp2); return (strcmp(dp1->d_name, dp2->d_name)); } @@ -267,7 +266,7 @@ static void diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2) { - int flags = D_HEADER; + int flags = D_HEADER; strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1); if (stat(path1, &stb1) != 0) { Modified: soc2012/jhagewood/diff/diff/pathnames.h ============================================================================== --- soc2012/jhagewood/diff/diff/pathnames.h Wed Jun 20 04:11:34 2012 (r237968) +++ soc2012/jhagewood/diff/diff/pathnames.h Wed Jun 20 05:23:07 2012 (r237969) @@ -23,4 +23,4 @@ #include <paths.h> #define _PATH_PR "/usr/bin/pr" -#define _PATH_SDIFF "/usr/bin/sdiff" +#define _PATH_SDIFF "/usr/bin/sdiff Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Wed Jun 20 04:11:34 2012 (r237968) +++ soc2012/jhagewood/diff/hagewood-diff.patch Wed Jun 20 05:23:07 2012 (r237969) @@ -305,6 +305,67 @@ sflag, tflag, Tflag, wflag; extern int Bflag, strip_cr, tabsize; extern int format, context, status; +diff -rupN jhagewood/diff/diff-orig/diffdir.c jhagewood/diff/diff/diffdir.c +--- jhagewood/diff/diff-orig/diffdir.c 2012-06-18 03:07:38.000000000 -0400 ++++ jhagewood/diff/diff/diffdir.c 2012-06-20 05:19:37.000000000 -0400 +@@ -20,14 +20,13 @@ + + #include <sys/cdefs.h> + +-#ifndef lint + #if 0 +-__RCSID("$OpenBSD: diffdir.c,v 1.32 2007/06/09 05:16:21 ray Exp $"); +-#else +-__FBSDID("$FreeBSD$"); ++#ifndef lint ++static char sccsid[] = "@(#)diffdir.c 8.1 (Berkeley) 6/6/93"; + #endif + #endif /* not lint */ +- ++#include <sys/cdefs.h> ++__FBSDID("$FreeBSD$"); + #include <sys/param.h> + #include <sys/stat.h> + +@@ -57,12 +56,12 @@ static void diffit(struct dirent *, char + void + diffdir(char *p1, char *p2) + { +- struct dirent **dirp1, **dirp2, **dp1, **dp2; +- struct dirent *dent1, *dent2; +- size_t dirlen1, dirlen2; +- char path1[MAXPATHLEN], path2[MAXPATHLEN]; +- char *dirbuf1, *dirbuf2; +- int pos; ++ struct dirent **dirp1, **dirp2, **dp1, **dp2; ++ struct dirent *dent1, *dent2; ++ size_t dirlen1, dirlen2; ++ char path1[MAXPATHLEN], path2[MAXPATHLEN]; ++ char *dirbuf1, *dirbuf2; ++ int pos; + + dirlen1 = strlcpy(path1, *p1 ? p1 : ".", sizeof(path1)); + if (dirlen1 >= sizeof(path1) - 1) { +@@ -255,8 +254,8 @@ slurpdir(char *path, char **bufp, int en + static int + dircompare(const void *vp1, const void *vp2) + { +- struct dirent *dp1 = *((struct dirent **) vp1); +- struct dirent *dp2 = *((struct dirent **) vp2); ++ struct dirent *dp1 = *((struct dirent **) vp1); ++ struct dirent *dp2 = *((struct dirent **) vp2); + + return (strcmp(dp1->d_name, dp2->d_name)); + } +@@ -267,7 +266,7 @@ dircompare(const void *vp1, const void * + static void + diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2) + { +- int flags = D_HEADER; ++ int flags = D_HEADER; + + strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1); + if (stat(path1, &stb1) != 0) { diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c --- jhagewood/diff/diff-orig/diffreg.c 2012-06-18 03:07:38.000000000 -0400 +++ jhagewood/diff/diff/diffreg.c 2012-06-19 05:18:57.000000000 -0400 @@ -795,3 +856,12 @@ + printf("%s %s\t%s\n", format == D_CONTEXT ? "---" : "+++", + file2, buf2); } +diff -rupN jhagewood/diff/diff-orig/pathnames.h jhagewood/diff/diff/pathnames.h +--- jhagewood/diff/diff-orig/pathnames.h 2012-06-18 03:07:38.000000000 -0400 ++++ jhagewood/diff/diff/pathnames.h 2012-06-20 05:22:32.000000000 -0400 +@@ -23,4 +23,4 @@ + #include <paths.h> + + #define _PATH_PR "/usr/bin/pr" +-#define _PATH_SDIFF "/usr/bin/sdiff" ++#define _PATH_SDIFF "/usr/bin/sdiff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120620052308.A1523106566B>