[BACK]Return to diff.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / diff

Diff for /src/usr.bin/diff/diff.h between version 1.14 and 1.15

version 1.14, 2003/07/04 17:50:24 version 1.15, 2003/07/06 20:48:59
Line 1 
Line 1 
 /*      $OpenBSD$       */  /*      $OpenBSD$       */
   
 /*  /*-
  * Copyright (C) Caldera International Inc.  2001-2002.   * Copyright (c) 1991, 1993
  * All rights reserved.   *      The Regents of the University of California.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
  * 1. Redistributions of source code and documentation must retain the above   * 1. Redistributions of source code must retain the above copyright
  *    copyright notice, this list of conditions and the following disclaimer.   *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. Neither the name of the University nor the names of its contributors
  *    must display the following acknowledgement:   *    may be used to endorse or promote products derived from this software
  *      This product includes software developed or owned by Caldera   *    without specific prior written permission.
  *      International, Inc.  
  * 4. Neither the name of Caldera International, Inc. nor the names of other  
  *    contributors may be used to endorse or promote products derived from  
  *    this software without specific prior written permission.  
  *   *
  * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.   * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE   * SUCH DAMAGE.
  * POSSIBILITY OF SUCH DAMAGE.   *
    *      @(#)diff.h      8.1 (Berkeley) 6/6/93
  */   */
   
 /*      diff.h  4.7     85/08/16        */  
   
 /*  /*
  * diff - common declarations  
  */  
   
 #include <sys/param.h>  
 #include <sys/stat.h>  
   
 #include <ctype.h>  
 #include <err.h>  
 #include <signal.h>  
 #include <stdio.h>  
   
 /*  
  * Output format options   * Output format options
  */   */
 #define D_NORMAL        0       /* Normal output */  #define D_NORMAL        0       /* Normal output */
Line 60 
Line 43 
 #define D_NREVERSE      5       /* Reverse ed script with numbered  #define D_NREVERSE      5       /* Reverse ed script with numbered
                                    lines and no trailing . */                                     lines and no trailing . */
   
 extern int      aflag, bflag, iflag, rflag, sflag, tflag, wflag;  /*
    * Output flags
    */
   #define D_HEADER        1       /* Print a header/footer between files */
   #define D_EMPTY1        2       /* Treat first file as empty (/dev/null) */
   #define D_EMPTY2        4       /* Treat second file as empty (/dev/null) */
   
   struct excludes {
           char *pattern;
           struct excludes *next;
   };
   
   extern int      aflag, bflag, iflag, Nflag, rflag, sflag, tflag, wflag;
 extern char     *start, *ifdefname;  extern char     *start, *ifdefname;
 extern int      opt, wantelses, context, status, anychange;  extern int      format, context, status, anychange;
 extern char     *tempfiles[], **diffargv;  extern char     *tempfiles[], *diffargs;
 extern char     *file1, *file2, *efile1, *efile2;  
 extern struct   stat stb1, stb2;  extern struct   stat stb1, stb2;
   extern struct   excludes *excludes_list;
   
   char    *copytemp(const char *, int);
   char    *splice(char *, char *);
 void    *emalloc(size_t);  void    *emalloc(size_t);
 void    *erealloc(void *, size_t);  void    *erealloc(void *, size_t);
 char    *splice(char *, char *);  void    diffdir(char *, char *);
 char    *copytemp(const char *, int);  void    diffreg(char *, char *, int);
 void    diffdir(char **);  void    quit(int);
 void    diffreg(void);  
 int     max(int, int);  
 int     min(int, int);  
 __dead void error(const char *, ...);  __dead void error(const char *, ...);
 __dead void errorx(const char *, ...);  __dead void errorx(const char *, ...);
 __dead void done(int);  
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15