head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.108 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.106 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.104 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.102 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.100 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.98 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.96 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.94 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.92 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.90 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.88 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.86 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.84 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.82 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.80 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.78 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.76 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.74 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.72 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.70 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.68 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.66 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.64 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.60 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.40 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.62 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.58 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.56 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.54 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.52 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.50 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.48 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.46 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.44 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.42 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.38 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.36 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.34 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.32 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.30 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.28 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.26 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.24 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.22 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.20 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.18 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.16 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.14 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.12 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.10 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.8 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.6 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.4 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.2 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2012.12.20.22.00.06; author joerg; state Exp; branches; next 1.3; 1.3 date 2011.12.05.02.14.40; author agc; state Exp; branches; next 1.2; 1.2 date 2001.05.29.08.16.05; author agc; state Exp; branches; next 1.1; 1.1 date 2001.03.22.10.04.36; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.03.22.10.04.36; author agc; state Exp; branches; next ; desc @@ 1.4 log @Define prototypes to avoid conflicting implicit declarations. @ text @$NetBSD: patch-aa,v 1.3 2011/12/05 02:14:40 agc Exp $ Don't overwrite read-only strings, so they can be placed in the text segment by a decent optimising compiler. Honour the VISUAL and EDITOR settings in the environment before using ed(1) Use c89 function defs Use correct header files --- idiff.c.orig 1998-09-16 19:58:16.000000000 +0000 +++ idiff.c @@@@ -1,16 +1,26 @@@@ /* idiff: interactive diff */ -#include +#include + #include +#include +#include +#include +#include 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; - char *argv[]; +int +main(int argc, char **argv) { FILE *fin, *fout, *f1, *f2, *efopen(); char buf[BUFSIZ], *mktemp(); + char realdiffname[MAXPATHLEN]; char *diffout = "idiff.XXXXXX"; progname = argv[0]; @@@@ -21,6 +31,8 @@@@ main(argc, argv) f1 = efopen(argv[1], "r"); f2 = efopen(argv[2], "r"); fout = efopen("idiff.out", "w"); + (void) strcpy(realdiffname, diffout); + diffout = realdiffname; mktemp(diffout); sprintf(buf,"diff %s %s >%s",argv[1],argv[2],diffout); system(buf); @@@@ -31,14 +43,18 @@@@ main(argc, argv) exit(0); } -idiff(f1, f2, fin, fout) /* process diffs */ - FILE *f1, *f2, *fin, *fout; +void +idiff(FILE *f1, FILE *f2, FILE *fin, FILE *fout) /* process diffs */ { + char realtempfile[MAXPATHLEN]; char *tempfile = "idiff.XXXXXX"; char buf[BUFSIZ], buf2[BUFSIZ], *mktemp(); FILE *ft, *efopen(); int cmd, n, from1, to1, from2, to2, nf1, nf2; + char *ed; + (void) strcpy(realtempfile, tempfile); + tempfile = realtempfile; mktemp(tempfile); nf1 = nf2 = 0; while (fgets(buf, sizeof buf, fin) != NULL) { @@@@ -76,7 +92,11 @@@@ idiff(f1, f2, fin, fout) /* process diff fprintf(ft, "---\n"); ncopy(f2, to2+1-from2, ft); fclose(ft); - sprintf(buf2, "ed %s", tempfile); + if ((ed = getenv("VISUAL")) == NULL && + (ed = getenv("EDITOR")) == NULL) { + ed = "/bin/ed"; + } + snprintf(buf2, sizeof(buf2), "%s %s", ed, tempfile); system(buf2); ft = efopen(tempfile, "r"); ncopy(ft, HUGE, fout); @@@@ -98,9 +118,8 @@@@ idiff(f1, f2, fin, fout) /* process diff unlink(tempfile); } -parse(s, pfrom1, pto1, pcmd, pfrom2, pto2) - char *s; - int *pcmd, *pfrom1, *pto1, *pfrom2, *pto2; +void +parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2) { #define a2i(p) while (isdigit(*s)) p = 10*(p) + *s++ - '0' @@@@ -120,8 +139,8 @@@@ parse(s, pfrom1, pto1, pcmd, pfrom2, pto *pto2 = *pfrom2; } -nskip(fin, n) /* skip n lines of file fin */ - FILE *fin; +void +nskip(FILE *fin, int n) /* skip n lines of file fin */ { char buf[BUFSIZ]; @@@@ -129,8 +148,8 @@@@ nskip(fin, n) /* skip n lines of file fi fgets(buf, sizeof buf, fin); } -ncopy(fin, n, fout) /* copy n lines from fin to fout */ - FILE *fin, *fout; +void +ncopy(FILE *fin, int n, FILE *fout) /* copy n lines from fin to fout */ { char buf[BUFSIZ]; @ 1.3 log @Avoid core-dumping with NetBSD/amd64 5.99.56 and later (i.e. gcc 4.5) Use c89 function defs Use correct header files @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2001/05/29 08:16:05 agc Exp $ d12 3 a14 3 --- 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 @@@@ d28 5 d46 1 a46 1 @@@@ -21,6 +26,8 @@@@ d55 1 a55 1 @@@@ -31,14 +38,18 @@@@ d76 1 a76 1 @@@@ -76,7 +87,11 @@@@ d89 1 a89 1 @@@@ -98,9 +113,8 @@@@ d101 1 a101 1 @@@@ -120,8 +134,8 @@@@ d112 1 a112 1 @@@@ -129,8 +143,8 @@@@ @ 1.2 log @Honour the VISUAL and EDITOR settings in the environment before using ed(1) @ text @d1 1 a1 1 $NetBSD$ d9 6 a14 3 --- idiff.c.orig Wed Sep 16 20:58:16 1998 +++ idiff.c Tue May 29 09:11:44 2001 @@@@ -1,5 +1,7 @@@@ d17 1 a19 1 #include d21 4 d26 8 a33 1 @@@@ -11,6 +13,7 @@@@ d41 1 a41 1 @@@@ -21,6 +24,8 @@@@ d50 8 a57 3 @@@@ -34,11 +39,15 @@@@ idiff(f1, f2, fin, fout) /* process diffs */ FILE *f1, *f2, *fin, *fout; d71 1 a71 1 @@@@ -76,7 +85,11 @@@@ d84 34 @ 1.1 log @Initial revision @ text @d6 5 a10 2 --- idiff.c 2001/03/19 13:19:52 1.1 +++ idiff.c 2001/03/19 13:27:03 d36 1 a36 1 @@@@ -34,11 +39,14 @@@@ d45 1 d52 13 @ 1.1.1.1 log @Initial import of idiff, the interactive front-end to diff(1), into the packages collection. idiff is taken from "The Unix Programming Environment" by Brian Kernighan and Rob Pike (Prentice-Hall, 1984, ISBN 0-13-937681-X). @ text @@