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