diff options
author | bde <bde@FreeBSD.org> | 1997-01-16 15:58:32 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-01-16 15:58:32 +0000 |
commit | 68c982254bc29d958b2c8e79f4783277bfffce2a (patch) | |
tree | f6c779b00c1bee18b1b63675e29ac0767fccdf1d /sys/kern | |
parent | 21695ece5ead7b2fd8511ac5906366cf3a3364a0 (diff) | |
download | FreeBSD-src-68c982254bc29d958b2c8e79f4783277bfffce2a.zip FreeBSD-src-68c982254bc29d958b2c8e79f4783277bfffce2a.tar.gz |
Reduced #include spam in <sys/sysproto.h> and fixed things that depended
on it.
makesyscalls.sh:
This parsed $Id$. Fixed(?) to parse $FreeBSD$. The output is wrong when
the id is not expanded in the source file.
syscalls.master:
Fixed declaration of sigsuspend(). There are still some bogons and
spam involving sigset_t.
Use `struct foo *' instead of the equivalent `foo_t *' for some nfs and
lfs syscalls so that <sys/sysproto.h> doesn't depend on <sys/mount.h>.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/init_main.c | 1 | ||||
-rw-r--r-- | sys/kern/kern_shutdown.c | 1 | ||||
-rw-r--r-- | sys/kern/makesyscalls.sh | 6 | ||||
-rw-r--r-- | sys/kern/syscalls.master | 21 |
4 files changed, 17 insertions, 12 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index d42ad77..37ac648 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -48,6 +48,7 @@ #include <sys/param.h> #include <sys/filedesc.h> #include <sys/kernel.h> +#include <sys/mount.h> #include <sys/sysctl.h> #include <sys/proc.h> #include <sys/resourcevar.h> diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 70433eb..35f7e65 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -52,6 +52,7 @@ #include <sys/syslog.h> #include <sys/malloc.h> #include <sys/kernel.h> +#include <sys/mount.h> #include <sys/sysctl.h> #include <sys/conf.h> #include <sys/sysproto.h> diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index bf3be26..a7ded79 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -87,7 +87,7 @@ s/\$//g printf " * DO NOT EDIT-- this file is automatically generated.\n" > syshide } NR == 1 { - gsub("[$]Id: ", "", $0) + gsub("[$]FreeBSD: ", "", $0) gsub(" [$]", "", $0) printf " * created from%s\n */\n\n", $0 > sysinc @@ -103,9 +103,7 @@ s/\$//g printf " * created from%s\n */\n\n", $0 > sysarg printf("#ifndef %s\n", sysproto_h) > sysarg printf("#define\t%s\n\n", sysproto_h) > sysarg - printf "#include <sys/types.h>\n", $0 > sysarg - printf "#include <sys/param.h>\n", $0 > sysarg - printf "#include <sys/mount.h>\n\n", $0 > sysarg + printf "#include <sys/signal.h>\n\n", $0 > sysarg printf " * created from%s\n */\n\n", $0 > sysnames printf "char *%s[] = {\n", namesname > sysnames diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 325029d..896f846 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -24,9 +24,7 @@ ; #ifdef's, etc. may be included, and are copied to the output files. -#include <sys/types.h> #include <sys/param.h> -#include <sys/mount.h> #include <sys/sysent.h> #include <sys/sysproto.h> @@ -98,6 +96,9 @@ struct sigaction *osa); } 47 STD POSIX { gid_t getgid(void); } 48 STD POSIX { int sigprocmask(int how, sigset_t mask); } +; XXX note nonstandard (bogus) calling convention - the libc stub passes +; us the mask, not a pointer to it, and we return the old mask as the +; (int) return value. 49 STD BSD { int getlogin(char *namebuf, u_int namelen); } 50 STD BSD { int setlogin(char *namebuf); } 51 STD BSD { int acct(char *path); } @@ -174,7 +175,9 @@ struct sigvec *osv); } 109 COMPAT BSD { int sigblock(int mask); } 110 COMPAT BSD { int sigsetmask(int mask); } -111 STD POSIX { int sigsuspend(int mask); } +111 STD POSIX { int sigsuspend(sigset_t mask); } +; XXX note nonstandard (bogus) calling convention - the libc stub passes +; us the mask, not a pointer to it. 112 COMPAT BSD { int sigstack(struct sigstack *nss, \ struct sigstack *oss); } 113 COMPAT BSD { int recvmsg(int s, struct omsghdr *msg, int flags); } @@ -247,7 +250,7 @@ 159 UNIMPL NOHIDE nosys 160 UNIMPL NOHIDE nosys #if defined(NFS) && !defined (NFS_NOSERVER) -161 STD BSD { int getfh(char *fname, fhandle_t *fhp); } +161 STD BSD { int getfh(char *fname, struct fhandle *fhp); } #else 161 UNIMPL BSD nosys #endif @@ -282,12 +285,14 @@ 182 STD BSD { int setegid(gid_t egid); } 183 STD BSD { int seteuid(uid_t euid); } #ifdef LFS -184 STD BSD { int lfs_bmapv(fsid_t *fsidp, \ +184 STD BSD { int lfs_bmapv(struct fsid **fsidp, \ struct block_info *blkiov, int blkcnt); } -185 STD BSD { int lfs_markv(fsid_t *fsidp, \ +185 STD BSD { int lfs_markv(struct fsid **fsidp, \ struct block_info *blkiov, int blkcnt); } -186 STD BSD { int lfs_segclean(fsid_t *fsidp, u_long segment); } -187 STD BSD { int lfs_segwait(fsid_t *fsidp, struct timeval *tv); } +186 STD BSD { int lfs_segclean(struct fsid **fsidp, \ + u_long segment); } +187 STD BSD { int lfs_segwait(struct fsid **fsidp, \ + struct timeval *tv); } #else 184 UNIMPL BSD nosys 185 UNIMPL BSD nosys |