use newstr for e_message consistently

[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 528e382..035f3c9 100644 (file)
--- a/usr/src/usr.sbin/mtree/mtree.h
+++ b/usr/src/usr.sbin/mtree/mtree.h
@@ -4,52 +4,59 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)mtree.h     5.4 (Berkeley) %G%
+ *     @(#)mtree.h     5.10 (Berkeley) %G%

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

-typedef struct _info {
-#define        F_BLOCK 0x001                           /* block special */
-#define        F_CHAR  0x002                           /* char special */
-#define        F_DIR   0x004                           /* directory */
-#define        F_FILE  0x008                           /* regular file */
-#define        F_LINK  0x010                           /* symbolic link */
-#define        F_SOCK  0x020                           /* socket */
-#define        F_NONE  0x040                           /* unknown */
-       u_short type;                           /* file type */
-
-#define        F_CKSUM 0x001                           /* check sum */
-#define        F_GROUP 0x002                           /* group */
-#define        F_IGN   0x004                           /* ignore */
-#define        F_MODE  0x008                           /* mode */
-#define        F_NLINK 0x010                           /* number of links */
-#define        F_OWNER 0x020                           /* owner */
-#define        F_SIZE  0x040                           /* size */
-#define        F_SLINK 0x080                           /* link count */
-#define        F_TYPE  0x100                           /* file type */
-       u_short flags;                          /* items set */
+#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 */
        off_t   st_size;                        /* size */

+       struct timespec st_mtimespec;           /* last modification time */

        u_long  cksum;                          /* check sum */
        u_long  cksum;                          /* check sum */

-       uid_t   st_uid;                         /* owner */
-       gid_t   st_gid;                         /* group */
+       char    *slink;                         /* symbolic link reference */
+       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 */

-       char    *slink;                         /* symbolic link reference */
-} INFO;
-
-typedef struct _entry {
-       struct _entry   *child, *parent;        /* up, down */
-       struct _entry   *next, *prev;           /* left, right */
-       INFO    info;                           /* node info structure */
-#define        F_DONE  0x01                            /* directory done */
-#define        F_MAGIC 0x02                            /* name has magic chars */
-#define        F_VISIT 0x04                            /* visited this node */
-       u_char  flags;                          /* flags */
+
+#define        F_CKSUM 0x0001                          /* check sum */
+#define        F_DONE  0x0002                          /* directory done */
+#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_UID   0x1000                          /* uid */
+#define        F_UNAME 0x2000                          /* user name */
+#define        F_VISIT 0x4000                          /* file visited */
+       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) */
        char    name[1];                        /* file name (must be last) */

-} ENTRY;
+} 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)