From d8c29cf81746b7a5551462b1318f8ff9bb76eacf Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 15 Dec 2011 22:07:36 +0000 Subject: Modify pw_copy: - if pw is NULL and oldpw is not NULL then the oldpw is deleted - if pw->pw_name != oldpw->pw_name but pw->pw_uid == oldpw->pw_uid then it renames the user add new gr_* functions so now gr_util API is similar to pw_util API, this allow to manipulate groups in a safe way. Reviewed by: des Approved by: des MFC after: 1 month --- libutil/libutil.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index fc6d3bb..dea14cf 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -152,9 +152,15 @@ int pw_tmp(int _mfd); #endif #ifdef _GRP_H_ +int gr_copy(int __ffd, int _tfd, const struct group *_gr, struct group *_old_gr); +struct group *gr_dup(const struct group *gr); int gr_equal(const struct group *gr1, const struct group *gr2); +void gr_fini(void); +int gr_init(const char *_dir, const char *_master); +int gr_lock(void); char *gr_make(const struct group *gr); -struct group *gr_dup(const struct group *gr); +int gr_mkdb(void); +int gr_tmp(int _mdf); struct group *gr_scan(const char *line); #endif -- cgit v1.2.3 From 5c5e67d83f6be45507a76cb75af552ccc3576daf Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 5 Jan 2012 10:40:24 +0000 Subject: Add new pw_make_v7 to make a passwd line (in v7 format) out of a struct passwd while here, fix missing parentheses of the return statement of pw_make. Approved by: des (mentor) --- libutil/libutil.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index dea14cf..47896c1 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -144,6 +144,7 @@ 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); +char *pw_make_v7(const struct passwd *_pw); int pw_mkdb(const char *_user); int pw_lock(void); struct passwd *pw_scan(const char *_line, int _flags); -- cgit v1.2.3 From 3d079fe22ea0f5378c08449929b95ad748d810af Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Tue, 10 Jan 2012 19:53:25 +0000 Subject: Add pidfile_fileno() to obtain the file descriptor for an open pidfile. --- libutil/libutil.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index 47896c1..25ac1db 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -170,6 +170,7 @@ 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); +int pidfile_fileno(struct pidfh *pfh); #endif #ifdef _UFS_UFS_QUOTA_H_ -- cgit v1.2.3 From 7ed1fa50263e1fdebc82bdc7b8b0d901f6add5f7 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Wed, 11 Jan 2012 00:31:04 +0000 Subject: Constify arguments. --- libutil/libutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index 25ac1db..7241503 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -170,7 +170,7 @@ 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); -int pidfile_fileno(struct pidfh *pfh); +int pidfile_fileno(const struct pidfh *pfh); #endif #ifdef _UFS_UFS_QUOTA_H_ -- cgit v1.2.3 From 955b3358365608a14596185abf3fd2ec9f61682d Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Wed, 11 Jan 2012 22:12:45 +0000 Subject: Fix forward structure declaration and prototype disorder. Requested by bde. --- libutil/libutil.h | 67 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index 7241503..ed5b814 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -84,45 +84,27 @@ struct pidfh { #endif /* Avoid pulling in all the include files for no need */ -struct termios; -struct winsize; struct in_addr; struct kinfo_file; struct kinfo_proc; struct kinfo_vmentry; +struct sockaddr; +struct termios; +struct winsize; __BEGIN_DECLS +char *auth_getval(const char *name); void clean_environment(const char * const *_white, const char * const *_more_white); +int expand_number(const char *_buf, uint64_t *_num); 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); +void hexdump(const void *ptr, int length, const char *hdr, int flags); 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; -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 * @@ -131,6 +113,23 @@ struct kinfo_proc * kinfo_getallproc(int *_cntp); struct kinfo_proc * kinfo_getproc(pid_t _pid); +int kld_isloaded(const char *name); +int kld_load(const char *name); +int login_tty(int _fd); +int openpty(int *_amaster, int *_aslave, char *_name, + struct termios *_termp, struct winsize *_winp); +void properties_free(properties list); +char *property_find(properties list, const char *name); +properties properties_read(int fd); +int realhostname(char *host, size_t hsize, const struct in_addr *ip); +int realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, + int addrlen); +int _secure_path(const char *_path, uid_t _uid, gid_t _gid); +void trimdomain(char *_fullhost, int _hostsize); +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); #ifdef _STDIO_H_ /* avoid adding new includes */ char *fparseln(FILE *, size_t *, size_t *, const char[3], int); @@ -166,28 +165,28 @@ 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); int pidfile_fileno(const struct pidfh *pfh); +struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr); +int pidfile_remove(struct pidfh *pfh); +int pidfile_write(struct pidfh *pfh); #endif #ifdef _UFS_UFS_QUOTA_H_ -struct quotafile; struct fstab; -struct quotafile *quota_open(struct fstab *, int, int); +struct quotafile; +int quota_check_path(const struct quotafile *, const char *path); void quota_close(struct quotafile *); -int quota_on(struct quotafile *); -int quota_off(struct quotafile *); +int quota_convert(struct quotafile *, int); 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_off(struct quotafile *); +int quota_on(struct quotafile *); +struct quotafile *quota_open(struct fstab *, int, int); +const char *quota_qfname(const struct quotafile *); 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 -- cgit v1.2.3 From bcd8acd4094ad0d5f12c95355ed6ddd5604ff76c Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Wed, 11 Jan 2012 22:33:41 +0000 Subject: Fix namespace issues with prototype parameter names. Add missing prototype parameter names. Requested by bde. --- libutil/libutil.h | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index ed5b814..accc99e 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -93,7 +93,7 @@ struct termios; struct winsize; __BEGIN_DECLS -char *auth_getval(const char *name); +char *auth_getval(const char *_name); void clean_environment(const char * const *_white, const char * const *_more_white); int expand_number(const char *_buf, uint64_t *_num); @@ -102,7 +102,7 @@ int extattr_string_to_namespace(const char *_string, int *_attrnamespace); int flopen(const char *_path, int _flags, ...); int forkpty(int *_amaster, char *_name, struct termios *_termp, struct winsize *_winp); -void hexdump(const void *ptr, int length, const char *hdr, int flags); +void hexdump(const void *_ptr, int _length, const char *_hdr, int _flags); int humanize_number(char *_buf, size_t _len, int64_t _number, const char *_suffix, int _scale, int _flags); struct kinfo_file * @@ -113,17 +113,17 @@ struct kinfo_proc * kinfo_getallproc(int *_cntp); struct kinfo_proc * kinfo_getproc(pid_t _pid); -int kld_isloaded(const char *name); -int kld_load(const char *name); +int kld_isloaded(const char *_name); +int kld_load(const char *_name); int login_tty(int _fd); int openpty(int *_amaster, int *_aslave, char *_name, struct termios *_termp, struct winsize *_winp); -void properties_free(properties list); -char *property_find(properties list, const char *name); -properties properties_read(int fd); -int realhostname(char *host, size_t hsize, const struct in_addr *ip); -int realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, - int addrlen); +void properties_free(properties _list); +char *property_find(properties _list, const char *_name); +properties properties_read(int _fd); +int realhostname(char *_host, size_t _hsize, const struct in_addr *_ip); +int realhostname_sa(char *_host, size_t _hsize, struct sockaddr *_addr, + int _addrlen); int _secure_path(const char *_path, uid_t _uid, gid_t _gid); void trimdomain(char *_fullhost, int _hostsize); const char *uu_lockerr(int _uu_lockresult); @@ -132,7 +132,7 @@ int uu_unlock(const char *_ttyname); int uu_lock_txfr(const char *_ttyname, pid_t _pid); #ifdef _STDIO_H_ /* avoid adding new includes */ -char *fparseln(FILE *, size_t *, size_t *, const char[3], int); +char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, const char _delim[3], int _flags); #endif #ifdef _PWD_H_ @@ -153,40 +153,40 @@ int pw_tmp(int _mfd); #ifdef _GRP_H_ int gr_copy(int __ffd, int _tfd, const struct group *_gr, struct group *_old_gr); -struct group *gr_dup(const struct group *gr); -int gr_equal(const struct group *gr1, const struct group *gr2); +struct group *gr_dup(const struct group *_gr); +int gr_equal(const struct group *_gr1, const struct group *_gr2); void gr_fini(void); int gr_init(const char *_dir, const char *_master); int gr_lock(void); -char *gr_make(const struct group *gr); +char *gr_make(const struct group *_gr); int gr_mkdb(void); +struct group *gr_scan(const char *_line); int gr_tmp(int _mdf); -struct group *gr_scan(const char *line); #endif #ifdef _SYS_PARAM_H_ -int pidfile_close(struct pidfh *pfh); -int pidfile_fileno(const struct pidfh *pfh); -struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr); -int pidfile_remove(struct pidfh *pfh); -int pidfile_write(struct pidfh *pfh); +int pidfile_close(struct pidfh *_pfh); +int pidfile_fileno(const struct pidfh *_pfh); +struct pidfh *pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); +int pidfile_remove(struct pidfh *_pfh); +int pidfile_write(struct pidfh *_pfh); #endif #ifdef _UFS_UFS_QUOTA_H_ struct fstab; struct quotafile; -int quota_check_path(const struct quotafile *, const char *path); -void quota_close(struct quotafile *); -int quota_convert(struct quotafile *, int); -const char *quota_fsname(const struct quotafile *); -int quota_maxid(struct quotafile *); -int quota_off(struct quotafile *); -int quota_on(struct quotafile *); -struct quotafile *quota_open(struct fstab *, int, int); -const char *quota_qfname(const struct quotafile *); -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_check_path(const struct quotafile *_qf, const char *_path); +void quota_close(struct quotafile *_qf); +int quota_convert(struct quotafile *_qf, int _wordsize); +const char *quota_fsname(const struct quotafile *_qf); +int quota_maxid(struct quotafile *_qf); +int quota_off(struct quotafile *_qf); +int quota_on(struct quotafile *_qf); +struct quotafile *quota_open(struct fstab *_fs, int _quotatype, int _openflags); +const char *quota_qfname(const struct quotafile *_qf); +int quota_read(struct quotafile *_qf, struct dqblk *_dqb, int _id); +int quota_write_limits(struct quotafile *_qf, struct dqblk *_dqb, int _id); +int quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id); #endif __END_DECLS -- cgit v1.2.3 From 77bf89c82612a70ca99594d1f52ff803e690ddb0 Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Wed, 11 Jan 2012 22:45:15 +0000 Subject: Fix prototype formatting (indentation, long lines, and continued lines). Requested by bde. --- libutil/libutil.h | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index accc99e..5e6721d 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -101,7 +101,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, ...); int forkpty(int *_amaster, char *_name, - struct termios *_termp, struct winsize *_winp); + struct termios *_termp, struct winsize *_winp); void hexdump(const void *_ptr, int _length, const char *_hdr, int _flags); int humanize_number(char *_buf, size_t _len, int64_t _number, const char *_suffix, int _scale, int _flags); @@ -117,22 +117,25 @@ int kld_isloaded(const char *_name); int kld_load(const char *_name); int login_tty(int _fd); int openpty(int *_amaster, int *_aslave, char *_name, - struct termios *_termp, struct winsize *_winp); + struct termios *_termp, struct winsize *_winp); void properties_free(properties _list); char *property_find(properties _list, const char *_name); -properties properties_read(int _fd); +properties + properties_read(int fd); int realhostname(char *_host, size_t _hsize, const struct in_addr *_ip); int realhostname_sa(char *_host, size_t _hsize, struct sockaddr *_addr, - int _addrlen); + int _addrlen); int _secure_path(const char *_path, uid_t _uid, gid_t _gid); void trimdomain(char *_fullhost, int _hostsize); -const char *uu_lockerr(int _uu_lockresult); +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); #ifdef _STDIO_H_ /* avoid adding new includes */ -char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, const char _delim[3], int _flags); +char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, + const char _delim[3], int _flags); #endif #ifdef _PWD_H_ @@ -165,28 +168,32 @@ int gr_tmp(int _mdf); #endif #ifdef _SYS_PARAM_H_ -int pidfile_close(struct pidfh *_pfh); -int pidfile_fileno(const struct pidfh *_pfh); -struct pidfh *pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); -int pidfile_remove(struct pidfh *_pfh); -int pidfile_write(struct pidfh *_pfh); +int pidfile_close(struct pidfh *_pfh); +int pidfile_fileno(const struct pidfh *_pfh); +struct pidfh * + pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); +int pidfile_remove(struct pidfh *_pfh); +int pidfile_write(struct pidfh *_pfh); #endif #ifdef _UFS_UFS_QUOTA_H_ struct fstab; struct quotafile; -int quota_check_path(const struct quotafile *_qf, const char *_path); -void quota_close(struct quotafile *_qf); -int quota_convert(struct quotafile *_qf, int _wordsize); -const char *quota_fsname(const struct quotafile *_qf); -int quota_maxid(struct quotafile *_qf); -int quota_off(struct quotafile *_qf); -int quota_on(struct quotafile *_qf); -struct quotafile *quota_open(struct fstab *_fs, int _quotatype, int _openflags); -const char *quota_qfname(const struct quotafile *_qf); -int quota_read(struct quotafile *_qf, struct dqblk *_dqb, int _id); -int quota_write_limits(struct quotafile *_qf, struct dqblk *_dqb, int _id); -int quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id); +int quota_check_path(const struct quotafile *_qf, const char *_path); +void quota_close(struct quotafile *_qf); +int quota_convert(struct quotafile *_qf, int _wordsize); +const char * + quota_fsname(const struct quotafile *_qf); +int quota_maxid(struct quotafile *_qf); +int quota_off(struct quotafile *_qf); +int quota_on(struct quotafile *_qf); +struct quotafile * + quota_open(struct fstab *_fs, int _quotatype, int _openflags); +const char * + quota_qfname(const struct quotafile *_qf); +int quota_read(struct quotafile *_qf, struct dqblk *_dqb, int _id); +int quota_write_limits(struct quotafile *_qf, struct dqblk *_dqb, int _id); +int quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id); #endif __END_DECLS -- cgit v1.2.3 From 7edffb98b4ef7dad5becb42359a4edf0852ec003 Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Thu, 12 Jan 2012 14:40:25 +0000 Subject: More prototype formatting fixes, struct member formatting fixes, and namespace fix for property_find() prototype. Provided by bde. --- libutil/libutil.h | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index 5e6721d..af29d33 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -69,8 +69,8 @@ typedef __uid_t uid_t; /* for properties.c */ typedef struct _property { struct _property *next; - char *name; - char *value; + char *name; + char *value; } *properties; #ifdef _SYS_PARAM_H_ @@ -121,7 +121,7 @@ int openpty(int *_amaster, int *_aslave, char *_name, void properties_free(properties _list); char *property_find(properties _list, const char *_name); properties - properties_read(int fd); + properties_read(int _fd); int realhostname(char *_host, size_t _hsize, const struct in_addr *_ip); int realhostname_sa(char *_host, size_t _hsize, struct sockaddr *_addr, int _addrlen); @@ -139,8 +139,10 @@ char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, #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_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); @@ -149,21 +151,26 @@ char *pw_make(const struct passwd *_pw); char *pw_make_v7(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); +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_copy(int __ffd, int _tfd, const struct group *_gr, struct group *_old_gr); -struct group *gr_dup(const struct group *_gr); +int gr_copy(int __ffd, int _tfd, const struct group *_gr, + struct group *_old_gr); +struct group + *gr_dup(const struct group *_gr); int gr_equal(const struct group *_gr1, const struct group *_gr2); void gr_fini(void); int gr_init(const char *_dir, const char *_master); int gr_lock(void); char *gr_make(const struct group *_gr); int gr_mkdb(void); -struct group *gr_scan(const char *_line); +struct group + *gr_scan(const char *_line); int gr_tmp(int _mdf); #endif -- cgit v1.2.3 From e8349f3902ec7a6badb6a9e6e27c73e6ababa203 Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Thu, 12 Jan 2012 22:49:36 +0000 Subject: Move struct pidfh definition into pidfile.c, and leave a forward declaration for pidfh in libutil.h in its place. This allows us to hide the contents of the pidfh structure, and also allowed removal of the "#ifdef _SYS_PARAM_H" guard from around the pidfile_* function prototypes. Suggested by pjd. --- libutil/libutil.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index af29d33..8cd21e5 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -48,6 +48,11 @@ typedef __gid_t gid_t; #define _GID_T_DECLARED #endif +#ifndef _MODE_T_DECLARED +typedef __mode_t mode_t; +#define _MODE_T_DECLARED +#endif + #ifndef _PID_T_DECLARED typedef __pid_t pid_t; #define _PID_T_DECLARED @@ -73,21 +78,12 @@ typedef struct _property { 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 in_addr; struct kinfo_file; struct kinfo_proc; struct kinfo_vmentry; +struct pidfh; struct sockaddr; struct termios; struct winsize; @@ -174,14 +170,12 @@ struct group int gr_tmp(int _mdf); #endif -#ifdef _SYS_PARAM_H_ int pidfile_close(struct pidfh *_pfh); int pidfile_fileno(const struct pidfh *_pfh); struct pidfh * pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); int pidfile_remove(struct pidfh *_pfh); int pidfile_write(struct pidfh *_pfh); -#endif #ifdef _UFS_UFS_QUOTA_H_ struct fstab; -- cgit v1.2.3 From 49d0a00f838f7ec6e5ea918878a87a152dc52d71 Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Mon, 16 Jan 2012 21:19:23 +0000 Subject: Fix more disorder in prototypes and constants. Fix header comments for each section of constants. Fix whitespace in #define lines. Fix unnecessary parenthesis in constants. --- libutil/libutil.h | 89 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 46 deletions(-) (limited to 'libutil/libutil.h') diff --git a/libutil/libutil.h b/libutil/libutil.h index 8cd21e5..b6bdbe0 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -49,8 +49,8 @@ typedef __gid_t gid_t; #endif #ifndef _MODE_T_DECLARED -typedef __mode_t mode_t; -#define _MODE_T_DECLARED +typedef __mode_t mode_t; +#define _MODE_T_DECLARED #endif #ifndef _PID_T_DECLARED @@ -68,8 +68,8 @@ 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 /* for properties.c */ typedef struct _property { @@ -80,9 +80,6 @@ typedef struct _property { /* Avoid pulling in all the include files for no need */ struct in_addr; -struct kinfo_file; -struct kinfo_proc; -struct kinfo_vmentry; struct pidfh; struct sockaddr; struct termios; @@ -114,6 +111,12 @@ int kld_load(const char *_name); int login_tty(int _fd); int openpty(int *_amaster, int *_aslave, char *_name, struct termios *_termp, struct winsize *_winp); +int pidfile_close(struct pidfh *_pfh); +int pidfile_fileno(const struct pidfh *_pfh); +struct pidfh * + pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); +int pidfile_remove(struct pidfh *_pfh); +int pidfile_write(struct pidfh *_pfh); void properties_free(properties _list); char *property_find(properties _list, const char *_name); properties @@ -170,13 +173,6 @@ struct group int gr_tmp(int _mdf); #endif -int pidfile_close(struct pidfh *_pfh); -int pidfile_fileno(const struct pidfh *_pfh); -struct pidfh * - pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr); -int pidfile_remove(struct pidfh *_pfh); -int pidfile_write(struct pidfh *_pfh); - #ifdef _UFS_UFS_QUOTA_H_ struct fstab; struct quotafile; @@ -199,22 +195,6 @@ int quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id); __END_DECLS -#define UU_LOCK_INUSE (1) -#define UU_LOCK_OK (0) -#define UU_LOCK_OPEN_ERR (-1) -#define UU_LOCK_READ_ERR (-2) -#define UU_LOCK_CREAT_ERR (-3) -#define UU_LOCK_WRITE_ERR (-4) -#define UU_LOCK_LINK_ERR (-5) -#define UU_LOCK_TRY_ERR (-6) -#define UU_LOCK_OWNER_ERR (-7) - -/* return values from realhostname() */ -#define HOSTNAME_FOUND (0) -#define HOSTNAME_INCORRECTNAME (1) -#define HOSTNAME_INVALIDADDR (2) -#define HOSTNAME_INVALIDNAME (3) - /* fparseln(3) */ #define FPARSELN_UNESCESC 0x01 #define FPARSELN_UNESCCONT 0x02 @@ -222,26 +202,43 @@ __END_DECLS #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_IEC_PREFIXES 0x10 - -/* maxscale = 0x07 */ -#define HN_GETSCALE 0x10 -#define HN_AUTOSCALE 0x20 - -/* hexdump(3) */ +/* Flags for 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) +/* Flags for humanize_number(3) flags. */ +#define HN_DECIMAL 0x01 +#define HN_NOSPACE 0x02 +#define HN_B 0x04 +#define HN_DIVISOR_1000 0x08 +#define HN_IEC_PREFIXES 0x10 + +/* Flags for humanize_number(3) scale. */ +#define HN_GETSCALE 0x10 +#define HN_AUTOSCALE 0x20 + +/* return values from realhostname(). */ +#define HOSTNAME_FOUND 0 +#define HOSTNAME_INCORRECTNAME 1 +#define HOSTNAME_INVALIDADDR 2 +#define HOSTNAME_INVALIDNAME 3 + +/* Flags for pw_scan(). */ +#define PWSCAN_MASTER 0x01 +#define PWSCAN_WARN 0x02 + +/* Return values from uu_lock(). */ +#define UU_LOCK_INUSE 1 +#define UU_LOCK_OK 0 +#define UU_LOCK_OPEN_ERR -1 +#define UU_LOCK_READ_ERR -2 +#define UU_LOCK_CREAT_ERR -3 +#define UU_LOCK_WRITE_ERR -4 +#define UU_LOCK_LINK_ERR -5 +#define UU_LOCK_TRY_ERR -6 +#define UU_LOCK_OWNER_ERR -7 + #endif /* !_LIBUTIL_H_ */ -- cgit v1.2.3