Don't duplicate define the stdint types.

[pw-darwin.git] / libutil / libutil.h

diff --git a/libutil/libutil.h b/libutil/libutil.h
index 3187fb37349c94a5b9d4c54e2eccfcbf04692294..f39e4f591dfe3a61bebc1180e19691b5ac10a2b7 100644 (file)
--- a/libutil/libutil.h
+++ b/libutil/libutil.h
@@ -39,6 +39,30 @@
 #ifndef _LIBUTIL_H_
 #define        _LIBUTIL_H_
 
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+#include <sys/_stdint.h>
+
+#ifndef _GID_T_DECLARED
+typedef        __gid_t         gid_t;
+#define        _GID_T_DECLARED
+#endif
+
+#ifndef _PID_T_DECLARED
+typedef        __pid_t         pid_t;
+#define        _PID_T_DECLARED
+#endif
+
+#ifndef _SIZE_T_DECLARED
+typedef        __size_t        size_t;
+#define        _SIZE_T_DECLARED
+#endif
+
+#ifndef _UID_T_DECLARED
+typedef        __uid_t         uid_t;
+#define        _UID_T_DECLARED
+#endif
+
 #define PROPERTY_MAX_NAME      64
 #define PROPERTY_MAX_VALUE     512
 
@@ -62,7 +86,6 @@ struct pidfh {
 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;
-struct utmp;
 struct in_addr;
 struct kinfo_file;
 struct kinfo_vmentry;
@@ -74,10 +97,7 @@ int  extattr_namespace_to_string(int _attrnamespace, char **_string);
 int    extattr_string_to_namespace(const char *_string, int *_attrnamespace);
 int    flopen(const char *_path, int _flags, ...);
 void   hexdump(const void *ptr, int length, const char *hdr, int flags);
-void   login(struct utmp *_ut);
 int    login_tty(int _fd);
-int    logout(const char *_line);
-void   logwtmp(const char *_line, const char *_name, const char *_host);
 void   trimdomain(char *_fullhost, int _hostsize);
 int    openpty(int *_amaster, int *_aslave, char *_name,
                     struct termios *_termp, struct winsize *_winp);
@@ -85,7 +105,7 @@ int  forkpty(int *_amaster, char *_name,
                     struct termios *_termp, struct winsize *_winp);
 int    humanize_number(char *_buf, size_t _len, int64_t _number,
            const char *_suffix, int _scale, int _flags);
-int    expand_number(const char *_buf, int64_t *_num);
+int    expand_number(const char *_buf, uint64_t *_num);
 const char *uu_lockerr(int _uu_lockresult);
 int    uu_lock(const char *_ttyname);
 int    uu_unlock(const char *_ttyname);
@@ -140,6 +160,23 @@ int pidfile_close(struct pidfh *pfh);
 int pidfile_remove(struct pidfh *pfh);
 #endif
 
+#ifdef _UFS_UFS_QUOTA_H_
+struct quotafile;
+struct fstab;
+struct quotafile *quota_open(struct fstab *, int, int);
+void quota_close(struct quotafile *);
+int quota_on(struct quotafile *);
+int quota_off(struct quotafile *);
+const char *quota_fsname(const struct quotafile *);
+const char *quota_qfname(const struct quotafile *);
+int quota_maxid(struct quotafile *);
+int quota_check_path(const struct quotafile *, const char *path);
+int quota_read(struct quotafile *, struct dqblk *, int);
+int quota_write_limits(struct quotafile *, struct dqblk *, int);
+int quota_write_usage(struct quotafile *, struct dqblk *, int);
+int quota_convert(struct quotafile *, int);
+#endif
+
 __END_DECLS
 
 #define UU_LOCK_INUSE (1)
@@ -174,7 +211,9 @@ __END_DECLS
 #define HN_NOSPACE             0x02
 #define HN_B                   0x04
 #define HN_DIVISOR_1000                0x08
+#define HN_IEC_PREFIXES                0x10
 
+/* maxscale = 0x07 */
 #define HN_GETSCALE            0x10
 #define HN_AUTOSCALE           0x20