From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 18 02:05:55 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 1845F106564A
	for <svn-soc-all@FreeBSD.org>; Mon, 18 Jun 2012 02:05:53 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 18 Jun 2012 02:05:53 +0000
Date: Mon, 18 Jun 2012 02:05:53 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120618020553.1845F106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237862 - in soc2012/jhagewood/diff: . diff
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2012 02:05:55 -0000

Author: jhagewood
Date: Mon Jun 18 02:05:52 2012
New Revision: 237862
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237862

Log:

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

Modified: soc2012/jhagewood/diff/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diffreg.c	Mon Jun 18 01:39:38 2012	(r237861)
+++ soc2012/jhagewood/diff/diff/diffreg.c	Mon Jun 18 02:05:52 2012	(r237862)
@@ -1602,10 +1602,12 @@
 	tm_ptr2 = localtime(&stb2.st_mtime);
 	strftime(buf1, 256, time_format, tm_ptr1);
 	strftime(buf2, 256, time_format, tm_ptr2);
-	strftime(end1, 10, "%z", tm_ptr1);
-	strftime(end2, 10, "%z", tm_ptr2);
-	sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1);
-	sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2);
+	if (!cflag) {
+		strftime(end1, 10, "%z", tm_ptr1);
+		strftime(end2, 10, "%z", tm_ptr2);
+		sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1);
+		sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2);
+	}
 	if (label[0] != NULL)
 		printf("%s %s\n", format == D_CONTEXT ? "***" : "---",
 			label[0]);

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 18 01:39:38 2012	(r237861)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 18 02:05:52 2012	(r237862)
@@ -124,7 +124,7 @@
  extern int	 format, context, status;
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
 --- jhagewood/diff/diff-orig/diffreg.c	2012-06-10 03:31:05.000000000 -0400
-+++ jhagewood/diff/diff/diffreg.c	2012-06-17 04:31:40.465581000 -0400
++++ jhagewood/diff/diff/diffreg.c	2012-06-18 02:05:37.000000000 -0400
 @@ -90,6 +90,12 @@ __FBSDID("$FreeBSD");
  #include "diff.h"
  #include "pathnames.h"
@@ -224,7 +224,7 @@
  				if (chrtran[c] != chrtran[d]) {
  					jackpot++;
  					J[i] = 0;
-@@ -1551,16 +1581,41 @@ dump_unified_vec(FILE *f1, FILE *f2)
+@@ -1551,16 +1581,43 @@ dump_unified_vec(FILE *f1, FILE *f2)
  static void
  print_header(const char *file1, const char *file2)
  {
@@ -249,10 +249,12 @@
 +	tm_ptr2 = localtime(&stb2.st_mtime);
 +	strftime(buf1, 256, time_format, tm_ptr1);
 +	strftime(buf2, 256, time_format, tm_ptr2);
-+	strftime(end1, 10, "%z", tm_ptr1);
-+	strftime(end2, 10, "%z", tm_ptr2);
-+	sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1);
-+	sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2);
++	if (!cflag) {
++		strftime(end1, 10, "%z", tm_ptr1);
++		strftime(end2, 10, "%z", tm_ptr2);
++		sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1);
++		sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2);
++	}
  	if (label[0] != NULL)
  		printf("%s %s\n", format == D_CONTEXT ? "***" : "---",
 -		    label[0]);