A bit more work to achieve C++ compatibility.

[unix-history] / usr / src / include / fts.h

diff --git a/usr/src/include/fts.h b/usr/src/include/fts.h
index d564e5b..248bb97 100644 (file)
--- a/usr/src/include/fts.h
+++ b/usr/src/include/fts.h
@@ -4,17 +4,17 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fts.h       5.8 (Berkeley) %G%
+ *     @(#)fts.h       5.11 (Berkeley) %G%

  */
 
  */
 

-typedef struct fts {
-       struct ftsent *fts_cur;         /* current node */
-       struct ftsent *fts_child;       /* linked list of children */
-       struct ftsent *fts_savelink;    /* saved link if node had a cycle */
-       struct ftsent **fts_array;      /* sort array */
+typedef struct {
+       struct _ftsent *fts_cur;        /* current node */
+       struct _ftsent *fts_child;      /* linked list of children */
+       struct _ftsent *fts_savelink;   /* saved link if node had a cycle */
+       struct _ftsent **fts_array;     /* sort array */

        dev_t sdev;                     /* starting device # */
        char *fts_path;                 /* path for this descent */
        dev_t sdev;                     /* starting device # */
        char *fts_path;                 /* path for this descent */

-       int fts_sd;                     /* starting directory */
+       int fts_sd;                     /* fd for root */

        int fts_pathlen;                /* sizeof(path) */
        int fts_nitems;                 /* elements in the sort array */
        int (*fts_compar)();            /* compare function */
        int fts_pathlen;                /* sizeof(path) */
        int fts_nitems;                 /* elements in the sort array */
        int (*fts_compar)();            /* compare function */


@@ -28,17 +28,19 @@ typedef struct fts {
        int fts_options;                /* openfts() options */
 } FTS;
 
        int fts_options;                /* openfts() options */
 } FTS;
 

-typedef struct ftsent {
-       struct ftsent *fts_parent;      /* parent directory */
-       struct ftsent *fts_link;        /* next/cycle node */
+typedef struct _ftsent {
+       struct _ftsent *fts_parent;     /* parent directory */
+       struct _ftsent *fts_link;       /* cycle or next file structure */

        union {
                long number;            /* local numeric value */
                void *pointer;          /* local address value */
        } fts_local;
        union {
                long number;            /* local numeric value */
                void *pointer;          /* local address value */
        } fts_local;

-       char *fts_accpath;              /* path from current directory */
-       char *fts_path;                 /* path from starting directory */
-       short fts_pathlen;              /* strlen(path) */
-       short fts_namelen;              /* strlen(name) */
+#define        fts_number      fts_local.number
+#define        fts_pointer     fts_local.pointer
+       char *fts_accpath;              /* access path */
+       char *fts_path;                 /* root path */
+       short fts_pathlen;              /* strlen(fts_path) */
+       short fts_namelen;              /* strlen(fts_name) */

        short fts_level;                /* depth (-1 to N) */
 #define        FTS_D            1              /* preorder directory */
 #define        FTS_DC           2              /* directory that causes cycles */
        short fts_level;                /* depth (-1 to N) */
 #define        FTS_D            1              /* preorder directory */
 #define        FTS_DC           2              /* directory that causes cycles */


@@ -51,23 +53,23 @@ typedef struct ftsent {
 #define        FTS_SL           9              /* symbolic link */
 #define        FTS_SLNONE      10              /* symbolic link without target */
 #define        FTS_DEFAULT     11              /* none of the above */
 #define        FTS_SL           9              /* symbolic link */
 #define        FTS_SLNONE      10              /* symbolic link without target */
 #define        FTS_DEFAULT     11              /* none of the above */

-       u_short fts_info;               /* file information */
+       u_short fts_info;               /* flags for FTSENT structure */
+#define        FTS__NOINSTR     0              /* private: no instructions */

 #define        FTS_AGAIN        1              /* user: read node again */
 #define        FTS_SKIP         2              /* user: discard node */
 #define        FTS_FOLLOW       3              /* user: follow symbolic link */
 #define        FTS_AGAIN        1              /* user: read node again */
 #define        FTS_SKIP         2              /* user: discard node */
 #define        FTS_FOLLOW       3              /* user: follow symbolic link */

-       short fts_instr;                /* setfts() instructions */
+       short fts_instr;                /* private: fts_set() instructions */

        struct stat fts_statb;          /* stat(2) information */
        char fts_name[1];               /* file name */
 } FTSENT;
 
        struct stat fts_statb;          /* stat(2) information */
        char fts_name[1];               /* file name */
 } FTSENT;
 

-#if __STDC__ || c_plusplus
-extern FTS *ftsopen(const char **, int, int (*)(const FTSENT *, const FTSENT *));
-extern FTSENT *ftsread(FTS *);
-extern FTSENT *ftschildren(FTS *);
-extern int ftsset(FTS *, FTSENT *, int);
-extern int ftsclose(FTS *);
-#else
-extern FTS *ftsopen();
-extern FTSENT *ftschildren(), *ftsread();
-extern int ftsclose(), ftsset();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+FTSENT *fts_children __P((FTS *));
+int     fts_close __P((FTS *));
+FTS    *fts_open
+           __P((char * const *, int, int (*)(const FTSENT *, const FTSENT *)));
+FTSENT *fts_read __P((FTS *));
+int     fts_set __P((FTS *, FTSENT *, int));
+__END_DECLS