Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Jun 2012 03:47:09 +0000
From:      jhagewood@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r238624 - in soc2012/jhagewood: diff diff/diff diff3 mdocml
Message-ID:  <20120630034709.52F79106566B@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhagewood
Date: Sat Jun 30 03:47:08 2012
New Revision: 238624
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238624

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/diff/diffreg.c
  soc2012/jhagewood/diff/hagewood-diff.patch
  soc2012/jhagewood/diff3/hagewood-diff3.patch
  soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Sat Jun 30 02:11:53 2012	(r238623)
+++ soc2012/jhagewood/diff/diff/diff.c	Sat Jun 30 03:47:08 2012	(r238624)
@@ -204,15 +204,15 @@
 int
 main(int argc, char **argv)
 {
-	char *ep, **oargv, *args, *optfile;
+	char *ep, **oargv, *optfile;
 	long l;
 	int ch, lastch, gotstdin, prevoptind, newarg;
-	int oargc, childstat;
-	pid_t childpid, done;
+	int oargc;
 	
 	oargv = argv;
 	oargc = argc;
 	gotstdin = 0;
+	optfile = "\0";
 
 	lastch = '\0';
 	prevoptind = 1;
@@ -345,7 +345,7 @@
 			break;
 		case OPT_FFILE:
 			Toflag = 1;
-			optfile3 = optarg;
+			optfile = optarg;
 			break;
 		case OPT_TOFILE:
 			Fromflag = 1;
@@ -482,18 +482,18 @@
 			exit(2);				
 		}
 		if (Toflag) {
-			print_status(diffreg(argv[0], optfile, 0), argv[0], optfile,
+			print_status(diffreg(optfile, argv[0], 0), optfile, argv[0],
 			NULL);
-			print_status(diffreg(argv[1], optfile, 0), argv[1], optfile,
+			print_status(diffreg(optfile, argv[1], 0), optfile, argv[1],
 			NULL);
 		}
 		if (Fromflag) {
-			print_status(diffreg(optfile, argv[0], 0), optfile, argv[0]
+			print_status(diffreg(argv[0], optfile, 0), argv[0], optfile,
 			NULL);
-			print_status(diffreg(optfile, argv[1], 0), optfile, argv[1],
+			print_status(diffreg(argv[1], optfile, 0), argv[1], optfile,
 			NULL);			
 		}
-		else
+		if (!Toflag && !Fromflag)
 			print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1],
 				NULL);
 	}

Modified: soc2012/jhagewood/diff/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diffreg.c	Sat Jun 30 02:11:53 2012	(r238623)
+++ soc2012/jhagewood/diff/diff/diffreg.c	Sat Jun 30 03:47:08 2012	(r238624)
@@ -1365,9 +1365,11 @@
 		check_size = MAX_CHECK;
 	else
 		check_size = BUFSIZ;
+	/* 
+	 * XXX Currently returns NULL even for file with no NULL chars? 
 	if (memchr(buf, '\0', check_size) != NULL) {
 		return (0);
-	}
+	}*/
 	return (1);
 }
 

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Sat Jun 30 02:11:53 2012	(r238623)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Sat Jun 30 03:47:08 2012	(r238624)
@@ -1,6 +1,6 @@
 diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
---- jhagewood/diff/diff-orig/diff.c	2012-06-28 18:13:23.287983517 -0400
-+++ jhagewood/diff/diff/diff.c	2012-06-29 22:49:21.899973597 -0400
+--- jhagewood/diff/diff-orig/diff.c	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-30 03:46:55.000000000 -0400
 @@ -1,4 +1,4 @@
 -/*-
 +/*
@@ -56,7 +56,7 @@
  
  
  /* Options which exceed manageable alphanumeric assignments */ 
-@@ -69,84 +67,128 @@ enum
+@@ -69,84 +67,128 @@ enum 
    OPT_STRIPCR,
    OPT_NORMAL,
    OPT_LEFTC,
@@ -237,7 +237,7 @@
  NULL,
  };
  char **help_strs = (char **)help_msg;
-@@ -162,11 +204,12 @@ void read_excludes_file(char *);
+@@ -162,14 +204,15 @@ void read_excludes_file(char *);
  int
  main(int argc, char **argv)
  {
@@ -246,15 +246,18 @@
 -	int	 ch, lastch, gotstdin, prevoptind, newarg;
 -	int	 oargc;
 -
-+	char *ep, **oargv, *args, *optfile;
++	char *ep, **oargv, *optfile;
 +	long l;
 +	int ch, lastch, gotstdin, prevoptind, newarg;
-+	int oargc, childstat;
-+	pid_t childpid, done;
++	int oargc;
 +	
  	oargv = argv;
  	oargc = argc;
  	gotstdin = 0;
++	optfile = "\0";
+ 
+ 	lastch = '\0';
+ 	prevoptind = 1;
 @@ -197,6 +240,7 @@ main(int argc, char **argv)
  			break;
  		case 'C':
@@ -279,7 +282,7 @@
  			break;
 +		case OPT_FFILE:
 +			Toflag = 1;
-+			optfile3 = optarg;
++			optfile = optarg;
 +			break;
 +		case OPT_TOFILE:
 +			Fromflag = 1;
@@ -380,18 +383,18 @@
 +			exit(2);				
 +		}
 +		if (Toflag) {
-+			print_status(diffreg(argv[0], optfile, 0), argv[0], optfile,
++			print_status(diffreg(optfile, argv[0], 0), optfile, argv[0],
 +			NULL);
-+			print_status(diffreg(argv[1], optfile, 0), argv[1], optfile,
++			print_status(diffreg(optfile, argv[1], 0), optfile, argv[1],
 +			NULL);
 +		}
 +		if (Fromflag) {
-+			print_status(diffreg(optfile, argv[0], 0), optfile, argv[0]
++			print_status(diffreg(argv[0], optfile, 0), argv[0], optfile,
 +			NULL);
-+			print_status(diffreg(optfile, argv[1], 0), optfile, argv[1],
++			print_status(diffreg(argv[1], optfile, 0), argv[1], optfile,
 +			NULL);			
 +		}
-+		else
++		if (!Toflag && !Fromflag)
 +			print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1],
 +				NULL);
  	}
@@ -516,7 +519,7 @@
  		break;
  	}
  }
-@@ -585,6 +687,7 @@ print_status(int val, char *path1, char
+@@ -585,6 +687,7 @@ print_status(int val, char *path1, char 
  void
  usage(void)
  {
@@ -524,9 +527,34 @@
  	(void)fprintf(stderr,
  	    "usage: diff [-abdilpqTtw] [-I pattern] [-c | -e | -f | -n | -u]\n"
  	    "            [-L label] file1 file2\n"
+diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h
+--- jhagewood/diff/diff-orig/diff.h	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff/diff/diff.h	2012-06-30 03:36:16.000000000 -0400
+@@ -48,6 +48,8 @@
+ #define	D_NREVERSE	5	/* Reverse ed script with numbered
+ 				   lines and no trailing . */
+ #define	D_BRIEF		6	/* Say if the files differ */
++#define D_GF		7	/* Group format */
++#define	D_LF		8	/* Line format */
+ 
+ /*
+  * Output flags
+@@ -75,9 +77,9 @@ struct excludes {
+ 	struct excludes	*next;
+ };
+ 
+-extern int	 aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
+-		 sflag, tflag, Tflag, wflag;
+-extern int	 Bflag, strip_cr, tabsize;
++extern int	 aflag, bflag, cflag, dflag, Eflag, Fromflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
++		 sflag, tflag, Tflag, Toflag, wflag;
++extern int	 Bflag, strip_cr, suppress_cl, tabsize;
+ extern int	 format, context, status;
+ extern char	 ignore_file_case;
+ extern char	*start, *ifdefname, *diffargs, *label[2], *ignore_pats;
 diff -rupN jhagewood/diff/diff-orig/diffdir.c jhagewood/diff/diff/diffdir.c
---- jhagewood/diff/diff-orig/diffdir.c	2012-06-28 18:13:23.287983517 -0400
-+++ jhagewood/diff/diff/diffdir.c	2012-06-28 18:13:23.375983516 -0400
+--- jhagewood/diff/diff-orig/diffdir.c	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff/diff/diffdir.c	2012-06-30 03:36:16.000000000 -0400
 @@ -20,14 +20,13 @@
  
  #include <sys/cdefs.h>
@@ -634,34 +662,9 @@
  
  	strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1);
  	if (stat(path1, &stb1) != 0) {
-diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h
---- jhagewood/diff/diff-orig/diff.h	2012-06-28 18:13:23.288983517 -0400
-+++ jhagewood/diff/diff/diff.h	2012-06-28 18:13:23.376983516 -0400
-@@ -48,6 +48,8 @@
- #define	D_NREVERSE	5	/* Reverse ed script with numbered
- 				   lines and no trailing . */
- #define	D_BRIEF		6	/* Say if the files differ */
-+#define D_GF		7	/* Group format */
-+#define	D_LF		8	/* Line format */
- 
- /*
-  * Output flags
-@@ -75,9 +77,9 @@ struct excludes {
- 	struct excludes	*next;
- };
- 
--extern int	 aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
--		 sflag, tflag, Tflag, wflag;
--extern int	 Bflag, strip_cr, tabsize;
-+extern int	 aflag, bflag, cflag, dflag, Eflag, Fromflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
-+		 sflag, tflag, Tflag, Toflag, wflag;
-+extern int	 Bflag, strip_cr, suppress_cl, tabsize;
- extern int	 format, context, status;
- extern char	 ignore_file_case;
- extern char	*start, *ifdefname, *diffargs, *label[2], *ignore_pats;
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
---- jhagewood/diff/diff-orig/diffreg.c	2012-06-28 18:13:23.286983517 -0400
-+++ jhagewood/diff/diff/diffreg.c	2012-06-29 22:27:15.024984607 -0400
+--- jhagewood/diff/diff-orig/diffreg.c	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff/diff/diffreg.c	2012-06-30 03:44:30.000000000 -0400
 @@ -62,15 +62,13 @@
   *	@(#)diffreg.c   8.1 (Berkeley) 6/6/93
   */
@@ -727,7 +730,7 @@
  
  	anychange = 0;
  	lastline = 0;
-@@ -353,7 +359,6 @@ diffreg(char *ofile1, char *ofile2, int
+@@ -353,7 +359,6 @@ diffreg(char *ofile1, char *ofile2, int 
  		status |= 2;
  		goto closem;
  	}
@@ -735,7 +738,7 @@
  	switch (files_differ(f1, f2, flags)) {
  	case 0:
  		goto closem;
-@@ -365,7 +370,7 @@ diffreg(char *ofile1, char *ofile2, int
+@@ -365,7 +370,7 @@ diffreg(char *ofile1, char *ofile2, int 
  		goto closem;
  	}
  
@@ -1175,7 +1178,7 @@
  
  	sum = 1;
  	space = 0;
-@@ -1305,20 +1346,28 @@ readhash(FILE *f)
+@@ -1305,20 +1346,30 @@ readhash(FILE *f)
  	return (sum == 0 ? 1 : sum);
  }
  
@@ -1206,13 +1209,15 @@
 +		check_size = MAX_CHECK;
 +	else
 +		check_size = BUFSIZ;
++	/* 
++	 * XXX Currently returns NULL even for file with no NULL chars? 
 +	if (memchr(buf, '\0', check_size) != NULL) {
 +		return (0);
-+	}
++	}*/
  	return (1);
  }
  
-@@ -1327,10 +1376,10 @@ asciifile(FILE *f)
+@@ -1327,10 +1378,10 @@ asciifile(FILE *f)
  static char *
  match_function(const long *f, int pos, FILE *file)
  {
@@ -1227,7 +1232,7 @@
  
  	lastline = pos;
  	while (pos > last) {
-@@ -1342,7 +1391,6 @@ match_function(const long *f, int pos, F
+@@ -1342,7 +1393,6 @@ match_function(const long *f, int pos, F
  		if (nc > 0) {
  			buf[nc] = '\0';
  			buf[strcspn(buf, "\n")] = '\0';
@@ -1235,7 +1240,7 @@
  			if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
  				if (begins_with(buf, "private:")) {
  					if (!state)
-@@ -1373,9 +1421,9 @@ static void
+@@ -1373,9 +1423,9 @@ static void
  dump_context_vec(FILE *f1, FILE *f2)
  {
  	struct context_vec *cvp = context_vec_start;
@@ -1248,7 +1253,7 @@
  
  	if (context_vec_start > context_vec_ptr)
  		return;
-@@ -1390,8 +1438,8 @@ dump_context_vec(FILE *f1, FILE *f2)
+@@ -1390,8 +1440,8 @@ dump_context_vec(FILE *f1, FILE *f2)
  	if (pflag) {
  		f = match_function(ixold, lowa-1, f1);
  		if (f != NULL) {
@@ -1259,7 +1264,7 @@
  		}
  	}
  	printf("\n*** ");
-@@ -1478,9 +1526,9 @@ static void
+@@ -1478,9 +1528,9 @@ static void
  dump_unified_vec(FILE *f1, FILE *f2)
  {
  	struct context_vec *cvp = context_vec_start;
@@ -1272,7 +1277,7 @@
  
  	if (context_vec_start > context_vec_ptr)
  		return;
-@@ -1491,19 +1539,19 @@ dump_unified_vec(FILE *f1, FILE *f2)
+@@ -1491,19 +1541,19 @@ dump_unified_vec(FILE *f1, FILE *f2)
  	lowc = MAX(1, cvp->c - context);
  	upd = MIN(len[1], context_vec_ptr->d + context);
  
@@ -1298,7 +1303,7 @@
  
  	/*
  	 * Output changes in "unified" diff format--the old and new lines
-@@ -1551,16 +1599,43 @@ dump_unified_vec(FILE *f1, FILE *f2)
+@@ -1551,16 +1601,43 @@ dump_unified_vec(FILE *f1, FILE *f2)
  static void
  print_header(const char *file1, const char *file2)
  {
@@ -1349,8 +1354,8 @@
 +			file2, buf2);	
  }
 diff -rupN jhagewood/diff/diff-orig/pathnames.h jhagewood/diff/diff/pathnames.h
---- jhagewood/diff/diff-orig/pathnames.h	2012-06-28 18:13:23.281983517 -0400
-+++ jhagewood/diff/diff/pathnames.h	2012-06-28 18:13:23.374983516 -0400
+--- jhagewood/diff/diff-orig/pathnames.h	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff/diff/pathnames.h	2012-06-30 03:36:16.000000000 -0400
 @@ -23,4 +23,5 @@
  #include <paths.h>
  

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Sat Jun 30 02:11:53 2012	(r238623)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Sat Jun 30 03:47:08 2012	(r238624)
@@ -1,6 +1,17 @@
+diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
+--- jhagewood/diff3/diff3-orig/Makefile	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff3/diff3/Makefile	2012-06-30 03:36:16.000000000 -0400
+@@ -6,6 +6,6 @@ BINDIR=	/usr/libexec
+ 
+ beforeinstall:
+ 	install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+-	    ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3
++	    ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3
+ 
+ .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-28 18:13:23.389983516 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-28 18:13:23.422983515 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c	2012-06-30 03:36:16.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-30 03:36:16.000000000 -0400
 @@ -64,19 +64,23 @@
   *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
   */
@@ -455,14 +466,3 @@
 +	fprintf(stderr, "usage: diff3 %s file1 file2 file3\n", OPTIONS);
  	exit(EXIT_FAILURE);
  }
-diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile	2012-06-28 18:13:23.390983516 -0400
-+++ jhagewood/diff3/diff3/Makefile	2012-06-28 18:13:23.423983515 -0400
-@@ -6,6 +6,6 @@ BINDIR=	/usr/libexec
- 
- beforeinstall:
- 	install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
--	    ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3
-+	    ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3
- 
- .include <bsd.prog.mk>

Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch	Sat Jun 30 02:11:53 2012	(r238623)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch	Sat Jun 30 03:47:08 2012	(r238624)
@@ -1,6 +1,6 @@
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h jhagewood/mdocml/mdocml-1.12.1/man.h
---- jhagewood/mdocml/mdocml-1.12.1-orig/man.h	2012-06-28 18:13:23.821983512 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man.h	2012-06-28 18:13:24.149983509 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man.h	2012-06-30 03:36:17.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h	2012-06-30 03:36:17.000000000 -0400
 @@ -43,6 +43,8 @@ enum	mant {
  	MAN_sp,
  	MAN_nf,
@@ -12,7 +12,7 @@
  	MAN_DT,
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig jhagewood/mdocml/mdocml-1.12.1/man.h.orig
 --- jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig	1969-12-31 19:00:00.000000000 -0500
-+++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig	2012-06-28 18:13:24.137983510 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig	2012-06-30 03:36:17.000000000 -0400
 @@ -0,0 +1,113 @@
 +/*	$Id: man.h,v 1.60 2012/01/03 15:16:24 kristaps Exp $ */
 +/*
@@ -128,8 +128,8 @@
 +
 +#endif /*!MAN_H*/
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c jhagewood/mdocml/mdocml-1.12.1/man_term.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c	2012-06-28 18:13:23.808983512 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c	2012-06-28 18:13:24.131983510 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c	2012-06-30 03:36:17.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c	2012-06-30 03:36:17.000000000 -0400
 @@ -82,6 +82,8 @@ static	int		  pre_alternate(DECL_ARGS);
  static	int		  pre_ft(DECL_ARGS);
  static	int		  pre_ign(DECL_ARGS);
@@ -173,7 +173,7 @@
  static int
 diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig
 --- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig	1969-12-31 19:00:00.000000000 -0500
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig	2012-06-28 18:13:24.146983510 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig	2012-06-30 03:36:17.000000000 -0400
 @@ -0,0 +1,1117 @@
 +/*	$Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */
 +/*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120630034709.52F79106566B>