BSD 4_4_Lite1 release

[unix-history] / usr / src / bin / pax / pax.h

diff --git a/usr/src/bin/pax/pax.h b/usr/src/bin/pax/pax.h
index 2c542e6..5658d76 100644 (file)
--- a/usr/src/bin/pax/pax.h
+++ b/usr/src/bin/pax/pax.h
@@ -6,9 +6,35 @@
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
  *
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
  *

- * %sccs.include.redist.c%
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.

  *
  *

- *     @(#)pax.h       8.1 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)pax.h       8.2 (Berkeley) 4/18/94

  */
 
 /*
  */
 
 /*


@@ -136,10 +162,11 @@ typedef struct {
  */
 typedef struct pattern {
        char            *pstr;          /* pattern to match, user supplied */
  */
 typedef struct pattern {
        char            *pstr;          /* pattern to match, user supplied */

+       char            *pend;          /* end of a prefix match */

        int             plen;           /* length of pstr */
        int             flgs;           /* processing/state flags */
        int             plen;           /* length of pstr */
        int             flgs;           /* processing/state flags */

-#define MTCH           0x1             /* this pattern has been matched */
-#define DIR_MTCH       0x2             /* this pattern matched a directory */
+#define MTCH           0x1             /* pattern has been matched */
+#define DIR_MTCH       0x2             /* pattern matched a directory */

        struct pattern  *fow;           /* next pattern */
 } PATTERN;
 
        struct pattern  *fow;           /* next pattern */
 } PATTERN;