BSD 4_4 release

[unix-history] / usr / src / usr.sbin / mtree / mtree.h

diff --git a/usr/src/usr.sbin/mtree/mtree.h b/usr/src/usr.sbin/mtree/mtree.h
index 74ed563..5583127 100644 (file)
--- a/usr/src/usr.sbin/mtree/mtree.h
+++ b/usr/src/usr.sbin/mtree/mtree.h
@@ -1,65 +1,88 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  *
  *

- *     @(#)mtree.h     5.7 (Berkeley) 5/25/90
+ * 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.
+ *
+ *     @(#)mtree.h     8.1 (Berkeley) 6/6/93

  */
 
 #include <string.h>
 #include <stdlib.h>
 
  */
 
 #include <string.h>
 #include <stdlib.h>
 

+#define        KEYDEFAULT \
+       (F_GID | F_MODE | F_NLINK | F_SIZE | F_SLINK | F_TIME | F_UID)
+
+#define        MISMATCHEXIT    2
+

 typedef struct _node {
        struct _node    *parent, *child;        /* up, down */
        struct _node    *prev, *next;           /* left, right */
        off_t   st_size;                        /* size */
 typedef struct _node {
        struct _node    *parent, *child;        /* up, down */
        struct _node    *prev, *next;           /* left, right */
        off_t   st_size;                        /* size */

-       time_t  st_mtime;                       /* last modification time */
+       struct timespec st_mtimespec;           /* last modification time */

        u_long  cksum;                          /* check sum */
        char    *slink;                         /* symbolic link reference */
        u_long  cksum;                          /* check sum */
        char    *slink;                         /* symbolic link reference */

-       uid_t   st_uid;                         /* owner */
-       gid_t   st_gid;                         /* group */
+       uid_t   st_uid;                         /* uid */
+       gid_t   st_gid;                         /* gid */

 #define        MBITS   (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
        mode_t  st_mode;                        /* mode */
        nlink_t st_nlink;                       /* link count */
 
 #define        MBITS   (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
        mode_t  st_mode;                        /* mode */
        nlink_t st_nlink;                       /* link count */
 

-#define        F_BLOCK 0x001                           /* block special */
-#define        F_CHAR  0x002                           /* char special */
-#define        F_DIR   0x004                           /* directory */
-#define        F_FIFO  0x008                           /* fifo */
-#define        F_FILE  0x010                           /* regular file */
-#define        F_LINK  0x020                           /* symbolic link */
-#define        F_SOCK  0x040                           /* socket */
-       u_short type;                           /* file type */
-

 #define        F_CKSUM 0x0001                          /* check sum */
 #define        F_DONE  0x0002                          /* directory done */
 #define        F_CKSUM 0x0001                          /* check sum */
 #define        F_DONE  0x0002                          /* directory done */

-#define        F_GROUP 0x0004                          /* group */
-#define        F_IGN   0x0008                          /* ignore */
-#define        F_MAGIC 0x0010                          /* name has magic chars */
-#define        F_MODE  0x0020                          /* mode */
-#define        F_NLINK 0x0040                          /* number of links */
-#define        F_OWNER 0x0080                          /* owner */
+#define        F_GID   0x0004                          /* gid */
+#define        F_GNAME 0x0008                          /* group name */
+#define        F_IGN   0x0010                          /* ignore */
+#define        F_MAGIC 0x0020                          /* name has magic chars */
+#define        F_MODE  0x0040                          /* mode */
+#define        F_NLINK 0x0080                          /* number of links */

 #define        F_SIZE  0x0100                          /* size */
 #define        F_SLINK 0x0200                          /* link count */
 #define        F_TIME  0x0400                          /* modification time */
 #define        F_TYPE  0x0800                          /* file type */
 #define        F_SIZE  0x0100                          /* size */
 #define        F_SLINK 0x0200                          /* link count */
 #define        F_TIME  0x0400                          /* modification time */
 #define        F_TYPE  0x0800                          /* file type */

-#define        F_VISIT 0x1000                          /* file visited */
+#define        F_UID   0x1000                          /* uid */
+#define        F_UNAME 0x2000                          /* user name */
+#define        F_VISIT 0x4000                          /* file visited */

        u_short flags;                          /* items set */
 
        u_short flags;                          /* items set */
 

+#define        F_BLOCK 0x001                           /* block special */
+#define        F_CHAR  0x002                           /* char special */
+#define        F_DIR   0x004                           /* directory */
+#define        F_FIFO  0x008                           /* fifo */
+#define        F_FILE  0x010                           /* regular file */
+#define        F_LINK  0x020                           /* symbolic link */
+#define        F_SOCK  0x040                           /* socket */
+       u_char  type;                           /* file type */
+

        char    name[1];                        /* file name (must be last) */
 } NODE;
 
        char    name[1];                        /* file name (must be last) */
 } NODE;
 

-#define        RP(p)   (p->fts_path + 2)
+#define        RP(p)   \
+       ((p)->fts_path[0] == '.' && (p)->fts_path[1] == '/' ? \
+           (p)->fts_path + 2 : (p)->fts_path)