src/usr.bin/diff/diff.h - diff

Return to diff.h CVS log

Up to [local] / src / usr.bin / diff

Diff for /src/usr.bin/diff/diff.h between version 1.7 and 1.8

-version 1.7, 2003/06/25 21:43:49
+version 1.8, 2003/06/26 00:20:48
 Line 51
 Line 51
 Line 51
  /*
   * Output format options
   */
- int     opt;
  #define D_NORMAL        0       /* Normal output */
  #define D_EDIT          -1      /* Editor script out */
  #define D_REVERSE       1       /* Reverse editor script */
-Line 62
+Line 60
 Line 62
 Line 60
  #define D_NREVERSE      5       /* Reverse ed script with numbered
                                     lines and no trailing . */
- int     tflag;                  /* expand tabs on output */
+ extern int      aflag, bflag, hflag, iflag, lflag, rflag, sflag, tflag, wflag;
+ extern char     *start, *ifdef1, *ifdef2, *endifname;
+ extern int      opt, wantelses, inifdef, context, status, anychange;
+ extern char     *tempfile, **diffargv;
+ extern char     *file1, *file2, *efile1, *efile2;
+ extern struct   stat stb1, stb2;
+ extern  char diffh[], diff[], pr[];
- /*
-  * Algorithm related options
-  */
- int     hflag;                  /* -h, use halfhearted DIFFH */
- int     bflag;                  /* ignore blanks in comparisons */
- int     wflag;                  /* totally ignore blanks in comparisons */
- int     iflag;                  /* ignore case in comparisons */
- /*
-  * Options on hierarchical diffs.
-  */
- int     lflag;                  /* long output format with header */
- int     rflag;                  /* recursively trace directories */
- int     sflag;                  /* announce files which are same */
- char    *start;                 /* do file only if name >= this */
- /*
-  * Variables for -I D_IFDEF option.
-  */
- int     wantelses;              /* -E */
- char    *ifdef1;                /* String for -1 */
- char    *ifdef2;                /* String for -2 */
- char    *endifname;             /* What we will print on next #endif */
- int     inifdef;
- /*
-  * Variables for -c context option.
-  */
- int     context;                /* lines of context to be printed */
- /*
-  * State for exit status.
-  */
- int     status;
- int     anychange;
- char    *tempfile;              /* used when comparing against std input */
- /*
-  * Variables for diffdir.
-  */
- 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 '/'.
-  */
- char    *file1, *file2, *efile1, *efile2;
- struct  stat stb1, stb2;
  void    *emalloc(size_t);
  void    *erealloc(void *, size_t);
  char    *splice(char *, char *);
-Line 124
+Line 77
 Line 124
 Line 77
  int     max(int, int);
  int     min(int, int);
  __dead void done(int);
- extern  char diffh[], diff[], pr[];