change ipc.h to use uid_t and friends, and then build compat system calls for the old ushort based ipc.h

3 files changed, 41 insertions, 41 deletions

diff --git a/lib/libc/sys/msgctl.2 b/lib/libc/sys/msgctl.2
index 4538a391a39..42afd48f40e 100644
--- a/lib/libc/sys/msgctl.2
+++ b/lib/libc/sys/msgctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgctl.2,v 1.4 1997/11/24 02:07:29 deraadt Exp $
+.\"	$OpenBSD: msgctl.2,v 1.5 1998/06/11 18:32:08 deraadt Exp $
 .\"	$NetBSD: msgctl.2,v 1.2 1997/03/27 08:20:35 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -59,15 +59,15 @@ 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 */
+	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() */
 };
 .Ed
 
@@ -84,13 +84,13 @@ 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 */
+	uid_t	cuid;	/* creator user id */
+	gid_t	cgid;	/* creator group id */
+	uid_t	uid;	/* user id */
+	gid_t	gid;	/* group id */
+	mode_t	mode;	/* permission (9 bits, see chmod(2)) */
+	u_short	seq;	/* sequence # (to generate unique id) */
+	key_t	key;	/* user specified msg/sem/shm key */
 };
 .Ed
 
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 109595cfe79..3495824780d 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semctl.2,v 1.5 1998/06/10 08:46:20 deraadt Exp $
+.\"	$OpenBSD: semctl.2,v 1.6 1998/06/11 18:32:10 deraadt Exp $
 .\"	$NetBSD: semctl.2,v 1.2 1997/03/27 08:20:40 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -91,12 +91,12 @@ 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;		/* r/w permission (see chmod(2)) */
-	ushort seq;		/* sequence # (to generate unique msg/sem/shm id) */
+	uid_t	cuid;		/* creator user id */
+	gid_t	cgid;		/* creator group id */
+	uid_t	uid;		/* user id */
+	gid_t	gid;		/* group id */
+	mode_t	mode;		/* r/w permission (see chmod(2)) */
+	u_short seq;		/* sequence # (to generate unique msg/sem/shm id) */
 	key_t key;		/* user specified msg/sem/shm key */
 };
 .Ed
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index b8f8f7f1bc7..e1435d04c10 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shmctl.2,v 1.5 1997/11/24 07:24:56 deraadt Exp $
+.\"	$OpenBSD: shmctl.2,v 1.6 1998/06/11 18:32:11 deraadt Exp $
 .\"	$NetBSD: shmctl.2,v 1.3 1997/03/27 08:20:39 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -59,15 +59,15 @@ This structure is defined as follows in
 .Aq Pa sys/shm.h :
 .Bd -literal
 struct shmid_ds {
-    struct ipc_perm shm_perm;     /* operation permissions */
-    int             shm_segsz;    /* size of segment in bytes */
-    pid_t           shm_lpid;     /* pid of last shm op */
-    pid_t           shm_cpid;     /* pid of creator */
-    short           shm_nattch;   /* # of current attaches */
-    time_t          shm_atime;    /* last shmat() time*/
-    time_t          shm_dtime;    /* last shmdt() time */
-    time_t          shm_ctime;    /* last change by shmctl() */
-    void           *shm_internal; /* sysv stupidity */
+	struct ipc_perm shm_perm;     /* operation permissions */
+	int             shm_segsz;    /* size of segment in bytes */
+	pid_t           shm_lpid;     /* pid of last shm op */
+	pid_t           shm_cpid;     /* pid of creator */
+	short           shm_nattch;   /* # of current attaches */
+	time_t          shm_atime;    /* last shmat() time*/
+	time_t          shm_dtime;    /* last shmdt() time */
+	time_t          shm_ctime;    /* last change by shmctl() */
+	void		*shm_internal; /* sysv stupidity */
 };
 .Ed
 .Pp
@@ -84,13 +84,13 @@ 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; /* r/w permission (see chmod(2)) */
-    ushort seq;	 /* sequence # (to generate unique msg/sem/shm id) */
-    key_t key;	 /* user specified msg/sem/shm key */
+	uid_t		cuid;	/* creator user id */
+	gid_t		cgid;	/* creator group id */
+	uid_t		uid;	/* user id */
+	gid_t		gid;	/* group id */
+	mode_t		mode;	/* r/w permission (see chmod(2)) */
+	u_short		seq;	/* sequence # (to generate unique msg/sem/shm id) */
+	key_t		key;	/* user specified msg/sem/shm key */
 };
 .Ed