socsvn commit: r237862 - in soc2012/jhagewood/diff: . diff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Mon Jun 18 02:05:55 UTC 2012
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]);
More information about the svn-soc-all
mailing list