diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/getfsent.3 | 12 | ||||
| -rw-r--r-- | lib/libc/gen/getgrent.3 | 4 | ||||
| -rw-r--r-- | lib/libc/gen/getpwent.3 | 5 | ||||
| -rw-r--r-- | lib/libc/gen/getttyent.3 | 10 | ||||
| -rw-r--r-- | lib/libc/gen/msgctl.3 | 42 |
5 files changed, 41 insertions, 32 deletions
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3 index 1cc90bf99376..17f3d77723ab 100644 --- a/lib/libc/gen/getfsent.3 +++ b/lib/libc/gen/getfsent.3 @@ -68,11 +68,11 @@ description file, struct fstab { char *fs_spec; /* block special device name */ char *fs_file; /* file system path prefix */ - char *fs_vfstype; /* type of file system */ - char *fs_mntops; /* comma separated mount options */ - char *fs_type; /* rw, ro, sw, or xx */ + char *fs_vfstype; /* File system type, ufs, nfs */ + char *fs_mntops; /* Mount options ala -o */ + char *fs_type; /* FSTAB_* from fs_mntops */ int fs_freq; /* dump frequency, in days */ - int fs_passno; /* pass number on parallel dump */ + int fs_passno; /* pass number on parallel fsck */ }; .Ed .Pp @@ -112,7 +112,9 @@ The and .Fn getfsfile functions -return a null pointer (0) on +return a +.Dv NULL +pointer on .Dv EOF or error. The diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3 index 4ed5595b0a8f..fbdf909b69f1 100644 --- a/lib/libc/gen/getgrent.3 +++ b/lib/libc/gen/getgrent.3 @@ -76,8 +76,8 @@ file struct group { char *gr_name; /* group name */ char *gr_passwd; /* group password */ - gid_t gr_gid; /* group id */ - char **gr_mem; /* null terminated list of group members */ + int gr_gid; /* group id */ + char **gr_mem; /* group members */ }; .Ed .Pp diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3 index e37e9f0e7b4e..6badc19f1294 100644 --- a/lib/libc/gen/getpwent.3 +++ b/lib/libc/gen/getpwent.3 @@ -72,14 +72,15 @@ file struct passwd { char *pw_name; /* user name */ char *pw_passwd; /* encrypted password */ - uid_t pw_uid; /* user uid */ - gid_t pw_gid; /* user gid */ + int pw_uid; /* user uid */ + int pw_gid; /* user gid */ time_t pw_change; /* password change time */ char *pw_class; /* user access class */ char *pw_gecos; /* Honeywell login info */ char *pw_dir; /* home directory */ char *pw_shell; /* default shell */ time_t pw_expire; /* account expiration */ + int pw_fields; /* internal: fields filled in */ }; .Ed .Pp diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3 index 0bbd85066afa..3884b300eef7 100644 --- a/lib/libc/gen/getttyent.3 +++ b/lib/libc/gen/getttyent.3 @@ -62,12 +62,12 @@ file. .Bd -literal struct ttyent { char *ty_name; /* terminal device name */ - char *ty_getty; /* command to execute */ - char *ty_type; /* terminal type */ -#define TTY_ON 0x01 /* enable logins */ + char *ty_getty; /* command to execute, usually getty */ + char *ty_type; /* terminal type for termcap */ +#define TTY_ON 0x01 /* enable logins (start ty_getty program) */ #define TTY_SECURE 0x02 /* allow uid of 0 to login */ - int ty_status; /* flag values */ - char *ty_window; /* command for window manager */ + int ty_status; /* status flags */ + char *ty_window; /* command to start up window manager */ char *ty_comment; /* comment field */ char *ty_group; /* tty group name */ }; diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3 index c55ece439cd0..c505e7d6716b 100644 --- a/lib/libc/gen/msgctl.3 +++ b/lib/libc/gen/msgctl.3 @@ -58,18 +58,24 @@ The data structure is defined in and contains (amongst others) the following members: .Bd -literal struct msqid_ds { - struct ipc_perm msg_perm; /* msg queue permission bits */ - u_long msg_cbytes; /* # of bytes in use on the queue */ - u_long msg_qnum; /* # of msgs in the queue */ - u_long msg_qbytes; /* max # of bytes on the queue */ - pid_t msg_lspid; /* pid of last msgsnd() */ - pid_t msg_lrpid; /* pid of last msgrcv() */ - time_t msg_stime; /* time of last msgsnd() */ - time_t msg_rtime; /* time of last msgrcv() */ - time_t msg_ctime; /* time of last msgctl() */ + struct ipc_perm msg_perm; /* msg queue permission bits */ + struct msg *msg_first; /* first message in the queue */ + struct msg *msg_last; /* last message in the queue */ + u_long msg_cbytes; /* number of bytes in use on the queue */ + u_long msg_qnum; /* number of msgs in the queue */ + u_long msg_qbytes; /* max # of bytes on the queue */ + pid_t msg_lspid; /* pid of last msgsnd() */ + pid_t msg_lrpid; /* pid of last msgrcv() */ + time_t msg_stime; /* time of last msgsnd() */ + long msg_pad1; + time_t msg_rtime; /* time of last msgrcv() */ + long msg_pad2; + time_t msg_ctime; /* time of last msgctl() */ + long msg_pad3; + long msg_pad4[4]; }; .Ed - +.Pp The .Bf -literal ipc_perm @@ -83,16 +89,16 @@ structure is defined in and looks like this: .Bd -literal struct ipc_perm { - ushort cuid; /* creator user id */ - ushort cgid; /* creator group id */ - ushort uid; /* user id */ - ushort gid; /* group id */ - ushort mode; /* permission (9 bits, see chmod(2)) */ - ushort seq; /* sequence # (to generate unique id) */ - key_t key; /* user specified msg/sem/shm key */ + ushort cuid; /* creator user id */ + ushort cgid; /* creator group id */ + ushort uid; /* user id */ + ushort gid; /* group id */ + ushort mode; /* r/w permission */ + ushort seq; /* sequence # (to generate unique msg/sem/shm id) */ + key_t key; /* user specified msg/sem/shm key */ }; .Ed - +.Pp The operation to be performed by .Fn msgctl is specified in |