summaryrefslogtreecommitdiff
path: root/textproc/2bsd-diff/files/patch-diffextern.h
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2020-09-04 02:42:28 +0000
committerSteve Wills <swills@FreeBSD.org>2020-09-04 02:42:28 +0000
commit176af6b0efbb58f508846961909b57c96a3a2b5a (patch)
tree3fac046e085e31a954a61599ef1b19c0808ead15 /textproc/2bsd-diff/files/patch-diffextern.h
parentsysutils/lsblk: update to 1.1 (diff)
textproc/2bsd-diff: Update to 2.11.1
PR: 248921 Submitted by: risner <risner@stdio.com> (maintainer)
Notes
Notes: svn path=/head/; revision=547506
Diffstat (limited to 'textproc/2bsd-diff/files/patch-diffextern.h')
-rw-r--r--textproc/2bsd-diff/files/patch-diffextern.h105
1 files changed, 105 insertions, 0 deletions
diff --git a/textproc/2bsd-diff/files/patch-diffextern.h b/textproc/2bsd-diff/files/patch-diffextern.h
new file mode 100644
index 000000000000..2345a4942fab
--- /dev/null
+++ b/textproc/2bsd-diff/files/patch-diffextern.h
@@ -0,0 +1,105 @@
+--- diffextern.h
++++ diffextern.h
+@@ -0,0 +1,102 @@
++/* diffextern.h 2.11.1 20/08/26 */
++
++/*
++ * diff external - common declarations
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <sys/param.h>
++#include <sys/stat.h>
++#include <dirent.h>
++#include <signal.h>
++#include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <sys/wait.h>
++#include <arpa/inet.h>
++
++/*
++ * Output format options
++ */
++extern int opt;
++
++#define D_NORMAL 0 /* Normal output */
++#define D_EDIT -1 /* Editor script out */
++#define D_REVERSE 1 /* Reverse editor script */
++#define D_CONTEXT 2 /* Diff with context */
++#define D_IFDEF 3 /* Diff with merged #ifdef's */
++#define D_NREVERSE 4 /* Reverse ed script with numbered
++ lines and no trailing . */
++
++extern int tflag; /* expand tabs on output */
++
++/*
++ * Algorithm related options
++ */
++extern int hflag; /* -h, use halfhearted DIFFH */
++extern int bflag; /* ignore blanks in comparisons */
++extern int wflag; /* totally ignore blanks in comparisons */
++extern int iflag; /* ignore case in comparisons */
++
++/*
++ * Options on hierarchical diffs.
++ */
++extern int lflag; /* long output format with header */
++extern int rflag; /* recursively trace directories */
++extern int sflag; /* announce files which are same */
++extern char *start; /* do file only if name >= this */
++
++/*
++ * Variables for -I D_IFDEF option.
++ */
++extern int wantelses; /* -E */
++extern char *ifdef1; /* String for -1 */
++extern char *ifdef2; /* String for -2 */
++extern char *endifname; /* What we will print on next #endif */
++extern int inifdef;
++
++/*
++ * Variables for -c context option.
++ */
++extern int context; /* lines of context to be printed */
++
++/*
++ * State for exit status.
++ */
++extern int status;
++extern int anychange;
++extern char tempfile[MAXPATHLEN];/* used when comparing against std input */
++
++/*
++ * Variables for diffdir.
++ */
++extern char **diffargv; /* option list to pass to recursive diffs */
++
++/*
++ * Input file names.
++ * With diffdir, file1 and file2 are allocated BUFSIZ space,
++ * and padded with a '/', and then efile0 and efile1 point after
++ * the '/'.
++ */
++extern char *file1, *file2, *efile1, *efile2;
++extern struct stat stb1, stb2;
++
++char *talloc(), *ralloc();
++char *savestr(), *splice(), *splicen();
++char *copytemp();
++sig_t done();
++
++extern char diffh[], diff[], pr[];
++
++/* declarations */
++void diffdir(char **argv);
++void diffreg();
++void noroom();
++void setfile(char **fpp, char **epp, char *file);
++int useless(register char *cp);
++int min(int, int);
++int max(int, int);
++void prune();
++int skipline(int);