expand_number() needs uint64_t, declare it here if not already declared.

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

diff --git a/libutil/libutil.h b/libutil/libutil.h
index aa82caae39049c809babc27e95d29a9172bc748b..66104e974f131d684b4ab31012d808b5839486f0 100644 (file)
--- a/libutil/libutil.h
+++ b/libutil/libutil.h
@@ -1,6 +1,13 @@
 /*
  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.
 /*
  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.

+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * Portions of this software were developed for the FreeBSD Project by
+ * ThinkSec AS and NAI Labs, the Security Research Division of Network
+ * Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, is permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, is permitted provided that the following conditions


@@ -10,6 +17,9 @@
  * 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.
  * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.

  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE


@@ -30,6 +40,37 @@
 #define        _LIBUTIL_H_
 
 #include <sys/cdefs.h>
 #define        _LIBUTIL_H_
 
 #include <sys/cdefs.h>

+#include <sys/_types.h>
+
+#ifndef _GID_T_DECLARED
+typedef        __gid_t         gid_t;
+#define        _GID_T_DECLARED
+#endif
+
+#ifndef _INT64_T_DECLARED
+typedef        __int64_t       int64_t;
+#define        _INT64_T_DECLARED
+#endif
+
+#ifndef _UINT64_T_DECLARED
+typedef        __uint64_t      uint64_t;
+#define        _UINT64_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
 
 #define PROPERTY_MAX_NAME      64
 #define PROPERTY_MAX_VALUE     512


@@ -41,41 +82,110 @@ typedef struct _property {
        char *value;
 } *properties;
 
        char *value;
 } *properties;
 

+#ifdef _SYS_PARAM_H_
+/* for pidfile.c */
+struct pidfh {
+       int     pf_fd;
+       char    pf_path[MAXPATHLEN + 1];
+       __dev_t pf_dev;
+       ino_t   pf_ino;
+};
+#endif
+

 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;
 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;

-struct utmp;

 struct in_addr;
 struct in_addr;

+struct kinfo_file;
+struct kinfo_vmentry;

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-int    extattr_namespace_to_string __P((int _attrnamespace, char **_string));
-int    extattr_string_to_namespace __P((const char *_string,
-                                        int *_attrnamespace));
-void   login __P((struct utmp *_ut));
-int    login_tty __P((int _fd));
-int    logout __P((const char *_line));
-void   logwtmp __P((const char *_line, const char *_name, const char *_host));
-void   trimdomain __P((char *_fullhost, int _hostsize));
-int    openpty __P((int *_amaster, int *_aslave, char *_name,
-                    struct termios *_termp, struct winsize *_winp));
-int    forkpty __P((int *_amaster, char *_name,
-                    struct termios *_termp, struct winsize *_winp));
-const char *uu_lockerr __P((int _uu_lockresult));
-int    uu_lock __P((const char *_ttyname));
-int    uu_unlock __P((const char *_ttyname));
-int    uu_lock_txfr __P((const char *_ttyname, pid_t _pid));
-int    _secure_path __P((const char *_path, uid_t _uid, gid_t _gid));
-properties properties_read __P((int fd));
-void   properties_free __P((properties list));
-char   *property_find __P((properties list, const char *name));
-char   *auth_getval __P((const char *name));
-int    realhostname __P((char *host, size_t hsize, const struct in_addr *ip));
+void   clean_environment(const char * const *_white,
+           const char * const *_more_white);
+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);
+int    login_tty(int _fd);
+void   trimdomain(char *_fullhost, int _hostsize);
+int    openpty(int *_amaster, int *_aslave, char *_name,
+                    struct termios *_termp, struct winsize *_winp);
+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, uint64_t *_num);
+const char *uu_lockerr(int _uu_lockresult);
+int    uu_lock(const char *_ttyname);
+int    uu_unlock(const char *_ttyname);
+int    uu_lock_txfr(const char *_ttyname, pid_t _pid);
+int    _secure_path(const char *_path, uid_t _uid, gid_t _gid);
+properties properties_read(int fd);
+void   properties_free(properties list);
+char   *property_find(properties list, const char *name);
+char   *auth_getval(const char *name);
+int    realhostname(char *host, size_t hsize, const struct in_addr *ip);

 struct sockaddr;
 struct sockaddr;

-int    realhostname_sa __P((char *host, size_t hsize, struct sockaddr *addr,
-                            int addrlen));
+int    realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
+                            int addrlen);
+
+int    kld_isloaded(const char *name);
+int    kld_load(const char *name);
+struct kinfo_file *
+       kinfo_getfile(pid_t _pid, int *_cntp);
+struct kinfo_vmentry *
+       kinfo_getvmmap(pid_t _pid, int *_cntp);
+

 #ifdef _STDIO_H_       /* avoid adding new includes */
 #ifdef _STDIO_H_       /* avoid adding new includes */

-char   *fparseln __P((FILE *, size_t *, size_t *, const char[3], int));
+char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
+#endif
+
+#ifdef _PWD_H_
+int    pw_copy(int _ffd, int _tfd, const struct passwd *_pw, struct passwd *_old_pw);
+struct passwd *pw_dup(const struct passwd *_pw);
+int    pw_edit(int _notsetuid);
+int    pw_equal(const struct passwd *_pw1, const struct passwd *_pw2);
+void   pw_fini(void);
+int    pw_init(const char *_dir, const char *_master);
+char   *pw_make(const struct passwd *_pw);
+int    pw_mkdb(const char *_user);
+int    pw_lock(void);
+struct passwd *pw_scan(const char *_line, int _flags);
+const char *pw_tempname(void);
+int    pw_tmp(int _mfd);
+#endif
+
+#ifdef _GRP_H_
+int    gr_equal(const struct group *gr1, const struct group *gr2);
+char   *gr_make(const struct group *gr);
+struct group *gr_dup(const struct group *gr);
+struct group *gr_scan(const char *line);
+#endif
+
+#ifdef _SYS_PARAM_H_
+struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
+int pidfile_write(struct pidfh *pfh);
+int pidfile_close(struct pidfh *pfh);
+int pidfile_remove(struct pidfh *pfh);

 #endif
 #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)
 __END_DECLS
 
 #define UU_LOCK_INUSE (1)


@@ -101,4 +211,24 @@ __END_DECLS
 #define        FPARSELN_UNESCREST      0x08
 #define        FPARSELN_UNESCALL       0x0f
 
 #define        FPARSELN_UNESCREST      0x08
 #define        FPARSELN_UNESCALL       0x0f
 

+/* pw_scan() */
+#define PWSCAN_MASTER          0x01
+#define PWSCAN_WARN            0x02
+
+/* humanize_number(3) */
+#define HN_DECIMAL             0x01
+#define HN_NOSPACE             0x02
+#define HN_B                   0x04
+#define HN_DIVISOR_1000                0x08
+
+#define HN_GETSCALE            0x10
+#define HN_AUTOSCALE           0x20
+
+/* hexdump(3) */
+#define        HD_COLUMN_MASK          0xff
+#define        HD_DELIM_MASK           0xff00
+#define        HD_OMIT_COUNT           (1 << 16)
+#define        HD_OMIT_HEX             (1 << 17)
+#define        HD_OMIT_CHARS           (1 << 18)
+

 #endif /* !_LIBUTIL_H_ */
 #endif /* !_LIBUTIL_H_ */