socsvn commit: r237916 - in soc2012/jhagewood/diff: . diff

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Tue Jun 19 00:24:03 2012
New Revision: 237916
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237916

Log:

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

Modified: soc2012/jhagewood/diff/TODO
==============================================================================
--- soc2012/jhagewood/diff/TODO	Mon Jun 18 23:18:49 2012	(r237915)
+++ soc2012/jhagewood/diff/TODO	Tue Jun 19 00:24:03 2012	(r237916)
@@ -20,3 +20,4 @@
 Notes: 
 
 - When using large files as input, diff will only output "Files [file1] and [file2] differ."
+- Needs function prototypes. (COMPLETE)

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Mon Jun 18 23:18:49 2012	(r237915)
+++ soc2012/jhagewood/diff/diff/diff.c	Tue Jun 19 00:24:03 2012	(r237916)
@@ -148,13 +148,17 @@
 };
 char **help_strs = (char **)help_msg;
 
+static void * emalloc(size_t);
+static int easprintf(char **, const char *, ...);
+static void * erealloc(void *, size_t);
+static char * estrdup(const char *);
+static void print_only(const char *, size_t, const char *);
+static void print_status(int, char *, char *, char *);
+static void push_excludes(char *);
+static void push_ignore_pats(char *);
+static void read_excludes_file(char *);
 void set_argstr(char **, char **);
-
-
-void usage(void);
-void push_excludes(char *);
-void push_ignore_pats(char *);
-void read_excludes_file(char *);
+static void usage(void);
 
 int
 main(int argc, char **argv)

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 18 23:18:49 2012	(r237915)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Tue Jun 19 00:24:03 2012	(r237916)
@@ -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-18 03:07:38.000000000 -0400
-+++ jhagewood/diff/diff/diff.c	2012-06-18 23:44:16.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-19 00:22:21.000000000 -0400
 @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$");
  #include "diff.h"
  #include "pathnames.h"
@@ -68,7 +68,31 @@
  	{ "unified",			optional_argument,	NULL,	'U' },
  	{ "version",			no_argument,		NULL,	'v' },
  /* XXX: UNIMPLEMENTED
-@@ -197,6 +194,7 @@ main(int argc, char **argv)
+@@ -151,13 +148,17 @@ NULL,
+ };
+ char **help_strs = (char **)help_msg;
+ 
++static void * emalloc(size_t);
++static int easprintf(char **, const char *, ...);
++static void * erealloc(void *, size_t);
++static char * estrdup(const char *);
++static void print_only(const char *, size_t, const char *);
++static void print_status(int, char *, char *, char *);
++static void push_excludes(char *);
++static void push_ignore_pats(char *);
++static void read_excludes_file(char *);
+ void set_argstr(char **, char **);
+-
+-
+-void usage(void);
+-void push_excludes(char *);
+-void push_ignore_pats(char *);
+-void read_excludes_file(char *);
++static void usage(void);
+ 
+ int
+ main(int argc, char **argv)
+@@ -197,6 +198,7 @@ main(int argc, char **argv)
  			break;
  		case 'C':
  		case 'c':
@@ -76,7 +100,7 @@
  			format = D_CONTEXT;
  			if (optarg != NULL) {
  				l = strtol(optarg, &ep, 10);
-@@ -213,6 +211,9 @@ main(int argc, char **argv)
+@@ -213,6 +215,9 @@ main(int argc, char **argv)
  		case 'd':
  			dflag = 1;
  			break;
@@ -86,7 +110,7 @@
  		case 'e':
  			format = D_EDIT;
  			break;
-@@ -296,6 +297,13 @@ main(int argc, char **argv)
+@@ -296,6 +301,13 @@ main(int argc, char **argv)
  		case 'y':
  			yflag = 1;
  			break;
@@ -100,7 +124,7 @@
  		case OPT_TSIZE:
                          if (optarg != NULL) {
                                  l = strtol(optarg, &ep, 10);
-@@ -548,7 +556,7 @@ print_status(int val, char *path1, char 
+@@ -548,7 +560,7 @@ print_status(int val, char *path1, char 
  		    path1, entry ? entry : "", path2, entry ? entry : "");
  		break;
  	case D_BINARY: