diff options
Diffstat (limited to 'devel/idiff')
| -rw-r--r-- | devel/idiff/distinfo | 4 | ||||
| -rw-r--r-- | devel/idiff/patches/patch-aa | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/devel/idiff/distinfo b/devel/idiff/distinfo index e72f08d60a7..1e8aae44696 100644 --- a/devel/idiff/distinfo +++ b/devel/idiff/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2011/12/05 02:14:40 agc Exp $ +$NetBSD: distinfo,v 1.7 2012/12/20 22:00:06 joerg Exp $ SHA1 (idiff-1.0.tar.gz) = 4d3f339184745a45747385bca6f559665c6136f8 RMD160 (idiff-1.0.tar.gz) = 65012d4580d37c00274e8f1015cdf6b873cbc780 Size (idiff-1.0.tar.gz) = 2307 bytes -SHA1 (patch-aa) = c56d6e04f393ebd4b68cd021fd2d7035c8f8f134 +SHA1 (patch-aa) = 2ada09aa3412196083c5f2e99521aa2632f0ef30 SHA1 (patch-ab) = 88d480c86527766cb602a57e9d1528da73675dbd diff --git a/devel/idiff/patches/patch-aa b/devel/idiff/patches/patch-aa index ae7e8d70e52..04e65e9cee5 100644 --- a/devel/idiff/patches/patch-aa +++ b/devel/idiff/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2011/12/05 02:14:40 agc Exp $ +$NetBSD: patch-aa,v 1.4 2012/12/20 22:00:06 joerg Exp $ Don't overwrite read-only strings, so they can be placed in the text segment by a decent optimising compiler. @@ -9,9 +9,9 @@ using ed(1) Use c89 function defs Use correct header files ---- idiff.c.orig 1998-09-16 12:58:16.000000000 -0700 -+++ idiff.c 2011-12-04 16:38:16.000000000 -0800 -@@ -1,16 +1,21 @@ +--- idiff.c.orig 1998-09-16 19:58:16.000000000 +0000 ++++ idiff.c +@@ -1,16 +1,26 @@ /* idiff: interactive diff */ -#include <stdio.h> @@ -25,6 +25,11 @@ Use correct header files char *progname; -#define HUGE 10000 /* large number of lines */ +#define HUGE 100000 /* large number of lines */ ++ ++void parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2); ++void nskip(FILE *fin, int n); ++void ncopy(FILE *fin, int n, FILE *fout); ++void idiff(FILE *f1, FILE *f2, FILE *fin, FILE *fout); -main(argc, argv) - int argc; @@ -38,7 +43,7 @@ Use correct header files char *diffout = "idiff.XXXXXX"; progname = argv[0]; -@@ -21,6 +26,8 @@ +@@ -21,6 +31,8 @@ main(argc, argv) f1 = efopen(argv[1], "r"); f2 = efopen(argv[2], "r"); fout = efopen("idiff.out", "w"); @@ -47,7 +52,7 @@ Use correct header files mktemp(diffout); sprintf(buf,"diff %s %s >%s",argv[1],argv[2],diffout); system(buf); -@@ -31,14 +38,18 @@ +@@ -31,14 +43,18 @@ main(argc, argv) exit(0); } @@ -68,7 +73,7 @@ Use correct header files mktemp(tempfile); nf1 = nf2 = 0; while (fgets(buf, sizeof buf, fin) != NULL) { -@@ -76,7 +87,11 @@ +@@ -76,7 +92,11 @@ idiff(f1, f2, fin, fout) /* process diff fprintf(ft, "---\n"); ncopy(f2, to2+1-from2, ft); fclose(ft); @@ -81,7 +86,7 @@ Use correct header files system(buf2); ft = efopen(tempfile, "r"); ncopy(ft, HUGE, fout); -@@ -98,9 +113,8 @@ +@@ -98,9 +118,8 @@ idiff(f1, f2, fin, fout) /* process diff unlink(tempfile); } @@ -93,7 +98,7 @@ Use correct header files { #define a2i(p) while (isdigit(*s)) p = 10*(p) + *s++ - '0' -@@ -120,8 +134,8 @@ +@@ -120,8 +139,8 @@ parse(s, pfrom1, pto1, pcmd, pfrom2, pto *pto2 = *pfrom2; } @@ -104,7 +109,7 @@ Use correct header files { char buf[BUFSIZ]; -@@ -129,8 +143,8 @@ +@@ -129,8 +148,8 @@ nskip(fin, n) /* skip n lines of file fi fgets(buf, sizeof buf, fin); } |