diff options
| author | christos <christos@NetBSD.org> | 1999-02-09 20:34:16 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1999-02-09 20:34:16 +0000 |
| commit | 090a9bebbccca6e2d7df75804c17c4c7fd266d84 (patch) | |
| tree | 9a3641d73d8b37e4202c1f68c056d6241140d155 | |
| parent | 908adf3eefcf1eeeed28e6dd9c6ef7c7f0823d31 (diff) | |
const poisoning.
| -rw-r--r-- | sys/compat/osf1/osf1_misc.c | 4 | ||||
| -rw-r--r-- | sys/compat/osf1/osf1_signal.c | 20 | ||||
| -rw-r--r-- | sys/compat/osf1/syscalls.master | 12 |
3 files changed, 17 insertions, 19 deletions
diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c index 1cde3df94ff..2412a37ab5e 100644 --- a/sys/compat/osf1/osf1_misc.c +++ b/sys/compat/osf1/osf1_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_misc.c,v 1.14 1998/05/20 16:34:29 chs Exp $ */ +/* $NetBSD: osf1_misc.c,v 1.15 1999/02/09 20:34:16 christos Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -933,7 +933,7 @@ osf1_sys_execve(p, v, retval) register_t *retval; { struct osf1_sys_execve_args /* { - syscallarg(char *) path; + syscallarg(const char *) path; syscallarg(char **) argv; syscallarg(char **) envp; } */ *uap = v; diff --git a/sys/compat/osf1/osf1_signal.c b/sys/compat/osf1/osf1_signal.c index 67477b78932..a9e08f0026b 100644 --- a/sys/compat/osf1/osf1_signal.c +++ b/sys/compat/osf1/osf1_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_signal.c,v 1.5 1998/08/09 20:37:54 perry Exp $ */ +/* $NetBSD: osf1_signal.c,v 1.6 1999/02/09 20:34:17 christos Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -18,19 +18,15 @@ #include <compat/osf1/osf1_syscallargs.h> #include <compat/osf1/osf1_util.h> -static void bsd_to_osf1_sigaction __P((const struct sigaction *bsa, +static void bsd_to_osf1_sigaction __P((const struct sigaction13 *bsa, struct osf1_sigaction *osa)); static void osf1_to_bsd_sigaction __P((const struct osf1_sigaction *osa, - struct sigaction *bsa)); - -#define sigemptyset(s) memset((s), 0, sizeof(*(s))) -#define sigismember(s, n) (*(s) & sigmask(n)) -#define sigaddset(s, n) (*(s) |= sigmask(n)) + struct sigaction13 *bsa)); #define osf1_sigmask(n) (1 << ((n) - 1)) #define osf1_sigemptyset(s) memset((s), 0, sizeof(*(s))) -#define osf1_sigismember(s, n) (*(s) & sigmask(n)) -#define osf1_sigaddset(s, n) (*(s) |= sigmask(n)) +#define osf1_sigismember(s, n) (*(s) & osf1_sigmask(n)) +#define osf1_sigaddset(s, n) (*(s) |= osf1_sigmask(n)) int bsd_to_osf1_sig[] = { 0, @@ -226,8 +222,8 @@ osf1_sys_sigaction(p, v, retval) syscallarg(struct osf1_sigaction *) osa; } */ *uap = v; struct osf1_sigaction *nosa, *oosa, tmposa; - struct sigaction *nbsa, *obsa, tmpbsa; - struct sys_sigaction_args sa; + struct sigaction13 *nbsa, *obsa, tmpbsa; + struct compat_13_sys_sigaction_args sa; caddr_t sg; int error; @@ -254,7 +250,7 @@ osf1_sys_sigaction(p, v, retval) SCARG(&sa, nsa) = nbsa; SCARG(&sa, osa) = obsa; - if ((error = sys_sigaction(p, &sa, retval)) != 0) + if ((error = compat_13_sys_sigaction(p, &sa, retval)) != 0) return error; if (oosa != NULL) { diff --git a/sys/compat/osf1/syscalls.master b/sys/compat/osf1/syscalls.master index 20a06944b18..d1284d00eb2 100644 --- a/sys/compat/osf1/syscalls.master +++ b/sys/compat/osf1/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.12 1998/12/10 17:03:20 christos Exp $ + $NetBSD: syscalls.master,v 1.13 1999/02/09 20:34:17 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -94,7 +94,8 @@ 45 STD { int osf1_sys_open(char *path, int flags, int mode); } 46 OBSOL sigaction 47 NOARGS { gid_t sys_getgid(void); } -48 NOARGS { int sys_sigprocmask(int how, sigset_t mask); } +48 NOARGS { int compat_13_sys_sigprocmask(int how, \ + sigset13_t mask); } 49 NOARGS { int sys___getlogin(char *namebuf, u_int namelen); } 50 NOARGS { int sys_setlogin(char *namebuf); } 51 NOARGS { int sys_acct(char *path); } @@ -105,7 +106,7 @@ 56 NOARGS { int sys_revoke(char *path); } 57 NOARGS { int sys_symlink(char *path, char *link); } 58 NOARGS { int sys_readlink(char *path, char *buf, int count); } -59 STD { int osf1_sys_execve(char *path, char **argp, \ +59 STD { int osf1_sys_execve(const char *path, char **argp, \ char **envp); } 60 NOARGS { int sys_umask(int newmask); } 61 NOARGS { int sys_chroot(char *path); } @@ -162,7 +163,8 @@ int flags); } 102 NOARGS { int compat_43_sys_recv(int s, caddr_t buf, int len, \ int flags); } -103 NOARGS { int sys_sigreturn(struct sigcontext *sigcntxp); } +103 NOARGS { int compat_13_sys_sigreturn(\ + struct sigcontext *sigcntxp); } 104 NOARGS { int sys_bind(int s, caddr_t name, int namelen); } 105 NOARGS { int sys_setsockopt(int s, int level, int name, \ caddr_t val, int valsize); } @@ -171,7 +173,7 @@ 108 UNIMPL old sigvec 109 UNIMPL old sigblock 110 UNIMPL old sigsetmask -111 NOARGS { int sys_sigsuspend(int mask); } +111 NOARGS { int compat_13_sys_sigsuspend(int mask); } 112 NOARGS { int compat_43_sys_sigstack(struct sigstack *nss, \ struct sigstack *oss); } 113 UNIMPL old recvmsg |
