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

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

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


@@ -19,7 +19,7 @@ typedef struct _node {
        struct _node    *parent, *child;        /* up, down */
        struct _node    *prev, *next;           /* left, right */
        off_t   st_size;                        /* size */
        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 */
        uid_t   st_uid;                         /* uid */
        u_long  cksum;                          /* check sum */
        char    *slink;                         /* symbolic link reference */
        uid_t   st_uid;                         /* uid */


@@ -57,4 +57,6 @@ typedef struct _node {
        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)