Date: Sat, 09 Jun 2012 03:50:14 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237333 - in soc2012/jhagewood/diff3: . diff3 Message-ID: <20120609035014.89E9B106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Sat Jun 9 03:50:13 2012 New Revision: 237333 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237333 Log: Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3prog.c Sat Jun 9 01:42:55 2012 (r237332) +++ soc2012/jhagewood/diff3/diff3/diff3prog.c Sat Jun 9 03:50:13 2012 (r237333) @@ -64,25 +64,33 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ -#ifdef __FreeBSD__ -#define __dead + +#if 0 +#ifndef lint +static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93"; #endif +#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: diff3prog.c 2012-06-8 23:36:08Z $"); +#include <ctype.h> +#include <err.h> +#include <errno.h> +#include <getopt.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> -#include <err.h> #include <unistd.h> -#include <limits.h> -#include <getopt.h> -#include <errno.h> #include <wchar.h> #include <wctype.h> +#ifdef __FreeBSD__ +#define __dead +#endif /* diff3 - 3-way differential file comparison */ -char const __version[] = "8.1"; +char const __version[] = "1.1"; /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3] * Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Sat Jun 9 01:42:55 2012 (r237332) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Sat Jun 9 03:50:13 2012 (r237333) @@ -11,17 +11,50 @@ .include <bsd.prog.mk> diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c --- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-07 05:12:54.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-07 23:42:04.000000000 -0400 -@@ -82,6 +82,8 @@ ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-09 03:49:17.000000000 -0400 +@@ -64,24 +64,34 @@ + * @(#)diff3.c 8.1 (Berkeley) 6/6/93 + */ +-#ifdef __FreeBSD__ +-#define __dead ++ ++#if 0 ++#ifndef lint ++static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93"; + #endif ++#endif /* not lint */ ++#include <sys/cdefs.h> ++__FBSDID("$FreeBSD: diff3prog.c 2012-06-8 23:36:08Z $"); + ++#include <ctype.h> ++#include <err.h> ++#include <errno.h> ++#include <getopt.h> ++#include <limits.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <ctype.h> +-#include <err.h> + #include <unistd.h> +-#include <limits.h> +-#include <getopt.h> +-#include <errno.h> + #include <wchar.h> + #include <wctype.h> + ++#ifdef __FreeBSD__ ++#define __dead ++#endif /* diff3 - 3-way differential file comparison */ -+char const __version[] = "8.1"; ++char const __version[] = "1.1"; + /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3] * * d13 = diff report on f1 vs f3 -@@ -149,33 +151,37 @@ void prange(struct range *); +@@ -149,33 +159,37 @@ void prange(struct range *); void repos(int); void separate(const char *); __dead void edscript(int); @@ -66,7 +99,7 @@ }; -@@ -216,12 +222,18 @@ main(int argc, char **argv) +@@ -216,12 +230,18 @@ main(int argc, char **argv) case 'X': oflag = eflag = 1; break; @@ -85,7 +118,7 @@ case STRIPCR_OPT: strip_cr = 1; break; -@@ -233,8 +245,10 @@ main(int argc, char **argv) +@@ -233,8 +253,10 @@ main(int argc, char **argv) argc -= optind; argv += optind; /* XXX - argc usage seems wrong here */ @@ -97,7 +130,7 @@ if (oflag) { (void)snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", -@@ -254,6 +268,8 @@ main(int argc, char **argv) +@@ -254,6 +276,8 @@ main(int argc, char **argv) for (i = 0; i <= 2; i++) { if ((fp[i] = fopen(argv[i + 2], "r")) == NULL) err(EXIT_FAILURE, "can't open %s", argv[i + 2]); @@ -106,7 +139,7 @@ } merge(m, n); exit(EXIT_SUCCESS); -@@ -606,6 +622,32 @@ repos(int nchar) +@@ -606,6 +630,32 @@ repos(int nchar) (void)fseek(fp[i], (long)-nchar, SEEK_CUR); } @@ -139,7 +172,7 @@ __dead void trouble(void) { -@@ -698,13 +740,30 @@ increase(void) +@@ -698,13 +748,30 @@ increase(void) szchanges = newsz; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120609035014.89E9B106566C>