From 9270c28aa419272363ee6a29e85080b31389f545 Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Mon, 23 Jan 2017 17:29:03 +1100 Subject: [PATCH] Permanently apply the ANSIfication source code transformations to include, libc and sys, if we should want to run the scripts again we will have to branch at the previous commit, re-run the scripts, and then rebase following commits on top --- include/a.out.h | 22 +++- include/ar.h | 5 + include/arpa/ftp.h | 5 + include/arpa/inet.h | 44 ++++++- include/arpa/nameser.h | 50 +++++++- include/arpa/telnet.h | 5 + include/arpa/tftp.h | 5 + include/assert.h | 11 +- include/compat-4.1.h | 35 ++++++ include/compat-sys5.h | 23 ++++ include/ctype.h | 5 + include/disktab.h | 20 ++- include/fstab.h | 35 +++++- include/gen.h | 124 +++++++++++++++++++ include/grp.h | 31 ++++- include/inet.h | 6 + include/lastlog.h | 7 ++ include/math.h | 55 ++++++--- include/memory.h | 40 +++++- include/mtab.h | 5 + include/ndbm.h | 41 ++++-- include/net.h | 51 +++++++- include/netdb.h | 80 +++++++++++- include/ns.h | 6 + include/pcc.h | 13 +- include/protocols/dumprestore.h | 8 ++ include/protocols/routed.h | 8 ++ include/protocols/rwhod.h | 5 + include/protocols/talkd.h | 12 +- include/protocols/timed.h | 9 ++ include/pwd.h | 27 +++- include/ranlib.h | 7 ++ include/resolv.h | 12 +- include/setjmp.h | 26 ++++ include/sgtty.h | 11 +- include/stab.h | 5 + include/stdio.h | 165 +++++++++++++++++++++++-- include/string.h | 62 ++++++++-- include/strings.h | 69 +++++++++-- include/struct.h | 5 + include/sys.h | 62 ++++++++++ include/syscall.h | 5 + include/sysexits.h | 5 + include/time.h | 28 ++++- include/ttyent.h | 27 +++- include/utmp.h | 24 ++++ include/varargs.h | 5 + include/vfont.h | 5 + lib/libc/compat-4.1/ftime.c | 15 +-- lib/libc/compat-4.1/getpw.c | 12 +- lib/libc/compat-4.1/gtty.c | 10 +- lib/libc/compat-4.1/nice.c | 12 +- lib/libc/compat-4.1/pause.c | 8 +- lib/libc/compat-4.1/rand.c | 11 +- lib/libc/compat-4.1/stty.c | 10 +- lib/libc/compat-4.1/tell.c | 10 +- lib/libc/compat-4.1/times.c | 23 ++-- lib/libc/compat-4.1/utime.c | 11 +- lib/libc/compat-4.1/vlimit.c | 16 +-- lib/libc/compat-4.1/vtimes.c | 30 +++-- lib/libc/compat-sys5/getopt.c | 14 +-- lib/libc/compat-sys5/memccpy.c | 8 +- lib/libc/compat-sys5/memchr.c | 8 +- lib/libc/compat-sys5/memcmp.c | 7 +- lib/libc/compat-sys5/memcpy.c | 8 +- lib/libc/compat-sys5/memset.c | 8 +- lib/libc/compat-sys5/strcatn.c | 10 +- lib/libc/compat-sys5/strchr.c | 9 +- lib/libc/compat-sys5/strcmpn.c | 9 +- lib/libc/compat-sys5/strcpyn.c | 9 +- lib/libc/compat-sys5/strcspn.c | 6 +- lib/libc/compat-sys5/strpbrk.c | 7 +- lib/libc/compat-sys5/strrchr.c | 9 +- lib/libc/compat-sys5/strspn.c | 6 +- lib/libc/compat-sys5/strtok.c | 8 +- lib/libc/compat-sys5/tmpnam.c | 10 +- lib/libc/gen/_setjmp.c | 8 +- lib/libc/gen/abort.c | 9 +- lib/libc/gen/abs.c | 3 + lib/libc/gen/alarm.c | 10 +- lib/libc/gen/atof.c | 4 + lib/libc/gen/atoi.c | 8 +- lib/libc/gen/atol.c | 9 +- lib/libc/gen/bcmp.c | 9 +- lib/libc/gen/bcopy.c | 10 +- lib/libc/gen/bzero.c | 9 +- lib/libc/gen/calloc.c | 16 +-- lib/libc/gen/closedir.c | 15 +-- lib/libc/gen/crypt.c | 18 +-- lib/libc/gen/ctime.c | 64 ++++------ lib/libc/gen/ctype_.c | 6 +- lib/libc/gen/disktab.c | 69 +++++------ lib/libc/gen/ecvt.c | 27 ++-- lib/libc/gen/errlst.c | 2 +- lib/libc/gen/execvp.c | 28 ++--- lib/libc/gen/fakcu.c | 9 +- lib/libc/gen/ffs.c | 8 +- lib/libc/gen/frexp.c | 10 +- lib/libc/gen/fstab.c | 58 ++++----- lib/libc/gen/gcvt.c | 12 +- lib/libc/gen/getenv.c | 18 ++- lib/libc/gen/getgrent.c | 28 ++--- lib/libc/gen/getgrgid.c | 11 +- lib/libc/gen/getgrnam.c | 12 +- lib/libc/gen/getlogin.c | 11 +- lib/libc/gen/getpass.c | 19 +-- lib/libc/gen/getpwent.c | 34 +++-- lib/libc/gen/getpwnamuid.c | 33 +++-- lib/libc/gen/getttyent.c | 35 +++--- lib/libc/gen/getttynam.c | 12 +- lib/libc/gen/getusershell.c | 36 +++--- lib/libc/gen/getwd.c | 29 ++--- lib/libc/gen/index.c | 9 +- lib/libc/gen/initgroups.c | 22 ++-- lib/libc/gen/insque.c | 10 +- lib/libc/gen/ldexp.c | 6 +- lib/libc/gen/malloc.c | 57 ++++----- lib/libc/gen/mkstemp.c | 12 +- lib/libc/gen/mktemp.c | 11 +- lib/libc/gen/modf.c | 6 +- lib/libc/gen/ndbm.c | 158 ++++++++++------------- lib/libc/gen/nlist.c | 19 +-- lib/libc/gen/opendir.c | 15 +-- lib/libc/gen/perror.c | 14 ++- lib/libc/gen/psignal.c | 13 +- lib/libc/gen/qsort.c | 18 ++- lib/libc/gen/random.c | 46 ++----- lib/libc/gen/readdir.c | 14 +-- lib/libc/gen/regex.c | 32 ++--- lib/libc/gen/remque.c | 10 +- lib/libc/gen/rindex.c | 9 +- lib/libc/gen/scandir.c | 23 ++-- lib/libc/gen/seekdir.c | 15 ++- lib/libc/gen/setegid.c | 8 +- lib/libc/gen/seteuid.c | 8 +- lib/libc/gen/setgid.c | 8 +- lib/libc/gen/setjmp.c | 8 +- lib/libc/gen/setjmperr.c | 8 +- lib/libc/gen/setrgid.c | 8 +- lib/libc/gen/setruid.c | 8 +- lib/libc/gen/setuid.c | 8 +- lib/libc/gen/siginterrupt.c | 10 +- lib/libc/gen/siglist.c | 6 +- lib/libc/gen/signal.c | 12 +- lib/libc/gen/sleep.c | 20 +-- lib/libc/gen/strcat.c | 9 +- lib/libc/gen/strcmp.c | 8 +- lib/libc/gen/strcpy.c | 9 +- lib/libc/gen/strlen.c | 8 +- lib/libc/gen/strncat.c | 10 +- lib/libc/gen/strncmp.c | 9 +- lib/libc/gen/strncpy.c | 9 +- lib/libc/gen/swab.c | 9 +- lib/libc/gen/syslog.c | 62 ++++++---- lib/libc/gen/system.c | 13 +- lib/libc/gen/telldir.c | 14 +-- lib/libc/gen/time.c | 14 +-- lib/libc/gen/timezone.c | 9 +- lib/libc/gen/ttyname.c | 22 ++-- lib/libc/gen/ttyslot.c | 15 ++- lib/libc/gen/ualarm.c | 12 +- lib/libc/gen/usleep.c | 19 +-- lib/libc/gen/valloc.c | 12 +- lib/libc/inet/inet_addr.c | 18 +-- lib/libc/inet/inet_lnaof.c | 15 ++- lib/libc/inet/inet_makeaddr.c | 16 +-- lib/libc/inet/inet_netof.c | 15 ++- lib/libc/inet/inet_network.c | 15 +-- lib/libc/inet/inet_ntoa.c | 15 +-- lib/libc/net/getnetbyaddr.c | 11 +- lib/libc/net/getnetbyname.c | 12 +- lib/libc/net/getnetent.c | 38 +++--- lib/libc/net/getproto.c | 11 +- lib/libc/net/getprotoent.c | 37 +++--- lib/libc/net/getprotoname.c | 12 +- lib/libc/net/getservbyname.c | 12 +- lib/libc/net/getservbyport.c | 13 +- lib/libc/net/getservent.c | 39 +++--- lib/libc/net/hosttable/gethostent.c | 46 ++++--- lib/libc/net/hosttable/gethostnamadr.c | 38 +++--- lib/libc/net/htonl.c | 7 +- lib/libc/net/htons.c | 9 +- lib/libc/net/named/gethostnamadr.c | 87 ++++++------- lib/libc/net/named/sethostent.c | 24 ++-- lib/libc/net/ntohl.c | 7 +- lib/libc/net/ntohs.c | 9 +- lib/libc/net/rcmd.c | 73 +++++------ lib/libc/net/res_comp.c | 53 +++----- lib/libc/net/res_debug.c | 59 ++++----- lib/libc/net/res_init.c | 35 ++++-- lib/libc/net/res_mkquery.c | 35 +++--- lib/libc/net/res_send.c | 77 ++++++------ lib/libc/net/rexec.c | 36 +++--- lib/libc/net/ruserpass.c | 146 +++++++++------------- lib/libc/ns/ns_addr.c | 36 +++--- lib/libc/ns/ns_ntoa.c | 23 ++-- lib/libc/stdio/clrerr.c | 10 +- lib/libc/stdio/doprnt.c | 58 ++++----- lib/libc/stdio/doscan.c | 49 ++++---- lib/libc/stdio/exit.c | 10 +- lib/libc/stdio/fdopen.c | 17 +-- lib/libc/stdio/fgetc.c | 10 +- lib/libc/stdio/fgets.c | 12 +- lib/libc/stdio/filbuf.c | 19 +-- lib/libc/stdio/findiop.c | 33 +++-- lib/libc/stdio/flsbuf.c | 29 +++-- lib/libc/stdio/fopen.c | 18 +-- lib/libc/stdio/fprintf.c | 26 ++-- lib/libc/stdio/fputc.c | 10 +- lib/libc/stdio/fputs.c | 11 +- lib/libc/stdio/fread.c | 13 +- lib/libc/stdio/freopen.c | 19 ++- lib/libc/stdio/fseek.c | 14 +-- lib/libc/stdio/ftell.c | 14 +-- lib/libc/stdio/fwrite.c | 13 +- lib/libc/stdio/getchar.c | 9 +- lib/libc/stdio/gets.c | 11 +- lib/libc/stdio/getw.c | 10 +- lib/libc/stdio/popen.c | 22 ++-- lib/libc/stdio/printf.c | 25 ++-- lib/libc/stdio/putchar.c | 10 +- lib/libc/stdio/puts.c | 10 +- lib/libc/stdio/putw.c | 10 +- lib/libc/stdio/rew.c | 11 +- lib/libc/stdio/scanf.c | 47 ++++--- lib/libc/stdio/setbuf.c | 12 +- lib/libc/stdio/setbuffer.c | 17 ++- lib/libc/stdio/sibuf.c | 6 +- lib/libc/stdio/sobuf.c | 6 +- lib/libc/stdio/sprintf.c | 25 ++-- lib/libc/stdio/strout.c | 13 +- lib/libc/stdio/ungetc.c | 10 +- lib/libc/stdio/vfprintf.c | 19 +-- lib/libc/stdio/vprintf.c | 18 ++- lib/libc/stdio/vsprintf.c | 18 ++- lib/libc/sys/_exit.c | 6 +- lib/libc/sys/accept.c | 6 +- lib/libc/sys/access.c | 5 +- lib/libc/sys/acct.c | 4 + lib/libc/sys/adjtime.c | 8 +- lib/libc/sys/bind.c | 6 +- lib/libc/sys/brk.c | 4 + lib/libc/sys/chdir.c | 4 + lib/libc/sys/chmod.c | 6 +- lib/libc/sys/chown.c | 5 +- lib/libc/sys/chroot.c | 4 + lib/libc/sys/close.c | 5 +- lib/libc/sys/connect.c | 6 +- lib/libc/sys/creat.c | 5 +- lib/libc/sys/dup.c | 5 +- lib/libc/sys/dup2.c | 5 +- lib/libc/sys/execl.c | 18 ++- lib/libc/sys/execle.c | 18 ++- lib/libc/sys/exect.c | 6 +- lib/libc/sys/execv.c | 6 +- lib/libc/sys/execve.c | 6 +- lib/libc/sys/fchmod.c | 6 +- lib/libc/sys/fchown.c | 5 +- lib/libc/sys/fcntl.c | 5 +- lib/libc/sys/flock.c | 5 +- lib/libc/sys/fork.c | 4 + lib/libc/sys/fstat.c | 6 +- lib/libc/sys/fsync.c | 5 +- lib/libc/sys/ftruncate.c | 8 +- lib/libc/sys/getdtablesize.c | 3 + lib/libc/sys/getegid.c | 7 +- lib/libc/sys/geteuid.c | 7 +- lib/libc/sys/getgid.c | 7 +- lib/libc/sys/getgroups.c | 6 +- lib/libc/sys/gethostid.c | 4 + lib/libc/sys/gethostname.c | 4 + lib/libc/sys/getitimer.c | 8 +- lib/libc/sys/getpagesize.c | 4 + lib/libc/sys/getpeername.c | 6 +- lib/libc/sys/getpgrp.c | 6 +- lib/libc/sys/getpid.c | 4 + lib/libc/sys/getppid.c | 4 + lib/libc/sys/getpriority.c | 6 +- lib/libc/sys/getrlimit.c | 6 +- lib/libc/sys/getrusage.c | 6 +- lib/libc/sys/getsockname.c | 6 +- lib/libc/sys/getsockopt.c | 6 +- lib/libc/sys/gettimeofday.c | 6 +- lib/libc/sys/getuid.c | 7 +- lib/libc/sys/ioctl.c | 9 +- lib/libc/sys/isatty.c | 6 +- lib/libc/sys/kill.c | 6 +- lib/libc/sys/killpg.c | 6 +- lib/libc/sys/link.c | 5 +- lib/libc/sys/listen.c | 6 +- lib/libc/sys/lseek.c | 8 +- lib/libc/sys/lstat.c | 4 + lib/libc/sys/mkdir.c | 6 +- lib/libc/sys/mknod.c | 6 +- lib/libc/sys/mount.c | 6 +- lib/libc/sys/open.c | 18 ++- lib/libc/sys/pipe.c | 3 + lib/libc/sys/profil.c | 6 +- lib/libc/sys/ptrace.c | 6 +- lib/libc/sys/quota.c | 6 +- lib/libc/sys/read.c | 5 +- lib/libc/sys/readlink.c | 5 +- lib/libc/sys/readv.c | 6 +- lib/libc/sys/reboot.c | 6 +- lib/libc/sys/recv.c | 6 +- lib/libc/sys/recvfrom.c | 6 +- lib/libc/sys/recvmsg.c | 6 +- lib/libc/sys/rename.c | 5 +- lib/libc/sys/rmdir.c | 4 + lib/libc/sys/sbrk.c | 6 +- lib/libc/sys/select.c | 9 +- lib/libc/sys/send.c | 6 +- lib/libc/sys/sendmsg.c | 6 +- lib/libc/sys/sendto.c | 6 +- lib/libc/sys/setgroups.c | 6 +- lib/libc/sys/sethostid.c | 4 + lib/libc/sys/sethostname.c | 4 + lib/libc/sys/setitimer.c | 8 +- lib/libc/sys/setpgrp.c | 6 +- lib/libc/sys/setpriority.c | 6 +- lib/libc/sys/setquota.c | 6 +- lib/libc/sys/setregid.c | 6 +- lib/libc/sys/setreuid.c | 6 +- lib/libc/sys/setrlimit.c | 6 +- lib/libc/sys/setsockopt.c | 6 +- lib/libc/sys/settimeofday.c | 6 +- lib/libc/sys/shutdown.c | 6 +- lib/libc/sys/sigblock.c | 6 +- lib/libc/sys/sigpause.c | 6 +- lib/libc/sys/sigreturn.c | 6 +- lib/libc/sys/sigsetmask.c | 6 +- lib/libc/sys/sigstack.c | 8 +- lib/libc/sys/sigvec.c | 8 +- lib/libc/sys/socket.c | 6 +- lib/libc/sys/socketpair.c | 6 +- lib/libc/sys/stat.c | 4 + lib/libc/sys/swapon.c | 4 + lib/libc/sys/symlink.c | 5 +- lib/libc/sys/sync.c | 5 +- lib/libc/sys/truncate.c | 6 +- lib/libc/sys/umask.c | 6 +- lib/libc/sys/umount.c | 4 + lib/libc/sys/unlink.c | 3 + lib/libc/sys/utimes.c | 6 +- lib/libc/sys/vfork.c | 4 + lib/libc/sys/vhangup.c | 4 + lib/libc/sys/vopen.c | 11 +- lib/libc/sys/wait.c | 4 + lib/libc/sys/wait3.c | 9 +- lib/libc/sys/write.c | 5 +- lib/libc/sys/writev.c | 6 +- sys/h/acct.h | 23 +++- sys/h/bkmac.h | 8 ++ sys/h/buf.h | 32 +++-- sys/h/callout.h | 7 ++ sys/h/clist.h | 7 ++ sys/h/cmap.h | 19 ++- sys/h/conf.h | 19 +-- sys/h/dir.h | 53 +++++++- sys/h/dk.h | 5 + sys/h/dkbad.h | 7 ++ sys/h/dmap.h | 13 +- sys/h/domain.h | 5 + sys/h/errno.h | 18 +++ sys/h/exec.h | 37 ++++++ sys/h/file.h | 101 ++++++++++++++- sys/h/fs.h | 16 ++- sys/h/gprof.h | 5 + sys/h/inode.h | 26 ++-- sys/h/ioctl.h | 36 +++++- sys/h/kernel.h | 13 +- sys/h/map.h | 8 +- sys/h/mbuf.h | 13 +- sys/h/mman.h | 5 + sys/h/mount.h | 27 +++- sys/h/msgbuf.h | 5 + sys/h/mtio.h | 8 ++ sys/h/namei.h | 15 ++- sys/h/param.h | 11 +- sys/h/proc.h | 95 +++++++++++++- sys/h/protosw.h | 7 +- sys/h/ptrace.h | 22 +++- sys/h/quota.h | 28 ++++- sys/h/reboot.h | 5 + sys/h/resource.h | 35 ++++++ sys/h/seg.h | 7 ++ sys/h/select.h | 22 ++++ sys/h/signal.h | 48 +++++++ sys/h/socket.h | 65 ++++++++++ sys/h/socketvar.h | 14 ++- sys/h/stat.h | 44 ++++++- sys/h/syslog.h | 21 ++++ sys/h/systm.h | 22 ++-- sys/h/tablet.h | 11 +- sys/h/text.h | 10 +- sys/h/time.h | 53 ++++++++ sys/h/timeb.h | 23 +++- sys/h/times.h | 20 +++ sys/h/trace.h | 5 + sys/h/tty.h | 13 +- sys/h/ttychars.h | 9 +- sys/h/ttydev.h | 9 +- sys/h/types.h | 9 +- sys/h/uio.h | 27 +++- sys/h/un.h | 7 +- sys/h/unpcb.h | 7 ++ sys/h/user.h | 22 +++- sys/h/vadvise.h | 5 + sys/h/vcmd.h | 9 +- sys/h/vlimit.h | 18 +++ sys/h/vm.h | 5 + sys/h/vmmac.h | 16 ++- sys/h/vmmeter.h | 11 +- sys/h/vmparam.h | 5 + sys/h/vmsystm.h | 11 +- sys/h/vsio.h | 9 +- sys/h/vtimes.h | 18 +++ sys/h/wait.h | 24 +++- sys/net/af.h | 7 ++ sys/net/if.h | 17 ++- sys/net/if_arp.h | 8 ++ sys/net/netisr.h | 7 ++ sys/net/raw_cb.h | 9 ++ sys/net/route.h | 8 ++ sys/netimp/if_imp.h | 8 ++ sys/netimp/if_imphost.h | 17 ++- sys/netinet/icmp_var.h | 7 ++ sys/netinet/if_ether.h | 15 ++- sys/netinet/in.h | 18 ++- sys/netinet/in_pcb.h | 11 +- sys/netinet/in_systm.h | 9 +- sys/netinet/in_var.h | 11 +- sys/netinet/ip.h | 9 ++ sys/netinet/ip_icmp.h | 10 ++ sys/netinet/ip_var.h | 11 +- sys/netinet/tcp.h | 10 ++ sys/netinet/tcp_debug.h | 10 ++ sys/netinet/tcp_fsm.h | 9 ++ sys/netinet/tcp_seq.h | 7 ++ sys/netinet/tcp_timer.h | 7 ++ sys/netinet/tcp_var.h | 16 ++- sys/netinet/tcpip.h | 8 ++ sys/netinet/udp.h | 7 ++ sys/netinet/udp_var.h | 9 ++ sys/netns/idp.h | 8 ++ sys/netns/idp_var.h | 5 + sys/netns/ns.h | 33 ++++- sys/netns/ns_error.h | 8 ++ sys/netns/ns_if.h | 11 +- sys/netns/ns_pcb.h | 12 +- sys/netns/sp.h | 7 ++ sys/netns/spidp.h | 8 ++ sys/netns/spp_debug.h | 9 ++ sys/netns/spp_var.h | 11 ++ sys/vax/clock.h | 7 ++ sys/vax/cons.h | 5 + sys/vax/cpu.h | 7 ++ sys/vax/crl.h | 6 +- sys/vax/dkio.h | 7 ++ sys/vax/flp.h | 5 + sys/vax/frame.h | 7 ++ sys/vax/ioa.h | 14 ++- sys/vax/ka630.h | 7 ++ sys/vax/machparam.h | 11 +- sys/vax/mem.h | 9 +- sys/vax/mscp.h | 13 +- sys/vax/mtpr.h | 5 + sys/vax/nexus.h | 9 +- sys/vax/pcb.h | 10 +- sys/vax/psl.h | 5 + sys/vax/pte.h | 14 ++- sys/vax/reg.h | 5 + sys/vax/rpb.h | 5 + sys/vax/rsp.h | 7 ++ sys/vax/scb.h | 5 + sys/vax/tmscp.h | 6 + sys/vax/trap.h | 5 + sys/vax/vmparam.h | 8 ++ sys/vaxif/if_accreg.h | 7 ++ sys/vaxif/if_cssreg.h | 8 +- sys/vaxif/if_ddnreg.h | 9 +- sys/vaxif/if_ddnvar.h | 8 +- sys/vaxif/if_dereg.h | 8 ++ sys/vaxif/if_dmc.h | 5 + sys/vaxif/if_ecreg.h | 5 + sys/vaxif/if_en.h | 7 ++ sys/vaxif/if_enreg.h | 5 + sys/vaxif/if_exreg.h | 7 +- sys/vaxif/if_hdhreg.h | 8 +- sys/vaxif/if_hy.h | 10 +- sys/vaxif/if_hyreg.h | 8 +- sys/vaxif/if_il.h | 7 ++ sys/vaxif/if_ilreg.h | 5 + sys/vaxif/if_ix.h | 7 ++ sys/vaxif/if_pclreg.h | 7 ++ sys/vaxif/if_qereg.h | 7 ++ sys/vaxif/if_uba.h | 10 +- sys/vaxif/if_vv.h | 7 ++ sys/vaxmba/hpreg.h | 8 +- sys/vaxmba/htreg.h | 8 +- sys/vaxmba/mbareg.h | 10 +- sys/vaxmba/mbavar.h | 9 +- sys/vaxmba/mtreg.h | 5 + sys/vaxuba/adreg.h | 7 ++ sys/vaxuba/dhreg.h | 7 ++ sys/vaxuba/dhureg.h | 5 + sys/vaxuba/dmfreg.h | 7 ++ sys/vaxuba/dmreg.h | 5 + sys/vaxuba/dmzreg.h | 8 +- sys/vaxuba/dzreg.h | 5 + sys/vaxuba/idcreg.h | 8 +- sys/vaxuba/ikreg.h | 8 ++ sys/vaxuba/npreg.h | 11 +- sys/vaxuba/pdma.h | 5 + sys/vaxuba/psreg.h | 8 +- sys/vaxuba/rkreg.h | 10 +- sys/vaxuba/rlreg.h | 7 ++ sys/vaxuba/rxreg.h | 9 +- sys/vaxuba/tmreg.h | 9 +- sys/vaxuba/tmscpreg.h | 5 + sys/vaxuba/tsreg.h | 9 +- sys/vaxuba/ubareg.h | 14 ++- sys/vaxuba/ubavar.h | 18 ++- sys/vaxuba/udareg.h | 6 +- sys/vaxuba/upreg.h | 10 +- sys/vaxuba/utreg.h | 8 ++ sys/vaxuba/uureg.h | 5 +- sys/vaxuba/vpreg.h | 8 ++ sys/vaxuba/vsreg.h | 8 +- 529 files changed, 5671 insertions(+), 2300 deletions(-) create mode 100644 include/compat-4.1.h create mode 100644 include/compat-sys5.h create mode 100644 include/inet.h create mode 100644 include/ns.h create mode 100644 include/sys.h diff --git a/include/a.out.h b/include/a.out.h index 91d4fcd..ad3166f 100644 --- a/include/a.out.h +++ b/include/a.out.h @@ -1,3 +1,8 @@ +#ifndef _A_OUT_H_ +#define _A_OUT_H_ + +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -11,7 +16,7 @@ * and magic numbers are shared with * the kernel. */ -#include +/*#include */ /* * Macros which take exec structures as arguments and tell whether @@ -80,3 +85,18 @@ unsigned long n_value; /* value of this symbol (or sdb offset) */ * Format for namelist values. */ #define N_FORMAT "%08x" + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/nlist.c */ +int nlist __P((char *name, struct nlist *list)); +#endif + +#endif diff --git a/include/ar.h b/include/ar.h index 8780c1f..19fa478 100644 --- a/include/ar.h +++ b/include/ar.h @@ -1,3 +1,6 @@ +#ifndef _AR_H_ +#define _AR_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -20,3 +23,5 @@ struct ar_hdr { char ar_size[10]; char ar_fmag[2]; }; + +#endif diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h index 187a875..852fcf9 100644 --- a/include/arpa/ftp.h +++ b/include/arpa/ftp.h @@ -1,3 +1,6 @@ +#ifndef _ARPA_FTP_H_ +#define _ARPA_FTP_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -65,3 +68,5 @@ #define BLK_RESTART 0x10 /* Block is Restart Marker */ #define BLK_BYTECOUNT 2 /* Bytes in this block */ + +#endif diff --git a/include/arpa/inet.h b/include/arpa/inet.h index af957ca..65a2370 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -1,3 +1,9 @@ +#ifndef _ARPA_INET_H_ +#define _ARPA_INET_H_ + +#include +/*#include netinet/in.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,7 +16,37 @@ * External definitions for * functions in inet(3N) */ -unsigned long inet_addr(); -char *inet_ntoa(); -struct in_addr inet_makeaddr(); -unsigned long inet_network(); +/*unsigned long inet_addr();*/ +/*char *inet_ntoa();*/ +/*struct in_addr inet_makeaddr();*/ +/*unsigned long inet_network();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* inet/inet_addr.c */ +u_long inet_addr __P((register char *cp)); + +/* inet/inet_lnaof.c */ +int inet_lnaof __P((struct in_addr in)); + +/* inet/inet_makeaddr.c */ +struct in_addr inet_makeaddr __P((int net, int host)); + +/* inet/inet_netof.c */ +int inet_netof __P((struct in_addr in)); + +/* inet/inet_network.c */ +u_long inet_network __P((register char *cp)); + +/* inet/inet_ntoa.c */ +char *inet_ntoa __P((struct in_addr in)); +#endif + +#endif diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 2b85ac3..9c7207a 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,3 +1,9 @@ +#ifndef _ARPA_NAMESER_H_ +#define _ARPA_NAMESER_H_ + +#include +/*#include stdio.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -152,5 +158,45 @@ struct rrec { char *r_data; /* pointer to data */ }; -extern u_short getshort(); -extern u_long getlong(); +/*extern u_short getshort();*/ +/*extern u_long getlong();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* net/res_comp.c */ +int dn_expand __P((char *msg, char *eomorig, char *comp_dn, char *exp_dn, int length)); +int dn_comp __P((char *exp_dn, char *comp_dn, int length, char **dnptrs, char **lastdnptr)); +int dn_skip __P((char *comp_dn)); +int dn_find __P((char *exp_dn, char *msg, char **dnptrs, char **lastdnptr)); +u_short getshort __P((char *msgp)); +u_long getlong __P((char *msgp)); +int putshort __P((int s, register char *msgp)); +int putlong __P((register u_long l, register char *msgp)); + +/* net/res_debug.c */ +int p_query __P((char *msg)); +int fp_query __P((char *msg, FILE *file)); +char *p_cdname __P((char *cp, char *msg, FILE *file)); +char *p_rr __P((char *cp, char *msg, FILE *file)); +char *p_type __P((int type)); +char *p_class __P((int class)); + +/* net/res_init.c */ +int res_init __P((void)); + +/* net/res_mkquery.c */ +int res_mkquery __P((int op, char *dname, int class, int type, char *data, int datalen, struct rrec *newrr, char *buf, int buflen)); + +/* net/res_send.c */ +int res_send __P((char *buf, int buflen, char *answer, int anslen)); +int _res_close __P((void)); +#endif + +#endif diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h index 1c5b435..01b7a0c 100644 --- a/include/arpa/telnet.h +++ b/include/arpa/telnet.h @@ -1,3 +1,6 @@ +#ifndef _ARPA_TELNET_H_ +#define _ARPA_TELNET_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -80,3 +83,5 @@ char *telopts[NTELOPTS] = { /* sub-option qualifiers */ #define TELQUAL_IS 0 /* option is... */ #define TELQUAL_SEND 1 /* send option */ + +#endif diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h index 73c536c..6fed9fc 100644 --- a/include/arpa/tftp.h +++ b/include/arpa/tftp.h @@ -1,3 +1,6 @@ +#ifndef _ARPA_TFTP_H_ +#define _ARPA_TFTP_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -46,3 +49,5 @@ struct tftphdr { #define EBADID 5 /* unknown transfer ID */ #define EEXISTS 6 /* file already exists */ #define ENOUSER 7 /* no such user */ + +#endif diff --git a/include/assert.h b/include/assert.h index 1529b79..89072b1 100644 --- a/include/assert.h +++ b/include/assert.h @@ -1,9 +1,16 @@ +#ifndef _ASSERT_H_ +#define _ASSERT_H_ + +#include + /* assert.h 4.2 85/01/21 */ -# ifndef NDEBUG +/*# ifndef NDEBUG*/ # define _assert(ex) {if (!(ex)){fprintf(stderr,"Assertion failed: file \"%s\", line %d\n", __FILE__, __LINE__);exit(1);}} # define assert(ex) _assert(ex) # else # define _assert(ex) # define assert(ex) -# endif +/*# endif*/ + +#endif diff --git a/include/compat-4.1.h b/include/compat-4.1.h new file mode 100644 index 0000000..d546509 --- /dev/null +++ b/include/compat-4.1.h @@ -0,0 +1,35 @@ +#ifndef _COMPAT_4_1_H_ +#define _COMPAT_4_1_H_ + +#include +#include +/*#include sys/resource.h*/ +#include +#include +#include +#include + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/getpw.c */ +int getpw __P((int uid, char buf[])); + +/* compat-4.1/pause.c */ +int pause __P((void)); + +/* compat-4.1/rand.c */ +int srand __P((unsigned x)); +int rand __P((void)); + +/* compat-4.1/tell.c */ +long tell __P((int f)); +#endif + +#endif diff --git a/include/compat-sys5.h b/include/compat-sys5.h new file mode 100644 index 0000000..39dd615 --- /dev/null +++ b/include/compat-sys5.h @@ -0,0 +1,23 @@ +#ifndef _COMPAT_SYS5_H_ +#define _COMPAT_SYS5_H_ + +#include +#include + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-sys5/getopt.c */ +int getopt __P((int nargc, char **nargv, char *ostr)); + +/* compat-sys5/tmpnam.c */ +char *tmpnam __P((char *s)); +#endif + +#endif diff --git a/include/ctype.h b/include/ctype.h index 83d853b..1142fde 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -1,3 +1,6 @@ +#ifndef _CTYPE_H_ +#define _CTYPE_H_ + /* ctype.h 4.2 85/09/04 */ #define _U 01 @@ -26,3 +29,5 @@ extern char _ctype_[]; #define toupper(c) ((c)-'a'+'A') #define tolower(c) ((c)-'A'+'a') #define toascii(c) ((c)&0177) + +#endif diff --git a/include/disktab.h b/include/disktab.h index 060d15f..531770f 100644 --- a/include/disktab.h +++ b/include/disktab.h @@ -1,3 +1,6 @@ +#ifndef _DISKTAB_H_ +#define _DISKTAB_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -28,4 +31,19 @@ struct disktab { } d_partitions[8]; }; -struct disktab *getdiskbyname(); +/*struct disktab *getdiskbyname();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/disktab.c */ +struct disktab *getdiskbyname __P((char *name)); +#endif + +#endif diff --git a/include/fstab.h b/include/fstab.h index c595c82..e42a66f 100644 --- a/include/fstab.h +++ b/include/fstab.h @@ -1,3 +1,6 @@ +#ifndef _FSTAB_H_ +#define _FSTAB_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -34,9 +37,29 @@ struct fstab{ int fs_passno; /* pass number on parallel dump */ }; -struct fstab *getfsent(); -struct fstab *getfsspec(); -struct fstab *getfsfile(); -struct fstab *getfstype(); -int setfsent(); -int endfsent(); +/*struct fstab *getfsent();*/ +/*struct fstab *getfsspec();*/ +/*struct fstab *getfsfile();*/ +/*struct fstab *getfstype();*/ +/*int setfsent();*/ +/*int endfsent();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/fstab.c */ +int setfsent __P((void)); +int endfsent __P((void)); +struct fstab *getfsent __P((void)); +struct fstab *getfsspec __P((char *name)); +struct fstab *getfsfile __P((char *name)); +struct fstab *getfstype __P((char *type)); +#endif + +#endif diff --git a/include/gen.h b/include/gen.h index c0a77d9..79be393 100644 --- a/include/gen.h +++ b/include/gen.h @@ -1,5 +1,129 @@ +#ifndef _GEN_H_ +#define _GEN_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include a.out.h*/ +#include +#include +#include +/*#include sys/proc.h*/ +/*#include sys/proc.h*/ +#include +#include + /* formerly duplicated in gen/insque.c and gen/remque.c */ struct vaxque { /* queue format expected by VAX queue instructions */ struct vaxque *vq_next; struct vaxque *vq_prev; }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/abort.c */ +int abort __P((void)); + +/* gen/abs.c */ +int abs __P((int i)); + +/* gen/atoi.c */ +int atoi __P((register char *p)); + +/* gen/atol.c */ +long atol __P((register char *p)); + +/* gen/calloc.c */ +void *calloc __P((register unsigned num, register unsigned size)); +int cfree __P((void *p, unsigned num, unsigned size)); + +/* gen/crypt.c */ +int setkey __P((char *key)); +int encrypt __P((char *block, int edflag)); +char *crypt __P((char *pw, char *salt)); + +/* gen/ecvt.c */ +char *ecvt __P((double arg, int ndigits, int *decpt, int *sign)); +char *fcvt __P((double arg, int ndigits, int *decpt, int *sign)); + +/* gen/fakcu.c */ +void _cleanup __P((void)); + +/* gen/ffs.c */ +int ffs __P((register long mask)); + +/* gen/gcvt.c */ +char *gcvt __P((double number, int ndigit, char *buf)); + +/* gen/getenv.c */ +char *getenv __P((register char *name)); + +/* gen/getpass.c */ +char *getpass __P((char *prompt)); + +/* gen/getusershell.c */ +char *getusershell __P((void)); +int endusershell __P((void)); +int setusershell __P((void)); + +/* gen/insque.c */ +int insque __P((register struct vaxque *e, register struct vaxque *prev)); + +/* gen/malloc.c */ +void *malloc __P((unsigned nbytes)); +void morecore __P((int bucket)); +void free __P((void *cp)); +void *realloc __P((void *cp, unsigned nbytes)); +void mstats __P((char *s)); + +/* gen/mkstemp.c */ +int mkstemp __P((char *as)); + +/* gen/mktemp.c */ +char *mktemp __P((char *as)); + +/* gen/qsort.c */ +void qsort __P((void *_base, int n, int size, int (*compar)(void))); + +/* gen/random.c */ +int srandom __P((unsigned x)); +char *initstate __P((unsigned seed, char *arg_state, int n)); +char *setstate __P((char *arg_state)); +long random __P((void)); + +/* gen/regex.c */ +char *re_comp __P((register char *sp)); +int re_exec __P((register char *p1)); +int backref __P((register int i, register char *lp)); +int cclass __P((register char *set, int c, int af)); + +/* gen/remque.c */ +int remque __P((register struct vaxque *e)); + +/* gen/swab.c */ +int swab __P((register char *from, register char *to, register int n)); + +/* gen/timezone.c */ +char *timezone __P((int zone, int dst)); + +/* gen/valloc.c */ +void *valloc __P((int i)); +#endif + +#endif diff --git a/include/grp.h b/include/grp.h index f053f22..7197fbf 100644 --- a/include/grp.h +++ b/include/grp.h @@ -1,3 +1,6 @@ +#ifndef _GRP_H_ +#define _GRP_H_ + /* grp.h 4.1 83/05/03 */ struct group { /* see getgrent(3) */ @@ -7,4 +10,30 @@ struct group { /* see getgrent(3) */ char **gr_mem; }; -struct group *getgrent(), *getgrgid(), *getgrnam(); +/*struct group *getgrent(), *getgrgid(), *getgrnam();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/getgrent.c */ +int setgrent __P((void)); +int endgrent __P((void)); +struct group *getgrent __P((void)); + +/* gen/getgrgid.c */ +struct group *getgrgid __P((register gid)); + +/* gen/getgrnam.c */ +struct group *getgrnam __P((register char *name)); + +/* gen/initgroups.c */ +int initgroups __P((char *uname, int agroup)); +#endif + +#endif diff --git a/include/inet.h b/include/inet.h new file mode 100644 index 0000000..be7a8b0 --- /dev/null +++ b/include/inet.h @@ -0,0 +1,6 @@ +#ifndef _INET_H_ +#define _INET_H_ + +#include + +#endif diff --git a/include/lastlog.h b/include/lastlog.h index 3686a91..65c514f 100644 --- a/include/lastlog.h +++ b/include/lastlog.h @@ -1,3 +1,8 @@ +#ifndef _LASTLOG_H_ +#define _LASTLOG_H_ + +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -11,3 +16,5 @@ struct lastlog { char ll_line[8]; char ll_host[16]; /* same as in utmp */ }; + +#endif diff --git a/include/math.h b/include/math.h index 6b874d6..1f968be 100644 --- a/include/math.h +++ b/include/math.h @@ -1,20 +1,47 @@ +#ifndef _MATH_H_ +#define _MATH_H_ + /* math.h 4.6 9/11/85 */ -extern double asinh(), acosh(), atanh(); -extern double erf(), erfc(); -extern double exp(), expm1(), log(), log10(), log1p(), pow(); -extern double fabs(), floor(), ceil(), rint(); -extern double lgamma(); -extern double hypot(), cabs(); -extern double copysign(), drem(), logb(), scalb(); -extern int finite(); +/*extern double asinh(), acosh(), atanh();*/ +/*extern double erf(), erfc();*/ +/*extern double exp(), expm1(), log(), log10(), log1p(), pow();*/ +/*extern double fabs(), floor(), ceil(), rint();*/ +/*extern double lgamma();*/ +/*extern double hypot(), cabs();*/ +/*extern double copysign(), drem(), logb(), scalb();*/ +/*extern int finite();*/ #ifdef vax -extern double infnan(); +/*extern double infnan();*/ #endif -extern double j0(), j1(), jn(), y0(), y1(), yn(); -extern double sin(), cos(), tan(), asin(), acos(), atan(), atan2(); -extern double sinh(), cosh(), tanh(); -extern double cbrt(), sqrt(); -extern double modf(), ldexp(), frexp(), atof(); +/*extern double j0(), j1(), jn(), y0(), y1(), yn();*/ +/*extern double sin(), cos(), tan(), asin(), acos(), atan(), atan2();*/ +/*extern double sinh(), cosh(), tanh();*/ +/*extern double cbrt(), sqrt();*/ +/*extern double modf(), ldexp(), frexp(), atof();*/ #define HUGE 1.701411733192644270e38 + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/atof.c */ +double atof __P((char *s)); + +/* gen/frexp.c */ +double frexp __P((double x, int *i)); + +/* gen/ldexp.c */ +double ldexp __P((double v, int e)); + +/* gen/modf.c */ +double modf __P((double v, double *p)); +#endif + +#endif diff --git a/include/memory.h b/include/memory.h index 532c8df..391cd52 100644 --- a/include/memory.h +++ b/include/memory.h @@ -1,3 +1,6 @@ +#ifndef _MEMORY_H_ +#define _MEMORY_H_ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,8 +13,35 @@ * Definitions of the Sys5 compat memory manipulation routines */ -extern char *memccpy(); -extern char *memchr(); -extern int memcmp(); -extern char *memcpy(); -extern char *memset(); +/*extern char *memccpy();*/ +/*extern char *memchr();*/ +/*extern int memcmp();*/ +/*extern char *memcpy();*/ +/*extern char *memset();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-sys5/memccpy.c */ +char *memccpy __P((void *_t, void *_f, register c, register n)); + +/* compat-sys5/memchr.c */ +void *memchr __P((void *_s, register c, register n)); + +/* compat-sys5/memcmp.c */ +int memcmp __P((void *_s1, void *_s2, register n)); + +/* compat-sys5/memcpy.c */ +void *memcpy __P((void *_t, void *_f, register n)); + +/* compat-sys5/memset.c */ +void *memset __P((void *_s, register c, register n)); +#endif + +#endif diff --git a/include/mtab.h b/include/mtab.h index bfe07ce..18179d7 100644 --- a/include/mtab.h +++ b/include/mtab.h @@ -1,3 +1,6 @@ +#ifndef _MTAB_H_ +#define _MTAB_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -14,3 +17,5 @@ struct mtab { char m_dname[32]; /* block device pathname */ char m_type[4]; /* read-only, quotas */ }; + +#endif diff --git a/include/ndbm.h b/include/ndbm.h index 57a8bf1..c45aa3a 100644 --- a/include/ndbm.h +++ b/include/ndbm.h @@ -1,3 +1,6 @@ +#ifndef _NDBM_H_ +#define _NDBM_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -52,11 +55,33 @@ typedef struct { #define DBM_INSERT 0 #define DBM_REPLACE 1 -DBM *dbm_open(); -void dbm_close(); -datum dbm_fetch(); -datum dbm_firstkey(); -datum dbm_nextkey(); -long dbm_forder(); -int dbm_delete(); -int dbm_store(); +/*DBM *dbm_open();*/ +/*void dbm_close();*/ +/*datum dbm_fetch();*/ +/*datum dbm_firstkey();*/ +/*datum dbm_nextkey();*/ +/*long dbm_forder();*/ +/*int dbm_delete();*/ +/*int dbm_store();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/ndbm.c */ +DBM *dbm_open __P((char *file, int flags, ...)); +void dbm_close __P((DBM *db)); +long dbm_forder __P((register DBM *db, datum key)); +datum dbm_fetch __P((register DBM *db, datum key)); +int dbm_delete __P((register DBM *db, datum key)); +int dbm_store __P((register DBM *db, datum key, datum dat, int replace)); +datum dbm_firstkey __P((DBM *db)); +datum dbm_nextkey __P((register DBM *db)); +#endif + +#endif diff --git a/include/net.h b/include/net.h index 7c94432..337cc5a 100644 --- a/include/net.h +++ b/include/net.h @@ -1,6 +1,53 @@ +#ifndef _NET_H_ +#define _NET_H_ + +#include +#include +/*#include arpa/nameser.h*/ +/*#include arpa/nameser.h*/ + /* * Functions for number representation conversion. */ /* formerly duplicated in netinet/in.h and netns/ns.h */ -u_short ntohs(), htons(); -u_long ntohl(), htonl(); +/*u_short ntohs(), htons();*/ +/*u_long ntohl(), htonl();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* net/htonl.c */ +u_long htonl __P((u_long hostlong)); + +/* net/htons.c */ +u_short htons __P((int hostshort)); + +/* net/ntohl.c */ +u_long ntohl __P((u_long netlong)); + +/* net/ntohs.c */ +u_short ntohs __P((int netshort)); + +/* net/rcmd.c */ +int rcmd __P((char **ahost, int rport, char *locuser, char *remuser, char *cmd, int *fd2p)); +int rresvport __P((int *alport)); +int ruserok __P((char *rhost, int superuser, char *ruser, char *luser)); +int _validuser __P((FILE *hostf, char *rhost, char *luser, char *ruser, int baselen)); +int _checkhost __P((char *rhost, char *lhost, int len)); + +/* net/rexec.c */ +int rexec __P((char **ahost, int rport, char *name, char *pass, char *cmd, int *fd2p)); + +/* net/ruserpass.c */ +void ruserpass __P((char *host, char **aname, char **apass)); +void mkpwunclear __P((char *spasswd, int mch, char *sencpasswd)); +void mkpwclear __P((char *sencpasswd, int mch, char *spasswd)); +#endif + +#endif diff --git a/include/netdb.h b/include/netdb.h index 762e4a5..4e8813d 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -1,3 +1,6 @@ +#ifndef _NETDB_H_ +#define _NETDB_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -46,10 +49,10 @@ struct protoent { int p_proto; /* protocol # */ }; -struct hostent *gethostbyname(), *gethostbyaddr(), *gethostent(); -struct netent *getnetbyname(), *getnetbyaddr(), *getnetent(); -struct servent *getservbyname(), *getservbyport(), *getservent(); -struct protoent *getprotobyname(), *getprotobynumber(), *getprotoent(); +/*struct hostent *gethostbyname(), *gethostbyaddr(), *gethostent();*/ +/*struct netent *getnetbyname(), *getnetbyaddr(), *getnetent();*/ +/*struct servent *getservbyname(), *getservbyport(), *getservent();*/ +/*struct protoent *getprotobyname(), *getprotobynumber(), *getprotoent();*/ /* * Error return codes from gethostbyname() and gethostbyaddr() @@ -61,3 +64,72 @@ extern int h_errno; #define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ #define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ #define NO_ADDRESS 4 /* Valid host name, no address, look for MX record */ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* net/getnetbyaddr.c */ +struct netent *getnetbyaddr __P((register int net, register int type)); + +/* net/getnetbyname.c */ +struct netent *getnetbyname __P((register char *name)); + +/* net/getnetent.c */ +int setnetent __P((int f)); +int endnetent __P((void)); +struct netent *getnetent __P((void)); + +/* net/getproto.c */ +struct protoent *getprotobynumber __P((register int proto)); + +/* net/getprotoent.c */ +int setprotoent __P((int f)); +int endprotoent __P((void)); +struct protoent *getprotoent __P((void)); + +/* net/getprotoname.c */ +struct protoent *getprotobyname __P((register char *name)); + +/* net/getservbyname.c */ +struct servent *getservbyname __P((char *name, char *proto)); + +/* net/getservbyport.c */ +struct servent *getservbyport __P((int port, char *proto)); + +/* net/getservent.c */ +int setservent __P((int f)); +int endservent __P((void)); +struct servent *getservent __P((void)); + +/* net/hosttable/gethostent.c */ +int sethostent __P((int f)); +int endhostent __P((void)); +struct hostent *gethostent __P((void)); +int sethostfile __P((char *file)); + +/* net/hosttable/gethostnamadr.c */ +struct hostent *gethostbyname __P((register char *nam)); +struct hostent *gethostbyaddr __P((char *addr, register int length, register int type)); + +/* net/named/gethostnamadr.c */ +struct hostent *gethostbyname __P((char *name)); +struct hostent *gethostbyaddr __P((char *addr, int len, int type)); +int _sethtent __P((int f)); +int _endhtent __P((void)); +struct hostent *_gethtent __P((void)); +struct hostent *_gethtbyname __P((char *name)); +struct hostent *_gethtbyaddr __P((char *addr, int len, int type)); + +/* net/named/sethostent.c */ +int sethostent __P((int stayopen)); +int endhostent __P((void)); +int sethostfile __P((char *name)); +#endif + +#endif diff --git a/include/ns.h b/include/ns.h new file mode 100644 index 0000000..953afdf --- /dev/null +++ b/include/ns.h @@ -0,0 +1,6 @@ +#ifndef _NS_H_ +#define _NS_H_ + +#include + +#endif diff --git a/include/pcc.h b/include/pcc.h index efc6da5..7e3e2f3 100644 --- a/include/pcc.h +++ b/include/pcc.h @@ -1,3 +1,8 @@ +#ifndef _PCC_H_ +#define _PCC_H_ + +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -113,7 +118,7 @@ # define PCC_INLINE 61 /* inline function */ /* no ASG */ # define PCC_UINLINE 63 /* inline with no arguments */ -# endif INLINE +# endif /* * Referencing and dereferencing. @@ -179,8 +184,7 @@ # define PCCF_FARIF 156 /* not implemented */ # define PCCF_FLABEL 157 /* an f77 label */ -# endif PCC_TOKENS - +# endif /* * Types, as encoded in intermediate file cookies. @@ -211,7 +215,6 @@ # define PCCTM_BASETYPE 017 # define PCCTM_TYPESHIFT 2 - /* * Useful macros. 'PCCOM' macros apply to ops. */ @@ -227,3 +230,5 @@ # define PCCM_ADDTYPE(t, m) \ ((((t) &~ PCCTM_BASETYPE) << PCCTM_TYPESHIFT) | \ (m) | ((t) & PCCTM_BASETYPE)) + +#endif diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h index fc576ec..faafd45 100644 --- a/include/protocols/dumprestore.h +++ b/include/protocols/dumprestore.h @@ -1,3 +1,9 @@ +#ifndef _PROTOCOLS_DUMPRESTORE_H_ +#define _PROTOCOLS_DUMPRESTORE_H_ + +#include +/*#include sys/inode.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -55,3 +61,5 @@ union u_spcl { #define DUMPOUTFMT "%-16s %c %s" /* for printf */ /* name, incno, ctime(date) */ #define DUMPINFMT "%16s %c %[^\n]\n" /* inverse for scanf */ + +#endif diff --git a/include/protocols/routed.h b/include/protocols/routed.h index ad7a61c..57facfe 100644 --- a/include/protocols/routed.h +++ b/include/protocols/routed.h @@ -1,3 +1,9 @@ +#ifndef _PROTOCOLS_ROUTED_H_ +#define _PROTOCOLS_ROUTED_H_ + +#include +/*#include sys/socket.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -62,3 +68,5 @@ char *ripcmds[RIPCMD_MAX] = #define EXPIRE_TIME 180 /* time to mark entry invalid */ #define GARBAGE_TIME 240 /* time to garbage collect */ + +#endif diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h index 745c4b1..0bc2dc8 100644 --- a/include/protocols/rwhod.h +++ b/include/protocols/rwhod.h @@ -1,3 +1,6 @@ +#ifndef _PROTOCOLS_RWHOD_H_ +#define _PROTOCOLS_RWHOD_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -32,3 +35,5 @@ struct whod { #define WHODVERSION 1 #define WHODTYPE_STATUS 1 /* host status */ + +#endif diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h index b932862..3936c31 100644 --- a/include/protocols/talkd.h +++ b/include/protocols/talkd.h @@ -1,3 +1,9 @@ +#ifndef _PROTOCOLS_TALKD_H_ +#define _PROTOCOLS_TALKD_H_ + +#include +/*#include sys/socket.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +12,8 @@ * @(#)talkd.h 5.2 (Berkeley) 3/13/86 */ -#include -#include +/*#include */ +/*#include */ /* * This describes the protocol used by the talk server and clients. * @@ -82,3 +88,5 @@ typedef struct { #define MAX_LIFE 60 /* max time daemon saves invitations */ /* RING_WAIT should be 10's of seconds less than MAX_LIFE */ #define RING_WAIT 30 /* time to wait before resending invitation */ + +#endif diff --git a/include/protocols/timed.h b/include/protocols/timed.h index 786d9d8..1177f92 100644 --- a/include/protocols/timed.h +++ b/include/protocols/timed.h @@ -1,3 +1,10 @@ +#ifndef _PROTOCOLS_TIMED_H_ +#define _PROTOCOLS_TIMED_H_ + +#include +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -65,3 +72,5 @@ char *tsptype[TSPTYPENUMBER] = "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ", "TEST", "SETDATE", "SETDATEREQ", "LOOP" }; #endif + +#endif diff --git a/include/pwd.h b/include/pwd.h index 6954fd7..5ae146d 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -1,3 +1,6 @@ +#ifndef _PWD_H_ +#define _PWD_H_ + /* pwd.h 4.1 83/05/03 */ struct passwd { /* see getpwent(3) */ @@ -12,4 +15,26 @@ struct passwd { /* see getpwent(3) */ char *pw_shell; }; -struct passwd *getpwent(), *getpwuid(), *getpwnam(); +/*struct passwd *getpwent(), *getpwuid(), *getpwnam();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/getpwent.c */ +int setpwent __P((void)); +int endpwent __P((void)); +struct passwd *getpwent __P((void)); +int setpwfile __P((char *file)); + +/* gen/getpwnamuid.c */ +struct passwd *getpwnam __P((char *nam)); +struct passwd *getpwuid __P((int uid)); +#endif + +#endif diff --git a/include/ranlib.h b/include/ranlib.h index 936ba34..7ea58a1 100644 --- a/include/ranlib.h +++ b/include/ranlib.h @@ -1,3 +1,8 @@ +#ifndef _RANLIB_H_ +#define _RANLIB_H_ + +#include + /* ranlib.h 4.1 83/05/03 */ /* @@ -15,3 +20,5 @@ struct ranlib { } ran_un; off_t ran_off; /* library member at this offset */ }; + +#endif diff --git a/include/resolv.h b/include/resolv.h index ec5ff75..ab44739 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -1,3 +1,9 @@ +#ifndef _RESOLV_H_ +#define _RESOLV_H_ + +#include +#include +/*#include arpa/nameser.h*/ /* * Copyright (c) 1983 Regents of the University of California. @@ -11,10 +17,8 @@ * Global defines and variables for resolver stub. */ - #define MAXNS 3 /* max # name servers we'll track */ - struct state { int retrans; /* retransmition time interval */ int retry; /* number of times to retransmit */ @@ -40,4 +44,6 @@ struct state { #define RES_STAYOPEN 0x0100 /* Keep TCP socket open */ extern struct state _res; -extern char *p_cdname(), *p_rr(), *p_type(), *p_class(); +/*extern char *p_cdname(), *p_rr(), *p_type(), *p_class();*/ + +#endif diff --git a/include/setjmp.h b/include/setjmp.h index a8c173c..200fc3a 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -1,3 +1,29 @@ +#ifndef _SETJMP_H_ +#define _SETJMP_H_ + /* setjmp.h 4.1 83/05/03 */ typedef int jmp_buf[10]; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/_setjmp.c */ +int _setjmp __P((jmp_buf e)); +void _longjmp __P((jmp_buf e, int v)); + +/* gen/setjmp.c */ +int setjmp __P((jmp_buf e)); +void longjmp __P((jmp_buf e, int v)); + +/* gen/setjmperr.c */ +int longjmperror __P((void)); +#endif + +#endif diff --git a/include/sgtty.h b/include/sgtty.h index e1186ca..cc1d2da 100644 --- a/include/sgtty.h +++ b/include/sgtty.h @@ -1,5 +1,12 @@ -/* sgtty.h 4.2 85/01/03 */ +#ifndef _SGTTY_H_ +#define _SGTTY_H_ -#ifndef _IOCTL_ #include + +/* sgtty.h 4.2 85/01/03 */ + +/*#ifndef _IOCTL_*/ +/*#include */ +/*#endif*/ + #endif diff --git a/include/stab.h b/include/stab.h index d7547d4..8eeac29 100644 --- a/include/stab.h +++ b/include/stab.h @@ -1,3 +1,6 @@ +#ifndef _STAB_H_ +#define _STAB_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -40,3 +43,5 @@ * for the berkeley pascal compiler, pc(1): */ #define N_PC 0x30 /* global pascal symbol: name,,0,subtype,line */ + +#endif diff --git a/include/stdio.h b/include/stdio.h index ca9648c..76125b9 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,3 +1,11 @@ +#ifndef _STDIO_H_ +#define _STDIO_H_ + +#include +#ifdef __STDC__ +#include +#endif + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +14,7 @@ * @(#)stdio.h 5.3 (Berkeley) 3/15/86 */ -# ifndef FILE +/*# ifndef FILE*/ #define BUFSIZ 1024 extern struct _iobuf { int _cnt; @@ -35,7 +43,7 @@ extern struct _iobuf { #define stderr (&_iob[2]) #ifndef lint #define getc(p) (--(p)->_cnt>=0? (int)(*(unsigned char *)(p)->_ptr++):_filbuf(p)) -#endif not lint +#endif #define getchar() getc(stdin) #ifndef lint #define putc(x, p) (--(p)->_cnt >= 0 ?\ @@ -45,21 +53,154 @@ extern struct _iobuf { (int)(*(unsigned char *)(p)->_ptr++) :\ _flsbuf(*(unsigned char *)(p)->_ptr, p)) :\ _flsbuf((unsigned char)(x), p))) -#endif not lint +#endif #define putchar(x) putc(x,stdout) #define feof(p) (((p)->_flag&_IOEOF)!=0) #define ferror(p) (((p)->_flag&_IOERR)!=0) #define fileno(p) ((p)->_file) #define clearerr(p) ((p)->_flag &= ~(_IOERR|_IOEOF)) -FILE *fopen(); -FILE *fdopen(); -FILE *freopen(); -FILE *popen(); -long ftell(); -char *fgets(); -char *gets(); +/*FILE *fopen();*/ +/*FILE *fdopen();*/ +/*FILE *freopen();*/ +/*FILE *popen();*/ +/*long ftell();*/ +/*char *fgets();*/ +/*char *gets();*/ #if 0 /*def vax*/ -char *sprintf(); /* too painful to do right */ +/*char *sprintf();*/ /* too painful to do right */ +#endif +/*# endif*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* stdio/clrerr.c */ +int clearerr __P((register FILE *iop)); + +/* stdio/doprnt.c */ +int _doprnt __P((u_char *fmt0, va_list argp, register FILE *fp)); + +/* stdio/doscan.c */ +int _doscan __P((FILE *iop, register char *fmt, register va_list argp)); + +/* stdio/exit.c */ +int exit __P((int code)); + +/* stdio/fdopen.c */ +FILE *fdopen __P((int fd, register char *mode)); + +/* stdio/fgetc.c */ +int fgetc __P((FILE *fp)); + +/* stdio/fgets.c */ +char *fgets __P((char *s, int n, register FILE *iop)); + +/* stdio/filbuf.c */ +int _filbuf __P((register FILE *iop)); + +/* stdio/findiop.c */ +FILE *_findiop __P((void)); +int _f_morefiles __P((void)); +void f_prealloc __P((void)); +void _fwalk __P((register int (*function)(void))); +void _cleanup __P((void)); + +/* stdio/flsbuf.c */ +int _flsbuf __P((int c, register FILE *iop)); +int fflush __P((register FILE *iop)); +int fclose __P((register FILE *iop)); + +/* stdio/fopen.c */ +FILE *fopen __P((char *file, register char *mode)); + +/* stdio/fprintf.c */ +int fprintf __P((register FILE *iop, char *fmt, ...)); + +/* stdio/fputc.c */ +int fputc __P((int c, register FILE *fp)); + +/* stdio/fputs.c */ +int fputs __P((register char *s, register FILE *iop)); + +/* stdio/fread.c */ +int fread __P((void *_ptr, unsigned size, unsigned count, register FILE *iop)); + +/* stdio/freopen.c */ +FILE *freopen __P((char *file, register char *mode, register FILE *iop)); + +/* stdio/fseek.c */ +int fseek __P((register FILE *iop, long offset, int ptrname)); + +/* stdio/ftell.c */ +long ftell __P((register FILE *iop)); + +/* stdio/fwrite.c */ +int fwrite __P((void *_ptr, unsigned size, unsigned count, register FILE *iop)); + +/* stdio/getchar.c */ +int getchar __P((void)); + +/* stdio/gets.c */ +char *gets __P((char *s)); + +/* stdio/getw.c */ +int getw __P((register FILE *iop)); + +/* stdio/popen.c */ +FILE *popen __P((char *cmd, char *mode)); +int pclose __P((FILE *ptr)); + +/* stdio/printf.c */ +int printf __P((char *fmt, ...)); + +/* stdio/putchar.c */ +int putchar __P((register c)); + +/* stdio/puts.c */ +int puts __P((register char *s)); + +/* stdio/putw.c */ +int putw __P((int w, register FILE *iop)); + +/* stdio/rew.c */ +int rewind __P((register FILE *iop)); + +/* stdio/scanf.c */ +int scanf __P((char *fmt, ...)); +int fscanf __P((FILE *iop, char *fmt, ...)); +int sscanf __P((register char *str, char *fmt, ...)); + +/* stdio/setbuf.c */ +int setbuf __P((register FILE *iop, char *buf)); + +/* stdio/setbuffer.c */ +int setbuffer __P((register FILE *iop, char *buf, int size)); +int setlinebuf __P((register FILE *iop)); + +/* stdio/sprintf.c */ +int sprintf __P((char *str, char *fmt, ...)); + +/* stdio/strout.c */ +int _strout __P((register count, register char *string, int adjust, register FILE *file, int fillch)); + +/* stdio/ungetc.c */ +int ungetc __P((int c, register FILE *iop)); + +/* stdio/vfprintf.c */ +int vfprintf __P((FILE *iop, char *fmt, va_list argp)); + +/* stdio/vprintf.c */ +int vprintf __P((char *fmt, va_list argp)); + +/* stdio/vsprintf.c */ +int vsprintf __P((char *str, char *fmt, va_list argp)); +#endif + #endif -# endif diff --git a/include/string.h b/include/string.h index b9e5c45..f0603f5 100644 --- a/include/string.h +++ b/include/string.h @@ -1,3 +1,6 @@ +#ifndef _STRING_H_ +#define _STRING_H_ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,24 +9,63 @@ * @(#)string.h 5.1 (Berkeley) 85/08/05 */ -#include +/*#include */ /* * these next few are obsolete trash */ -extern char *strcpyn(); -extern char *strcatn(); -extern int strcmpn(); +/*extern char *strcpyn();*/ +/*extern char *strcatn();*/ +/*extern int strcmpn();*/ /* * and the rest are Sys5 functions supported just so * Sys5 progs will compile easily. */ -extern char *strchr(); -extern char *strrchr(); -extern char *strpbrk(); -extern int strspn(); -extern int strcspn(); -extern char *strtok(); +/*extern char *strchr();*/ +/*extern char *strrchr();*/ +/*extern char *strpbrk();*/ +/*extern int strspn();*/ +/*extern int strcspn();*/ +/*extern char *strtok();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-sys5/strcatn.c */ +char *strcatn __P((register char *s1, register char *s2, register n)); + +/* compat-sys5/strchr.c */ +char *strchr __P((register char *sp, int c)); + +/* compat-sys5/strcmpn.c */ +int strcmpn __P((register char *s1, register char *s2, register n)); + +/* compat-sys5/strcpyn.c */ +char *strcpyn __P((register char *s1, register char *s2, int n)); + +/* compat-sys5/strcspn.c */ +int strcspn __P((register char *s, register char *set)); + +/* compat-sys5/strpbrk.c */ +char *strpbrk __P((register char *s, register char *brk)); + +/* compat-sys5/strrchr.c */ +char *strrchr __P((register char *sp, int c)); + +/* compat-sys5/strspn.c */ +int strspn __P((register char *s, register char *set)); + +/* compat-sys5/strtok.c */ +char *strtok __P((register char *s, register char *sep)); +#endif + +#endif diff --git a/include/strings.h b/include/strings.h index 2b69a31..139103e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1,3 +1,6 @@ +#ifndef _STRINGS_H_ +#define _STRINGS_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,12 +13,60 @@ * External function definitions * for routines described in string(3). */ -char *strcat(); -char *strncat(); -int strcmp(); -int strncmp(); -char *strcpy(); -char *strncpy(); -int strlen(); -char *index(); -char *rindex(); +/*char *strcat();*/ +/*char *strncat();*/ +/*int strcmp();*/ +/*int strncmp();*/ +/*char *strcpy();*/ +/*char *strncpy();*/ +/*int strlen();*/ +/*char *index();*/ +/*char *rindex();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/bcmp.c */ +int bcmp __P((void *_b1, void *_b2, register int length)); + +/* gen/bcopy.c */ +int bcopy __P((void *_src, void *_dst, register int length)); + +/* gen/bzero.c */ +int bzero __P((void *_b, register int length)); + +/* gen/index.c */ +char *index __P((register char *sp, int c)); + +/* gen/rindex.c */ +char *rindex __P((register char *sp, int c)); + +/* gen/strcat.c */ +char *strcat __P((register char *s1, register char *s2)); + +/* gen/strcmp.c */ +int strcmp __P((register char *s1, register char *s2)); + +/* gen/strcpy.c */ +char *strcpy __P((register char *s1, register char *s2)); + +/* gen/strlen.c */ +int strlen __P((register char *s)); + +/* gen/strncat.c */ +char *strncat __P((register char *s1, register char *s2, register n)); + +/* gen/strncmp.c */ +int strncmp __P((register char *s1, register char *s2, register n)); + +/* gen/strncpy.c */ +char *strncpy __P((register char *s1, register char *s2, int n)); +#endif + +#endif diff --git a/include/struct.h b/include/struct.h index 2486388..044352d 100644 --- a/include/struct.h +++ b/include/struct.h @@ -1,3 +1,6 @@ +#ifndef _STRUCT_H_ +#define _STRUCT_H_ + /* struct.h 4.1 83/05/03 */ /* @@ -7,3 +10,5 @@ #define fldoff(str, fld) ((int)&(((struct str *)0)->fld)) #define fldsiz(str, fld) (sizeof(((struct str *)0)->fld)) #define strbase(str, ptr, fld) ((struct str *)((char *)(ptr)-fldoff(str, fld))) + +#endif diff --git a/include/sys.h b/include/sys.h new file mode 100644 index 0000000..b077031 --- /dev/null +++ b/include/sys.h @@ -0,0 +1,62 @@ +#ifndef _SYS_H_ +#define _SYS_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include sys/wait.h*/ +#include +#include +/*#include sys/ioctl.h*/ +#include +/*#include sys/proc.h*/ +#include +#include + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/gethostid.c */ +long gethostid __P((void)); + +/* sys/gethostname.c */ +int gethostname __P((char *n, int l)); + +/* sys/getpagesize.c */ +int getpagesize __P((void)); + +/* sys/profil.c */ +void profil __P((char *b, int s, int o, int i)); + +/* sys/reboot.c */ +void reboot __P((int h)); + +/* sys/sethostid.c */ +int sethostid __P((long h)); + +/* sys/sethostname.c */ +int sethostname __P((char *n, int l)); + +/* sys/shutdown.c */ +int shutdown __P((int s, int h)); + +/* sys/swapon.c */ +int swapon __P((char *s)); + +/* sys/vhangup.c */ +void vhangup __P((void)); +#endif + +#endif diff --git a/include/syscall.h b/include/syscall.h index 89ceabe..7e99388 100644 --- a/include/syscall.h +++ b/include/syscall.h @@ -1,3 +1,6 @@ +#ifndef _SYSCALL_H_ +#define _SYSCALL_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -156,3 +159,5 @@ #define SYS_setquota 148 #define SYS_quota 149 #define SYS_getsockname 150 + +#endif diff --git a/include/sysexits.h b/include/sysexits.h index dc4a9ff..9382f44 100644 --- a/include/sysexits.h +++ b/include/sysexits.h @@ -1,3 +1,6 @@ +#ifndef _SYSEXITS_H_ +#define _SYSEXITS_H_ + /* ** SYSEXITS.H -- Exit status codes for system programs. ** @@ -80,3 +83,5 @@ # define EX_TEMPFAIL 75 /* temp failure; user is invited to retry */ # define EX_PROTOCOL 76 /* remote error in protocol */ # define EX_NOPERM 77 /* permission denied */ + +#endif diff --git a/include/time.h b/include/time.h index 8eb62c0..921e9bb 100644 --- a/include/time.h +++ b/include/time.h @@ -1,3 +1,8 @@ +#ifndef _TIME_H_ +#define _TIME_H_ + +#include + /* time.h 1.1 85/03/13 */ /* @@ -15,5 +20,24 @@ struct tm { int tm_isdst; }; -extern struct tm *gmtime(), *localtime(); -extern char *asctime(), *ctime(); +/*extern struct tm *gmtime(), *localtime();*/ +/*extern char *asctime(), *ctime();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/ctime.c */ +char *ctime __P((time_t *t)); +struct tm *localtime __P((time_t *tim)); +struct tm *gmtime __P((time_t *tim)); +char *asctime __P((struct tm *t)); +int dysize __P((int y)); +#endif + +#endif diff --git a/include/ttyent.h b/include/ttyent.h index f7e0835..9556424 100644 --- a/include/ttyent.h +++ b/include/ttyent.h @@ -1,3 +1,6 @@ +#ifndef _TTYENT_H_ +#define _TTYENT_H_ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -18,5 +21,25 @@ struct ttyent { /* see getttyent(3) */ #define TTY_ON 0x1 /* enable logins (startup getty) */ #define TTY_SECURE 0x2 /* allow root to login */ -extern struct ttyent *getttyent(); -extern struct ttyent *getttynam(); +/*extern struct ttyent *getttyent();*/ +/*extern struct ttyent *getttynam();*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/getttyent.c */ +int setttyent __P((void)); +int endttyent __P((void)); +struct ttyent *getttyent __P((void)); + +/* gen/getttynam.c */ +struct ttyent *getttynam __P((char *tty)); +#endif + +#endif diff --git a/include/utmp.h b/include/utmp.h index c45b1f2..c52ed0c 100644 --- a/include/utmp.h +++ b/include/utmp.h @@ -1,3 +1,6 @@ +#ifndef _UTMP_H_ +#define _UTMP_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -17,3 +20,24 @@ struct utmp { char ut_host[16]; /* host name, if remote */ long ut_time; /* time on */ }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/getlogin.c */ +char *getlogin __P((void)); + +/* gen/ttyname.c */ +char *ttyname __P((int f)); + +/* gen/ttyslot.c */ +int ttyslot __P((void)); +#endif + +#endif diff --git a/include/varargs.h b/include/varargs.h index 3a081f5..fe57a5d 100644 --- a/include/varargs.h +++ b/include/varargs.h @@ -1,3 +1,6 @@ +#ifndef _VARARGS_H_ +#define _VARARGS_H_ + /* varargs.h 4.1 83/05/03 */ typedef char *va_list; @@ -5,3 +8,5 @@ typedef char *va_list; # define va_start(list) list = (char *) &va_alist # define va_end(list) # define va_arg(list,mode) ((mode *)(list += sizeof(mode)))[-1] + +#endif diff --git a/include/vfont.h b/include/vfont.h index b2104df..62dd57c 100644 --- a/include/vfont.h +++ b/include/vfont.h @@ -1,3 +1,6 @@ +#ifndef _VFONT_H_ +#define _VFONT_H_ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -25,3 +28,5 @@ struct dispatch { char up,down,left,right; short width; }; + +#endif diff --git a/lib/libc/compat-4.1/ftime.c b/lib/libc/compat-4.1/ftime.c index ec24405..87c49e1 100644 --- a/lib/libc/compat-4.1/ftime.c +++ b/lib/libc/compat-4.1/ftime.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ftime.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* * Backwards compatible ftime. @@ -25,9 +28,7 @@ static char sccsid[] = "@(#)ftime.c 5.2 (Berkeley) 3/9/86"; /* short dstflag;*/ /*};*/ -ftime(tp) - register struct timeb *tp; -{ +int ftime(tp) register struct timeb *tp; { struct timeval t; struct timezone tz; diff --git a/lib/libc/compat-4.1/getpw.c b/lib/libc/compat-4.1/getpw.c index 67a9bd3..e8f29d8 100644 --- a/lib/libc/compat-4.1/getpw.c +++ b/lib/libc/compat-4.1/getpw.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getpw.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -getpw(uid, buf) -int uid; -char buf[]; -{ +int getpw(uid, buf) int uid; char buf[]; { static FILE *pwf; register n, c; register char *bp; diff --git a/lib/libc/compat-4.1/gtty.c b/lib/libc/compat-4.1/gtty.c index 7c4372c..8ebc24e 100644 --- a/lib/libc/compat-4.1/gtty.c +++ b/lib/libc/compat-4.1/gtty.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gtty.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Writearound to old gtty system call. */ -#include +/*#include */ -gtty(fd, ap) - struct sgttyb *ap; -{ +int gtty(fd, ap) int fd; struct sgttyb *ap; { return(ioctl(fd, TIOCGETP, ap)); } diff --git a/lib/libc/compat-4.1/nice.c b/lib/libc/compat-4.1/nice.c index 9a2fa22..20b16d9 100644 --- a/lib/libc/compat-4.1/nice.c +++ b/lib/libc/compat-4.1/nice.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +8,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)nice.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * Backwards compatible nice. */ -nice(incr) - int incr; -{ +int nice(incr) int incr; { int prio; extern int errno; diff --git a/lib/libc/compat-4.1/pause.c b/lib/libc/compat-4.1/pause.c index 24d80cf..6143b01 100644 --- a/lib/libc/compat-4.1/pause.c +++ b/lib/libc/compat-4.1/pause.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +9,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)pause.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Backwards compatible pause. */ -pause() -{ +int pause() { sigpause(sigblock(0)); } diff --git a/lib/libc/compat-4.1/rand.c b/lib/libc/compat-4.1/rand.c index 009914c..c4494e5 100644 --- a/lib/libc/compat-4.1/rand.c +++ b/lib/libc/compat-4.1/rand.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rand.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif static long randx = 1; -srand(x) -unsigned x; -{ +int srand(x) unsigned x; { randx = x; } -rand() -{ +int rand() { return((randx = randx * 1103515245 + 12345) & 0x7fffffff); } diff --git a/lib/libc/compat-4.1/stty.c b/lib/libc/compat-4.1/stty.c index beb475a..1cc6458 100644 --- a/lib/libc/compat-4.1/stty.c +++ b/lib/libc/compat-4.1/stty.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)stty.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Writearound to old stty system call. */ -#include +/*#include */ -stty(fd, ap) - struct sgttyb *ap; -{ +int stty(fd, ap) int fd; struct sgttyb *ap; { return(ioctl(fd, TIOCSETP, ap)); } diff --git a/lib/libc/compat-4.1/tell.c b/lib/libc/compat-4.1/tell.c index 68a4ba1..b1d95b2 100644 --- a/lib/libc/compat-4.1/tell.c +++ b/lib/libc/compat-4.1/tell.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +9,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tell.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * return offset in file. */ -long lseek(); +/*long lseek();*/ -long tell(f) -{ +long tell(f) int f; { return(lseek(f, 0L, 1)); } diff --git a/lib/libc/compat-4.1/times.c b/lib/libc/compat-4.1/times.c index 8293649..d831125 100644 --- a/lib/libc/compat-4.1/times.c +++ b/lib/libc/compat-4.1/times.c @@ -1,3 +1,7 @@ +#include +/*#include sys/resource.h*/ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +10,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)times.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* * Backwards compatible times. @@ -23,9 +27,9 @@ static char sccsid[] = "@(#)times.c 5.2 (Berkeley) 3/9/86"; /* int tms_cstime;*/ /* system time, children */ /*};*/ -times(tmsp) - register struct tms *tmsp; -{ +static scale60 __P((register struct timeval *tvp)); + +int times(tmsp) register struct tms *tmsp; { struct rusage ru; if (getrusage(RUSAGE_SELF, &ru) < 0) @@ -39,10 +43,7 @@ times(tmsp) return (0); } -static -scale60(tvp) - register struct timeval *tvp; -{ +static scale60(tvp) register struct timeval *tvp; { return (tvp->tv_sec * 60 + tvp->tv_usec / 16667); } diff --git a/lib/libc/compat-4.1/utime.c b/lib/libc/compat-4.1/utime.c index 3e0b150..8f80564 100644 --- a/lib/libc/compat-4.1/utime.c +++ b/lib/libc/compat-4.1/utime.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)utime.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * Backwards compatible utime. */ -utime(name, otv) - char *name; - int otv[]; -{ +int utime(name, otv) char *name; int otv[]; { struct timeval tv[2]; tv[0].tv_sec = otv[0]; tv[0].tv_usec = 0; diff --git a/lib/libc/compat-4.1/vlimit.c b/lib/libc/compat-4.1/vlimit.c index df8d0ff..52aafa3 100644 --- a/lib/libc/compat-4.1/vlimit.c +++ b/lib/libc/compat-4.1/vlimit.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +10,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)vlimit.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * (Almost) backwards compatible vlimit. */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* LIM_NORAISE is not emulated */ #define LIM_NORAISE 0 /* if <> 0, can't raise limits */ @@ -26,9 +30,7 @@ static char sccsid[] = "@(#)vlimit.c 5.2 (Berkeley) 3/9/86"; #define NLIMITS 6 -vlimit(limit, value) - int limit, value; -{ +int vlimit(limit, value) int limit; int value; { struct rlimit rlim; if (limit <= 0 || limit > NLIMITS) diff --git a/lib/libc/compat-4.1/vtimes.c b/lib/libc/compat-4.1/vtimes.c index cb3b61b..13d4cb3 100644 --- a/lib/libc/compat-4.1/vtimes.c +++ b/lib/libc/compat-4.1/vtimes.c @@ -1,3 +1,7 @@ +#include +/*#include sys/resource.h*/ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +10,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)vtimes.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* * Backwards compatible vtimes. @@ -30,9 +34,10 @@ static char sccsid[] = "@(#)vtimes.c 5.2 (Berkeley) 3/9/86"; /* int vm_oublk;*/ /* block writes */ /*};*/ -vtimes(par, chi) - register struct vtimes *par, *chi; -{ +static getvtimes __P((register struct rusage *aru, register struct vtimes *avt)); +static scale60 __P((register struct timeval *tvp)); + +int vtimes(par, chi) register struct vtimes *par; register struct vtimes *chi; { struct rusage ru; if (par) { @@ -48,11 +53,7 @@ vtimes(par, chi) return (0); } -static -getvtimes(aru, avt) - register struct rusage *aru; - register struct vtimes *avt; -{ +static getvtimes(aru, avt) register struct rusage *aru; register struct vtimes *avt; { avt->vm_utime = scale60(&aru->ru_utime); avt->vm_stime = scale60(&aru->ru_stime); @@ -66,10 +67,7 @@ getvtimes(aru, avt) avt->vm_oublk = aru->ru_oublock; } -static -scale60(tvp) - register struct timeval *tvp; -{ +static scale60(tvp) register struct timeval *tvp; { return (tvp->tv_sec * 60 + tvp->tv_usec / 16667); } diff --git a/lib/libc/compat-sys5/getopt.c b/lib/libc/compat-sys5/getopt.c index 6905a61..d671494 100644 --- a/lib/libc/compat-sys5/getopt.c +++ b/lib/libc/compat-sys5/getopt.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +10,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getopt.c 4.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * get option letter from argument vector @@ -23,11 +27,7 @@ char *optarg; /* argument associated with option */ #define tell(s) if (opterr) {fputs(*nargv,stderr);fputs(s,stderr); \ fputc(optopt,stderr);fputc('\n',stderr);return(BADCH);} -getopt(nargc,nargv,ostr) -int nargc; -char **nargv, - *ostr; -{ +int getopt(nargc, nargv, ostr) int nargc; char **nargv; char *ostr; { static char *place = EMSG; /* option letter processing */ register char *oli; /* option letter list index */ char *index(); diff --git a/lib/libc/compat-sys5/memccpy.c b/lib/libc/compat-sys5/memccpy.c index 9bed847..46437e0 100644 --- a/lib/libc/compat-sys5/memccpy.c +++ b/lib/libc/compat-sys5/memccpy.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,11 +14,7 @@ static char sccsid[] = "@(#)memccpy.c 5.2 (Berkeley) 86/03/09"; #endif -char * -memccpy(_t, _f, c, n) - void *_t, *_f; - register c, n; -{ +char *memccpy(_t, _f, c, n) void *_t; void *_f; register c; register n; { #define t (*(char **)&_t) #define f (*(char **)&_f) while (--n >= 0) diff --git a/lib/libc/compat-sys5/memchr.c b/lib/libc/compat-sys5/memchr.c index 14fb81c..5f81202 100644 --- a/lib/libc/compat-sys5/memchr.c +++ b/lib/libc/compat-sys5/memchr.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,11 +14,7 @@ static char sccsid[] = "@(#)memchr.c 5.2 (Berkeley) 86/03/09"; #endif -void * -memchr(_s, c, n) - void *_s; - register c, n; -{ +void *memchr(_s, c, n) void *_s; register c; register n; { #define s (*(char **)&_s) while (--n >= 0) if (*s++ == c) diff --git a/lib/libc/compat-sys5/memcmp.c b/lib/libc/compat-sys5/memcmp.c index f2cd066..7f88d7f 100644 --- a/lib/libc/compat-sys5/memcmp.c +++ b/lib/libc/compat-sys5/memcmp.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,10 +14,7 @@ static char sccsid[] = "@(#)memcmp.c 5.2 (Berkeley) 86/03/09"; #endif -memcmp(_s1, _s2, n) - void *_s1, *_s2; - register n; -{ +int memcmp(_s1, _s2, n) void *_s1; void *_s2; register n; { #define s1 (*(char **)&_s1) #define s2 (*(char **)&_s2) while (--n >= 0) diff --git a/lib/libc/compat-sys5/memcpy.c b/lib/libc/compat-sys5/memcpy.c index 29e06af..5ba956e 100644 --- a/lib/libc/compat-sys5/memcpy.c +++ b/lib/libc/compat-sys5/memcpy.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,11 +14,7 @@ static char sccsid[] = "@(#)memcpy.c 5.2 (Berkeley) 86/03/09"; #endif -void * -memcpy(_t, _f, n) - void *_t, *_f; - register n; -{ +void *memcpy(_t, _f, n) void *_t; void *_f; register n; { #define t (*(char **)&_t) #define f (*(char **)&_f) register char *p = t; diff --git a/lib/libc/compat-sys5/memset.c b/lib/libc/compat-sys5/memset.c index 7769840..4024a8c 100644 --- a/lib/libc/compat-sys5/memset.c +++ b/lib/libc/compat-sys5/memset.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,11 +14,7 @@ static char sccsid[] = "@(#)memset.c 5.2 (Berkeley) 86/03/09"; #endif -void * -memset(_s, c, n) - void *_s; - register c, n; -{ +void *memset(_s, c, n) void *_s; register c; register n; { #define s (*(char **)&_s) register char *p = s; diff --git a/lib/libc/compat-sys5/strcatn.c b/lib/libc/compat-sys5/strcatn.c index 8db783b..56120c1 100644 --- a/lib/libc/compat-sys5/strcatn.c +++ b/lib/libc/compat-sys5/strcatn.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +8,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcatn.c 4.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Concatenate s2 on the end of s1. S1's space must be large enough. @@ -14,11 +16,7 @@ static char sccsid[] = "@(#)strcatn.c 4.3 (Berkeley) 3/9/86"; * Return s1. */ -char * -strcatn(s1, s2, n) -register char *s1, *s2; -register n; -{ +char *strcatn(s1, s2, n) register char *s1; register char *s2; register n; { register char *os1; os1 = s1; diff --git a/lib/libc/compat-sys5/strchr.c b/lib/libc/compat-sys5/strchr.c index 24c9b31..5fc2672 100644 --- a/lib/libc/compat-sys5/strchr.c +++ b/lib/libc/compat-sys5/strchr.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strchr.c 5.2 (Berkeley) 86/03/09"; -#endif LIBC_SCCS and not lint +#endif /* * Return the ptr in sp at which the character c appears; @@ -11,10 +13,7 @@ static char sccsid[] = "@(#)strchr.c 5.2 (Berkeley) 86/03/09"; #define NULL 0 -char * -strchr(sp, c) -register char *sp, c; -{ +char *strchr(sp, c) register char *sp; int c; { do { if (*sp == c) return(sp); diff --git a/lib/libc/compat-sys5/strcmpn.c b/lib/libc/compat-sys5/strcmpn.c index 5e5d4f7..182ad22 100644 --- a/lib/libc/compat-sys5/strcmpn.c +++ b/lib/libc/compat-sys5/strcmpn.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmpn.c 4.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Compare strings (at most n bytes): s1>s2: >0 s1==s2: 0 s1= 0 && *s1 == *s2++) if (*s1++ == '\0') diff --git a/lib/libc/compat-sys5/strcpyn.c b/lib/libc/compat-sys5/strcpyn.c index f791647..83134b8 100644 --- a/lib/libc/compat-sys5/strcpyn.c +++ b/lib/libc/compat-sys5/strcpyn.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcpyn.c 4.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Copy s2 to s1, truncating or null-padding to always copy n bytes * return s1 */ -char * -strcpyn(s1, s2, n) -register char *s1, *s2; -{ +char *strcpyn(s1, s2, n) register char *s1; register char *s2; int n; { register i; register char *os1; diff --git a/lib/libc/compat-sys5/strcspn.c b/lib/libc/compat-sys5/strcspn.c index f32fa1a..60867ff 100644 --- a/lib/libc/compat-sys5/strcspn.c +++ b/lib/libc/compat-sys5/strcspn.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,9 +14,7 @@ static char sccsid[] = "@(#)strcspn.c 5.2 (Berkeley) 86/03/09"; #endif -strcspn(s, set) - register char *s, *set; -{ +int strcspn(s, set) register char *s; register char *set; { register n = 0; register char *p; register c; diff --git a/lib/libc/compat-sys5/strpbrk.c b/lib/libc/compat-sys5/strpbrk.c index b1a2727..5d2462f 100644 --- a/lib/libc/compat-sys5/strpbrk.c +++ b/lib/libc/compat-sys5/strpbrk.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,10 +14,7 @@ static char sccsid[] = "@(#)strpbrk.c 5.2 (Berkeley) 86/03/09"; #endif -char * -strpbrk(s, brk) - register char *s, *brk; -{ +char *strpbrk(s, brk) register char *s; register char *brk; { register char *p; register c; diff --git a/lib/libc/compat-sys5/strrchr.c b/lib/libc/compat-sys5/strrchr.c index ec71ac6..07e8f05 100644 --- a/lib/libc/compat-sys5/strrchr.c +++ b/lib/libc/compat-sys5/strrchr.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strrchr.c 5.2 (berkeley) 86/03/09"; -#endif LIBC_SCCS and not lint +#endif /* * Return the ptr in sp at which the character c last @@ -11,10 +13,7 @@ static char sccsid[] = "@(#)strrchr.c 5.2 (berkeley) 86/03/09"; #define NULL 0 -char * -strrchr(sp, c) -register char *sp, c; -{ +char *strrchr(sp, c) register char *sp; int c; { register char *r; r = NULL; diff --git a/lib/libc/compat-sys5/strspn.c b/lib/libc/compat-sys5/strspn.c index 8185083..af60b4a 100644 --- a/lib/libc/compat-sys5/strspn.c +++ b/lib/libc/compat-sys5/strspn.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,9 +14,7 @@ static char sccsid[] = "@(#)strspn.c 5.2 (Berkeley) 86/03/09"; #endif -strspn(s, set) - register char *s, *set; -{ +int strspn(s, set) register char *s; register char *set; { register n = 0; register char *p; register c; diff --git a/lib/libc/compat-sys5/strtok.c b/lib/libc/compat-sys5/strtok.c index e378a0a..444e9d2 100644 --- a/lib/libc/compat-sys5/strtok.c +++ b/lib/libc/compat-sys5/strtok.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,10 +15,7 @@ static char sccsid[] = "@(#)strtok.c 5.2 (Berkeley) 86/03/09"; #endif -char * -strtok(s, sep) - register char *s, *sep; -{ +char *strtok(s, sep) register char *s; register char *sep; { register char *p; register c; static char *lasts; diff --git a/lib/libc/compat-sys5/tmpnam.c b/lib/libc/compat-sys5/tmpnam.c index 7b42ba7..5b26914 100644 --- a/lib/libc/compat-sys5/tmpnam.c +++ b/lib/libc/compat-sys5/tmpnam.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +10,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tmpnam.c 4.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -char *tmpnam(s) -char *s; -{ +char *tmpnam(s) char *s; { static seed; sprintf(s, "temp.%d.%d", getpid(), seed++); diff --git a/lib/libc/gen/_setjmp.c b/lib/libc/gen/_setjmp.c index f4be53d..1a59583 100644 --- a/lib/libc/gen/_setjmp.c +++ b/lib/libc/gen/_setjmp.c @@ -1,10 +1,14 @@ -#include +#include +/*#include gen.h*/ +#include + +/*#include */ int _setjmp(e) jmp_buf e; { write(2, "_setjmp()\n", 10); abort(); } -void _longjmp(e, v) jmp_buf e; { +void _longjmp(e, v) jmp_buf e; int v; { write(2, "_longjmp()\n", 11); abort(); } diff --git a/lib/libc/gen/abort.c b/lib/libc/gen/abort.c index 7bb45b6..5412dc8 100644 --- a/lib/libc/gen/abort.c +++ b/lib/libc/gen/abort.c @@ -1,3 +1,7 @@ +#include +/*#include gen.h*/ +/*#include gen.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +10,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)abort.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* C library -- abort */ #include "signal.h" -abort() -{ +int abort() { sigblock(~0); signal(SIGILL, SIG_DFL); sigsetmask(~sigmask(SIGILL)); diff --git a/lib/libc/gen/abs.c b/lib/libc/gen/abs.c index 0988e86..5a7d93a 100644 --- a/lib/libc/gen/abs.c +++ b/lib/libc/gen/abs.c @@ -1,3 +1,6 @@ +#include +#include + int abs(i) int i; { write(2, "abs()\n", 6); abort(); diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c index 81ed615..2163d4c 100644 --- a/lib/libc/gen/alarm.c +++ b/lib/libc/gen/alarm.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)alarm.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Backwards compatible alarm. */ -#include +/*#include */ -alarm(secs) - int secs; -{ +int alarm(secs) int secs; { struct itimerval it, oitv; register struct itimerval *itp = ⁢ diff --git a/lib/libc/gen/atof.c b/lib/libc/gen/atof.c index 1516cf5..a653918 100644 --- a/lib/libc/gen/atof.c +++ b/lib/libc/gen/atof.c @@ -1,3 +1,7 @@ +#include +/*#include gen.h*/ +#include + double atof(s) char *s; { write(2, "atof()\n", 7); abort(); diff --git a/lib/libc/gen/atoi.c b/lib/libc/gen/atoi.c index e6f7be2..e4f968f 100644 --- a/lib/libc/gen/atoi.c +++ b/lib/libc/gen/atoi.c @@ -1,10 +1,10 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atoi.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -atoi(p) -register char *p; -{ +int atoi(p) register char *p; { register int n; register int f; diff --git a/lib/libc/gen/atol.c b/lib/libc/gen/atol.c index bbfab95..8259ae1 100644 --- a/lib/libc/gen/atol.c +++ b/lib/libc/gen/atol.c @@ -1,11 +1,10 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atol.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -long -atol(p) -register char *p; -{ +long atol(p) register char *p; { long n; register int f; diff --git a/lib/libc/gen/bcmp.c b/lib/libc/gen/bcmp.c index c98c535..97cfb75 100644 --- a/lib/libc/gen/bcmp.c +++ b/lib/libc/gen/bcmp.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +8,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bcmp.c 5.1 (Berkeley) 1/27/87"; -#endif LIBC_SCCS and not lint +#endif /* * bcmp -- vax cmpc3 instruction */ -bcmp(_b1, _b2, length) - void *_b1, *_b2; - register int length; -{ +int bcmp(_b1, _b2, length) void *_b1; void *_b2; register int length; { #define b1 (*(char **)&_b1) #define b2 (*(char **)&_b2) if (length == 0) diff --git a/lib/libc/gen/bcopy.c b/lib/libc/gen/bcopy.c index 503440f..4fedfbc 100644 --- a/lib/libc/gen/bcopy.c +++ b/lib/libc/gen/bcopy.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +9,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bcopy.c 5.1 (Berkeley) 1/27/87"; -#endif LIBC_SCCS and not lint +#endif /* * bcopy -- vax movc3 instruction */ -bcopy(_src, _dst, length) - void *_src, *_dst; - register int length; -{ +int bcopy(_src, _dst, length) void *_src; void *_dst; register int length; { #define src (*(char **)&_src) #define dst (*(char **)&_dst) if (length && src != dst) diff --git a/lib/libc/gen/bzero.c b/lib/libc/gen/bzero.c index 6a7c786..2de2cdf 100644 --- a/lib/libc/gen/bzero.c +++ b/lib/libc/gen/bzero.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +8,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bzero.c 5.1 (Berkeley) 1/27/87"; -#endif LIBC_SCCS and not lint +#endif /* * bzero -- vax movc5 instruction */ -bzero(_b, length) - void *_b; - register int length; -{ +int bzero(_b, length) void *_b; register int length; { #define b (*(char **)&_b) if (length) do diff --git a/lib/libc/gen/calloc.c b/lib/libc/gen/calloc.c index 5c5ac2a..387227c 100644 --- a/lib/libc/gen/calloc.c +++ b/lib/libc/gen/calloc.c @@ -1,14 +1,14 @@ +#include +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)calloc.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Calloc - allocate and clear memory block */ -void * -calloc(num, size) - register unsigned num, size; -{ +void *calloc(num, size) register unsigned num; register unsigned size; { extern void *malloc(); register void *p; @@ -18,10 +18,6 @@ calloc(num, size) return (p); } -cfree(p, num, size) - void *p; - unsigned num; - unsigned size; -{ +int cfree(p, num, size) void *p; unsigned num; unsigned size; { free(p); } diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c index 5b15e4d..3510711 100644 --- a/lib/libc/gen/closedir.c +++ b/lib/libc/gen/closedir.c @@ -1,3 +1,7 @@ +#include +/*#include gen.h*/ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +10,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)closedir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * close a directory. */ -void -closedir(dirp) - register DIR *dirp; -{ +void closedir(dirp) register DIR *dirp; { close(dirp->dd_fd); dirp->dd_fd = -1; dirp->dd_loc = 0; diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c index 6c17b88..3ea5f87 100644 --- a/lib/libc/gen/crypt.c +++ b/lib/libc/gen/crypt.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)crypt.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * This program implements the @@ -113,9 +115,7 @@ static char e[] = { * Set up the key schedule from the key. */ -setkey(key) -char *key; -{ +int setkey(key) char *key; { register i, j, k; int t; @@ -239,9 +239,7 @@ static char preS[48]; * The payoff: encrypt a block. */ -encrypt(block, edflag) -char *block; -{ +int encrypt(block, edflag) char *block; int edflag; { int i, ii; register t, j, k; @@ -327,11 +325,7 @@ char *block; block[j] = L[FP[j]-1]; } -char * -crypt(pw,salt) -char *pw; -char *salt; -{ +char *crypt(pw, salt) char *pw; char *salt; { register i, j, c; int temp; static char block[66], iobuf[16]; diff --git a/lib/libc/gen/ctime.c b/lib/libc/gen/ctime.c index 3473435..3b87964 100644 --- a/lib/libc/gen/ctime.c +++ b/lib/libc/gen/ctime.c @@ -1,3 +1,7 @@ +#include +/*#include sys/time.h*/ +/*#include sys/time.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +10,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ctime.c 5.5 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * This routine converts time as follows. @@ -42,13 +46,12 @@ static char sccsid[] = "@(#)ctime.c 5.5 (Berkeley) 3/9/86"; * ctime(t) just calls localtime, then asctime. */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ static char cbuf[26]; -static int dmsize[12] = -{ +static int dmsize[12] = { 31, 28, 31, @@ -133,24 +136,21 @@ static struct dayrules { -1, }; -struct tm *gmtime(); -char *ct_numb(); -struct tm *localtime(); -char *ctime(); -char *ct_num(); -char *asctime(); +/*struct tm *gmtime();*/ +/*char *ct_numb();*/ +/*struct tm *localtime();*/ +/*char *ctime();*/ +/*char *ct_num();*/ +/*char *asctime();*/ + +static sunday __P((register struct tm *t, register int d)); +static char *ct_numb __P((register char *cp, int n)); -char * -ctime(t) -time_t *t; -{ +char *ctime(t) time_t *t; { return(asctime(localtime(t))); } -struct tm * -localtime(tim) -time_t *tim; -{ +struct tm *localtime(tim) time_t *tim; { register int dayno; register struct tm *ct; register dalybeg, daylend; @@ -211,20 +211,13 @@ time_t *tim; * The value is the day number of the last * Sunday on or before the day. */ -static -sunday(t, d) -register struct tm *t; -register int d; -{ +static sunday(t, d) register struct tm *t; register int d; { if (d >= 58) d += dysize(t->tm_year) - 365; return(d - (d - t->tm_yday + t->tm_wday + 700) % 7); } -struct tm * -gmtime(tim) -time_t *tim; -{ +struct tm *gmtime(tim) time_t *tim; { register int d0, d1; long hms, day; register int *tp; @@ -283,10 +276,7 @@ time_t *tim; return(&xtime); } -char * -asctime(t) -struct tm *t; -{ +char *asctime(t) struct tm *t; { register char *cp, *ncp; register int *tp; @@ -316,17 +306,13 @@ struct tm *t; return(cbuf); } -dysize(y) -{ +int dysize(y) int y; { if((y%4) == 0) return(366); return(365); } -static char * -ct_numb(cp, n) -register char *cp; -{ +static char *ct_numb(cp, n) register char *cp; int n; { cp++; if (n>=10) *cp++ = (n/10)%10 + '0'; diff --git a/lib/libc/gen/ctype_.c b/lib/libc/gen/ctype_.c index c64d586..e981d94 100644 --- a/lib/libc/gen/ctype_.c +++ b/lib/libc/gen/ctype_.c @@ -1,8 +1,10 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ctype_.c 5.4 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ char _ctype_[1 + 256] = { 0, diff --git a/lib/libc/gen/disktab.c b/lib/libc/gen/disktab.c index 4546c53..8978ce4 100644 --- a/lib/libc/gen/disktab.c +++ b/lib/libc/gen/disktab.c @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +12,22 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)disktab.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -static char *dgetstr(); +/*static char *dgetstr();*/ -struct disktab * -getdiskbyname(name) - char *name; -{ +static dgetent __P((char *bp, char *name)); +static dnamatch __P((char *np)); +static char *dskip __P((register char *bp)); +static dgetnum __P((char *id)); +static dgetflag __P((char *id)); +static char *dgetstr __P((char *id, char **area)); +static char *ddecode __P((register char *str, char **area)); + +struct disktab *getdiskbyname(name) char *name; { static struct disktab disk; static char localbuf[100], *cp = localbuf; register struct disktab *dp = &disk; @@ -54,21 +65,18 @@ getdiskbyname(name) return (dp); } -#include +/*#include */ static char *tbuf; -static char *dskip(); -static char *ddecode(); +/*static char *dskip();*/ +/*static char *ddecode();*/ /* * Get an entry for disk name in buffer bp, * from the diskcap file. Parse is very rudimentary; * we just notice escaped newlines. */ -static -dgetent(bp, name) - char *bp, *name; -{ +static dgetent(bp, name) char *bp; char *name; { register char *cp; register int c; register int i = 0, cnt = 0; @@ -122,10 +130,7 @@ dgetent(bp, name) * against each such name. The normal : terminator after the last * name (before the first field) stops us. */ -static -dnamatch(np) - char *np; -{ +static dnamatch(np) char *np; { register char *Np, *Bp; Bp = tbuf; @@ -149,10 +154,7 @@ dnamatch(np) * knowing about \: escapes or any such. If necessary, :'s can be put * into the diskcap file in octal. */ -static char * -dskip(bp) - register char *bp; -{ +static char *dskip(bp) register char *bp; { while (*bp && *bp != ':') bp++; @@ -169,10 +171,7 @@ dskip(bp) * a # character. If the option is not found we return -1. * Note that we handle octal numbers beginning with 0. */ -static -dgetnum(id) - char *id; -{ +static dgetnum(id) char *id; { register int i, base; register char *bp = tbuf; @@ -203,10 +202,7 @@ dgetnum(id) * of the buffer. Return 1 if we find the option, or 0 if it is * not given. */ -static -dgetflag(id) - char *id; -{ +static dgetflag(id) char *id; { register char *bp = tbuf; for (;;) { @@ -230,10 +226,7 @@ dgetflag(id) * placed in area, which is a ref parameter which is updated. * No checking on area overflow. */ -static char * -dgetstr(id, area) - char *id, **area; -{ +static char *dgetstr(id, area) char *id; char **area; { register char *bp = tbuf; for (;;) { @@ -255,11 +248,7 @@ dgetstr(id, area) * Tdecode does the grung work to decode the * string capability escapes. */ -static char * -ddecode(str, area) - register char *str; - char **area; -{ +static char *ddecode(str, area) register char *str; char **area; { register char *cp; register int c; register char *dp; diff --git a/lib/libc/gen/ecvt.c b/lib/libc/gen/ecvt.c index fd84d3b..6eaf580 100644 --- a/lib/libc/gen/ecvt.c +++ b/lib/libc/gen/ecvt.c @@ -1,6 +1,9 @@ +#include +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ecvt.c 5.1 (Berkeley) 3/15/86"; -#endif LIBC_SCCS and not lint +#endif /* * ecvt converts to decimal @@ -9,30 +12,20 @@ static char sccsid[] = "@(#)ecvt.c 5.1 (Berkeley) 3/15/86"; * sign is set to 0 for positive, 1 for negative */ -char *cvt(); +/*char *cvt();*/ #define NDIG 80 -char* -ecvt(arg, ndigits, decpt, sign) -double arg; -int ndigits, *decpt, *sign; -{ +static char *cvt __P((double arg, int ndigits, int *decpt, int *sign, int eflag)); + +char *ecvt(arg, ndigits, decpt, sign) double arg; int ndigits; int *decpt; int *sign; { return(cvt(arg, ndigits, decpt, sign, 1)); } -char* -fcvt(arg, ndigits, decpt, sign) -double arg; -int ndigits, *decpt, *sign; -{ +char *fcvt(arg, ndigits, decpt, sign) double arg; int ndigits; int *decpt; int *sign; { return(cvt(arg, ndigits, decpt, sign, 0)); } -static char* -cvt(arg, ndigits, decpt, sign, eflag) -double arg; -int ndigits, *decpt, *sign; -{ +static char *cvt(arg, ndigits, decpt, sign, eflag) double arg; int ndigits; int *decpt; int *sign; int eflag; { register int r2; double fi, fj; register char *p, *p1; diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c index 405d2c0..0e8a39f 100644 --- a/lib/libc/gen/errlst.c +++ b/lib/libc/gen/errlst.c @@ -6,7 +6,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)errlst.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif char *sys_errlist[] = { "Error 0", diff --git a/lib/libc/gen/execvp.c b/lib/libc/gen/execvp.c index fdd4d69..2d01687 100644 --- a/lib/libc/gen/execvp.c +++ b/lib/libc/gen/execvp.c @@ -1,27 +1,31 @@ +#include +/*#include gen.h*/ +/*#include gen.h*/ +/*#include gen.h*/ +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)execvp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * execlp(name, arg,...,0) (like execl, but does path search) * execvp(name, argv) (like execv, but does path search) */ -#include +/*#include */ #define NULL 0 static char shell[] = "/bin/sh"; -char *execat(), *getenv(); +/*char *execat(), *getenv();*/ extern errno; -execlp(name, argv) -char *name, *argv; -{ +static char *execat __P((register char *s1, register char *s2, char *si)); + +int execlp(name, argv) char *name; char *argv; { return(execvp(name, &argv)); } -execvp(name, argv) -char *name, **argv; -{ +int execvp(name, argv) char *name; char **argv; { char *pathstr; register char *cp; char fname[128]; @@ -68,11 +72,7 @@ char *name, **argv; return(-1); } -static char * -execat(s1, s2, si) -register char *s1, *s2; -char *si; -{ +static char *execat(s1, s2, si) register char *s1; register char *s2; char *si; { register char *s; s = si; diff --git a/lib/libc/gen/fakcu.c b/lib/libc/gen/fakcu.c index e737ba2..c0c3eed 100644 --- a/lib/libc/gen/fakcu.c +++ b/lib/libc/gen/fakcu.c @@ -1,12 +1,13 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fakcu.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Null cleanup routine to resolve reference in exit() * if not using stdio. */ -void -_cleanup() -{ +void _cleanup() { } diff --git a/lib/libc/gen/ffs.c b/lib/libc/gen/ffs.c index 9cdd64b..e18dca5 100644 --- a/lib/libc/gen/ffs.c +++ b/lib/libc/gen/ffs.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. @@ -17,14 +19,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ffs.c 5.2 (Berkeley) 6/27/88"; -#endif /* LIBC_SCCS and not lint */ +#endif /* * ffs -- vax ffs instruction */ -ffs(mask) - register long mask; -{ +int ffs(mask) register long mask; { register int cnt; if (mask == 0) diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c index c1c727f..dd9a21a 100644 --- a/lib/libc/gen/frexp.c +++ b/lib/libc/gen/frexp.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)frexp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * the call @@ -12,11 +14,7 @@ static char sccsid[] = "@(#)frexp.c 5.2 (Berkeley) 3/9/86"; * if the argument is 0.0, return 0.0 mantissa and 0 exponent. */ -double -frexp(x,i) -double x; -int *i; -{ +double frexp(x, i) double x; int *i; { int neg; int j; j = 0; diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c index fab4d13..9d49213 100644 --- a/lib/libc/gen/fstab.c +++ b/lib/libc/gen/fstab.c @@ -1,3 +1,8 @@ +#include +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,20 +11,21 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fstab.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ static struct fstab fs; static char line[BUFSIZ+1]; static FILE *fs_file = 0; -static char * -fsskip(p) - register char *p; -{ +static char *fsskip __P((register char *p)); +static char *fsdigit __P((int *backp, char *string, int end)); +static fstabscan __P((struct fstab *fs)); + +static char *fsskip(p) register char *p; { while (*p && *p != ':') ++p; @@ -28,11 +34,7 @@ fsskip(p) return (p); } -static char * -fsdigit(backp, string, end) - int *backp; - char *string, end; -{ +static char *fsdigit(backp, string, end) int *backp; char *string; int end; { register int value = 0; register char *cp; @@ -50,10 +52,7 @@ fsdigit(backp, string, end) return (cp+1); } -static -fstabscan(fs) - struct fstab *fs; -{ +static fstabscan(fs) struct fstab *fs; { register char *cp; cp = fgets(line, 256, fs_file); @@ -74,8 +73,7 @@ fstabscan(fs) return (5); } -setfsent() -{ +int setfsent() { if (fs_file) endfsent(); @@ -86,8 +84,7 @@ setfsent() return (1); } -endfsent() -{ +int endfsent() { if (fs_file) { fclose(fs_file); @@ -96,9 +93,7 @@ endfsent() return (1); } -struct fstab * -getfsent() -{ +struct fstab *getfsent() { int nfields; if ((fs_file == 0) && (setfsent() == 0)) @@ -109,10 +104,7 @@ getfsent() return (&fs); } -struct fstab * -getfsspec(name) - char *name; -{ +struct fstab *getfsspec(name) char *name; { register struct fstab *fsp; if (setfsent() == 0) /* start from the beginning */ @@ -123,10 +115,7 @@ getfsspec(name) return ((struct fstab *)0); } -struct fstab * -getfsfile(name) - char *name; -{ +struct fstab *getfsfile(name) char *name; { register struct fstab *fsp; if (setfsent() == 0) /* start from the beginning */ @@ -137,10 +126,7 @@ getfsfile(name) return ((struct fstab *)0); } -struct fstab * -getfstype(type) - char *type; -{ +struct fstab *getfstype(type) char *type; { register struct fstab *fs; if (setfsent() == 0) diff --git a/lib/libc/gen/gcvt.c b/lib/libc/gen/gcvt.c index e78925d..a2693be 100644 --- a/lib/libc/gen/gcvt.c +++ b/lib/libc/gen/gcvt.c @@ -1,19 +1,17 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gcvt.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * gcvt - Floating output conversion to * minimal length string */ -char *ecvt(); +/*char *ecvt();*/ -char * -gcvt(number, ndigit, buf) -double number; -char *buf; -{ +char *gcvt(number, ndigit, buf) double number; int ndigit; char *buf; { int sign, decpt; register char *p1, *p2; register i; diff --git a/lib/libc/gen/getenv.c b/lib/libc/gen/getenv.c index 7da3627..f92d294 100644 --- a/lib/libc/gen/getenv.c +++ b/lib/libc/gen/getenv.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getenv.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * getenv(name) @@ -8,12 +10,11 @@ static char sccsid[] = "@(#)getenv.c 5.2 (Berkeley) 3/9/86"; */ #define NULL 0 extern char **environ; -char *nvmatch(); +/*char *nvmatch();*/ + +static char *nvmatch __P((register char *s1, register char *s2)); -char * -getenv(name) -register char *name; -{ +char *getenv(name) register char *name; { register char **p = environ; register char *v; @@ -30,10 +31,7 @@ register char *name; * used for environment searching: see getenv */ -static char * -nvmatch(s1, s2) -register char *s1, *s2; -{ +static char *nvmatch(s1, s2) register char *s1; register char *s2; { while (*s1 == *s2++) if (*s1++ == '=') diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c index dbd487c..35e644c 100644 --- a/lib/libc/gen/getgrent.c +++ b/lib/libc/gen/getgrent.c @@ -1,9 +1,13 @@ +#include +/*#include gen.h*/ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getgrent.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ #define MAXGRP 200 @@ -13,35 +17,29 @@ static char line[BUFSIZ+1]; static struct group group; static char *gr_mem[MAXGRP]; -setgrent() -{ +static char *grskip __P((register char *p, register c)); + +int setgrent() { if( !grf ) grf = fopen( GROUP, "r" ); else rewind( grf ); } -endgrent() -{ +int endgrent() { if( grf ){ fclose( grf ); grf = NULL; } } -static char * -grskip(p,c) -register char *p; -register c; -{ +static char *grskip(p, c) register char *p; register c; { while( *p && *p != c ) ++p; if( *p ) *p++ = 0; return( p ); } -struct group * -getgrent() -{ +struct group *getgrent() { register char *p, **q; if( !grf && !(grf = fopen( GROUP, "r" )) ) diff --git a/lib/libc/gen/getgrgid.c b/lib/libc/gen/getgrgid.c index d7c07fe..ed5e853 100644 --- a/lib/libc/gen/getgrgid.c +++ b/lib/libc/gen/getgrgid.c @@ -1,13 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getgrgid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -struct group * -getgrgid(gid) -register gid; -{ +struct group *getgrgid(gid) register gid; { register struct group *p; struct group *getgrent(); diff --git a/lib/libc/gen/getgrnam.c b/lib/libc/gen/getgrnam.c index 5e12284..65c1b9f 100644 --- a/lib/libc/gen/getgrnam.c +++ b/lib/libc/gen/getgrnam.c @@ -1,13 +1,13 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getgrnam.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -struct group * -getgrnam(name) -register char *name; -{ +struct group *getgrnam(name) register char *name; { register struct group *p; struct group *getgrent(); diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c index 6988fba..2cc87f3 100644 --- a/lib/libc/gen/getlogin.c +++ b/lib/libc/gen/getlogin.c @@ -1,15 +1,16 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getlogin.c 5.3 (Berkeley) 5/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ static char UTMP[] = "/etc/utmp"; static struct utmp ubuf; -char * -getlogin() -{ +char *getlogin() { register int me, uf; register char *cp; diff --git a/lib/libc/gen/getpass.c b/lib/libc/gen/getpass.c index a782812..d8bc3ad 100644 --- a/lib/libc/gen/getpass.c +++ b/lib/libc/gen/getpass.c @@ -1,15 +1,18 @@ +#include +#include +#include +#include +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getpass.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -char * -getpass(prompt) -char *prompt; -{ +char *getpass(prompt) char *prompt; { struct sgttyb ttyb; int flags; register char *p; diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 6ac2c73..2425072 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -1,3 +1,8 @@ +#include +/*#include gen.h*/ +/*#include gen.h*/ +#include + /* * Copyright (c) 1984 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +11,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getpwent.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ static char EMPTY[] = ""; static FILE *pwf = NULL; @@ -24,16 +29,16 @@ char *_pw_file = "/etc/passwd"; DBM *_pw_db; int _pw_stayopen; -setpwent() -{ +static char *pwskip __P((register char *p)); + +int setpwent() { if (pwf == NULL) pwf = fopen(_pw_file, "r"); else rewind(pwf); } -endpwent() -{ +int endpwent() { if (pwf != NULL) { fclose(pwf); pwf = NULL; @@ -45,10 +50,7 @@ endpwent() } } -static char * -pwskip(p) -register char *p; -{ +static char *pwskip(p) register char *p; { while (*p && *p != ':' && *p != '\n') ++p; if (*p) @@ -56,9 +58,7 @@ register char *p; return(p); } -struct passwd * -getpwent() -{ +struct passwd *getpwent() { register char *p; if (pwf == NULL) { @@ -89,8 +89,6 @@ getpwent() return(&passwd); } -setpwfile(file) - char *file; -{ +int setpwfile(file) char *file; { _pw_file = file; } diff --git a/lib/libc/gen/getpwnamuid.c b/lib/libc/gen/getpwnamuid.c index 44865b8..f2e9e26 100644 --- a/lib/libc/gen/getpwnamuid.c +++ b/lib/libc/gen/getpwnamuid.c @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +12,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getpwnamuid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -#include +/*#include */ static char line[BUFSIZ+1]; static struct passwd passwd; @@ -24,10 +30,9 @@ extern char *_pw_file; DBM *_pw_db; int _pw_stayopen; -static struct passwd * -fetchpw(key) - datum key; -{ +static struct passwd *fetchpw __P((datum key)); + +static struct passwd *fetchpw(key) datum key; { register char *cp, *tp; if (key.dptr == 0) @@ -54,10 +59,7 @@ fetchpw(key) return (&passwd); } -struct passwd * -getpwnam(nam) - char *nam; -{ +struct passwd *getpwnam(nam) char *nam; { datum key; register struct passwd *pw; @@ -87,10 +89,7 @@ getpwnam(nam) return (pw); } -struct passwd * -getpwuid(uid) - int uid; -{ +struct passwd *getpwuid(uid) int uid; { datum key; register struct passwd *pw; diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index 164c6b3..1a01c5d 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +10,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getttyent.c 5.4 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ static char TTYFILE[] = "/etc/ttys"; static char zapchar; @@ -19,16 +23,17 @@ static FILE *tf = NULL; static char line[LINE]; static struct ttyent tty; -setttyent() -{ +static char *skip __P((register char *p)); +static char *value __P((register char *p)); + +int setttyent() { if (tf == NULL) tf = fopen(TTYFILE, "r"); else rewind(tf); } -endttyent() -{ +int endttyent() { if (tf != NULL) { (void) fclose(tf); tf = NULL; @@ -41,10 +46,7 @@ endttyent() * Skip over the current field, removing quotes, * and return a pointer to the next field. */ -static char * -skip(p) - register char *p; -{ +static char *skip(p) register char *p; { register char *t = p; register int c; register int q = 0; @@ -76,19 +78,14 @@ skip(p) return (p); } -static char * -value(p) - register char *p; -{ +static char *value(p) register char *p; { if ((p = index(p,'=')) == 0) return(NULL); p++; /* get past the = sign */ return(p); } -struct ttyent * -getttyent() -{ +struct ttyent *getttyent() { register char *p; register int c; diff --git a/lib/libc/gen/getttynam.c b/lib/libc/gen/getttynam.c index f947abd..2e499d0 100644 --- a/lib/libc/gen/getttynam.c +++ b/lib/libc/gen/getttynam.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getttynam.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -struct ttyent * -getttynam(tty) - char *tty; -{ +struct ttyent *getttynam(tty) char *tty; { register struct ttyent *t; setttyent(); diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c index 24258e7..054a7a0 100644 --- a/lib/libc/gen/getusershell.c +++ b/lib/libc/gen/getusershell.c @@ -1,3 +1,9 @@ +/*#include gen.h*/ +#include +#include +/*#include gen.h*/ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +12,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getusershell.c 5.4 (Berkeley) 7/25/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define SHELLS "/etc/shells" @@ -24,14 +30,14 @@ static char *okshells[] = static char **shells, *strings; static char **curshell = NULL; -extern char **initshells(); +/*extern char **initshells();*/ /* * Get a list of shells from SHELLS, if it exists. */ -char * -getusershell() -{ +static char **initshells __P((void)); + +char *getusershell() { char *ret; if (curshell == NULL) @@ -42,8 +48,7 @@ getusershell() return (ret); } -endusershell() -{ +int endusershell() { if (shells != NULL) free((char *)shells); @@ -54,15 +59,12 @@ endusershell() curshell = NULL; } -setusershell() -{ +int setusershell() { curshell = initshells(); } -static char ** -initshells() -{ +static char **initshells() { register char **sp, *cp; register FILE *fp; struct stat statb; diff --git a/lib/libc/gen/getwd.c b/lib/libc/gen/getwd.c index ac4005a..85a92dd 100644 --- a/lib/libc/gen/getwd.c +++ b/lib/libc/gen/getwd.c @@ -1,3 +1,9 @@ +#include +#include +/*#include sys/dir.h*/ +#include +/*#include sys/dir.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,25 +12,24 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getwd.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * getwd() returns the pathname of the current working directory. On error * an error message is copied to pathname and null pointer is returned. */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ #define GETWDERR(s) strcpy(pathname, (s)); -char *strcpy(); +/*char *strcpy();*/ static int pathsize; /* pathname length */ -char * -getwd(pathname) - char *pathname; -{ +static char *prepend __P((register char *dirname, register char *pathname)); + +char *getwd(pathname) char *pathname; { char pathbuf[MAXPATHLEN]; /* temporary pathname buffer */ char *pnptr = &pathbuf[(sizeof pathbuf)-1]; /* pathname pointer */ char curdir[MAXPATHLEN]; /* current directory buffer */ @@ -98,11 +103,7 @@ getwd(pathname) /* * prepend() tacks a directory name onto the front of a pathname. */ -static char * -prepend(dirname, pathname) - register char *dirname; - register char *pathname; -{ +static char *prepend(dirname, pathname) register char *dirname; register char *pathname; { register int i; /* directory name size counter */ for (i = 0; *dirname != '\0'; i++, dirname++) diff --git a/lib/libc/gen/index.c b/lib/libc/gen/index.c index 6a6871c..0720e4f 100644 --- a/lib/libc/gen/index.c +++ b/lib/libc/gen/index.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)index.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Return the ptr in sp at which the character c appears; @@ -9,10 +11,7 @@ static char sccsid[] = "@(#)index.c 5.2 (Berkeley) 3/9/86"; #define NULL 0 -char * -index(sp, c) -register char *sp, c; -{ +char *index(sp, c) register char *sp; int c; { do { if (*sp == c) return(sp); diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c index 362e3e6..fab5ed1 100644 --- a/lib/libc/gen/initgroups.c +++ b/lib/libc/gen/initgroups.c @@ -1,3 +1,10 @@ +#include +#include +#include +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,21 +13,18 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)initgroups.c 5.3 (Berkeley) 4/27/86"; -#endif LIBC_SCCS and not lint +#endif /* * initgroups */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -struct group *getgrent(); +/*struct group *getgrent();*/ -initgroups(uname, agroup) - char *uname; - int agroup; -{ +int initgroups(uname, agroup) char *uname; int agroup; { int groups[NGROUPS], ngroups = 0; register struct group *grp; register int i; diff --git a/lib/libc/gen/insque.c b/lib/libc/gen/insque.c index 9ea7b25..23d9a38 100644 --- a/lib/libc/gen/insque.c +++ b/lib/libc/gen/insque.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)insque.c 5.1 (Berkeley) 1/27/87"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * insque -- vax insque instruction @@ -22,9 +24,7 @@ static char sccsid[] = "@(#)insque.c 5.1 (Berkeley) 1/27/87"; /* struct vaxque *vq_prev;*/ /*};*/ -insque(e, prev) - register struct vaxque *e, *prev; -{ +int insque(e, prev) register struct vaxque *e; register struct vaxque *prev; { e->vq_prev = prev; e->vq_next = prev->vq_next; prev->vq_next->vq_prev = e; diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c index c94cfdf..e58008b 100644 --- a/lib/libc/gen/ldexp.c +++ b/lib/libc/gen/ldexp.c @@ -1,4 +1,8 @@ -double ldexp(v, e) double v; { +#include +/*#include gen.h*/ +#include + +double ldexp(v, e) double v; int e; { write(2, "ldexp()\n", 8); abort(); } diff --git a/lib/libc/gen/malloc.c b/lib/libc/gen/malloc.c index 27bb9b4..ee85116 100644 --- a/lib/libc/gen/malloc.c +++ b/lib/libc/gen/malloc.c @@ -1,3 +1,10 @@ +#include +#include +/*#include gen.h*/ +#include +/*#include gen.h*/ +/*#include gen.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +13,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)malloc.c 5.6 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * malloc.c (Caltech) 2/21/82 @@ -19,7 +26,7 @@ static char sccsid[] = "@(#)malloc.c 5.6 (Berkeley) 3/9/86"; * This is designed for use in a virtual memory environment. */ -#include +/*#include */ #define NULL 0 @@ -65,7 +72,7 @@ union overhead { */ #define NBUCKETS 30 static union overhead *nextf[NBUCKETS]; -extern char *sbrk(); +/*extern char *sbrk();*/ static int pagesz; /* page size */ static int pagebucket; /* page size bucket */ @@ -76,16 +83,16 @@ static int pagebucket; /* page size bucket */ * for a given block size. */ static u_int nmalloc[NBUCKETS]; -#include +/*#include */ #endif #if defined(DEBUG) || defined(RCHECK) #define ASSERT(p) if (!(p)) botch("p") -#include -static void -botch(s) - char *s; -{ +/*#include */ +static void botch __P((char *s)); +static findbucket __P((union overhead *freep, int srchlen)); + +static void botch(s) char *s; { fprintf(stderr, "\r\nassertion botched: %s\r\n", s); (void) fflush(stderr); /* just in case user buffered it */ abort(); @@ -94,10 +101,7 @@ botch(s) #define ASSERT(p) #endif -void * -malloc(nbytes) - unsigned nbytes; -{ +void *malloc(nbytes) unsigned nbytes; { register union overhead *op; register int bucket; register unsigned amt, n; @@ -179,10 +183,7 @@ malloc(nbytes) /* * Allocate more memory to the indicated bucket. */ -void -morecore(bucket) - int bucket; -{ +void morecore(bucket) int bucket; { register union overhead *op; register int sz; /* size of desired block */ int amt; /* amount to allocate */ @@ -221,10 +222,7 @@ morecore(bucket) } } -void -free(cp) - void *cp; -{ +void free(cp) void *cp; { register int size; register union overhead *op; @@ -263,11 +261,7 @@ free(cp) */ int realloc_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ -void * -realloc(cp, nbytes) - void *cp; - unsigned nbytes; -{ +void *realloc(cp, nbytes) void *cp; unsigned nbytes; { register u_int onb, i; union overhead *op; char *res; @@ -333,11 +327,7 @@ realloc(cp, nbytes) * header starts at ``freep''. If srchlen is -1 search the whole list. * Return bucket number, or -1 if not found. */ -static -findbucket(freep, srchlen) - union overhead *freep; - int srchlen; -{ +static findbucket(freep, srchlen) union overhead *freep; int srchlen; { register union overhead *p; register int i, j; @@ -360,10 +350,7 @@ findbucket(freep, srchlen) * for each size category, the second showing the number of mallocs - * frees for each size category. */ -void -mstats(s) - char *s; -{ +void mstats(s) char *s; { register int i, j; register union overhead *p; int totfree = 0, diff --git a/lib/libc/gen/mkstemp.c b/lib/libc/gen/mkstemp.c index bbd68e2..335204c 100644 --- a/lib/libc/gen/mkstemp.c +++ b/lib/libc/gen/mkstemp.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +10,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mkstemp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -mkstemp(as) - char *as; -{ +int mkstemp(as) char *as; { register char *s; register unsigned int pid; register int fd, i; diff --git a/lib/libc/gen/mktemp.c b/lib/libc/gen/mktemp.c index c3e2712..c2149f1 100644 --- a/lib/libc/gen/mktemp.c +++ b/lib/libc/gen/mktemp.c @@ -1,11 +1,12 @@ +#include +#include +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mktemp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -char * -mktemp(as) -char *as; -{ +char *mktemp(as) char *as; { register char *s; register unsigned pid; register i; diff --git a/lib/libc/gen/modf.c b/lib/libc/gen/modf.c index babd583..8b424f6 100644 --- a/lib/libc/gen/modf.c +++ b/lib/libc/gen/modf.c @@ -1,4 +1,8 @@ -double modf(v, p) double v, *p; { +#include +/*#include gen.h*/ +#include + +double modf(v, p) double v; double *p; { write(2, "modf()\n", 7); abort(); } diff --git a/lib/libc/gen/ndbm.c b/lib/libc/gen/ndbm.c index 4db66f0..2d2d874 100644 --- a/lib/libc/gen/ndbm.c +++ b/lib/libc/gen/ndbm.c @@ -1,3 +1,19 @@ +#include +/*#include gen.h*/ +#include +/*#include gen.h*/ +/*#include gen.h*/ +#include +/*#include gen.h*/ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,29 +22,40 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ndbm.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define BYTESIZ 8 #undef setbit -static datum makdatum(); -static long hashinc(); -static long dcalchash(); +/*static datum makdatum();*/ +/*static long hashinc();*/ +/*static long dcalchash();*/ extern int errno; -DBM * -dbm_open(file, flags, va_alist) - char *file; - int flags; - va_dcl +#ifdef __STDC__ +static dbm_access __P((register DBM *db, long hash)); +static getbit __P((register DBM *db)); +static setbit __P((register DBM *db)); +static datum makdatum __P((char buf[PBLKSIZ], int n)); +static finddatum __P((char buf[PBLKSIZ], datum item)); +static long hashinc __P((register DBM *db, long hash)); +static long dcalchash __P((datum item)); +static delitem __P((char buf[PBLKSIZ], int n)); +static additem __P((char buf[PBLKSIZ], datum item, datum item1)); +static chkblk __P((char buf[PBLKSIZ])); + +DBM *dbm_open(char *file, int flags, ...) +#else +DBM *dbm_open(file, flags, va_alist) char *file; int flags; va_dcl +#endif { va_list argp; struct stat statb; @@ -43,14 +70,14 @@ dbm_open(file, flags, va_alist) flags = (flags & ~03) | O_RDWR; strcpy(db->dbm_pagbuf, file); strcat(db->dbm_pagbuf, ".pag"); - va_start(argp); + _va_start(argp, fmt); db->dbm_pagf = vopen(db->dbm_pagbuf, flags, argp); va_end(argp); if (db->dbm_pagf < 0) goto bad; strcpy(db->dbm_pagbuf, file); strcat(db->dbm_pagbuf, ".dir"); - va_start(argp); + _va_start(argp, fmt); db->dbm_dirf = vopen(db->dbm_pagbuf, flags, argp); va_end(argp); if (db->dbm_dirf < 0) @@ -66,21 +93,14 @@ bad: return ((DBM *)0); } -void -dbm_close(db) - DBM *db; -{ +void dbm_close(db) DBM *db; { (void) close(db->dbm_dirf); (void) close(db->dbm_pagf); free((char *)db); } -long -dbm_forder(db, key) - register DBM *db; - datum key; -{ +long dbm_forder(db, key) register DBM *db; datum key; { long hash; hash = dcalchash(key); @@ -93,11 +113,7 @@ dbm_forder(db, key) return (db->dbm_blkno); } -datum -dbm_fetch(db, key) - register DBM *db; - datum key; -{ +datum dbm_fetch(db, key) register DBM *db; datum key; { register i; datum item; @@ -115,10 +131,7 @@ err: return (item); } -dbm_delete(db, key) - register DBM *db; - datum key; -{ +int dbm_delete(db, key) register DBM *db; datum key; { register i; datum item; @@ -143,11 +156,7 @@ dbm_delete(db, key) return (0); } -dbm_store(db, key, dat, replace) - register DBM *db; - datum key, dat; - int replace; -{ +int dbm_store(db, key, dat, replace) register DBM *db; datum key; datum dat; int replace; { register i; datum item, item1; char ovfbuf[PBLKSIZ]; @@ -220,20 +229,14 @@ split: goto loop; } -datum -dbm_firstkey(db) - DBM *db; -{ +datum dbm_firstkey(db) DBM *db; { db->dbm_blkptr = 0L; db->dbm_keyptr = 0; return (dbm_nextkey(db)); } -datum -dbm_nextkey(db) - register DBM *db; -{ +datum dbm_nextkey(db) register DBM *db; { struct stat statb; datum item; @@ -268,11 +271,7 @@ err: return (item); } -static -dbm_access(db, hash) - register DBM *db; - long hash; -{ +static dbm_access(db, hash) register DBM *db; long hash; { for (db->dbm_hmask=0;; db->dbm_hmask=(db->dbm_hmask<<1)+1) { db->dbm_blkno = hash & db->dbm_hmask; @@ -292,10 +291,7 @@ dbm_access(db, hash) } } -static -getbit(db) - register DBM *db; -{ +static getbit(db) register DBM *db; { long bn; register b, i, n; @@ -315,10 +311,7 @@ getbit(db) return (db->dbm_dirbuf[i] & (1<dbm_flags |= _DBM_IOERR; } -static datum -makdatum(buf, n) - char buf[PBLKSIZ]; -{ +static datum makdatum(buf, n) char buf[PBLKSIZ]; int n; { register short *sp; register t; datum item; @@ -363,11 +353,7 @@ makdatum(buf, n) return (item); } -static -finddatum(buf, item) - char buf[PBLKSIZ]; - datum item; -{ +static finddatum(buf, item) char buf[PBLKSIZ]; datum item; { register short *sp; register int i, n, j; @@ -384,8 +370,7 @@ finddatum(buf, item) } static int hitab[16] -/* ken's -{ +/* ken's { 055,043,036,054,063,014,004,005, 010,064,077,000,035,027,025,071, }; @@ -413,11 +398,7 @@ static long hltab[64] 04723077174L,03642763134L,05750130273L,03655541561L, }; -static long -hashinc(db, hash) - register DBM *db; - long hash; -{ +static long hashinc(db, hash) register DBM *db; long hash; { long bit; hash &= db->dbm_hmask; @@ -432,10 +413,7 @@ hashinc(db, hash) } } -static long -dcalchash(item) - datum item; -{ +static long dcalchash(item) datum item; { register int s, c, j; register char *cp; register long hashl; @@ -457,10 +435,7 @@ dcalchash(item) /* * Delete pairs of items (n & n+1). */ -static -delitem(buf, n) - char buf[PBLKSIZ]; -{ +static delitem(buf, n) char buf[PBLKSIZ]; int n; { register short *sp, *sp1; register i1, i2; @@ -489,11 +464,7 @@ delitem(buf, n) /* * Add pairs of items (item & item1). */ -static -additem(buf, item, item1) - char buf[PBLKSIZ]; - datum item, item1; -{ +static additem(buf, item, item1) char buf[PBLKSIZ]; datum item; datum item1; { register short *sp; register i1, i2; @@ -514,10 +485,7 @@ additem(buf, item, item1) } #ifdef DEBUG -static -chkblk(buf) - char buf[PBLKSIZ]; -{ +static chkblk(buf) char buf[PBLKSIZ]; { register short *sp; register t, i; diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index 4c43b05..84d857c 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -1,3 +1,9 @@ +#include +#include +#include +/*#include a.out.h*/ +/*#include stdio.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,19 +12,16 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)nlist.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* * nlist - retreive attributes from name list (string table version) */ -nlist(name, list) - char *name; - struct nlist *list; -{ +int nlist(name, list) char *name; struct nlist *list; { register struct nlist *p, *q; register char *s1, *s2; register n, m; diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c index 6996007..96cbba5 100644 --- a/lib/libc/gen/opendir.c +++ b/lib/libc/gen/opendir.c @@ -1,3 +1,7 @@ +#include +/*#include gen.h*/ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +10,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)opendir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * open a directory. */ -DIR * -opendir(name) - char *name; -{ +DIR *opendir(name) char *name; { register DIR *dirp; register int fd; diff --git a/lib/libc/gen/perror.c b/lib/libc/gen/perror.c index 9742026..68e22ca 100644 --- a/lib/libc/gen/perror.c +++ b/lib/libc/gen/perror.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,21 +10,19 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)perror.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Print the error indicated * in the cerror cell. */ -#include -#include +/*#include */ +/*#include */ int errno; int sys_nerr; extern char *sys_errlist[]; -perror(s) - char *s; -{ +int perror(s) char *s; { struct iovec iov[4]; register struct iovec *v = iov; diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c index 9929948..8d8573a 100644 --- a/lib/libc/gen/psignal.c +++ b/lib/libc/gen/psignal.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,20 +10,17 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)psignal.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Print the name of the signal indicated * along with the supplied message. */ -#include +/*#include */ extern char *sys_siglist[]; -psignal(sig, s) - unsigned sig; - char *s; -{ +int psignal(sig, s) unsigned sig; char *s; { register char *c; register n; diff --git a/lib/libc/gen/qsort.c b/lib/libc/gen/qsort.c index 539bc41..2801b45 100644 --- a/lib/libc/gen/qsort.c +++ b/lib/libc/gen/qsort.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +8,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)qsort.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * qsort.c: @@ -32,13 +34,9 @@ static int mthresh; /* MTHRESHold in chars */ * It's not... */ -void -qsort(_base, n, size, compar) - void *_base; - int n; - int size; - int (*compar)(); -{ +static void qst __P((char *base, char *max)); + +void qsort(_base, n, size, compar) void *_base; int n; int size; int (*compar)(); { #define base ((char *)_base) register char c, *i, *j, *lo, *hi; char *min, *max; @@ -110,9 +108,7 @@ qsort(_base, n, size, compar) * (And there are only three places where this is done). */ -static void -qst(base, max) - char *base, *max; { +static void qst(base, max) char *base; char *max; { register char c, *i, *j, *jj; register int ii; char *mid, *tmp; diff --git a/lib/libc/gen/random.c b/lib/libc/gen/random.c index 0f3c08a..c78922f 100644 --- a/lib/libc/gen/random.c +++ b/lib/libc/gen/random.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +9,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)random.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * random.c: @@ -47,8 +50,6 @@ static char sccsid[] = "@(#)random.c 5.2 (Berkeley) 3/9/86"; * predicted by this formula. */ - - /* * For each of the currently supported random number generators, we have a * break value on the amount of state information (you need at least this @@ -82,7 +83,6 @@ static char sccsid[] = "@(#)random.c 5.2 (Berkeley) 3/9/86"; #define DEG_4 63 #define SEP_4 1 - /* * Array versions of the above information to make code run faster -- relies * on fact that TYPE_i == i. @@ -96,8 +96,6 @@ static int degrees[ MAX_TYPES ] = { DEG_0, DEG_1, DEG_2, static int seps[ MAX_TYPES ] = { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 }; - - /* * Initially, everything is set up as if from : * initstate( 1, &randtbl, 128 ); @@ -134,8 +132,6 @@ static long randtbl[ DEG_3 + 1 ] = { TYPE_3, static long *fptr = &randtbl[ SEP_3 + 1 ]; static long *rptr = &randtbl[ 1 ]; - - /* * The following things are the pointer to the state information table, * the type of the current generator, the degree of the current polynomial @@ -156,8 +152,6 @@ static int rand_sep = SEP_3; static long *end_ptr = &randtbl[ DEG_3 + 1 ]; - - /* * srandom: * Initialize the random number generator based on the given seed. If the @@ -171,10 +165,7 @@ static long *end_ptr = &randtbl[ DEG_3 + 1 ]; * values produced by this routine. */ -srandom( x ) - - unsigned x; -{ +int srandom(x) unsigned x; { register int i, j; if( rand_type == TYPE_0 ) { @@ -192,8 +183,6 @@ srandom( x ) } } - - /* * initstate: * Initialize the state information in the given array of n bytes for @@ -210,13 +199,7 @@ srandom( x ) * Returns a pointer to the old state. */ -char * -initstate( seed, arg_state, n ) - - unsigned seed; /* seed for R. N. G. */ - char *arg_state; /* pointer to state array */ - int n; /* # bytes of state info */ -{ +char *initstate(seed, arg_state, n) unsigned seed; /* seed for R. N. G. */ char *arg_state; /* pointer to state array */ int n; /* # bytes of state info */ { register char *ostate = (char *)( &state[ -1 ] ); if( rand_type == TYPE_0 ) state[ -1 ] = rand_type; @@ -264,8 +247,6 @@ initstate( seed, arg_state, n ) return( ostate ); } - - /* * setstate: * Restore the state from the given state array. @@ -278,11 +259,7 @@ initstate( seed, arg_state, n ) * Returns a pointer to the old state information. */ -char * -setstate( arg_state ) - - char *arg_state; -{ +char *setstate(arg_state) char *arg_state; { register long *new_state = (long *)arg_state; register int type = new_state[0]%MAX_TYPES; register int rear = new_state[0]/MAX_TYPES; @@ -313,8 +290,6 @@ setstate( arg_state ) return( ostate ); } - - /* * random: * If we are using the trivial TYPE_0 R.N.G., just do the old linear @@ -330,9 +305,7 @@ setstate( arg_state ) * Returns a 31-bit random number. */ -long -random() -{ +long random() { long i; if( rand_type == TYPE_0 ) { @@ -351,4 +324,3 @@ random() } return( i ); } - diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c index 34d43ba..a873340 100644 --- a/lib/libc/gen/readdir.c +++ b/lib/libc/gen/readdir.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +9,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)readdir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * get next entry in a directory. */ -struct direct * -readdir(dirp) - register DIR *dirp; -{ +struct direct *readdir(dirp) register DIR *dirp; { register struct direct *dp; for (;;) { diff --git a/lib/libc/gen/regex.c b/lib/libc/gen/regex.c index 75c7146..0e15415 100644 --- a/lib/libc/gen/regex.c +++ b/lib/libc/gen/regex.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +8,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)regex.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * routines to do regular expression matching @@ -97,10 +99,9 @@ static char circf; /* * compile the regular expression argument into a dfa */ -char * -re_comp(sp) - register char *sp; -{ +static int advance __P((register char *lp, register char *ep)); + +char *re_comp(sp) register char *sp; { register int c; register char *ep = expbuf; int cclcnt, numbra = 0; @@ -221,10 +222,7 @@ re_comp(sp) /* * match the argument string against the compiled re */ -int -re_exec(p1) - register char *p1; -{ +int re_exec(p1) register char *p1; { register char *p2 = expbuf; register int c; int rv; @@ -261,10 +259,7 @@ re_exec(p1) /* * try to match the next thing in the dfa */ -static int -advance(lp, ep) - register char *lp, *ep; -{ +static int advance(lp, ep) register char *lp; register char *ep; { register char *curlp; int ct, i; int rv; @@ -369,10 +364,7 @@ advance(lp, ep) } } -backref(i, lp) - register int i; - register char *lp; -{ +int backref(i, lp) register int i; register char *lp; { register char *bp; bp = braslist[i]; @@ -382,11 +374,7 @@ backref(i, lp) return(0); } -int -cclass(set, c, af) - register char *set, c; - int af; -{ +int cclass(set, c, af) register char *set; int c; int af; { register int n; if (c == 0) diff --git a/lib/libc/gen/remque.c b/lib/libc/gen/remque.c index afd76e4..372f834 100644 --- a/lib/libc/gen/remque.c +++ b/lib/libc/gen/remque.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)remque.c 5.1 (Berkeley) 1/27/87"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * remque -- vax remque instruction @@ -22,9 +24,7 @@ static char sccsid[] = "@(#)remque.c 5.1 (Berkeley) 1/27/87"; /* struct vaxque *vq_prev;*/ /*};*/ -remque(e) - register struct vaxque *e; -{ +int remque(e) register struct vaxque *e; { e->vq_prev->vq_next = e->vq_next; e->vq_next->vq_prev = e->vq_prev; } diff --git a/lib/libc/gen/rindex.c b/lib/libc/gen/rindex.c index ee93bd3..7ac2bf9 100644 --- a/lib/libc/gen/rindex.c +++ b/lib/libc/gen/rindex.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rindex.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Return the ptr in sp at which the character c last @@ -9,10 +11,7 @@ static char sccsid[] = "@(#)rindex.c 5.2 (Berkeley) 3/9/86"; #define NULL 0 -char * -rindex(sp, c) -register char *sp, c; -{ +char *rindex(sp, c) register char *sp; int c; { register char *r; r = NULL; diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 1964c80..22f7142 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -1,3 +1,8 @@ +#include +/*#include gen.h*/ +/*#include gen.h*/ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +11,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)scandir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Scan the directory dirname calling select to make a list of selected @@ -15,15 +20,11 @@ static char sccsid[] = "@(#)scandir.c 5.2 (Berkeley) 3/9/86"; * struct direct (through namelist). Returns -1 if there were any errors. */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -scandir(dirname, namelist, select, dcomp) - char *dirname; - struct direct *(*namelist[]); - int (*select)(), (*dcomp)(); -{ +int scandir(dirname, namelist, select, dcomp) char *dirname; struct direct *(*namelist[]); int (*select)(); int (*dcomp)(); { register struct direct *d, *p, **names; register int nitems; register char *cp1, *cp2; @@ -84,8 +85,6 @@ scandir(dirname, namelist, select, dcomp) /* * Alphabetic order comparison routine for those who want it. */ -alphasort(d1, d2) - struct direct **d1, **d2; -{ +int alphasort(d1, d2) struct direct **d1; struct direct **d2; { return(strcmp((*d1)->d_name, (*d2)->d_name)); } diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c index f1bc890..342f156 100644 --- a/lib/libc/gen/seekdir.c +++ b/lib/libc/gen/seekdir.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,20 +9,16 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)seekdir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * seek to an entry in a directory. * Only values returned by "telldir" should be passed to seekdir. */ -void -seekdir(dirp, loc) - register DIR *dirp; - long loc; -{ +void seekdir(dirp, loc) register DIR *dirp; long loc; { long curloc, base, offset; struct direct *dp; extern long lseek(); diff --git a/lib/libc/gen/setegid.c b/lib/libc/gen/setegid.c index cb332d0..0329fc8 100644 --- a/lib/libc/gen/setegid.c +++ b/lib/libc/gen/setegid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setegid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -setegid(egid) - int egid; -{ +int setegid(egid) int egid; { return (setregid(-1, egid)); } diff --git a/lib/libc/gen/seteuid.c b/lib/libc/gen/seteuid.c index 2c6096c..d2e8164 100644 --- a/lib/libc/gen/seteuid.c +++ b/lib/libc/gen/seteuid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)seteuid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -seteuid(euid) - int euid; -{ +int seteuid(euid) int euid; { return (setreuid(-1, euid)); } diff --git a/lib/libc/gen/setgid.c b/lib/libc/gen/setgid.c index bed8d8a..29ed6f6 100644 --- a/lib/libc/gen/setgid.c +++ b/lib/libc/gen/setgid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +8,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setgid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Backwards compatible setgid. */ -setgid(gid) - int gid; -{ +int setgid(gid) int gid; { return (setregid(gid, gid)); } diff --git a/lib/libc/gen/setjmp.c b/lib/libc/gen/setjmp.c index 7bc584e..49cf7c9 100644 --- a/lib/libc/gen/setjmp.c +++ b/lib/libc/gen/setjmp.c @@ -1,10 +1,14 @@ -#include +#include +/*#include gen.h*/ +#include + +/*#include */ int setjmp(e) jmp_buf e; { write(2, "setjmp()\n", 9); abort(); } -void longjmp(e, v) jmp_buf e; { +void longjmp(e, v) jmp_buf e; int v; { write(2, "longjmp()\n", 10); abort(); } diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c index d46b7a6..14a2d5d 100644 --- a/lib/libc/gen/setjmperr.c +++ b/lib/libc/gen/setjmperr.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +9,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setjmperr.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif #define ERRMSG "longjmp botch\n" @@ -16,8 +19,7 @@ static char sccsid[] = "@(#)setjmperr.c 5.2 (Berkeley) 3/9/86"; * write their own versions. * If this routine returns, the program is aborted. */ -longjmperror() -{ +int longjmperror() { write(2, ERRMSG, sizeof(ERRMSG)); } diff --git a/lib/libc/gen/setrgid.c b/lib/libc/gen/setrgid.c index c5c38cf..0bb3d1c 100644 --- a/lib/libc/gen/setrgid.c +++ b/lib/libc/gen/setrgid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setrgid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -setrgid(rgid) - int rgid; -{ +int setrgid(rgid) int rgid; { return (setregid(rgid, -1)); } diff --git a/lib/libc/gen/setruid.c b/lib/libc/gen/setruid.c index 49a4a79..53c1dba 100644 --- a/lib/libc/gen/setruid.c +++ b/lib/libc/gen/setruid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setruid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -setruid(ruid) - int ruid; -{ +int setruid(ruid) int ruid; { return (setreuid(ruid, -1)); } diff --git a/lib/libc/gen/setuid.c b/lib/libc/gen/setuid.c index 3e33294..880b813 100644 --- a/lib/libc/gen/setuid.c +++ b/lib/libc/gen/setuid.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +8,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setuid.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Backwards compatible setuid. */ -setuid(uid) - int uid; -{ +int setuid(uid) int uid; { return (setreuid(uid, uid)); } diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c index ecbeff5..67df098 100644 --- a/lib/libc/gen/siginterrupt.c +++ b/lib/libc/gen/siginterrupt.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +8,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)siginterrupt.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ /* * Set signal state to prevent restart of system calls * after an instance of the indicated signal. */ -siginterrupt(sig, flag) - int sig, flag; -{ +int siginterrupt(sig, flag) int sig; int flag; { struct sigvec sv; int ret; diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c index 276e5fc..102bef6 100644 --- a/lib/libc/gen/siglist.c +++ b/lib/libc/gen/siglist.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)siglist.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ char *sys_siglist[NSIG] = { "Signal 0", diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c index d6bb2cf..1e85ee4 100644 --- a/lib/libc/gen/signal.c +++ b/lib/libc/gen/signal.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +8,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)signal.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Almost backwards compatible signal. */ -#include +/*#include */ -void -(*signal(s, a))() - int s; - void (*a)(); -{ +void (*signal(s, a))() int s; void (*a)(); { struct sigvec osv, sv; static int mask[NSIG]; static int flags[NSIG]; diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c index f5b7d0b..084f204 100644 --- a/lib/libc/gen/sleep.c +++ b/lib/libc/gen/sleep.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,20 +9,19 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sleep.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ #define setvec(vec, a) \ vec.sv_handler = a; vec.sv_mask = vec.sv_onstack = 0 static int ringring; -void -sleep(n) - unsigned n; -{ +static void sleepx __P((void)); + +void sleep(n) unsigned n; { void sleepx(); int omask; struct itimerval itv, oitv; @@ -60,8 +62,6 @@ sleep(n) (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0); } -static void -sleepx() -{ +static void sleepx() { ringring = 1; } diff --git a/lib/libc/gen/strcat.c b/lib/libc/gen/strcat.c index 6030ccc..aed1f8d 100644 --- a/lib/libc/gen/strcat.c +++ b/lib/libc/gen/strcat.c @@ -1,16 +1,15 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcat.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Concatenate s2 on the end of s1. S1's space must be large enough. * Return s1. */ -char * -strcat(s1, s2) -register char *s1, *s2; -{ +char *strcat(s1, s2) register char *s1; register char *s2; { register char *os1; os1 = s1; diff --git a/lib/libc/gen/strcmp.c b/lib/libc/gen/strcmp.c index cd152f2..921f505 100644 --- a/lib/libc/gen/strcmp.c +++ b/lib/libc/gen/strcmp.c @@ -1,14 +1,14 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Compare strings: s1>s2: >0 s1==s2: 0 s1 + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcpy.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Copy string s2 to s1. s1 must be large enough. * return s1 */ -char * -strcpy(s1, s2) -register char *s1, *s2; -{ +char *strcpy(s1, s2) register char *s1; register char *s2; { register char *os1; os1 = s1; diff --git a/lib/libc/gen/strlen.c b/lib/libc/gen/strlen.c index 55faed8..d613ea7 100644 --- a/lib/libc/gen/strlen.c +++ b/lib/libc/gen/strlen.c @@ -1,15 +1,15 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strlen.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Returns the number of * non-NULL bytes in string argument. */ -strlen(s) -register char *s; -{ +int strlen(s) register char *s; { register n; n = 0; diff --git a/lib/libc/gen/strncat.c b/lib/libc/gen/strncat.c index 21d75cb..b8e4605 100644 --- a/lib/libc/gen/strncat.c +++ b/lib/libc/gen/strncat.c @@ -1,6 +1,8 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncat.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Concatenate s2 on the end of s1. S1's space must be large enough. @@ -8,11 +10,7 @@ static char sccsid[] = "@(#)strncat.c 5.2 (Berkeley) 3/9/86"; * Return s1. */ -char * -strncat(s1, s2, n) -register char *s1, *s2; -register n; -{ +char *strncat(s1, s2, n) register char *s1; register char *s2; register n; { register char *os1; os1 = s1; diff --git a/lib/libc/gen/strncmp.c b/lib/libc/gen/strncmp.c index 9d035e8..5fd5beb 100644 --- a/lib/libc/gen/strncmp.c +++ b/lib/libc/gen/strncmp.c @@ -1,15 +1,14 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncmp.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Compare strings (at most n bytes): s1>s2: >0 s1==s2: 0 s1= 0 && *s1 == *s2++) if (*s1++ == '\0') diff --git a/lib/libc/gen/strncpy.c b/lib/libc/gen/strncpy.c index 40be252..2f46479 100644 --- a/lib/libc/gen/strncpy.c +++ b/lib/libc/gen/strncpy.c @@ -1,16 +1,15 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncpy.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Copy s2 to s1, truncating or null-padding to always copy n bytes * return s1 */ -char * -strncpy(s1, s2, n) -register char *s1, *s2; -{ +char *strncpy(s1, s2, n) register char *s1; register char *s2; int n; { register i; register char *os1; diff --git a/lib/libc/gen/swab.c b/lib/libc/gen/swab.c index 8085998..289f39d 100644 --- a/lib/libc/gen/swab.c +++ b/lib/libc/gen/swab.c @@ -1,16 +1,15 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)swab.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Swab bytes * Jeffrey Mogul, Stanford */ -swab(from, to, n) - register char *from, *to; - register int n; -{ +int swab(from, to, n) register char *from; register char *to; register int n; { register unsigned long temp; n >>= 1; n++; diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index 075eb89..7bf841c 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -1,3 +1,21 @@ +#include +#include +#include +#include +#include +#include +#include +/*#include sys/proc.h*/ +#include +/*#include sys/proc.h*/ +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +24,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)syslog.c 5.9 (Berkeley) 5/7/86"; -#endif LIBC_SCCS and not lint +#endif /* * SYSLOG -- print message on log file @@ -25,14 +43,14 @@ static char sccsid[] = "@(#)syslog.c 5.9 (Berkeley) 5/7/86"; * Modified to use UNIX domain IPC by Ralph Campbell */ -#include -#include -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXLINE 1024 /* max message size */ #define NULL 0 /* manifest */ @@ -55,11 +73,11 @@ static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */ extern int errno, sys_nerr; extern char *sys_errlist[]; -void -syslog(pri, fmt, va_alist) - int pri; - char *fmt; - va_dcl +#ifdef __STDC__ +void syslog(int pri, char *fmt, ...) +#else +void syslog(pri, fmt, va_alist) int pri; char *fmt; va_dcl +#endif { char buf[MAXLINE + 1], outline[MAXLINE + 1]; register char *b, *f, *o; @@ -118,7 +136,7 @@ syslog(pri, fmt, va_alist) } *b++ = '\n'; *b = '\0'; - va_start(argp); + _va_start(argp, fmt); vsprintf(o, buf, argp); va_end(argp); c = strlen(outline); @@ -158,11 +176,7 @@ syslog(pri, fmt, va_alist) * OPENLOG -- open system log */ -void -openlog(ident, logstat, logfac) - char *ident; - int logstat, logfac; -{ +void openlog(ident, logstat, logfac) char *ident; int logstat; int logfac; { if (ident != NULL) LogTag = ident; LogStat = logstat; @@ -182,9 +196,7 @@ openlog(ident, logstat, logfac) * CLOSELOG -- close the system log */ -void -closelog() -{ +void closelog() { (void) close(LogFile); LogFile = -1; } @@ -192,9 +204,7 @@ closelog() /* * SETLOGMASK -- set the log mask level */ -setlogmask(pmask) - int pmask; -{ +int setlogmask(pmask) int pmask; { int omask; omask = LogMask; diff --git a/lib/libc/gen/system.c b/lib/libc/gen/system.c index 6303403..ffcb153 100644 --- a/lib/libc/gen/system.c +++ b/lib/libc/gen/system.c @@ -1,12 +1,15 @@ +#include +#include +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)system.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -system(s) -char *s; -{ +int system(s) char *s; { int status, pid, w; register void (*istat)(), (*qstat)(); diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c index 2b7af90..01a2761 100644 --- a/lib/libc/gen/telldir.c +++ b/lib/libc/gen/telldir.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +9,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)telldir.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * return a pointer into a directory */ -long -telldir(dirp) - DIR *dirp; -{ +long telldir(dirp) DIR *dirp; { extern long lseek(); return (lseek(dirp->dd_fd, 0L, 1) - dirp->dd_size + dirp->dd_loc); diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c index 49eeb8d..917196c 100644 --- a/lib/libc/gen/time.c +++ b/lib/libc/gen/time.c @@ -1,3 +1,6 @@ +#include +/*#include sys/time.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +9,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)time.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Backwards compatible time call. */ -#include -#include +/*#include */ +/*#include */ -long -time(t) - time_t *t; -{ +long time(t) time_t *t; { struct timeval tt; if (gettimeofday(&tt, (struct timezone *)0) < 0) diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c index 644bbd2..7ec2bec 100644 --- a/lib/libc/gen/timezone.c +++ b/lib/libc/gen/timezone.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +10,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)timezone.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * The arguments are the number of minutes of time @@ -40,8 +44,7 @@ static struct zone { -1 }; -char *timezone(zone, dst) -{ +char *timezone(zone, dst) int zone; int dst; { register struct zone *zp; static char czone[10]; char *sign; diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c index 9fd0c91..73cb7be 100644 --- a/lib/libc/gen/ttyname.c +++ b/lib/libc/gen/ttyname.c @@ -1,6 +1,12 @@ +#include +#include +#include +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ttyname.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * ttyname(f): return "/dev/ttyXX" which the the name of the @@ -9,17 +15,15 @@ static char sccsid[] = "@(#)ttyname.c 5.2 (Berkeley) 3/9/86"; */ #define NULL 0 -#include -#include -#include +/*#include sys/dir.h*/ +/*#include */ +/*#include */ static char dev[] = "/dev/"; -char *strcpy(); -char *strcat(); +/*char *strcpy();*/ +/*char *strcat();*/ -char * -ttyname(f) -{ +char *ttyname(f) int f; { struct stat fsb; struct stat tsb; register struct direct *db; diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c index e8ba04f..e429f18 100644 --- a/lib/libc/gen/ttyslot.c +++ b/lib/libc/gen/ttyslot.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1984 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,22 +10,21 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ttyslot.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Return the number of the slot in the utmp file * corresponding to the current user: try for file 0, 1, 2. * Definition is the line number in the /etc/ttys file. */ -#include +/*#include */ -char *ttyname(); -char *rindex(); +/*char *ttyname();*/ +/*char *rindex();*/ #define NULL 0 -ttyslot() -{ +int ttyslot() { register struct ttyent *ty; register char *tp, *p; register s; diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c index 6f14494..22624f6 100644 --- a/lib/libc/gen/ualarm.c +++ b/lib/libc/gen/ualarm.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,9 +8,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ualarm.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ #define USPS 1000000 /* # of microseconds in a second */ @@ -17,11 +19,7 @@ static char sccsid[] = "@(#)ualarm.c 5.2 (Berkeley) 3/9/86"; * If ``reload'' is non-zero, keep generating SIGALRM * every ``reload'' microseconds after the first signal. */ -unsigned -ualarm(usecs, reload) - register unsigned usecs; - register unsigned reload; -{ +unsigned ualarm(usecs, reload) register unsigned usecs; register unsigned reload; { struct itimerval new, old; new.it_interval.tv_usec = reload % USPS; diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c index 1e4a431..6d544fe 100644 --- a/lib/libc/gen/usleep.c +++ b/lib/libc/gen/usleep.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,10 +9,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)usleep.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ #define USPS 1000000 /* number of microseconds in a second */ #define TICK 10000 /* system clock resolution in microseconds */ @@ -19,10 +22,9 @@ static char sccsid[] = "@(#)usleep.c 5.2 (Berkeley) 3/9/86"; static int ringring; -void -usleep(n) - unsigned n; -{ +static void sleepx __P((void)); + +void usleep(n) unsigned n; { void sleepx(); int omask; struct itimerval itv, oitv; @@ -63,7 +65,6 @@ usleep(n) (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0); } -static void -sleepx() { +static void sleepx() { ringring = 1; } diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c index ecd3034..5af312f 100644 --- a/lib/libc/gen/valloc.c +++ b/lib/libc/gen/valloc.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)valloc.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -void *malloc(); +/*void *malloc();*/ -void * -valloc(i) - int i; -{ +void *valloc(i) int i; { int valsiz = getpagesize(), j; char *cp = malloc(i + (valsiz-1)); diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c index 3a1070c..c3ca463 100644 --- a/lib/libc/inet/inet_addr.c +++ b/lib/libc/inet/inet_addr.c @@ -1,3 +1,8 @@ +#include +#include +#include +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,11 +11,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_addr.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ /* * Internet address interpretation routine. @@ -19,10 +24,7 @@ static char sccsid[] = "@(#)inet_addr.c 5.2 (Berkeley) 3/9/86"; * which are expected to be an address. * The value returned is in network order. */ -u_long -inet_addr(cp) - register char *cp; -{ +u_long inet_addr(cp) register char *cp; { register u_long val, base, n; register char c; u_long parts[4], *pp = parts; diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c index 3451855..89a4ca7 100644 --- a/lib/libc/inet/inet_lnaof.c +++ b/lib/libc/inet/inet_lnaof.c @@ -1,3 +1,8 @@ +#include +#include +/*#include arpa/inet.h*/ +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,19 +11,17 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_lnaof.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * Return the local network address portion of an * internet address; handles class a/b/c network * number formats. */ -inet_lnaof(in) - struct in_addr in; -{ +int inet_lnaof(in) struct in_addr in; { register u_long i = ntohl(in.s_addr); if (IN_CLASSA(i)) diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c index 10b2b28..64e4ea8 100644 --- a/lib/libc/inet/inet_makeaddr.c +++ b/lib/libc/inet/inet_makeaddr.c @@ -1,3 +1,8 @@ +#include +#include +/*#include arpa/inet.h*/ +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,19 +11,16 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_makeaddr.c 5.1 (Berkeley) 3/11/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * Formulate an Internet address from network + host. Used in * building addresses stored in the ifnet structure. */ -struct in_addr -inet_makeaddr(net, host) - int net, host; -{ +struct in_addr inet_makeaddr(net, host) int net; int host; { u_long addr; if (net < 128) diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c index a0c9782..6a50cf3 100644 --- a/lib/libc/inet/inet_netof.c +++ b/lib/libc/inet/inet_netof.c @@ -1,3 +1,8 @@ +#include +#include +/*#include arpa/inet.h*/ +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +11,16 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_netof.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * Return the network number from an internet * address; handles class a/b/c network #'s. */ -inet_netof(in) - struct in_addr in; -{ +int inet_netof(in) struct in_addr in; { register u_long i = ntohl(in.s_addr); if (IN_CLASSA(i)) diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c index 57f0b5f..ec18ddb 100644 --- a/lib/libc/inet/inet_network.c +++ b/lib/libc/inet/inet_network.c @@ -1,3 +1,7 @@ +#include +#include +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,20 +10,17 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_network.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ /* * Internet network address interpretation routine. * The library routines call this routine to interpret * network numbers. */ -u_long -inet_network(cp) - register char *cp; -{ +u_long inet_network(cp) register char *cp; { register u_long val, base, n; register char c; u_long parts[4], *pp = parts; diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c index 98713f4..04aa8dc 100644 --- a/lib/libc/inet/inet_ntoa.c +++ b/lib/libc/inet/inet_ntoa.c @@ -1,3 +1,7 @@ +#include +/*#include arpa/inet.h*/ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,19 +10,16 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_ntoa.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Convert network-format internet address * to base 256 d.d.d.d representation. */ -#include -#include +/*#include */ +/*#include */ -char * -inet_ntoa(in) - struct in_addr in; -{ +char *inet_ntoa(in) struct in_addr in; { static char b[18]; register char *p; diff --git a/lib/libc/net/getnetbyaddr.c b/lib/libc/net/getnetbyaddr.c index 848c1c8..38b3904 100644 --- a/lib/libc/net/getnetbyaddr.c +++ b/lib/libc/net/getnetbyaddr.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getnetbyaddr.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _net_stayopen; -struct netent * -getnetbyaddr(net, type) - register int net, type; -{ +struct netent *getnetbyaddr(net, type) register int net; register int type; { register struct netent *p; setnetent(_net_stayopen); diff --git a/lib/libc/net/getnetbyname.c b/lib/libc/net/getnetbyname.c index c944ae5..e328218 100644 --- a/lib/libc/net/getnetbyname.c +++ b/lib/libc/net/getnetbyname.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +9,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getnetbyname.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _net_stayopen; -struct netent * -getnetbyname(name) - register char *name; -{ +struct netent *getnetbyname(name) register char *name; { register struct netent *p; register char **cp; diff --git a/lib/libc/net/getnetent.c b/lib/libc/net/getnetent.c index 488aa50..0cd6dfd 100644 --- a/lib/libc/net/getnetent.c +++ b/lib/libc/net/getnetent.c @@ -1,3 +1,8 @@ +#include +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +11,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getnetent.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXALIASES 35 @@ -22,11 +27,11 @@ static char line[BUFSIZ+1]; static struct netent net; static char *net_aliases[MAXALIASES]; int _net_stayopen; -static char *any(); +/*static char *any();*/ + +static char *any __P((register char *cp, char *match)); -setnetent(f) - int f; -{ +int setnetent(f) int f; { if (netf == NULL) netf = fopen(NETDB, "r" ); else @@ -34,8 +39,7 @@ setnetent(f) _net_stayopen |= f; } -endnetent() -{ +int endnetent() { if (netf) { fclose(netf); netf = NULL; @@ -43,9 +47,7 @@ endnetent() _net_stayopen = 0; } -struct netent * -getnetent() -{ +struct netent *getnetent() { char *p; register char *cp, **q; @@ -91,11 +93,7 @@ again: return (&net); } -static char * -any(cp, match) - register char *cp; - char *match; -{ +static char *any(cp, match) register char *cp; char *match; { register char *mp, c; while (c = *cp) { diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c index f35a6d6..2e3b13b 100644 --- a/lib/libc/net/getproto.c +++ b/lib/libc/net/getproto.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +8,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getproto.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _proto_stayopen; -struct protoent * -getprotobynumber(proto) - register int proto; -{ +struct protoent *getprotobynumber(proto) register int proto; { register struct protoent *p; setprotoent(_proto_stayopen); diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c index 15a6a18..4ec4e7a 100644 --- a/lib/libc/net/getprotoent.c +++ b/lib/libc/net/getprotoent.c @@ -1,3 +1,7 @@ +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +10,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getprotoent.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXALIASES 35 @@ -21,12 +25,12 @@ static FILE *protof = NULL; static char line[BUFSIZ+1]; static struct protoent proto; static char *proto_aliases[MAXALIASES]; -static char *any(); +/*static char *any();*/ int _proto_stayopen; -setprotoent(f) - int f; -{ +static char *any __P((register char *cp, char *match)); + +int setprotoent(f) int f; { if (protof == NULL) protof = fopen(PROTODB, "r" ); else @@ -34,8 +38,7 @@ setprotoent(f) _proto_stayopen |= f; } -endprotoent() -{ +int endprotoent() { if (protof) { fclose(protof); protof = NULL; @@ -43,9 +46,7 @@ endprotoent() _proto_stayopen = 0; } -struct protoent * -getprotoent() -{ +struct protoent *getprotoent() { char *p; register char *cp, **q; @@ -90,11 +91,7 @@ again: return (&proto); } -static char * -any(cp, match) - register char *cp; - char *match; -{ +static char *any(cp, match) register char *cp; char *match; { register char *mp, c; while (c = *cp) { diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c index 872303f..7223866 100644 --- a/lib/libc/net/getprotoname.c +++ b/lib/libc/net/getprotoname.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +9,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getprotoname.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _proto_stayopen; -struct protoent * -getprotobyname(name) - register char *name; -{ +struct protoent *getprotobyname(name) register char *name; { register struct protoent *p; register char **cp; diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c index 40c784d..3ac46d2 100644 --- a/lib/libc/net/getservbyname.c +++ b/lib/libc/net/getservbyname.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +9,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getservbyname.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _serv_stayopen; -struct servent * -getservbyname(name, proto) - char *name, *proto; -{ +struct servent *getservbyname(name, proto) char *name; char *proto; { register struct servent *p; register char **cp; diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c index d3632a2..71b9720 100644 --- a/lib/libc/net/getservbyport.c +++ b/lib/libc/net/getservbyport.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +9,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getservbyport.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ extern int _serv_stayopen; -struct servent * -getservbyport(port, proto) - int port; - char *proto; -{ +struct servent *getservbyport(port, proto) int port; char *proto; { register struct servent *p; setservent(_serv_stayopen); diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c index 7df4ac8..972e3df 100644 --- a/lib/libc/net/getservent.c +++ b/lib/libc/net/getservent.c @@ -1,3 +1,9 @@ +#include +#include +/*#include net.h*/ +/*#include net.h*/ +/*#include gen.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +12,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getservent.c 5.3 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXALIASES 35 @@ -21,12 +27,12 @@ static FILE *servf = NULL; static char line[BUFSIZ+1]; static struct servent serv; static char *serv_aliases[MAXALIASES]; -static char *any(); +/*static char *any();*/ int _serv_stayopen; -setservent(f) - int f; -{ +static char *any __P((register char *cp, char *match)); + +int setservent(f) int f; { if (servf == NULL) servf = fopen(SERVDB, "r" ); else @@ -34,8 +40,7 @@ setservent(f) _serv_stayopen |= f; } -endservent() -{ +int endservent() { if (servf) { fclose(servf); servf = NULL; @@ -43,9 +48,7 @@ endservent() _serv_stayopen = 0; } -struct servent * -getservent() -{ +struct servent *getservent() { char *p; register char *cp, **q; @@ -92,11 +95,7 @@ again: return (&serv); } -static char * -any(cp, match) - register char *cp; - char *match; -{ +static char *any(cp, match) register char *cp; char *match; { register char *mp, c; while (c = *cp) { diff --git a/lib/libc/net/hosttable/gethostent.c b/lib/libc/net/hosttable/gethostent.c index 4faffe1..86c6452 100644 --- a/lib/libc/net/hosttable/gethostent.c +++ b/lib/libc/net/hosttable/gethostent.c @@ -1,3 +1,10 @@ +#include +#include +#include +#include +#include +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +13,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostent.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ /* * Internet version. @@ -38,18 +45,17 @@ char *_host_file = "/etc/hosts"; int _host_stayopen; DBM *_host_db; /* set by gethostbyname(), gethostbyaddr() */ -static char *any(); +/*static char *any();*/ + +static char *any __P((register char *cp, char *match)); -sethostent(f) - int f; -{ +int sethostent(f) int f; { if (hostf != NULL) rewind(hostf); _host_stayopen |= f; } -endhostent() -{ +int endhostent() { if (hostf) { fclose(hostf); hostf = NULL; @@ -61,9 +67,7 @@ endhostent() _host_stayopen = 0; } -struct hostent * -gethostent() -{ +struct hostent *gethostent() { char *p; register char *cp, **q; @@ -109,17 +113,11 @@ again: return (&host); } -sethostfile(file) - char *file; -{ +int sethostfile(file) char *file; { _host_file = file; } -static char * -any(cp, match) - register char *cp; - char *match; -{ +static char *any(cp, match) register char *cp; char *match; { register char *mp, c; while (c = *cp) { diff --git a/lib/libc/net/hosttable/gethostnamadr.c b/lib/libc/net/hosttable/gethostnamadr.c index b32602c..8aab4c1 100644 --- a/lib/libc/net/hosttable/gethostnamadr.c +++ b/lib/libc/net/hosttable/gethostnamadr.c @@ -1,3 +1,10 @@ +#include +#include +#include +#include +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +13,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 5.5 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXALIASES 35 @@ -30,10 +37,9 @@ extern char *_host_file; DBM *_host_db = (DBM *)NULL; int _host_stayopen; /* set by sethostent(), cleared by endhostent() */ -static struct hostent * -fetchhost(key) - datum key; -{ +static struct hostent *fetchhost __P((datum key)); + +static struct hostent *fetchhost(key) datum key; { register char *cp, *tp, **ap; int naliases; @@ -65,10 +71,7 @@ fetchhost(key) return (&host); } -struct hostent * -gethostbyname(nam) - register char *nam; -{ +struct hostent *gethostbyname(nam) register char *nam; { register struct hostent *hp; register char **cp; datum key; @@ -109,12 +112,7 @@ gethostbyname(nam) return (hp); } -struct hostent * -gethostbyaddr(addr, length, type) - char *addr; - register int length; - register int type; -{ +struct hostent *gethostbyaddr(addr, length, type) char *addr; register int length; register int type; { register struct hostent *hp; datum key; diff --git a/lib/libc/net/htonl.c b/lib/libc/net/htonl.c index 1e2d219..96adf05 100644 --- a/lib/libc/net/htonl.c +++ b/lib/libc/net/htonl.c @@ -1,5 +1,10 @@ -#include +#include #include +#include +/*#include gen.h*/ + +/*#include */ +/*#include */ u_long htonl(hostlong) u_long hostlong; { write(2, "htonl()\n", 8); diff --git a/lib/libc/net/htons.c b/lib/libc/net/htons.c index 1a33707..4d57870 100644 --- a/lib/libc/net/htons.c +++ b/lib/libc/net/htons.c @@ -1,7 +1,12 @@ -#include +#include #include +#include +/*#include gen.h*/ -u_short htons(hostshort) u_short hostshort; { +/*#include */ +/*#include */ + +u_short htons(hostshort) int hostshort; { write(2, "htons()\n", 8); abort(); } diff --git a/lib/libc/net/named/gethostnamadr.c b/lib/libc/net/named/gethostnamadr.c index fee3aa6..d17a59e 100644 --- a/lib/libc/net/named/gethostnamadr.c +++ b/lib/libc/net/named/gethostnamadr.c @@ -1,3 +1,16 @@ +#include +/*#include net.h*/ +#include +#include +/*#include net.h*/ +/*#include arpa/inet.h*/ +#include +/*#include arpa/nameser.h*/ +#include +#include +#include +/*#include arpa/inet.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +19,18 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 6.12 (Berkeley) 5/19/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ #define MAXALIASES 35 #define MAXADDRS 35 @@ -34,7 +47,7 @@ static char line[BUFSIZ+1]; static char hostaddr[MAXADDRS]; static char *host_addrs[2]; static int stayopen = 0; -static char *any(); +/*static char *any();*/ typedef union { HEADER qb1; @@ -46,15 +59,13 @@ static union { char ac; } align; - int h_errno; extern errno; -static struct hostent * -getanswer(msg, msglen, iquery) - char *msg; - int msglen, iquery; -{ +static struct hostent *getanswer __P((char *msg, int msglen, int iquery)); +static char *any __P((register char *cp, char *match)); + +static struct hostent *getanswer(msg, msglen, iquery) char *msg; int msglen; int iquery; { register HEADER *hp; register char *cp; register int n; @@ -222,10 +233,7 @@ getanswer(msg, msglen, iquery) } } -struct hostent * -gethostbyname(name) - char *name; -{ +struct hostent *gethostbyname(name) char *name; { int n; querybuf buf; register struct hostent *hp; @@ -246,11 +254,7 @@ gethostbyname(name) return(hp); } -struct hostent * -gethostbyaddr(addr, len, type) - char *addr; - int len, type; -{ +struct hostent *gethostbyaddr(addr, len, type) char *addr; int len; int type; { int n; querybuf buf; register struct hostent *hp; @@ -286,10 +290,7 @@ gethostbyaddr(addr, len, type) return(hp); } - -_sethtent(f) - int f; -{ +int _sethtent(f) int f; { if (hostf == NULL) hostf = fopen(HOSTDB, "r" ); else @@ -297,17 +298,14 @@ _sethtent(f) stayopen |= f; } -_endhtent() -{ +int _endhtent() { if (hostf && !stayopen) { (void) fclose(hostf); hostf = NULL; } } -struct hostent * -_gethtent() -{ +struct hostent *_gethtent() { char *p; register char *cp, **q; @@ -354,11 +352,7 @@ again: return (&host); } -static char * -any(cp, match) - register char *cp; - char *match; -{ +static char *any(cp, match) register char *cp; char *match; { register char *mp, c; while (c = *cp) { @@ -370,10 +364,7 @@ any(cp, match) return ((char *)0); } -struct hostent * -_gethtbyname(name) - char *name; -{ +struct hostent *_gethtbyname(name) char *name; { register struct hostent *p; register char **cp; char lowname[128]; @@ -399,11 +390,7 @@ found: return (p); } -struct hostent * -_gethtbyaddr(addr, len, type) - char *addr; - int len, type; -{ +struct hostent *_gethtbyaddr(addr, len, type) char *addr; int len; int type; { register struct hostent *p; _sethtent(0); diff --git a/lib/libc/net/named/sethostent.c b/lib/libc/net/named/sethostent.c index 0acfe9c..614db87 100644 --- a/lib/libc/net/named/sethostent.c +++ b/lib/libc/net/named/sethostent.c @@ -1,3 +1,7 @@ +/*#include resolv.h*/ +#include +#include + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,28 +10,24 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sethostent.c 6.3 (Berkeley) 4/10/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ -sethostent(stayopen) -{ +int sethostent(stayopen) int stayopen; { if (stayopen) _res.options |= RES_STAYOPEN | RES_USEVC; } -endhostent() -{ +int endhostent() { _res.options &= ~(RES_STAYOPEN | RES_USEVC); _res_close(); } -sethostfile(name) -char *name; -{ +int sethostfile(name) char *name; { #ifdef lint name = name; #endif diff --git a/lib/libc/net/ntohl.c b/lib/libc/net/ntohl.c index 5c0c36e..8c0f95d 100644 --- a/lib/libc/net/ntohl.c +++ b/lib/libc/net/ntohl.c @@ -1,5 +1,10 @@ -#include +#include #include +#include +/*#include gen.h*/ + +/*#include */ +/*#include */ u_long ntohl(netlong) u_long netlong; { write(2, "ntohl()\n", 8); diff --git a/lib/libc/net/ntohs.c b/lib/libc/net/ntohs.c index 80e0941..dd0eba8 100644 --- a/lib/libc/net/ntohs.c +++ b/lib/libc/net/ntohs.c @@ -1,7 +1,12 @@ -#include +#include #include +#include +/*#include gen.h*/ -u_short ntohs(netshort) u_short netshort; { +/*#include */ +/*#include */ + +u_short ntohs(netshort) int netshort; { write(2, "ntohs()\n", 8); abort(); } diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index d35b25b..e96719b 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -1,3 +1,22 @@ +#include +#include +#include +/*#include net.h*/ +/*#include arpa/inet.h*/ +#include +/*#include net.h*/ +/*#include sys.h*/ +#include +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include sys.h*/ +/*#include arpa/inet.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,31 +25,26 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rcmd.c 5.11 (Berkeley) 5/6/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ -#include +/*#include */ -#include -#include +/*#include */ +/*#include */ extern errno; -char *index(), *sprintf(); +/*char *index(), *sprintf();*/ -rcmd(ahost, rport, locuser, remuser, cmd, fd2p) - char **ahost; - u_short rport; - char *locuser, *remuser, *cmd; - int *fd2p; -{ +int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) char **ahost; int rport; char *locuser; char *remuser; char *cmd; int *fd2p; { int s, timo = 1, pid, oldmask; struct sockaddr_in sin, sin2, from; char c; @@ -149,9 +163,7 @@ bad: return (-1); } -rresvport(alport) - int *alport; -{ +int rresvport(alport) int *alport; { struct sockaddr_in sin; int s; @@ -177,11 +189,7 @@ rresvport(alport) } } -ruserok(rhost, superuser, ruser, luser) - char *rhost; - int superuser; - char *ruser, *luser; -{ +int ruserok(rhost, superuser, ruser, luser) char *rhost; int superuser; char *ruser; char *luser; { FILE *hostf; char fhost[MAXHOSTNAMELEN]; int first = 1; @@ -231,11 +239,7 @@ again: return (-1); } -_validuser(hostf, rhost, luser, ruser, baselen) -char *rhost, *luser, *ruser; -FILE *hostf; -int baselen; -{ +int _validuser(hostf, rhost, luser, ruser, baselen) FILE *hostf; char *rhost; char *luser; char *ruser; int baselen; { char *user; char ahost[MAXHOSTNAMELEN]; register char *p; @@ -264,10 +268,7 @@ int baselen; return (-1); } -_checkhost(rhost, lhost, len) -char *rhost, *lhost; -int len; -{ +int _checkhost(rhost, lhost, len) char *rhost; char *lhost; int len; { static char ldomain[MAXHOSTNAMELEN + 1]; static char *domainp = NULL; register char *cp; diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c index 4047129..96b8b68 100644 --- a/lib/libc/net/res_comp.c +++ b/lib/libc/net/res_comp.c @@ -1,3 +1,6 @@ +#include +/*#include arpa/nameser.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,12 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_comp.c 6.7 (Berkeley) 3/11/86"; -#endif LIBC_SCCS and not lint - -#include -#include -#include +#endif +/*#include */ +/*#include */ +/*#include */ /* * Expand compressed domain name 'comp_dn' to full domain name. @@ -20,10 +22,7 @@ static char sccsid[] = "@(#)res_comp.c 6.7 (Berkeley) 3/11/86"; * 'exp_dn' is a pointer to a buffer of size 'length' for the result. * Return size of compressed name or -1 if there was an error. */ -dn_expand(msg, eomorig, comp_dn, exp_dn, length) - char *msg, *eomorig, *comp_dn, *exp_dn; - int length; -{ +int dn_expand(msg, eomorig, comp_dn, exp_dn, length) char *msg; char *eomorig; char *comp_dn; char *exp_dn; int length; { register char *cp, *dn; register int n, c; char *eom; @@ -90,11 +89,7 @@ dn_expand(msg, eomorig, comp_dn, exp_dn, length) * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' * is NULL, we don't update the list. */ -dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr) - char *exp_dn, *comp_dn; - int length; - char **dnptrs, **lastdnptr; -{ +int dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr) char *exp_dn; char *comp_dn; int length; char **dnptrs; char **lastdnptr; { register char *cp, *dn; register int c, l; char **cpp, **lpp, *sp, *eob; @@ -159,9 +154,7 @@ dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr) /* * Skip over a compressed domain name. Return the size or -1. */ -dn_skip(comp_dn) - char *comp_dn; -{ +int dn_skip(comp_dn) char *comp_dn; { register char *cp; register int n; @@ -188,10 +181,7 @@ dn_skip(comp_dn) * Search for expanded name from a list of previously compressed names. * Return the offset from msg if found or -1. */ -dn_find(exp_dn, msg, dnptrs, lastdnptr) - char *exp_dn, *msg; - char **dnptrs, **lastdnptr; -{ +int dn_find(exp_dn, msg, dnptrs, lastdnptr) char *exp_dn; char *msg; char **dnptrs; char **lastdnptr; { register char *dn, *cp, **cpp; register int n; char *sp; @@ -237,10 +227,7 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr) * advantage of being portable. */ -u_short -getshort(msgp) - char *msgp; -{ +u_short getshort(msgp) char *msgp; { register u_char *p = (u_char *) msgp; #ifdef vax /* @@ -255,10 +242,7 @@ getshort(msgp) return ((u_short)(u | *p)); } -u_long -getlong(msgp) - char *msgp; -{ +u_long getlong(msgp) char *msgp; { register u_char *p = (u_char *) msgp; register u_long u; @@ -268,20 +252,13 @@ getlong(msgp) return (u | *p); } - -putshort(s, msgp) - register u_short s; - register char *msgp; -{ +int putshort(s, msgp) int s; register char *msgp; { msgp[1] = s; msgp[0] = s >> 8; } -putlong(l, msgp) - register u_long l; - register char *msgp; -{ +int putlong(l, msgp) register u_long l; register char *msgp; { msgp[3] = l; msgp[2] = (l >>= 8); diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c index 1238698..e1775b7 100644 --- a/lib/libc/net/res_debug.c +++ b/lib/libc/net/res_debug.c @@ -1,3 +1,11 @@ +#include +/*#include net.h*/ +#include +/*#include arpa/inet.h*/ +/*#include arpa/nameser.h*/ +#include +/*#include arpa/inet.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,19 +14,19 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_debug.c 5.13 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif #if defined(lint) && !defined(DEBUG) #define DEBUG #endif -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ -extern char *p_cdname(), *p_rr(), *p_type(), *p_class(); -extern char *inet_ntoa(); +/*extern char *p_cdname(), *p_rr(), *p_type(), *p_class();*/ +/*extern char *inet_ntoa();*/ char *opcodes[] = { "QUERY", @@ -58,9 +66,7 @@ char *rcodes[] = { "NOCHANGE", }; -p_query(msg) - char *msg; -{ +int p_query(msg) char *msg; { #ifdef DEBUG fp_query(msg,stdout); #endif @@ -70,10 +76,7 @@ p_query(msg) * Print the contents of a query. * This is intended to be primarily a debugging routine. */ -fp_query(msg,file) - char *msg; - FILE *file; -{ +int fp_query(msg, file) char *msg; FILE *file; { #ifdef DEBUG register char *cp; register HEADER *hp; @@ -160,11 +163,7 @@ fp_query(msg,file) #endif } -char * -p_cdname(cp, msg, file) - char *cp, *msg; - FILE *file; -{ +char *p_cdname(cp, msg, file) char *cp; char *msg; FILE *file; { #ifdef DEBUG char name[MAXDNAME]; int n; @@ -183,11 +182,7 @@ p_cdname(cp, msg, file) /* * Print resource record fields in human readable form. */ -char * -p_rr(cp, msg, file) - char *cp, *msg; - FILE *file; -{ +char *p_rr(cp, msg, file) char *cp; char *msg; FILE *file; { #ifdef DEBUG int type, class, dlen, n, c; struct in_addr inaddr; @@ -232,7 +227,7 @@ p_rr(cp, msg, file) #ifdef OLDRR case T_MD: case T_MF: -#endif /* OLDRR */ +#endif case T_MG: case T_MR: case T_NS: @@ -330,15 +325,12 @@ p_rr(cp, msg, file) static char nbuf[20]; /* we have taken the portable sprintf() from 4.3tahoe */ /*extern char *sprintf();*/ -extern int sprintf(); +/*extern int sprintf();*/ /* * Return a string for the type */ -char * -p_type(type) - int type; -{ +char *p_type(type) int type; { switch (type) { case T_A: return("A"); @@ -349,7 +341,7 @@ p_type(type) return("MD"); case T_MF: /* mail forwarder */ return("MF"); -#endif /* OLDRR */ +#endif case T_CNAME: /* connonical name */ return("CNAME"); case T_SOA: /* start of authority zone */ @@ -397,10 +389,7 @@ p_type(type) /* * Return a mnemonic for class */ -char * -p_class(class) - int class; -{ +char *p_class(class) int class; { switch (class) { case C_IN: /* internet class */ diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index 306959e..feaf59b 100644 --- a/lib/libc/net/res_init.c +++ b/lib/libc/net/res_init.c @@ -1,3 +1,15 @@ +#include +/*#include net.h*/ +#include +#include +/*#include arpa/inet.h*/ +#include +/*#include arpa/nameser.h*/ +/*#include gen.h*/ +#include +/*#include sys.h*/ +/*#include arpa/inet.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +18,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_init.c 6.5 (Berkeley) 4/11/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ /* * Resolver configuration file. Contains the address of the @@ -52,8 +64,7 @@ struct state _res = { * * Return 0 if completes successfully, -1 on error */ -res_init() -{ +int res_init() { register FILE *fp; char buf[BUFSIZ], *cp; extern u_long inet_addr(); @@ -61,7 +72,7 @@ res_init() extern char *strcpy(), *strncpy(); #ifdef DEBUG extern char *getenv(); -#endif DEBUG +#endif int n = 0; /* number of nameserver records read from file */ _res.nsaddr.sin_addr.s_addr = INADDR_ANY; @@ -104,7 +115,7 @@ res_init() #ifdef DEBUG if ( _res.options & RES_DEBUG ) printf("MAXNS reached, reading resolv.conf\n"); -#endif DEBUG +#endif } continue; } @@ -123,7 +134,7 @@ res_init() /* Allow user to override the local domain definition */ if ((cp = getenv("LOCALDOMAIN")) != NULL) (void)strncpy(_res.defdname, cp, sizeof(_res.defdname)); -#endif DEBUG +#endif _res.options |= RES_INIT; return(0); } diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c index 0f0c8b5..a81e2cd 100644 --- a/lib/libc/net/res_mkquery.c +++ b/lib/libc/net/res_mkquery.c @@ -1,3 +1,10 @@ +/*#include net.h*/ +#include +#include +/*#include arpa/nameser.h*/ +#include +/*#include arpa/nameser.h*/ + /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,33 +13,23 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_mkquery.c 6.3 (Berkeley) 3/17/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ /* we have taken the portable sprintf() from 4.3tahoe */ /*extern char *sprintf();*/ -extern int sprintf(); - +/*extern int sprintf();*/ /* * Form all types of queries. * Returns the size of the result or -1. */ -res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen) - int op; /* opcode of query */ - char *dname; /* domain name */ - int class, type; /* class and type of query */ - char *data; /* resource record data */ - int datalen; /* length of data */ - struct rrec *newrr; /* new rr for modify or append */ - char *buf; /* buffer to put query */ - int buflen; /* size of buffer */ -{ +int res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen) int op; /* opcode of query */ char *dname; /* domain name */ int class; int type; /* class and type of query */ char *data; /* resource record data */ int datalen; /* length of data */ struct rrec *newrr; /* new rr for modify or append */ char *buf; /* buffer to put query */ int buflen; /* size of buffer */ { register HEADER *hp; register char *cp; register int n; @@ -43,7 +40,7 @@ res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen) #ifdef DEBUG if (_res.options & RES_DEBUG) printf("res_mkquery(%d, %s, %d, %d)\n", op, dname, class, type); -#endif DEBUG +#endif /* * Initialize header fields. */ diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index 8cdd9a2..8018393 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -1,3 +1,16 @@ +#include +/*#include net.h*/ +#include +#include +/*#include arpa/nameser.h*/ +/*#include sys/file.h*/ +#include +/*#include sys/file.h*/ +#include +#include +/*#include sys/select.h*/ +/*#include arpa/inet.h*/ +#include /* * Copyright (c) 1985 Regents of the University of California. @@ -7,21 +20,21 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_send.c 6.14 (Berkeley) 7/2/86"; -#endif LIBC_SCCS and not lint +#endif /* * Send query to name server and wait for reply. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ extern int errno; @@ -29,12 +42,7 @@ static int s = -1; /* socket used for communications */ #define KEEPOPEN (RES_USEVC|RES_STAYOPEN) -res_send(buf, buflen, answer, anslen) - char *buf; - int buflen; - char *answer; - int anslen; -{ +int res_send(buf, buflen, answer, anslen) char *buf; int buflen; char *answer; int anslen; { register int n; int retry, v_circuit, resplen, ns; int gotsomewhere = 0; @@ -52,7 +60,7 @@ res_send(buf, buflen, answer, anslen) printf("res_send()\n"); p_query(buf); } -#endif DEBUG +#endif if (!(_res.options & RES_INIT)) if (res_init() == -1) { return(-1); @@ -68,7 +76,7 @@ res_send(buf, buflen, answer, anslen) if (_res.options & RES_DEBUG) printf("Querying server (# %d) address = %s\n", ns+1, inet_ntoa(_res.nsaddr_list[ns].sin_addr.s_addr)); -#endif DEBUG +#endif if (v_circuit) { /* * Use virtual circuit. @@ -80,7 +88,7 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("socket failed"); -#endif DEBUG +#endif continue; } if (connect(s, (struct sockaddr *)&(_res.nsaddr_list[ns]), @@ -89,7 +97,7 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("connect failed"); -#endif DEBUG +#endif (void) close(s); s = -1; continue; @@ -108,7 +116,7 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("write failed"); -#endif DEBUG +#endif (void) close(s); s = -1; continue; @@ -128,7 +136,7 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("read failed"); -#endif DEBUG +#endif (void) close(s); s = -1; continue; @@ -145,7 +153,7 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("read failed"); -#endif DEBUG +#endif (void) close(s); s = -1; continue; @@ -163,19 +171,19 @@ res_send(buf, buflen, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) perror("connect"); -#endif DEBUG +#endif continue; } -#else BSD +#else if (sendto(s, buf, buflen, 0, &_res.nsaddr_list[ns], sizeof(struct sockaddr)) != buflen) { #ifdef DEBUG if (_res.options & RES_DEBUG) perror("sendto"); -#endif DEBUG +#endif continue; } -#endif BSD +#endif /* * Wait for reply */ @@ -193,7 +201,7 @@ wait: #ifdef DEBUG if (_res.options & RES_DEBUG) perror("select"); -#endif DEBUG +#endif continue; } if (n == 0) { @@ -203,7 +211,7 @@ wait: #ifdef DEBUG if (_res.options & RES_DEBUG) printf("timeout\n"); -#endif DEBUG +#endif gotsomewhere = 1; continue; } @@ -211,7 +219,7 @@ wait: #ifdef DEBUG if (_res.options & RES_DEBUG) perror("recvfrom"); -#endif DEBUG +#endif continue; } gotsomewhere = 1; @@ -224,7 +232,7 @@ wait: printf("old answer:\n"); p_query(answer); } -#endif DEBUG +#endif goto wait; } if (!(_res.options & RES_IGNTC) && anhp->tc) { @@ -234,7 +242,7 @@ wait: #ifdef DEBUG if (_res.options & RES_DEBUG) printf("truncated answer\n"); -#endif DEBUG +#endif (void) close(s); s = -1; /* @@ -251,7 +259,7 @@ wait: printf("got answer:\n"); p_query(answer); } -#endif DEBUG +#endif /* * We are going to assume that the first server is preferred * over the rest (i.e. it is on the local machine) and only @@ -287,8 +295,7 @@ wait: * * This routine is not expected to be user visible. */ -_res_close() -{ +int _res_close() { if (s != -1) { (void) close(s); s = -1; diff --git a/lib/libc/net/rexec.c b/lib/libc/net/rexec.c index 39198ca..4dea98e 100644 --- a/lib/libc/net/rexec.c +++ b/lib/libc/net/rexec.c @@ -1,3 +1,14 @@ +#include +/*#include net.h*/ +#include +/*#include net.h*/ +#include +/*#include sys/file.h*/ +#include +#include +#include +/*#include net.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,28 +17,23 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rexec.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -#include +/*#include */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ extern errno; -char *index(), *sprintf(); +/*char *index(), *sprintf();*/ int rexecoptions; -char *getpass(), *getlogin(); +/*char *getpass(), *getlogin();*/ -rexec(ahost, rport, name, pass, cmd, fd2p) - char **ahost; - int rport; - char *name, *pass, *cmd; - int *fd2p; -{ +int rexec(ahost, rport, name, pass, cmd, fd2p) char **ahost; int rport; char *name; char *pass; char *cmd; int *fd2p; { int s, timo = 1, s3; struct sockaddr_in sin, sin2, from; char c; diff --git a/lib/libc/net/ruserpass.c b/lib/libc/net/ruserpass.c index ad8a2bd..dfbf02e 100644 --- a/lib/libc/net/ruserpass.c +++ b/lib/libc/net/ruserpass.c @@ -1,3 +1,14 @@ +/*#include gen.h*/ +#include +#include +/*#include net.h*/ +/*#include gen.h*/ +/*#include gen.h*/ +#include +#include +#include +/*#include gen.h*/ + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,23 +17,38 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ruserpass.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ +/*#include */ -char *renvlook(), *malloc(), *index(), *getenv(), *getpass(), *getlogin(); -struct utmp *getutmp(); +/*char *renvlook(), *malloc(), *index(), *getenv(), *getpass(), *getlogin();*/ +/*struct utmp *getutmp();*/ static FILE *cfile; -void -ruserpass(host, aname, apass) - char *host, **aname, **apass; -{ +static void renv __P((char *host, char **aname, char **apass)); +static char *renvlook __P((char *host)); +static void rnetrc __P((char *host, char **aname, char **apass)); +static token __P((void)); +static char *nbsencrypt __P((char *str, char *key, char *result)); +static char *nbsdecrypt __P((char *cpt, char *key, char *result)); +static char *nbs8encrypt __P((char *str, char *key)); +static char *nbs8decrypt __P((char *crp, char *key)); +static enblkclr __P((char *blk, char *str)); +static char *deblkclr __P((char *blk)); +static enblknot __P((char *blk, char *crp)); +static char *deblknot __P((char *blk)); +static void nbssetkey __P((char *key)); +static void blkencrypt __P((char *block, int edflag)); +static struct utmp *getutmp __P((char *sttyname)); +static void sreverse __P((register char *sto, register char *sfrom)); +static char *mkenvkey __P((int mch)); + +void ruserpass(host, aname, apass) char *host; char **aname; char **apass; { renv(host, aname, apass); if (*aname == 0 || *apass == 0) @@ -47,10 +73,7 @@ ruserpass(host, aname, apass) } } -static void -renv(host, aname, apass) - char *host, **aname, **apass; -{ +static void renv(host, aname, apass) char *host; char **aname; char **apass; { register char *cp; char *stemp, fgetlogin, *comma; @@ -75,10 +98,7 @@ renv(host, aname, apass) mkpwclear(cp, host[0], *apass); } -static char * -renvlook(host) - char *host; -{ +static char *renvlook(host) char *host; { register char *cp, **env; extern char **environ; @@ -128,10 +148,7 @@ static struct toktab { 0, 0 }; -static void -rnetrc(host, aname, apass) - char *host, **aname, **apass; -{ +static void rnetrc(host, aname, apass) char *host; char **aname; char **apass; { char *hdir, buf[BUFSIZ]; int t; struct stat stb; @@ -197,9 +214,7 @@ done: fclose(cfile); } -static -token() -{ +static token() { char *cp; int c; struct toktab *t; @@ -237,8 +252,8 @@ token() } /* rest is nbs.c stolen from berknet */ -char *deblknot(), *deblkclr(); -char *nbs8decrypt(), *nbs8encrypt(); +/*char *deblknot(), *deblkclr();*/ +/*char *nbs8decrypt(), *nbs8encrypt();*/ static char E[48]; /* @@ -254,10 +269,7 @@ static char e[] = { 24,25,26,27,28,29, 28,29,30,31,32, 1, }; -static -char *nbsencrypt(str,key,result) - char *result; - char *str, *key; { +static char *nbsencrypt(str, key, result) char *str; char *key; char *result; { static char buf[20],oldbuf[20]; register int j; result[0] = 0; @@ -271,10 +283,7 @@ char *nbsencrypt(str,key,result) } return(result); } -static -char *nbsdecrypt(cpt,key,result) - char *result; - char *cpt,*key; { +static char *nbsdecrypt(cpt, key, result) char *cpt; char *key; char *result; { char *s; char c,oldbuf[20]; result[0] = 0; @@ -291,9 +300,7 @@ char *nbsdecrypt(cpt,key,result) return(result); } -static -char *nbs8encrypt(str,key) -char *str, *key; { +static char *nbs8encrypt(str, key) char *str; char *key; { static char keyblk[100], blk[100]; register int i; @@ -307,9 +314,7 @@ char *str, *key; { return(deblknot(blk)); } -static -char *nbs8decrypt(crp,key) -char *crp, *key; { +static char *nbs8decrypt(crp, key) char *crp; char *key; { static char keyblk[100], blk[100]; register int i; @@ -323,9 +328,7 @@ char *crp, *key; { return(deblkclr(blk)); } -static -enblkclr(blk,str) /* ignores top bit of chars in string str */ -char *blk,*str; { +static enblkclr(blk, str) /* ignores top bit of chars in string str */ char *blk; char *str; { register int i,j; char c; for(i=0;i<70;i++)blk[i] = 0; @@ -336,9 +339,7 @@ char *blk,*str; { } } -static -char *deblkclr(blk) -char *blk; { +static char *deblkclr(blk) char *blk; { register int i,j; char c; static char iobuf[30]; @@ -354,10 +355,7 @@ char *blk; { return(iobuf); } -static -enblknot(blk,crp) -char *blk; -char *crp; { +static enblknot(blk, crp) char *blk; char *crp; { register int i,j; char c; for(i=0;i<70;i++)blk[i] = 0; @@ -370,9 +368,7 @@ char *crp; { } } -static -char *deblknot(blk) -char *blk; { +static char *deblknot(blk) char *blk; { register int i,j; char c; static char iobuf[30]; @@ -487,10 +483,7 @@ static char KS[16][48]; * Set up the key schedule from the key. */ -static void -nbssetkey(key) -char *key; -{ +static void nbssetkey(key) char *key; { register i, j, k; int t; @@ -533,7 +526,6 @@ char *key; } } - /* * The 8 selection functions. * For some reason, they give a 0-origin @@ -612,10 +604,7 @@ static char preS[48]; * The payoff: encrypt a block. */ -static void -blkencrypt(block, edflag) -char *block; -{ +static void blkencrypt(block, edflag) char *block; int edflag; { int i, ii; register t, j, k; @@ -707,10 +696,7 @@ char *block; Is version independent-- will work on v6 systems return NULL if error */ -static -struct utmp *getutmp(sttyname) -char *sttyname; -{ +static struct utmp *getutmp(sttyname) char *sttyname; { static struct utmp utmpstr; FILE *fdutmp; @@ -728,10 +714,7 @@ char *sttyname; return(NULL); } -static void -sreverse(sto, sfrom) - register char *sto, *sfrom; -{ +static void sreverse(sto, sfrom) register char *sto; register char *sfrom; { register int i; i = strlen(sfrom); @@ -739,10 +722,7 @@ sreverse(sto, sfrom) *sto++ = sfrom[i--]; } -static -char *mkenvkey(mch) - char mch; -{ +static char *mkenvkey(mch) int mch; { static char skey[40]; register struct utmp *putmp; char stemp[40], stemp1[40], sttyname[30]; @@ -773,10 +753,7 @@ char *mkenvkey(mch) return (skey); } -void -mkpwunclear(spasswd,mch,sencpasswd) - char mch, *spasswd, *sencpasswd; -{ +void mkpwunclear(spasswd, mch, sencpasswd) char *spasswd; int mch; char *sencpasswd; { register char *skey; if (spasswd[0] == 0) { @@ -791,10 +768,7 @@ mkpwunclear(spasswd,mch,sencpasswd) nbsencrypt(spasswd, skey, sencpasswd); } -void -mkpwclear(sencpasswd,mch,spasswd) - char mch, *spasswd, *sencpasswd; -{ +void mkpwclear(sencpasswd, mch, spasswd) char *sencpasswd; int mch; char *spasswd; { register char *skey; if (sencpasswd[0] == 0) { diff --git a/lib/libc/ns/ns_addr.c b/lib/libc/ns/ns_addr.c index 0bd83ed..2387daf 100644 --- a/lib/libc/ns/ns_addr.c +++ b/lib/libc/ns/ns_addr.c @@ -1,3 +1,9 @@ +#include +#include +/*#include net.h*/ +#include +/*#include net.h*/ + /* * Copyright (c) 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,17 +15,17 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ns_addr.c 6.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ static struct ns_addr addr, zero_addr; -struct ns_addr -ns_addr(name) - char *name; -{ +static void Field __P((char *buf, u_char *out, int len)); +static cvtbase __P((int oldbase, int newbase, int input[], int inlen, unsigned char result[], int reslen)); + +struct ns_addr ns_addr(name) char *name; { u_long net; u_short socket; char separator = '.'; @@ -63,12 +69,7 @@ ns_addr(name) return (addr); } -static void -Field(buf, out, len) -char *buf; -u_char *out; -int len; -{ +static void Field(buf, out, len) char *buf; u_char *out; int len; { register char *bp = buf; int i, ibase, base16 = 0, base10 = 0, clen = 0; int hb[6], *hp; @@ -167,14 +168,7 @@ int len; cvtbase(ibase, 256, hb, i, out, len); } -static -cvtbase(oldbase,newbase,input,inlen,result,reslen) - int oldbase, newbase; - int input[]; - int inlen; - unsigned char result[]; - int reslen; -{ +static cvtbase(oldbase, newbase, input, inlen, result, reslen) int oldbase; int newbase; int input[]; int inlen; unsigned char result[]; int reslen; { int d, e; long sum; diff --git a/lib/libc/ns/ns_ntoa.c b/lib/libc/ns/ns_ntoa.c index f72ca71..d877876 100644 --- a/lib/libc/ns/ns_ntoa.c +++ b/lib/libc/ns/ns_ntoa.c @@ -1,3 +1,8 @@ +#include +#include +/*#include net.h*/ +/*#include net.h*/ + /* * Copyright (c) 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -7,15 +12,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ns_ntoa.c 6.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ + +static char *spectHex __P((char *p0)); -char * -ns_ntoa(addr) -struct ns_addr addr; -{ +char *ns_ntoa(addr) struct ns_addr addr; { static char obuf[40]; char *spectHex(); union { union ns_net net_e; u_long long_e; } net; @@ -50,10 +54,7 @@ struct ns_addr addr; return (obuf); } -static char * -spectHex(p0) -char *p0; -{ +static char *spectHex(p0) char *p0; { int ok = 0; int nonzero = 0; register char *p = p0; diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c index baaede2..99234f3 100644 --- a/lib/libc/stdio/clrerr.c +++ b/lib/libc/stdio/clrerr.c @@ -1,12 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)clrerr.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ #undef clearerr -clearerr(iop) - register FILE *iop; -{ +int clearerr(iop) register FILE *iop; { iop->_flag &= ~(_IOERR|_IOEOF); } diff --git a/lib/libc/stdio/doprnt.c b/lib/libc/stdio/doprnt.c index 3aa00db..a84cd95 100644 --- a/lib/libc/stdio/doprnt.c +++ b/lib/libc/stdio/doprnt.c @@ -1,3 +1,17 @@ +#include +#include +#include +#include +#include +/*#include stdio.h*/ +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -17,12 +31,12 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)doprnt.c 5.35 (Berkeley) 6/27/88"; -#endif /* LIBC_SCCS and not lint */ +#endif -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ /* 11-bit exponent (VAX G floating point) is 308 decimal digits */ #define MAXEXP 308 @@ -53,11 +67,11 @@ static char sccsid[] = "@(#)doprnt.c 5.35 (Berkeley) 6/27/88"; #define ZEROPAD 0x20 /* zero (as opposed to blank) pad */ #define HEXPREFIX 0x40 /* add 0x or 0X prefix */ -_doprnt(fmt0, argp, fp) - u_char *fmt0; - va_list argp; - register FILE *fp; -{ +static cvt __P((double number, register int prec, int flags, char *signp, int fmtch, char *startp, char *endp)); +static char *round __P((double fract, int *exp, register char *start, register char *end, int ch, char *signp)); +static char *exponent __P((register char *p, register int exp, int fmtch)); + +int _doprnt(fmt0, argp, fp) u_char *fmt0; va_list argp; register FILE *fp; { register u_char *fmt; /* format string */ register int ch; /* character from fmt */ register int cnt; /* return value accumulator */ @@ -403,14 +417,7 @@ pforw: /* NOTREACHED */ } -static -cvt(number, prec, flags, signp, fmtch, startp, endp) - double number; - register int prec; - int flags; - u_char fmtch; - char *signp, *startp, *endp; -{ +static cvt(number, prec, flags, signp, fmtch, startp, endp) double number; register int prec; int flags; char *signp; int fmtch; char *startp; char *endp; { register char *p, *t; register double fract; int dotrim, expcnt, gformat; @@ -589,13 +596,7 @@ eformat: if (expcnt) { return(t - startp); } -static char * -round(fract, exp, start, end, ch, signp) - double fract; - int *exp; - register char *start, *end; - char ch, *signp; -{ +static char *round(fract, exp, start, end, ch, signp) double fract; int *exp; register char *start; register char *end; int ch; char *signp; { double tmp; if (fract) @@ -634,12 +635,7 @@ round(fract, exp, start, end, ch, signp) return(start); } -static char * -exponent(p, exp, fmtch) - register char *p; - register int exp; - u_char fmtch; -{ +static char *exponent(p, exp, fmtch) register char *p; register int exp; int fmtch; { register char *t; char expbuf[MAXEXP]; diff --git a/lib/libc/stdio/doscan.c b/lib/libc/stdio/doscan.c index ed2ec05..7a8f05d 100644 --- a/lib/libc/stdio/doscan.c +++ b/lib/libc/stdio/doscan.c @@ -1,10 +1,21 @@ +#include +#include +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)doscan.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ #define SPC 01 #define STP 02 @@ -15,7 +26,7 @@ static char sccsid[] = "@(#)doscan.c 5.2 (Berkeley) 3/9/86"; #define INT 0 #define FLOAT 1 -static char *_getccl(); +/*static char *_getccl();*/ static char _sctab[256] = { 0,0,0,0,0,0,0,0, @@ -28,11 +39,11 @@ static char _sctab[256] = { 0,0,0,0,0,0,0,0, }; -_doscan(iop, fmt, argp) -FILE *iop; -register char *fmt; -register va_list argp; -{ +static _innum __P((int *ptr, int type, int len, int size, FILE *iop, int *eofptr)); +static _instr __P((register char *ptr, int type, int len, register FILE *iop, int *eofptr)); +static char *_getccl __P((register unsigned char *s)); + +int _doscan(iop, fmt, argp) FILE *iop; register char *fmt; register va_list argp; { register int ch; int nmatch, len, ch1; int *ptr, fileended, size; @@ -99,11 +110,7 @@ register va_list argp; } } -static -_innum(ptr, type, len, size, iop, eofptr) -int *ptr, *eofptr; -FILE *iop; -{ +static _innum(ptr, type, len, size, iop, eofptr) int *ptr; int type; int len; int size; FILE *iop; int *eofptr; { extern double atof(); register char *np; char numbuf[64]; @@ -208,12 +215,7 @@ FILE *iop; return(1); } -static -_instr(ptr, type, len, iop, eofptr) -register char *ptr; -register FILE *iop; -int *eofptr; -{ +static _instr(ptr, type, len, iop, eofptr) register char *ptr; int type; int len; register FILE *iop; int *eofptr; { register ch; register char *optr; int ignstp; @@ -253,10 +255,7 @@ int *eofptr; return(0); } -static char * -_getccl(s) -register unsigned char *s; -{ +static char *_getccl(s) register unsigned char *s; { register c, t; t = 0; diff --git a/lib/libc/stdio/exit.c b/lib/libc/stdio/exit.c index aa9949c..62677c4 100644 --- a/lib/libc/stdio/exit.c +++ b/lib/libc/stdio/exit.c @@ -1,10 +1,12 @@ +#include +#include +/*#include gen.h*/ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)exit.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -exit(code) - int code; -{ +int exit(code) int code; { _cleanup(); _exit(code); diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c index 04032b7..333a264 100644 --- a/lib/libc/stdio/fdopen.c +++ b/lib/libc/stdio/fdopen.c @@ -1,3 +1,7 @@ +#include +#include +/*#include stdio.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +10,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fdopen.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Unix routine to do an "fopen" on file descriptor @@ -14,14 +18,11 @@ static char sccsid[] = "@(#)fdopen.c 5.2 (Berkeley) 3/9/86"; * status */ -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -FILE * -fdopen(fd, mode) - register char *mode; -{ +FILE *fdopen(fd, mode) int fd; register char *mode; { extern FILE *_findiop(); static int nofile = -1; register FILE *iop; diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c index 4fa4e8e..ad7235b 100644 --- a/lib/libc/stdio/fgetc.c +++ b/lib/libc/stdio/fgetc.c @@ -1,11 +1,11 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fgetc.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -fgetc(fp) -FILE *fp; -{ +int fgetc(fp) FILE *fp; { return(getc(fp)); } diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c index e232c47..a43d2de 100644 --- a/lib/libc/stdio/fgets.c +++ b/lib/libc/stdio/fgets.c @@ -1,14 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fgets.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -char * -fgets(s, n, iop) -char *s; -register FILE *iop; -{ +char *fgets(s, n, iop) char *s; int n; register FILE *iop; { register c; register char *cs; diff --git a/lib/libc/stdio/filbuf.c b/lib/libc/stdio/filbuf.c index 9b497f9..d398dac 100644 --- a/lib/libc/stdio/filbuf.c +++ b/lib/libc/stdio/filbuf.c @@ -1,3 +1,8 @@ +#include +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,16 +11,14 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)filbuf.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include -char *malloc(); +/*#include */ +/*#include */ +/*#include */ +/*char *malloc();*/ -_filbuf(iop) -register FILE *iop; -{ +int _filbuf(iop) register FILE *iop; { int size; struct stat stbuf; extern char *_smallbuf; diff --git a/lib/libc/stdio/findiop.c b/lib/libc/stdio/findiop.c index 07275b8..9f1e28d 100644 --- a/lib/libc/stdio/findiop.c +++ b/lib/libc/stdio/findiop.c @@ -1,3 +1,8 @@ +#include +#include +/*#include gen.h*/ +#include + /* * Copyright (c) 1983, 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,10 +11,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)findiop.c 5.6 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ extern int errno; @@ -23,7 +28,7 @@ FILE _iob[NSTATIC] = { { 0, NULL, NULL, 0, _IOWRT|_IONBF, 2 }, /* stderr */ }; -extern void *calloc(); +/*extern void *calloc();*/ static char sbuf[NSTATIC]; char *_smallbuf = sbuf; @@ -39,9 +44,7 @@ static FILE **endglue; * If none are available, then we allocate a structure to glue together * the old and new FILE entries, which are then no longer contiguous. */ -FILE * -_findiop() -{ +FILE *_findiop() { register FILE **iov, *iop; register FILE *fp; @@ -69,8 +72,7 @@ _findiop() return (*iov); } -_f_morefiles() -{ +int _f_morefiles() { register FILE **iov; register FILE *fp; register char *cp; @@ -91,9 +93,7 @@ _f_morefiles() return (1); } -void -f_prealloc() -{ +void f_prealloc() { register FILE **iov; register FILE *fp; @@ -105,10 +105,7 @@ f_prealloc() *iov = (FILE *)calloc(1, sizeof **iov); } -void -_fwalk(function) - register int (*function)(); -{ +void _fwalk(function) register int (*function)(); { register FILE **iov; register FILE *fp; @@ -123,9 +120,7 @@ _fwalk(function) } } -void -_cleanup() -{ +void _cleanup() { extern int fclose(); _fwalk(fclose); diff --git a/lib/libc/stdio/flsbuf.c b/lib/libc/stdio/flsbuf.c index e2996cc..4723b58 100644 --- a/lib/libc/stdio/flsbuf.c +++ b/lib/libc/stdio/flsbuf.c @@ -1,3 +1,9 @@ +#include +#include +#include +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +12,15 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)flsbuf.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -char *malloc(); +/*char *malloc();*/ -_flsbuf(c, iop) -unsigned char c; -register FILE *iop; -{ +int _flsbuf(c, iop) int c; register FILE *iop; { register char *base; register n, rn; char c1; @@ -80,9 +83,7 @@ tryagain: return(c); } -fflush(iop) -register FILE *iop; -{ +int fflush(iop) register FILE *iop; { register char *base; register n; @@ -98,9 +99,7 @@ register FILE *iop; return(0); } -fclose(iop) - register FILE *iop; -{ +int fclose(iop) register FILE *iop; { register int r; r = EOF; diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c index 6eda99a..7ff5938 100644 --- a/lib/libc/stdio/fopen.c +++ b/lib/libc/stdio/fopen.c @@ -1,3 +1,7 @@ +#include +#include +/*#include stdio.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,17 +10,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fopen.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -FILE * -fopen(file, mode) - char *file; - register char *mode; -{ +FILE *fopen(file, mode) char *file; register char *mode; { register FILE *iop; register f, rw, oflags; extern FILE *_findiop(); diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index ca358bb..76f69fa 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. @@ -17,21 +26,22 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fprintf.c 5.4 (Berkeley) 6/27/88"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -fprintf(iop, fmt, va_alist) - register FILE *iop; - char *fmt; - va_dcl +#ifdef __STDC__ +int fprintf(register FILE *iop, char *fmt, ...) +#else +int fprintf(iop, fmt, va_alist) register FILE *iop; char *fmt; va_dcl +#endif { va_list argp; int len; char localbuf[BUFSIZ]; - va_start(argp); + _va_start(argp, fmt); if (iop->_flag & _IONBF) { iop->_flag &= ~_IONBF; iop->_ptr = iop->_base = localbuf; diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c index 2bd5999..2106d52 100644 --- a/lib/libc/stdio/fputc.c +++ b/lib/libc/stdio/fputc.c @@ -1,11 +1,11 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fputc.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -fputc(c, fp) -register FILE *fp; -{ +int fputc(c, fp) int c; register FILE *fp; { return(putc(c, fp)); } diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c index 3aa913e..932dd05 100644 --- a/lib/libc/stdio/fputs.c +++ b/lib/libc/stdio/fputs.c @@ -1,3 +1,5 @@ +#include + /* * Copyright (c) 1984 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +8,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fputs.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -fputs(s, iop) -register char *s; -register FILE *iop; -{ +int fputs(s, iop) register char *s; register FILE *iop; { register r = 0; register c; int unbuffered; diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c index 89c7cf8..b6444ba 100644 --- a/lib/libc/stdio/fread.c +++ b/lib/libc/stdio/fread.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fread.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -fread(_ptr, size, count, iop) - void *_ptr; - unsigned size, count; - register FILE *iop; -{ +int fread(_ptr, size, count, iop) void *_ptr; unsigned size; unsigned count; register FILE *iop; { #define ptr (*(char **)&_ptr) register int s; int c; diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c index e81db9b..ad684fa 100644 --- a/lib/libc/stdio/freopen.c +++ b/lib/libc/stdio/freopen.c @@ -1,3 +1,7 @@ +#include +#include +/*#include stdio.h*/ + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,18 +10,13 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)freopen.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ -FILE * -freopen(file, mode, iop) - char *file; - register char *mode; - register FILE *iop; -{ +FILE *freopen(file, mode, iop) char *file; register char *mode; register FILE *iop; { register f, rw, oflags; rw = (mode[1] == '+'); diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index 12dda67..638142a 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -1,19 +1,19 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fseek.c 5.3 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Seek for standard library. Coordinates with buffering. */ -#include +/*#include */ -long lseek(); +/*long lseek();*/ -fseek(iop, offset, ptrname) - register FILE *iop; - long offset; -{ +int fseek(iop, offset, ptrname) register FILE *iop; long offset; int ptrname; { register resync, c; long p = -1; /* can't happen? */ diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c index 04c15a8..6a94418 100644 --- a/lib/libc/stdio/ftell.c +++ b/lib/libc/stdio/ftell.c @@ -1,19 +1,19 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ftell.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * Return file offset. * Coordinates with buffering. */ -#include -long lseek(); - +/*#include */ +/*long lseek();*/ -long ftell(iop) -register FILE *iop; -{ +long ftell(iop) register FILE *iop; { register long tres; register adjust; diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c index f50301b..8b9e4aa 100644 --- a/lib/libc/stdio/fwrite.c +++ b/lib/libc/stdio/fwrite.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fwrite.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -fwrite(_ptr, size, count, iop) - void *_ptr; - unsigned size, count; - register FILE *iop; -{ +int fwrite(_ptr, size, count, iop) void *_ptr; unsigned size; unsigned count; register FILE *iop; { #define ptr (*(char **)&_ptr) register int s; diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c index f85e8dd..53fa8b0 100644 --- a/lib/libc/stdio/getchar.c +++ b/lib/libc/stdio/getchar.c @@ -1,15 +1,16 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getchar.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * A subroutine version of the macro getchar. */ -#include +/*#include */ #undef getchar -getchar() -{ +int getchar() { return(getc(stdin)); } diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c index edd0432..73e5ecb 100644 --- a/lib/libc/stdio/gets.c +++ b/lib/libc/stdio/gets.c @@ -1,13 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gets.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -char * -gets(s) -char *s; -{ +char *gets(s) char *s; { register c; register char *cs; diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c index f307e1b..187e43d 100644 --- a/lib/libc/stdio/getw.c +++ b/lib/libc/stdio/getw.c @@ -1,12 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getw.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -getw(iop) -register FILE *iop; -{ +int getw(iop) register FILE *iop; { register i; register char *p; int w; diff --git a/lib/libc/stdio/popen.c b/lib/libc/stdio/popen.c index ecb31df..9fc2113 100644 --- a/lib/libc/stdio/popen.c +++ b/lib/libc/stdio/popen.c @@ -1,3 +1,11 @@ +#include +#include +/*#include gen.h*/ +#include +/*#include gen.h*/ +/*#include gen.h*/ +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -8,22 +16,19 @@ static char sccsid[] = "@(#)popen.c 5.4 (Berkeley) 3/26/86"; #endif -#include -#include +/*#include */ +/*#include */ #define tst(a,b) (*mode == 'r'? (b) : (a)) #define RDR 0 #define WTR 1 -extern char *malloc(); +/*extern char *malloc();*/ static int *popen_pid; static int nfiles; -FILE * -popen(cmd,mode) - char *cmd; - char *mode; { +FILE *popen(cmd, mode) char *cmd; char *mode; { int p[2]; int myside, hisside, pid; @@ -60,8 +65,7 @@ popen(cmd,mode) return (fdopen(myside, mode)); } -pclose(ptr) - FILE *ptr; { +int pclose(ptr) FILE *ptr; { int child, pid, status, omask; child = popen_pid[fileno(ptr)]; diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index 7686d39..f2fdfd1 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. @@ -17,19 +26,21 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)printf.c 5.4 (Berkeley) 6/27/88"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -printf(fmt, va_alist) - char *fmt; - va_dcl +#ifdef __STDC__ +int printf(char *fmt, ...) +#else +int printf(fmt, va_alist) char *fmt; va_dcl +#endif { va_list argp; int len; - va_start(argp); + _va_start(argp, fmt); len = _doprnt(fmt, argp, stdout); va_end(argp); return(ferror(stdout) ? EOF : len); diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c index 5aa3cee..9a63dc1 100644 --- a/lib/libc/stdio/putchar.c +++ b/lib/libc/stdio/putchar.c @@ -1,16 +1,16 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)putchar.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif /* * A subroutine version of the macro putchar */ -#include +/*#include */ #undef putchar -putchar(c) -register c; -{ +int putchar(c) register c; { putc(c, stdout); } diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c index bffc619..a0e1669 100644 --- a/lib/libc/stdio/puts.c +++ b/lib/libc/stdio/puts.c @@ -1,12 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)puts.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -puts(s) -register char *s; -{ +int puts(s) register char *s; { register c; while (c = *s++) diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c index d56868b..d307535 100644 --- a/lib/libc/stdio/putw.c +++ b/lib/libc/stdio/putw.c @@ -1,12 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)putw.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -putw(w, iop) -register FILE *iop; -{ +int putw(w, iop) int w; register FILE *iop; { register char *p; register i; diff --git a/lib/libc/stdio/rew.c b/lib/libc/stdio/rew.c index 14a716e..6ced2c1 100644 --- a/lib/libc/stdio/rew.c +++ b/lib/libc/stdio/rew.c @@ -1,12 +1,13 @@ +#include +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rew.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -rewind(iop) -register FILE *iop; -{ +int rewind(iop) register FILE *iop; { fflush(iop); lseek(fileno(iop), 0L, 0); iop->_cnt = 0; diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c index 7afbabd..d43cdf7 100644 --- a/lib/libc/stdio/scanf.c +++ b/lib/libc/stdio/scanf.c @@ -1,47 +1,60 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)scanf.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -scanf(fmt, va_alist) -char *fmt; -va_dcl +#ifdef __STDC__ +int scanf(char *fmt, ...) +#else +int scanf(fmt, va_alist) char *fmt; va_dcl +#endif { va_list argp; int len; - va_start(argp); + _va_start(argp, fmt); len = _doscan(stdin, fmt, argp); va_end(argp); return len; } -fscanf(iop, fmt, va_alist) -FILE *iop; -char *fmt; -va_dcl +#ifdef __STDC__ +int fscanf(FILE *iop, char *fmt, ...) +#else +int fscanf(iop, fmt, va_alist) FILE *iop; char *fmt; va_dcl +#endif { va_list argp; int len; - va_start(argp); + _va_start(argp, fmt); len = _doscan(iop, fmt, argp); va_end(argp); return len; } -sscanf(str, fmt, va_alist) -register char *str; -char *fmt; -va_dcl +#ifdef __STDC__ +int sscanf(register char *str, char *fmt, ...) +#else +int sscanf(str, fmt, va_alist) register char *str; char *fmt; va_dcl +#endif { FILE _strbuf; va_list argp; int len; - va_start(argp); + _va_start(argp, fmt); _strbuf._flag = _IOREAD|_IOSTRG; _strbuf._ptr = _strbuf._base = str; _strbuf._cnt = 0; diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c index 4b5b59b..c51b025 100644 --- a/lib/libc/stdio/setbuf.c +++ b/lib/libc/stdio/setbuf.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1980 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setbuf.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -setbuf(iop, buf) -register FILE *iop; -char *buf; -{ +int setbuf(iop, buf) register FILE *iop; char *buf; { if (iop->_base != NULL && iop->_flag&_IOMYBUF) free(iop->_base); iop->_flag &= ~(_IOMYBUF|_IONBF|_IOLBF); diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c index b1c0379..b9b1bb6 100644 --- a/lib/libc/stdio/setbuffer.c +++ b/lib/libc/stdio/setbuffer.c @@ -1,3 +1,6 @@ +#include +#include + /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,15 +9,11 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setbuffer.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -setbuffer(iop, buf, size) - register FILE *iop; - char *buf; - int size; -{ +int setbuffer(iop, buf, size) register FILE *iop; char *buf; int size; { if (iop->_base != NULL && iop->_flag&_IOMYBUF) free(iop->_base); iop->_flag &= ~(_IOMYBUF|_IONBF|_IOLBF); @@ -31,9 +30,7 @@ setbuffer(iop, buf, size) /* * set line buffering for either stdout or stderr */ -setlinebuf(iop) - register FILE *iop; -{ +int setlinebuf(iop) register FILE *iop; { char *buf; extern void *malloc(); diff --git a/lib/libc/stdio/sibuf.c b/lib/libc/stdio/sibuf.c index 691f250..b749e84 100644 --- a/lib/libc/stdio/sibuf.c +++ b/lib/libc/stdio/sibuf.c @@ -1,7 +1,9 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sibuf.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ char _sibuf[BUFSIZ]; diff --git a/lib/libc/stdio/sobuf.c b/lib/libc/stdio/sobuf.c index e0b63f2..dee91d1 100644 --- a/lib/libc/stdio/sobuf.c +++ b/lib/libc/stdio/sobuf.c @@ -1,7 +1,9 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sobuf.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ char _sobuf[BUFSIZ]; diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index 3728531..7403f05 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. @@ -17,20 +26,22 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sprintf.c 5.5 (Berkeley) 6/27/88"; -#endif LIBC_SCCS and not lint +#endif -#include -#include +/*#include */ +/*#include */ -sprintf(str, fmt, va_alist) - char *str, *fmt; - va_dcl +#ifdef __STDC__ +int sprintf(char *str, char *fmt, ...) +#else +int sprintf(str, fmt, va_alist) char *str; char *fmt; va_dcl +#endif { va_list argp; FILE _strbuf; int len; - va_start(argp); + _va_start(argp, fmt); _strbuf._flag = _IOWRT+_IOSTRG; _strbuf._ptr = str; _strbuf._cnt = 32767; diff --git a/lib/libc/stdio/strout.c b/lib/libc/stdio/strout.c index 8b032c2..520cb33 100644 --- a/lib/libc/stdio/strout.c +++ b/lib/libc/stdio/strout.c @@ -1,15 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strout.c 5.2 (Berkeley) 3/9/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -_strout(count, string, adjust, file, fillch) -register char *string; -register count; -int adjust; -register FILE *file; -{ +int _strout(count, string, adjust, file, fillch) register count; register char *string; int adjust; register FILE *file; int fillch; { while (adjust < 0) { if (*string=='-' && fillch=='0') { putc(*string++, file); diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c index 286734c..c041c3d 100644 --- a/lib/libc/stdio/ungetc.c +++ b/lib/libc/stdio/ungetc.c @@ -1,12 +1,12 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ungetc.c 5.3 (Berkeley) 3/26/86"; -#endif LIBC_SCCS and not lint +#endif -#include +/*#include */ -ungetc(c, iop) - register FILE *iop; -{ +int ungetc(c, iop) int c; register FILE *iop; { if (c == EOF || (iop->_flag & (_IOREAD|_IORW)) == 0 || iop->_ptr == NULL || iop->_base == NULL) return (EOF); diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 08934ad..300a166 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -19,14 +28,10 @@ static char sccsid[] = "@(#)vfprintf.c 5.2 (Berkeley) 6/27/88"; #endif -#include -#include +/*#include */ +/*#include */ -int -vfprintf(iop, fmt, argp) - FILE *iop; - char *fmt; - va_list argp; { +int vfprintf(iop, fmt, argp) FILE *iop; char *fmt; va_list argp; { int len; char localbuf[BUFSIZ]; diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c index 0db5729..2c72c95 100644 --- a/lib/libc/stdio/vprintf.c +++ b/lib/libc/stdio/vprintf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -19,13 +28,10 @@ static char sccsid[] = "@(#)vprintf.c 5.2 (Berkeley) 6/27/88"; #endif -#include -#include +/*#include */ +/*#include */ -int -vprintf(fmt, argp) - char *fmt; - va_list argp; { +int vprintf(fmt, argp) char *fmt; va_list argp; { int len; len = _doprnt(fmt, argp, stdout); diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index f2a588d..1b8f648 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -1,3 +1,12 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else +#include +#define _va_start(argp, arg) va_start(argp) +#endif + /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -19,13 +28,10 @@ static char sccsid[] = "@(#)vsprintf.c 5.2 (Berkeley) 6/27/88"; #endif -#include -#include +/*#include */ +/*#include */ -int -vsprintf(str, fmt, argp) - char *str, *fmt; - va_list argp; { +int vsprintf(str, fmt, argp) char *str; char *fmt; va_list argp; { FILE f; int len; diff --git a/lib/libc/sys/_exit.c b/lib/libc/sys/_exit.c index 7f7bcc4..5075fc9 100644 --- a/lib/libc/sys/_exit.c +++ b/lib/libc/sys/_exit.c @@ -1,4 +1,8 @@ -void _exit(s) { +#include +#include +/*#include gen.h*/ + +void _exit(s) int s; { write(2, "_exit()\n", 8); abort(); } diff --git a/lib/libc/sys/accept.c b/lib/libc/sys/accept.c index 2725b7b..a1fbe79 100644 --- a/lib/libc/sys/accept.c +++ b/lib/libc/sys/accept.c @@ -1,6 +1,10 @@ +#include +#include #include -int accept(s, a, l) struct sockaddr *a; int *l; { +/*#include */ + +int accept(s, a, l) int s; struct sockaddr *a; int *l; { write(2, "accept()\n", 9); abort(); } diff --git a/lib/libc/sys/access.c b/lib/libc/sys/access.c index aecd4ad..bb4628d 100644 --- a/lib/libc/sys/access.c +++ b/lib/libc/sys/access.c @@ -1,4 +1,7 @@ -int access(p, m) char *p; { +#include +#include + +int access(p, m) char *p; int m; { write(2, "access()\n", 9); abort(); } diff --git a/lib/libc/sys/acct.c b/lib/libc/sys/acct.c index bc07d5b..deb5bb1 100644 --- a/lib/libc/sys/acct.c +++ b/lib/libc/sys/acct.c @@ -1,3 +1,7 @@ +#include +#include +#include + int acct(f) char *f; { write(2, "acct()\n", 7); abort(); diff --git a/lib/libc/sys/adjtime.c b/lib/libc/sys/adjtime.c index 98b7570..b633d9a 100644 --- a/lib/libc/sys/adjtime.c +++ b/lib/libc/sys/adjtime.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int adjtime(delta, odelta) struct timeval *delta, *odelta; { +/*#include */ + +int adjtime(delta, odelta) struct timeval *delta; struct timeval *odelta; { write(2, "adjtime()\n", 10); abort(); } diff --git a/lib/libc/sys/bind.c b/lib/libc/sys/bind.c index f263554..a1595ce 100644 --- a/lib/libc/sys/bind.c +++ b/lib/libc/sys/bind.c @@ -1,6 +1,10 @@ +#include +#include #include -int bind(s, n, l) struct sockaddr *n; { +/*#include */ + +int bind(s, n, l) int s; struct sockaddr *n; int l; { write(2, "bind()\n", 7); abort(); } diff --git a/lib/libc/sys/brk.c b/lib/libc/sys/brk.c index 80f33fa..bd3836a 100644 --- a/lib/libc/sys/brk.c +++ b/lib/libc/sys/brk.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + void *brk(a) void *a; { write(2, "brk()\n", 6); abort(); diff --git a/lib/libc/sys/chdir.c b/lib/libc/sys/chdir.c index e00809c..b497378 100644 --- a/lib/libc/sys/chdir.c +++ b/lib/libc/sys/chdir.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int chdir(s) char *s; { write(2, "chdir()\n", 8); abort(); diff --git a/lib/libc/sys/chmod.c b/lib/libc/sys/chmod.c index 1e5bf5c..de8a497 100644 --- a/lib/libc/sys/chmod.c +++ b/lib/libc/sys/chmod.c @@ -1,4 +1,8 @@ -int chmod(s, m) char *s; { +#include +#include +#include + +int chmod(s, m) char *s; int m; { write(2, "chmod()\n", 8); abort(); } diff --git a/lib/libc/sys/chown.c b/lib/libc/sys/chown.c index d9e77fa..505304e 100644 --- a/lib/libc/sys/chown.c +++ b/lib/libc/sys/chown.c @@ -1,4 +1,7 @@ -int chown(s, u, g) char *s; { +#include +#include + +int chown(s, u, g) char *s; int u; int g; { write(2, "chown()\n", 8); abort(); } diff --git a/lib/libc/sys/chroot.c b/lib/libc/sys/chroot.c index d5c0a19..0030bb6 100644 --- a/lib/libc/sys/chroot.c +++ b/lib/libc/sys/chroot.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int chroot(d) char *d; { write(2, "chroot()\n", 9); abort(); diff --git a/lib/libc/sys/close.c b/lib/libc/sys/close.c index 1397e5e..da0072a 100644 --- a/lib/libc/sys/close.c +++ b/lib/libc/sys/close.c @@ -1,4 +1,7 @@ -int close(f) { +#include +#include + +int close(f) int f; { write(2, "close()\n", 8); abort(); } diff --git a/lib/libc/sys/connect.c b/lib/libc/sys/connect.c index 472e908..d32160c 100644 --- a/lib/libc/sys/connect.c +++ b/lib/libc/sys/connect.c @@ -1,6 +1,10 @@ +#include +#include #include -int connect(s, n, l) struct sockaddr *n; { +/*#include */ + +int connect(s, n, l) int s; struct sockaddr *n; int l; { write(2, "connect()\n", 10); abort(); } diff --git a/lib/libc/sys/creat.c b/lib/libc/sys/creat.c index 63b90f4..ef21e42 100644 --- a/lib/libc/sys/creat.c +++ b/lib/libc/sys/creat.c @@ -1,4 +1,7 @@ -int creat(s, m) char *s; { +#include +#include + +int creat(s, m) char *s; int m; { write(2, "creat()\n", 8); abort(); } diff --git a/lib/libc/sys/dup.c b/lib/libc/sys/dup.c index 7ec4eb5..1aec890 100644 --- a/lib/libc/sys/dup.c +++ b/lib/libc/sys/dup.c @@ -1,4 +1,7 @@ -int dup(f) { +#include +#include + +int dup(f) int f; { write(2, "dup()\n", 6); abort(); } diff --git a/lib/libc/sys/dup2.c b/lib/libc/sys/dup2.c index f905bfd..af389fe 100644 --- a/lib/libc/sys/dup2.c +++ b/lib/libc/sys/dup2.c @@ -1,4 +1,7 @@ -int dup2(o, n) { +#include +#include + +int dup2(o, n) int o; int n; { write(2, "dup2()\n", 7); abort(); } diff --git a/lib/libc/sys/execl.c b/lib/libc/sys/execl.c index c9742c5..5e6bbb2 100644 --- a/lib/libc/sys/execl.c +++ b/lib/libc/sys/execl.c @@ -1,5 +1,21 @@ +#include +/*#include gen.h*/ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else #include -void execl(f, va_alist) char *f; va_dcl { +#define _va_start(argp, arg) va_start(argp) +#endif + +/*#include */ +#ifdef __STDC__ +void execl(char *f, ...) +#else +void execl(f, va_alist) char *f; va_dcl +#endif +{ write(2, "execl()\n", 8); abort(); } diff --git a/lib/libc/sys/execle.c b/lib/libc/sys/execle.c index f3105c3..b883a6e 100644 --- a/lib/libc/sys/execle.c +++ b/lib/libc/sys/execle.c @@ -1,5 +1,21 @@ +#include +/*#include gen.h*/ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else #include -void execle(f, va_alist) char *f; va_dcl { +#define _va_start(argp, arg) va_start(argp) +#endif + +/*#include */ +#ifdef __STDC__ +void execle(char *f, ...) +#else +void execle(f, va_alist) char *f; va_dcl +#endif +{ write(2, "execle()\n", 9); abort(); } diff --git a/lib/libc/sys/exect.c b/lib/libc/sys/exect.c index 86f3537..77afe0c 100644 --- a/lib/libc/sys/exect.c +++ b/lib/libc/sys/exect.c @@ -1,4 +1,8 @@ -void exect(s, v, e) char *s, *v[], *e[]; { +#include +/*#include gen.h*/ +#include + +void exect(s, v, e) char *s; char *v[]; char *e[]; { write(2, "exect()\n", 8); abort(); } diff --git a/lib/libc/sys/execv.c b/lib/libc/sys/execv.c index 9728baf..94a4557 100644 --- a/lib/libc/sys/execv.c +++ b/lib/libc/sys/execv.c @@ -1,4 +1,8 @@ -void execv(s, v) char *s, *v[]; { +#include +/*#include gen.h*/ +#include + +void execv(s, v) char *s; char *v[]; { write(2, "execv()\n", 8); abort(); } diff --git a/lib/libc/sys/execve.c b/lib/libc/sys/execve.c index 963f235..3ac4e3e 100644 --- a/lib/libc/sys/execve.c +++ b/lib/libc/sys/execve.c @@ -1,4 +1,8 @@ -void execve(s, v, e) char *s, *v[], *e[]; { +#include +/*#include gen.h*/ +#include + +void execve(s, v, e) char *s; char *v[]; char *e[]; { write(2, "execve()\n", 9); abort(); } diff --git a/lib/libc/sys/fchmod.c b/lib/libc/sys/fchmod.c index 8e4eb33..39e99bd 100644 --- a/lib/libc/sys/fchmod.c +++ b/lib/libc/sys/fchmod.c @@ -1,4 +1,8 @@ -int fchmod(f, m) { +#include +#include +#include + +int fchmod(f, m) int f; int m; { write(2, "fchmod()\n", 9); abort(); } diff --git a/lib/libc/sys/fchown.c b/lib/libc/sys/fchown.c index b41f83b..4fc5b0e 100644 --- a/lib/libc/sys/fchown.c +++ b/lib/libc/sys/fchown.c @@ -1,4 +1,7 @@ -int fchown(f, u, g) { +#include +#include + +int fchown(f, u, g) int f; int u; int g; { write(2, "fchown()\n", 9); abort(); } diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c index 5cddbf3..035bad9 100644 --- a/lib/libc/sys/fcntl.c +++ b/lib/libc/sys/fcntl.c @@ -1,4 +1,7 @@ -int fcntl(f, c, a) { +#include +#include + +int fcntl(f, c, a) int f; int c; int a; { write(2, "fcntl()\n", 8); abort(); } diff --git a/lib/libc/sys/flock.c b/lib/libc/sys/flock.c index 8944c49..09c7b45 100644 --- a/lib/libc/sys/flock.c +++ b/lib/libc/sys/flock.c @@ -1,4 +1,7 @@ -int flock(f, o) { +#include +#include + +int flock(f, o) int f; int o; { write(2, "flock()\n", 8); abort(); } diff --git a/lib/libc/sys/fork.c b/lib/libc/sys/fork.c index cc78532..506acce 100644 --- a/lib/libc/sys/fork.c +++ b/lib/libc/sys/fork.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int fork() { write(2, "fork()\n", 7); abort(); diff --git a/lib/libc/sys/fstat.c b/lib/libc/sys/fstat.c index 9c7c4da..386c005 100644 --- a/lib/libc/sys/fstat.c +++ b/lib/libc/sys/fstat.c @@ -1,6 +1,10 @@ +#include +#include #include -int fstat(f, b) struct stat *b; { +/*#include */ + +int fstat(f, b) int f; struct stat *b; { write(2, "fstat()\n", 8); abort(); } diff --git a/lib/libc/sys/fsync.c b/lib/libc/sys/fsync.c index bf2cbce..4dfd8f3 100644 --- a/lib/libc/sys/fsync.c +++ b/lib/libc/sys/fsync.c @@ -1,4 +1,7 @@ -int fsync(f) { +#include +#include + +int fsync(f) int f; { write(2, "fsync()\n", 8); abort(); } diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c index eba2b44..26c610b 100644 --- a/lib/libc/sys/ftruncate.c +++ b/lib/libc/sys/ftruncate.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int ftruncate(d, l) off_t l; { +/*#include */ + +int ftruncate(d, l) int d; off_t l; { write(2, "ftruncate()\n", 12); abort(); } diff --git a/lib/libc/sys/getdtablesize.c b/lib/libc/sys/getdtablesize.c index c1105d3..d61474b 100644 --- a/lib/libc/sys/getdtablesize.c +++ b/lib/libc/sys/getdtablesize.c @@ -1,3 +1,6 @@ +#include +#include + int getdtablesize() { write(2, "getdtablesize()\n", 16); abort(); diff --git a/lib/libc/sys/getegid.c b/lib/libc/sys/getegid.c index 4603a9c..9700cc4 100644 --- a/lib/libc/sys/getegid.c +++ b/lib/libc/sys/getegid.c @@ -1,4 +1,9 @@ -#include +#include +#include +/*#include gen.h*/ +/*#include gen.h*/ + +/*#include */ gid_t getegid() { write(2, "getegid()\n", 10); diff --git a/lib/libc/sys/geteuid.c b/lib/libc/sys/geteuid.c index 32e1a47..eb8cf53 100644 --- a/lib/libc/sys/geteuid.c +++ b/lib/libc/sys/geteuid.c @@ -1,4 +1,9 @@ -#include +#include +#include +/*#include gen.h*/ +/*#include gen.h*/ + +/*#include */ uid_t geteuid() { write(2, "geteuid()\n", 10); diff --git a/lib/libc/sys/getgid.c b/lib/libc/sys/getgid.c index c0b2537..1ba1093 100644 --- a/lib/libc/sys/getgid.c +++ b/lib/libc/sys/getgid.c @@ -1,4 +1,9 @@ -#include +#include +#include +/*#include gen.h*/ +/*#include gen.h*/ + +/*#include */ gid_t getgid() { write(2, "getgid()\n", 9); diff --git a/lib/libc/sys/getgroups.c b/lib/libc/sys/getgroups.c index aa44917..d3a51b4 100644 --- a/lib/libc/sys/getgroups.c +++ b/lib/libc/sys/getgroups.c @@ -1,4 +1,8 @@ -int getgroups(n, g) int n, *g; { +#include +#include +/*#include gen.h*/ + +int getgroups(n, g) int n; int *g; { write(2, "getgroups()\n", 12); abort(); } diff --git a/lib/libc/sys/gethostid.c b/lib/libc/sys/gethostid.c index 0c3ca43..9fbf2f9 100644 --- a/lib/libc/sys/gethostid.c +++ b/lib/libc/sys/gethostid.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + long gethostid() { write(2, "gethostid()\n", 12); abort(); diff --git a/lib/libc/sys/gethostname.c b/lib/libc/sys/gethostname.c index 787d7d9..807c308 100644 --- a/lib/libc/sys/gethostname.c +++ b/lib/libc/sys/gethostname.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + int gethostname(n, l) char *n; int l; { write(2, "gethostname()\n", 14); abort(); diff --git a/lib/libc/sys/getitimer.c b/lib/libc/sys/getitimer.c index 7d0c1ac..f8bd1b8 100644 --- a/lib/libc/sys/getitimer.c +++ b/lib/libc/sys/getitimer.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int getitimer(w, v) struct itimerval *v; { +/*#include */ + +int getitimer(w, v) int w; struct itimerval *v; { write(2, "getitimer()\n", 12); abort(); } diff --git a/lib/libc/sys/getpagesize.c b/lib/libc/sys/getpagesize.c index 8506315..b6d1adc 100644 --- a/lib/libc/sys/getpagesize.c +++ b/lib/libc/sys/getpagesize.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + int getpagesize() { write(2, "getpagesize()\n", 14); abort(); diff --git a/lib/libc/sys/getpeername.c b/lib/libc/sys/getpeername.c index 012153d..3343b61 100644 --- a/lib/libc/sys/getpeername.c +++ b/lib/libc/sys/getpeername.c @@ -1,6 +1,10 @@ +#include +#include #include -int getpeername(s, n, l) struct sockaddr *n; int *l; { +/*#include */ + +int getpeername(s, n, l) int s; struct sockaddr *n; int *l; { write(2, "getpeername()\n", 14); abort(); } diff --git a/lib/libc/sys/getpgrp.c b/lib/libc/sys/getpgrp.c index 4719980..6f15c4d 100644 --- a/lib/libc/sys/getpgrp.c +++ b/lib/libc/sys/getpgrp.c @@ -1,4 +1,8 @@ -int getpgrp(p) { +#include +#include +/*#include gen.h*/ + +int getpgrp(p) int p; { write(2, "getpgrp()\n", 10); abort(); } diff --git a/lib/libc/sys/getpid.c b/lib/libc/sys/getpid.c index f1e1a5e..2af8fb7 100644 --- a/lib/libc/sys/getpid.c +++ b/lib/libc/sys/getpid.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int getpid() { write(2, "getpid()\n", 9); abort(); diff --git a/lib/libc/sys/getppid.c b/lib/libc/sys/getppid.c index 82c80c9..fa10f0a 100644 --- a/lib/libc/sys/getppid.c +++ b/lib/libc/sys/getppid.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int getppid() { write(2, "getppid()\n", 10); abort(); diff --git a/lib/libc/sys/getpriority.c b/lib/libc/sys/getpriority.c index f788762..9cc207a 100644 --- a/lib/libc/sys/getpriority.c +++ b/lib/libc/sys/getpriority.c @@ -1,4 +1,8 @@ -int getpriority(w, who) { +#include +#include +#include + +int getpriority(w, who) int w; int who; { write(2, "getpriority()\n", 14); abort(); } diff --git a/lib/libc/sys/getrlimit.c b/lib/libc/sys/getrlimit.c index 20ee251..8a94fc4 100644 --- a/lib/libc/sys/getrlimit.c +++ b/lib/libc/sys/getrlimit.c @@ -1,6 +1,10 @@ +#include +#include #include -int getrlimit(res, rip) struct rlimit *rip; { +/*#include */ + +int getrlimit(res, rip) int res; struct rlimit *rip; { write(2, "getrlimit()\n", 12); abort(); } diff --git a/lib/libc/sys/getrusage.c b/lib/libc/sys/getrusage.c index 9751a03..d6eeb9e 100644 --- a/lib/libc/sys/getrusage.c +++ b/lib/libc/sys/getrusage.c @@ -1,6 +1,10 @@ +#include +#include #include -int getrusage(res, rip) struct rusage *rip; { +/*#include */ + +int getrusage(res, rip) int res; struct rusage *rip; { write(2, "getrusage()\n", 12); abort(); } diff --git a/lib/libc/sys/getsockname.c b/lib/libc/sys/getsockname.c index b90a597..0715dba 100644 --- a/lib/libc/sys/getsockname.c +++ b/lib/libc/sys/getsockname.c @@ -1,6 +1,10 @@ +#include +#include #include -int getsockname(s, name, namelen) struct sockaddr *name; int *namelen; { +/*#include */ + +int getsockname(s, name, namelen) int s; struct sockaddr *name; int *namelen; { write(2, "getsockname()\n", 14); abort(); } diff --git a/lib/libc/sys/getsockopt.c b/lib/libc/sys/getsockopt.c index a8b038f..2f500bc 100644 --- a/lib/libc/sys/getsockopt.c +++ b/lib/libc/sys/getsockopt.c @@ -1,4 +1,8 @@ -int getsockopt(s, level, opt, buf, len) void *buf; int *len; { +#include +#include +#include + +int getsockopt(s, level, opt, buf, len) int s; int level; int opt; void *buf; int *len; { write(2, "getsockopt()\n", 13); abort(); } diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c index de79c23..ef9fb36 100644 --- a/lib/libc/sys/gettimeofday.c +++ b/lib/libc/sys/gettimeofday.c @@ -1,4 +1,8 @@ -#include +#include +#include +/*#include gen.h*/ + +/*#include */ int gettimeofday(t, z) struct timeval *t; struct timezone *z; { write(2, "gettimeofday()\n", 15); diff --git a/lib/libc/sys/getuid.c b/lib/libc/sys/getuid.c index 13189af..ae4a22b 100644 --- a/lib/libc/sys/getuid.c +++ b/lib/libc/sys/getuid.c @@ -1,4 +1,9 @@ -#include +#include +#include +/*#include gen.h*/ +/*#include gen.h*/ + +/*#include */ uid_t getuid() { write(2, "getuid()\n", 9); diff --git a/lib/libc/sys/ioctl.c b/lib/libc/sys/ioctl.c index 55f0d14..4305184 100644 --- a/lib/libc/sys/ioctl.c +++ b/lib/libc/sys/ioctl.c @@ -1,6 +1,11 @@ -#include +#include +#include +#include +/*#include gen.h*/ -int ioctl(d, r, p) u_long r; void *p; { +/*#include */ + +int ioctl(d, r, p) int d; u_long r; void *p; { write(2, "ioctl()\n", 8); abort(); } diff --git a/lib/libc/sys/isatty.c b/lib/libc/sys/isatty.c index 888a899..77fdcdb 100644 --- a/lib/libc/sys/isatty.c +++ b/lib/libc/sys/isatty.c @@ -1,3 +1,5 @@ +#include + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)isatty.c 5.2 (Berkeley) 3/9/86"; #endif @@ -6,9 +8,9 @@ static char sccsid[] = "@(#)isatty.c 5.2 (Berkeley) 3/9/86"; * Returns 1 iff file is a tty */ -#include +/*#include */ -isatty(f) { +int isatty(f) int f; { struct sgttyb ttyb; if (ioctl(f, TIOCGETP, &ttyb) < 0) diff --git a/lib/libc/sys/kill.c b/lib/libc/sys/kill.c index bd5fbbc..8ff5023 100644 --- a/lib/libc/sys/kill.c +++ b/lib/libc/sys/kill.c @@ -1,4 +1,8 @@ -int kill(p, s) { +#include +#include +/*#include gen.h*/ + +int kill(p, s) int p; int s; { write(2, "kill()\n", 7); abort(); } diff --git a/lib/libc/sys/killpg.c b/lib/libc/sys/killpg.c index 7b5ffc4..39a11ef 100644 --- a/lib/libc/sys/killpg.c +++ b/lib/libc/sys/killpg.c @@ -1,4 +1,8 @@ -int killpg(pg, s) { +#include +#include +/*#include gen.h*/ + +int killpg(pg, s) int pg; int s; { write(2, "killpg()\n", 9); abort(); } diff --git a/lib/libc/sys/link.c b/lib/libc/sys/link.c index cbf25e8..a46e747 100644 --- a/lib/libc/sys/link.c +++ b/lib/libc/sys/link.c @@ -1,4 +1,7 @@ -int link(a, b) char *a, *b; { +#include +#include + +int link(a, b) char *a; char *b; { write(2, "link()\n", 7); abort(); } diff --git a/lib/libc/sys/listen.c b/lib/libc/sys/listen.c index b762851..3b4f269 100644 --- a/lib/libc/sys/listen.c +++ b/lib/libc/sys/listen.c @@ -1,4 +1,8 @@ -int listen(s, b){ +#include +#include +#include + +int listen(s, b) int s; int b; { write(2, "listen()\n", 9); abort(); } diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c index 68839d6..9f6cfda 100644 --- a/lib/libc/sys/lseek.c +++ b/lib/libc/sys/lseek.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -off_t lseek(f, o, d) off_t o; { +/*#include */ + +off_t lseek(f, o, d) int f; off_t o; int d; { write(2, "lseek()\n", 8); abort(); } diff --git a/lib/libc/sys/lstat.c b/lib/libc/sys/lstat.c index 3d5411c..0212cfe 100644 --- a/lib/libc/sys/lstat.c +++ b/lib/libc/sys/lstat.c @@ -1,5 +1,9 @@ +#include +#include #include +/*#include */ + int lstat(s, b) char *s; struct stat *b; { write(2, "lstat()\n", 8); abort(); diff --git a/lib/libc/sys/mkdir.c b/lib/libc/sys/mkdir.c index 4c62724..689196f 100644 --- a/lib/libc/sys/mkdir.c +++ b/lib/libc/sys/mkdir.c @@ -1,4 +1,8 @@ -int mkdir(p, m) char *p; { +#include +#include +#include + +int mkdir(p, m) char *p; int m; { write(2, "mkdir()\n", 8); abort(); } diff --git a/lib/libc/sys/mknod.c b/lib/libc/sys/mknod.c index 23c78f3..2debbe2 100644 --- a/lib/libc/sys/mknod.c +++ b/lib/libc/sys/mknod.c @@ -1,4 +1,8 @@ -int mknod(n, m, a) char *n; { +#include +#include +#include + +int mknod(n, m, a) char *n; int m; int a; { write(2, "mknod()\n", 8); abort(); } diff --git a/lib/libc/sys/mount.c b/lib/libc/sys/mount.c index c0a9ea0..cc51990 100644 --- a/lib/libc/sys/mount.c +++ b/lib/libc/sys/mount.c @@ -1,4 +1,8 @@ -int mount(s, n, f) char *s, *n; { +#include +#include +#include + +int mount(s, n, f) char *s; char *n; int f; { write(2, "mount()\n", 8); abort(); } diff --git a/lib/libc/sys/open.c b/lib/libc/sys/open.c index 92a5bb9..051becb 100644 --- a/lib/libc/sys/open.c +++ b/lib/libc/sys/open.c @@ -1,10 +1,24 @@ +#include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else #include +#define _va_start(argp, arg) va_start(argp) +#endif -int open(f, m, va_alist) char *f; va_dcl { +/*#include */ + +#ifdef __STDC__ +int open(char *f, int m, ...) +#else +int open(f, m, va_alist) char *f; int m; va_dcl +#endif +{ va_list argp; int res; - va_start(argp); + _va_start(argp, fmt); res = vopen(f, m, argp); va_end(argp); return res; diff --git a/lib/libc/sys/pipe.c b/lib/libc/sys/pipe.c index 085ad2a..e23542c 100644 --- a/lib/libc/sys/pipe.c +++ b/lib/libc/sys/pipe.c @@ -1,3 +1,6 @@ +#include +#include + int pipe(f) int f[2]; { write(2, "pipe()\n", 7); abort(); diff --git a/lib/libc/sys/profil.c b/lib/libc/sys/profil.c index de3d355..2198ed0 100644 --- a/lib/libc/sys/profil.c +++ b/lib/libc/sys/profil.c @@ -1,4 +1,8 @@ -void profil(b, s, o, i) char *b; { +#include +#include +/*#include sys.h*/ + +void profil(b, s, o, i) char *b; int s; int o; int i; { write(2, "profil()\n", 9); abort(); } diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c index 4f73683..c746598 100644 --- a/lib/libc/sys/ptrace.c +++ b/lib/libc/sys/ptrace.c @@ -1,4 +1,8 @@ -int ptrace(r, p, a, d) int *a; { +#include +#include +#include + +int ptrace(r, p, a, d) int r; int p; int *a; int d; { write(2, "ptrace()\n", 9); abort(); } diff --git a/lib/libc/sys/quota.c b/lib/libc/sys/quota.c index 007e302..9dc2884 100644 --- a/lib/libc/sys/quota.c +++ b/lib/libc/sys/quota.c @@ -1,4 +1,8 @@ -int quota(c, u, a, ad) void *ad; { +#include +#include +#include + +int quota(c, u, a, ad) int c; int u; int a; void *ad; { write(2, "quota()\n", 8); abort(); } diff --git a/lib/libc/sys/read.c b/lib/libc/sys/read.c index 078cfd3..f43b3f6 100644 --- a/lib/libc/sys/read.c +++ b/lib/libc/sys/read.c @@ -1,4 +1,7 @@ -int read(f, b, l) void *b; { +#include +#include + +int read(f, b, l) int f; void *b; int l; { write(2, "read()\n", 7); abort(); } diff --git a/lib/libc/sys/readlink.c b/lib/libc/sys/readlink.c index 41416c8..0771738 100644 --- a/lib/libc/sys/readlink.c +++ b/lib/libc/sys/readlink.c @@ -1,4 +1,7 @@ -int readlink(p, b, s) char *p, *b; { +#include +#include + +int readlink(p, b, s) char *p; char *b; int s; { write(2, "readlink()\n", 11); abort(); } diff --git a/lib/libc/sys/readv.c b/lib/libc/sys/readv.c index fae61bb..94ab9b1 100644 --- a/lib/libc/sys/readv.c +++ b/lib/libc/sys/readv.c @@ -1,6 +1,10 @@ +#include +#include #include -int readv(d, v, l) struct iovec *v; { +/*#include */ + +int readv(d, v, l) int d; struct iovec *v; int l; { write(2, "readv()\n", 8); abort(); } diff --git a/lib/libc/sys/reboot.c b/lib/libc/sys/reboot.c index 4e757d7..0e06190 100644 --- a/lib/libc/sys/reboot.c +++ b/lib/libc/sys/reboot.c @@ -1,4 +1,8 @@ -void reboot(h) { +#include +#include +/*#include sys.h*/ + +void reboot(h) int h; { write(2, "reboot()\n", 9); abort(); } diff --git a/lib/libc/sys/recv.c b/lib/libc/sys/recv.c index 3223282..1d32034 100644 --- a/lib/libc/sys/recv.c +++ b/lib/libc/sys/recv.c @@ -1,4 +1,8 @@ -int recv(s, b, l, f) void *b; { +#include +#include +#include + +int recv(s, b, l, f) int s; void *b; int l; int f; { write(2, "recv()\n", 7); abort(); } diff --git a/lib/libc/sys/recvfrom.c b/lib/libc/sys/recvfrom.c index d904feb..b8e300f 100644 --- a/lib/libc/sys/recvfrom.c +++ b/lib/libc/sys/recvfrom.c @@ -1,6 +1,10 @@ +#include +#include #include -int recvfrom(s, b, l, f, fr, fl) void *b; struct sockaddr *fr; int *fl; { +/*#include */ + +int recvfrom(s, b, l, f, fr, fl) int s; void *b; int l; int f; struct sockaddr *fr; int *fl; { write(2, "recvfrom()\n", 11); abort(); } diff --git a/lib/libc/sys/recvmsg.c b/lib/libc/sys/recvmsg.c index 3e1e070..fc8daeb 100644 --- a/lib/libc/sys/recvmsg.c +++ b/lib/libc/sys/recvmsg.c @@ -1,6 +1,10 @@ +#include +#include #include -int recvmsg(s, m, f) struct msghdr m[]; { +/*#include */ + +int recvmsg(s, m, f) int s; struct msghdr m[]; int f; { write(2, "recvmsg()\n", 10); abort(); } diff --git a/lib/libc/sys/rename.c b/lib/libc/sys/rename.c index 83f12cc..6cecd11 100644 --- a/lib/libc/sys/rename.c +++ b/lib/libc/sys/rename.c @@ -1,4 +1,7 @@ -int rename(f, t) char *f, *t; { +#include +#include + +int rename(f, t) char *f; char *t; { write(2, "rename()\n", 9); abort(); } diff --git a/lib/libc/sys/rmdir.c b/lib/libc/sys/rmdir.c index 45719f0..5ba61ff 100644 --- a/lib/libc/sys/rmdir.c +++ b/lib/libc/sys/rmdir.c @@ -1,3 +1,7 @@ +#include +/*#include gen.h*/ +#include + int rmdir(p) char *p; { write(2, "rmdir()\n", 8); abort(); diff --git a/lib/libc/sys/sbrk.c b/lib/libc/sys/sbrk.c index 457849f..70b8644 100644 --- a/lib/libc/sys/sbrk.c +++ b/lib/libc/sys/sbrk.c @@ -1,4 +1,8 @@ -void *sbrk(i) { +#include +#include +/*#include gen.h*/ + +void *sbrk(i) int i; { write(2, "sbrk()\n", 7); abort(); } diff --git a/lib/libc/sys/select.c b/lib/libc/sys/select.c index 2039f1c..1d65bb8 100644 --- a/lib/libc/sys/select.c +++ b/lib/libc/sys/select.c @@ -1,7 +1,12 @@ +#include +#include #include -#include +/*#include gen.h*/ -int select(n, r, w, e, t) fd_set *r, *w, *e; struct timeval *t; { +/*#include */ +/*#include */ + +int select(n, r, w, e, t) int n; fd_set *r; fd_set *w; fd_set *e; struct timeval *t; { write(2, "select()\n", 9); abort(); } diff --git a/lib/libc/sys/send.c b/lib/libc/sys/send.c index b806ef3..d0eb2d5 100644 --- a/lib/libc/sys/send.c +++ b/lib/libc/sys/send.c @@ -1,4 +1,8 @@ -int send(s, m, l, f) void *m; { +#include +#include +#include + +int send(s, m, l, f) int s; void *m; int l; int f; { write(2, "send()\n", 7); abort(); } diff --git a/lib/libc/sys/sendmsg.c b/lib/libc/sys/sendmsg.c index c1b5ff8..45965e1 100644 --- a/lib/libc/sys/sendmsg.c +++ b/lib/libc/sys/sendmsg.c @@ -1,6 +1,10 @@ +#include +#include #include -int sendmsg(s, m, l) struct msghdr m[]; { +/*#include */ + +int sendmsg(s, m, l) int s; struct msghdr m[]; int l; { write(2, "sendmsg()\n", 10); abort(); } diff --git a/lib/libc/sys/sendto.c b/lib/libc/sys/sendto.c index 33ebacb..5112c14 100644 --- a/lib/libc/sys/sendto.c +++ b/lib/libc/sys/sendto.c @@ -1,6 +1,10 @@ +#include +#include #include -int sendto(s, m, l, f, t, tl) void *m; struct sockaddr *t; { +/*#include */ + +int sendto(s, m, l, f, t, tl) int s; void *m; int l; int f; struct sockaddr *t; int tl; { write(2, "sendto()\n", 9); abort(); } diff --git a/lib/libc/sys/setgroups.c b/lib/libc/sys/setgroups.c index 0d8b166..837532c 100644 --- a/lib/libc/sys/setgroups.c +++ b/lib/libc/sys/setgroups.c @@ -1,4 +1,8 @@ -int setgroups(n, g) int *g; { +#include +#include +/*#include gen.h*/ + +int setgroups(n, g) int n; int *g; { write(2, "setgroups()\n", 12); abort(); } diff --git a/lib/libc/sys/sethostid.c b/lib/libc/sys/sethostid.c index 13aa28d..4e24414 100644 --- a/lib/libc/sys/sethostid.c +++ b/lib/libc/sys/sethostid.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + int sethostid(h) long h; { write(2, "sethostid()\n", 12); abort(); diff --git a/lib/libc/sys/sethostname.c b/lib/libc/sys/sethostname.c index 15b9bf5..16df010 100644 --- a/lib/libc/sys/sethostname.c +++ b/lib/libc/sys/sethostname.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + int sethostname(n, l) char *n; int l; { write(2, "sethostname()\n", 14); abort(); diff --git a/lib/libc/sys/setitimer.c b/lib/libc/sys/setitimer.c index 49ca8eb..b9db548 100644 --- a/lib/libc/sys/setitimer.c +++ b/lib/libc/sys/setitimer.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int setitimer(w, v, ov) struct itimerval *v, *ov; { +/*#include */ + +int setitimer(w, v, ov) int w; struct itimerval *v; struct itimerval *ov; { write(2, "setitimer()\n", 12); abort(); } diff --git a/lib/libc/sys/setpgrp.c b/lib/libc/sys/setpgrp.c index 28806b2..469b747 100644 --- a/lib/libc/sys/setpgrp.c +++ b/lib/libc/sys/setpgrp.c @@ -1,4 +1,8 @@ -int setpgrp(g, pg) { +#include +#include +/*#include gen.h*/ + +int setpgrp(g, pg) int g; int pg; { write(2, "setpgrp()\n", 10); abort(); } diff --git a/lib/libc/sys/setpriority.c b/lib/libc/sys/setpriority.c index 6dfca6e..a76f6ce 100644 --- a/lib/libc/sys/setpriority.c +++ b/lib/libc/sys/setpriority.c @@ -1,4 +1,8 @@ -int setpriority(w, who, pri) { +#include +#include +#include + +int setpriority(w, who, pri) int w; int who; int pri; { write(2, "setpriority()\n", 14); abort(); } diff --git a/lib/libc/sys/setquota.c b/lib/libc/sys/setquota.c index 3182ebd..397c430 100644 --- a/lib/libc/sys/setquota.c +++ b/lib/libc/sys/setquota.c @@ -1,4 +1,8 @@ -int setquota(s, f) char *s, *f; { +#include +#include +#include + +int setquota(s, f) char *s; char *f; { write(2, "setquota()\n", 11); abort(); } diff --git a/lib/libc/sys/setregid.c b/lib/libc/sys/setregid.c index ef98c6c..2fc1a58 100644 --- a/lib/libc/sys/setregid.c +++ b/lib/libc/sys/setregid.c @@ -1,4 +1,8 @@ -int setregid(r, e) int r, e; { +#include +#include +/*#include gen.h*/ + +int setregid(r, e) int r; int e; { write(2, "setregid()\n", 11); abort(); } diff --git a/lib/libc/sys/setreuid.c b/lib/libc/sys/setreuid.c index 5a26f5b..552fc8c 100644 --- a/lib/libc/sys/setreuid.c +++ b/lib/libc/sys/setreuid.c @@ -1,4 +1,8 @@ -int setreuid(r, e) int r, e; { +#include +#include +/*#include gen.h*/ + +int setreuid(r, e) int r; int e; { write(2, "setreuid()\n", 11); abort(); } diff --git a/lib/libc/sys/setrlimit.c b/lib/libc/sys/setrlimit.c index 9d86780..5848974 100644 --- a/lib/libc/sys/setrlimit.c +++ b/lib/libc/sys/setrlimit.c @@ -1,6 +1,10 @@ +#include +#include #include -int setrlimit(res, rip) struct rlimit *rip; { +/*#include */ + +int setrlimit(res, rip) int res; struct rlimit *rip; { write(2, "setrlimit()\n", 12); abort(); } diff --git a/lib/libc/sys/setsockopt.c b/lib/libc/sys/setsockopt.c index 0c6ddaa..e65dcc0 100644 --- a/lib/libc/sys/setsockopt.c +++ b/lib/libc/sys/setsockopt.c @@ -1,4 +1,8 @@ -int setsockopt(s, level, opt, buf, len) void *buf; { +#include +#include +#include + +int setsockopt(s, level, opt, buf, len) int s; int level; int opt; void *buf; int len; { write(2, "setsockopt()\n", 13); abort(); } diff --git a/lib/libc/sys/settimeofday.c b/lib/libc/sys/settimeofday.c index 32d99a5..1ee3978 100644 --- a/lib/libc/sys/settimeofday.c +++ b/lib/libc/sys/settimeofday.c @@ -1,4 +1,8 @@ -#include +#include +#include +/*#include gen.h*/ + +/*#include */ int settimeofday(t, z) struct timeval *t; struct timezone *z; { write(2, "settimeofday()\n", 15); diff --git a/lib/libc/sys/shutdown.c b/lib/libc/sys/shutdown.c index 694be71..2ac0c3a 100644 --- a/lib/libc/sys/shutdown.c +++ b/lib/libc/sys/shutdown.c @@ -1,4 +1,8 @@ -int shutdown(s, h){ +#include +#include +/*#include sys.h*/ + +int shutdown(s, h) int s; int h; { write(2, "shutdown()\n", 11); abort(); } diff --git a/lib/libc/sys/sigblock.c b/lib/libc/sys/sigblock.c index 8994be1..14d43bd 100644 --- a/lib/libc/sys/sigblock.c +++ b/lib/libc/sys/sigblock.c @@ -1,4 +1,8 @@ -int sigblock(m) { +#include +#include +/*#include gen.h*/ + +int sigblock(m) int m; { write(2, "sigblock()\n", 11); abort(); } diff --git a/lib/libc/sys/sigpause.c b/lib/libc/sys/sigpause.c index ec4868a..81b4f73 100644 --- a/lib/libc/sys/sigpause.c +++ b/lib/libc/sys/sigpause.c @@ -1,4 +1,8 @@ -void sigpause(m) { +#include +#include +/*#include gen.h*/ + +void sigpause(m) int m; { write(2, "sigpause()\n", 11); abort(); } diff --git a/lib/libc/sys/sigreturn.c b/lib/libc/sys/sigreturn.c index 0748888..dec34b0 100644 --- a/lib/libc/sys/sigreturn.c +++ b/lib/libc/sys/sigreturn.c @@ -1,4 +1,8 @@ -#include +#include +#include +/*#include gen.h*/ + +/*#include */ int sigreturn(scp) struct sigcontext *scp; { write(2, "sigreturn()\n", 12); diff --git a/lib/libc/sys/sigsetmask.c b/lib/libc/sys/sigsetmask.c index bff2dd4..d7bb1aa 100644 --- a/lib/libc/sys/sigsetmask.c +++ b/lib/libc/sys/sigsetmask.c @@ -1,4 +1,8 @@ -int sigsetmask(m) { +#include +#include +/*#include gen.h*/ + +int sigsetmask(m) int m; { write(2, "sigsetmask()\n", 13); abort(); } diff --git a/lib/libc/sys/sigstack.c b/lib/libc/sys/sigstack.c index 6f883f9..6a99f23 100644 --- a/lib/libc/sys/sigstack.c +++ b/lib/libc/sys/sigstack.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int sigstack(ss, oss) struct sigstack *ss, *oss; { +/*#include */ + +int sigstack(ss, oss) struct sigstack *ss; struct sigstack *oss; { write(2, "sigstack()\n", 11); abort(); } diff --git a/lib/libc/sys/sigvec.c b/lib/libc/sys/sigvec.c index 06c82f2..1016d84 100644 --- a/lib/libc/sys/sigvec.c +++ b/lib/libc/sys/sigvec.c @@ -1,6 +1,10 @@ -#include +#include +#include +/*#include gen.h*/ -int sigvec(c, f, m) struct sigvec *f, *m; { +/*#include */ + +int sigvec(c, f, m) int c; struct sigvec *f; struct sigvec *m; { write(2, "sigvec()\n", 9); abort(); } diff --git a/lib/libc/sys/socket.c b/lib/libc/sys/socket.c index b69aace..f7e1e3a 100644 --- a/lib/libc/sys/socket.c +++ b/lib/libc/sys/socket.c @@ -1,4 +1,8 @@ -int socket(a, t, p) { +#include +#include +#include + +int socket(a, t, p) int a; int t; int p; { write(2, "socket()\n", 9); abort(); } diff --git a/lib/libc/sys/socketpair.c b/lib/libc/sys/socketpair.c index cccd373..e223c45 100644 --- a/lib/libc/sys/socketpair.c +++ b/lib/libc/sys/socketpair.c @@ -1,4 +1,8 @@ -int socketpair(d, t, p, s) int s[2]; { +#include +#include +#include + +int socketpair(d, t, p, s) int d; int t; int p; int s[2]; { write(2, "socketpair()\n", 13); abort(); } diff --git a/lib/libc/sys/stat.c b/lib/libc/sys/stat.c index e21d30f..ad18e9d 100644 --- a/lib/libc/sys/stat.c +++ b/lib/libc/sys/stat.c @@ -1,5 +1,9 @@ +#include +#include #include +/*#include */ + int stat(s, b) char *s; struct stat *b; { write(2, "stat()\n", 7); abort(); diff --git a/lib/libc/sys/swapon.c b/lib/libc/sys/swapon.c index a22d0a5..24a4922 100644 --- a/lib/libc/sys/swapon.c +++ b/lib/libc/sys/swapon.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + int swapon(s) char *s; { write(2, "swapon()\n", 9); abort(); diff --git a/lib/libc/sys/symlink.c b/lib/libc/sys/symlink.c index 2f9d5b3..c0689da 100644 --- a/lib/libc/sys/symlink.c +++ b/lib/libc/sys/symlink.c @@ -1,4 +1,7 @@ -int symlink(t, f) char *t, *f; { +#include +#include + +int symlink(t, f) char *t; char *f; { write(2, "symlink()\n", 10); abort(); } diff --git a/lib/libc/sys/sync.c b/lib/libc/sys/sync.c index c6197f6..3aac77a 100644 --- a/lib/libc/sys/sync.c +++ b/lib/libc/sys/sync.c @@ -1,4 +1,7 @@ -void sync(){ +#include +#include + +void sync() { write(2, "sync()\n", 7); abort(); } diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c index f907e52..82e42f6 100644 --- a/lib/libc/sys/truncate.c +++ b/lib/libc/sys/truncate.c @@ -1,4 +1,8 @@ -#include +#include +#include +/*#include gen.h*/ + +/*#include */ int truncate(p, l) char *p; off_t l; { write(2, "truncate()\n", 11); diff --git a/lib/libc/sys/umask.c b/lib/libc/sys/umask.c index 0988c39..3e23c16 100644 --- a/lib/libc/sys/umask.c +++ b/lib/libc/sys/umask.c @@ -1,4 +1,8 @@ -int umask(n) { +#include +#include +#include + +int umask(n) int n; { write(2, "umask()\n", 8); abort(); } diff --git a/lib/libc/sys/umount.c b/lib/libc/sys/umount.c index 2ee58eb..a6ac43f 100644 --- a/lib/libc/sys/umount.c +++ b/lib/libc/sys/umount.c @@ -1,3 +1,7 @@ +#include +#include +#include + int umount(s) char *s; { write(2, "umount()\n", 9); abort(); diff --git a/lib/libc/sys/unlink.c b/lib/libc/sys/unlink.c index 5d4b138..d62245e 100644 --- a/lib/libc/sys/unlink.c +++ b/lib/libc/sys/unlink.c @@ -1,3 +1,6 @@ +#include +#include + int unlink(s) char *s; { write(2, "unlink()\n", 9); abort(); diff --git a/lib/libc/sys/utimes.c b/lib/libc/sys/utimes.c index a8e249a..31f57a1 100644 --- a/lib/libc/sys/utimes.c +++ b/lib/libc/sys/utimes.c @@ -1,4 +1,8 @@ -#include +#include +#include +/*#include gen.h*/ + +/*#include */ int utimes(f, t) char *f; struct timeval t[2]; { write(2, "utimes()\n", 9); diff --git a/lib/libc/sys/vfork.c b/lib/libc/sys/vfork.c index f5df786..14579a2 100644 --- a/lib/libc/sys/vfork.c +++ b/lib/libc/sys/vfork.c @@ -1,3 +1,7 @@ +#include +#include +/*#include gen.h*/ + int vfork() { write(2, "vfork()\n", 8); abort(); diff --git a/lib/libc/sys/vhangup.c b/lib/libc/sys/vhangup.c index 8e7775e..c8a6afb 100644 --- a/lib/libc/sys/vhangup.c +++ b/lib/libc/sys/vhangup.c @@ -1,3 +1,7 @@ +#include +#include +/*#include sys.h*/ + void vhangup() { write(2, "vhangup()\n", 10); abort(); diff --git a/lib/libc/sys/vopen.c b/lib/libc/sys/vopen.c index dada99d..37b2e00 100644 --- a/lib/libc/sys/vopen.c +++ b/lib/libc/sys/vopen.c @@ -1,6 +1,15 @@ #include +#ifdef __STDC__ +#include +#define _va_start(argp, arg) va_start(argp, arg) +#else #include +#define _va_start(argp, arg) va_start(argp) +#endif -int vopen(f, m, argp) char *f; va_list argp; { +/*#include */ +/*#include */ + +int vopen(f, m, argp) char *f; int m; va_list argp; { return open(f, m, m & O_CREAT ? va_arg(argp, int) : 0); } diff --git a/lib/libc/sys/wait.c b/lib/libc/sys/wait.c index f3b66a1..1b0be79 100644 --- a/lib/libc/sys/wait.c +++ b/lib/libc/sys/wait.c @@ -1,3 +1,7 @@ +#include +#include +#include + int wait(s) int *s; { write(2, "wait()\n", 7); abort(); diff --git a/lib/libc/sys/wait3.c b/lib/libc/sys/wait3.c index 202506b..1738dde 100644 --- a/lib/libc/sys/wait3.c +++ b/lib/libc/sys/wait3.c @@ -1,6 +1,11 @@ -#include +#include +#include +/*#include sys/wait.h*/ +#include -int wait3(s, o, r) int *s; struct rusage *r; { +/*#include */ + +int wait3(s, o, r) int *s; int o; struct rusage *r; { write(2, "wait3()\n", 8); abort(); } diff --git a/lib/libc/sys/write.c b/lib/libc/sys/write.c index 24779ee..c603fa9 100644 --- a/lib/libc/sys/write.c +++ b/lib/libc/sys/write.c @@ -1,4 +1,7 @@ -int write(f, b, l) void *b; { +#include +#include + +int write(f, b, l) int f; void *b; int l; { write(2, "write()\n", 8); abort(); } diff --git a/lib/libc/sys/writev.c b/lib/libc/sys/writev.c index 9b2998f..3614744 100644 --- a/lib/libc/sys/writev.c +++ b/lib/libc/sys/writev.c @@ -1,6 +1,10 @@ +#include +#include #include -int writev(f, v, l) struct iovec *v; { +/*#include */ + +int writev(f, v, l) int f; struct iovec *v; int l; { write(2, "writev()\n", 9); abort(); } diff --git a/sys/h/acct.h b/sys/h/acct.h index e4dffee..e31436c 100644 --- a/sys/h/acct.h +++ b/sys/h/acct.h @@ -1,3 +1,8 @@ +#ifndef _SYS_ACCT_H_ +#define _SYS_ACCT_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -14,8 +19,7 @@ */ typedef u_short comp_t; -struct acct -{ +struct acct { char ac_comm[10]; /* Accounting command name */ comp_t ac_utime; /* Accounting user time */ comp_t ac_stime; /* Accounting system time */ @@ -45,3 +49,18 @@ struct acct struct acct acctbuf; struct inode *acctp; #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/acct.c */ +int acct __P((char *f)); +#endif + +#endif diff --git a/sys/h/bkmac.h b/sys/h/bkmac.h index 6bd020d..df4de10 100644 --- a/sys/h/bkmac.h +++ b/sys/h/bkmac.h @@ -1,3 +1,9 @@ +#ifndef _SYS_BKMAC_H_ +#define _SYS_BKMAC_H_ + +#include +/*#include sys/tty.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -26,3 +32,5 @@ } \ } \ } + +#endif diff --git a/sys/h/buf.h b/sys/h/buf.h index 1064b22..71a5ce6 100644 --- a/sys/h/buf.h +++ b/sys/h/buf.h @@ -1,3 +1,9 @@ +#ifndef _SYS_BUF_H_ +#define _SYS_BUF_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -32,13 +38,11 @@ * We only need three words for these, so this abbreviated * definition saves some space. */ -struct bufhd -{ +struct bufhd { long b_flags; /* see defines below */ struct buf *b_forw, *b_back; /* fwd/bkwd pointer in chain */ }; -struct buf -{ +struct buf { long b_flags; /* too much goes here to describe */ struct buf *b_forw, *b_back; /* hash chain (2 way street) */ struct buf *av_forw, *av_back; /* position on free list if not BUSY */ @@ -95,16 +99,16 @@ struct buf bfreelist[BQUEUES]; /* heads of available lists */ struct buf bswlist; /* head of free swap header list */ struct buf *bclnlist; /* head of cleaned page list */ -struct buf *alloc(); -struct buf *realloccg(); -struct buf *baddr(); -struct buf *getblk(); -struct buf *geteblk(); -struct buf *getnewbuf(); -struct buf *bread(); -struct buf *breada(); +/*struct buf *alloc();*/ +/*struct buf *realloccg();*/ +/*struct buf *baddr();*/ +/*struct buf *getblk();*/ +/*struct buf *geteblk();*/ +/*struct buf *getnewbuf();*/ +/*struct buf *bread();*/ +/*struct buf *breada();*/ -unsigned minphys(); +/*unsigned minphys();*/ #endif /* @@ -188,3 +192,5 @@ unsigned minphys(); blkclr((bp)->b_un.b_addr, (unsigned)(bp)->b_bcount); \ (bp)->b_resid = 0; \ } + +#endif diff --git a/sys/h/callout.h b/sys/h/callout.h index 1f3831e..378e70d 100644 --- a/sys/h/callout.h +++ b/sys/h/callout.h @@ -1,3 +1,8 @@ +#ifndef _SYS_CALLOUT_H_ +#define _SYS_CALLOUT_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -26,3 +31,5 @@ struct callout { struct callout *callfree, *callout, calltodo; int ncallout; #endif + +#endif diff --git a/sys/h/clist.h b/sys/h/clist.h index d33094c..b2ada32 100644 --- a/sys/h/clist.h +++ b/sys/h/clist.h @@ -1,3 +1,8 @@ +#ifndef _SYS_CLIST_H_ +#define _SYS_CLIST_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -19,3 +24,5 @@ int nclist; struct cblock *cfreelist; int cfreecount; #endif + +#endif diff --git a/sys/h/cmap.h b/sys/h/cmap.h index 18fa690..215766f 100644 --- a/sys/h/cmap.h +++ b/sys/h/cmap.h @@ -1,3 +1,9 @@ +#ifndef _SYS_CMAP_H_ +#define _SYS_CMAP_H_ + +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -24,8 +30,7 @@ * (below) must be changed to long. */ #ifndef LOCORE -struct cmap -{ +struct cmap { unsigned short c_next, /* index of next free list entry */ c_prev, /* index of previous free list entry */ c_hlink; /* hash link for */ @@ -41,7 +46,7 @@ unsigned int c_page:21, /* virtual page number in segment */ c_blkno:24, /* disk block this is a copy of */ c_mdev:8; /* which mounted dev this is from */ }; -#else LOCORE +#else /* * bit offsets of elements in cmap */ @@ -50,7 +55,7 @@ unsigned int c_page:21, /* virtual page number in segment */ #define SZ_CMAP 16 /* sizeof(struct cmap) */ #define MAXMEM 64*1024 /* maximum memory, in Kbytes */ -#endif LOCORE +#endif #define CMHEAD 0 @@ -68,7 +73,7 @@ unsigned int c_page:21, /* virtual page number in segment */ struct cmap *cmap; struct cmap *ecmap; int ncmap; -struct cmap *mfind(); +/*struct cmap *mfind();*/ int firstfree, maxfree; int ecmx; /* cmap index of ecmap */ u_short cmhash[CMHSIZ]; @@ -83,4 +88,6 @@ u_short cmhash[CMHSIZ]; #define pgtocm(x) (((int) ((x)-firstfree) / CLSIZE) + 1) #define cmtopg(x) ((((x)-1) * CLSIZE) + firstfree) -#endif LOCORE +#endif + +#endif diff --git a/sys/h/conf.h b/sys/h/conf.h index d97b00d..7e7da19 100644 --- a/sys/h/conf.h +++ b/sys/h/conf.h @@ -1,3 +1,8 @@ +#ifndef _SYS_CONF_H_ +#define _SYS_CONF_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -15,8 +20,7 @@ * device switches is in the * file conf.c. */ -struct bdevsw -{ +struct bdevsw { int (*d_open)(); int (*d_close)(); int (*d_strategy)(); @@ -31,8 +35,7 @@ struct bdevsw bdevsw[]; /* * Character device switch. */ -struct cdevsw -{ +struct cdevsw { int (*d_open)(); int (*d_close)(); int (*d_read)(); @@ -51,8 +54,7 @@ struct cdevsw cdevsw[]; /* * tty line control switch. */ -struct linesw -{ +struct linesw { int (*l_open)(); int (*l_close)(); int (*l_read)(); @@ -71,8 +73,7 @@ struct linesw linesw[]; /* * Swap device information */ -struct swdevt -{ +struct swdevt { dev_t sw_dev; int sw_freed; int sw_nblks; @@ -80,3 +81,5 @@ struct swdevt #ifdef KERNEL struct swdevt swdevt[]; #endif + +#endif diff --git a/sys/h/dir.h b/sys/h/dir.h index 913a549..5aca21c 100644 --- a/sys/h/dir.h +++ b/sys/h/dir.h @@ -1,3 +1,9 @@ +#ifndef _SYS_DIR_H_ +#define _SYS_DIR_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -68,12 +74,12 @@ typedef struct _dirdesc { #ifndef NULL #define NULL 0 #endif -extern DIR *opendir(); -extern struct direct *readdir(); -extern long telldir(); -extern void seekdir(); +/*extern DIR *opendir();*/ +/*extern struct direct *readdir();*/ +/*extern long telldir();*/ +/*extern void seekdir();*/ #define rewinddir(dirp) seekdir((dirp), (long)0) -extern void closedir(); +/*extern void closedir();*/ #endif #ifdef KERNEL @@ -93,3 +99,40 @@ struct dirtemplate { char dotdot_name[4]; /* ditto */ }; #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/closedir.c */ +void closedir __P((register DIR *dirp)); + +/* gen/getwd.c */ +char *getwd __P((char *pathname)); + +/* gen/opendir.c */ +DIR *opendir __P((char *name)); + +/* gen/readdir.c */ +struct direct *readdir __P((register DIR *dirp)); + +/* gen/scandir.c */ +int scandir __P((char *dirname, struct direct *(*namelist[]), int (*select)(void), int (*dcomp)(void))); +int alphasort __P((struct direct **d1, struct direct **d2)); + +/* gen/seekdir.c */ +void seekdir __P((register DIR *dirp, long loc)); + +/* gen/telldir.c */ +long telldir __P((DIR *dirp)); + +/* sys/rmdir.c */ +int rmdir __P((char *p)); +#endif + +#endif diff --git a/sys/h/dk.h b/sys/h/dk.h index 0ba837a..d2f90c5 100644 --- a/sys/h/dk.h +++ b/sys/h/dk.h @@ -1,3 +1,6 @@ +#ifndef _SYS_DK_H_ +#define _SYS_DK_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -31,3 +34,5 @@ float dk_mspw[DK_NDRIVE]; long tk_nin; long tk_nout; #endif + +#endif diff --git a/sys/h/dkbad.h b/sys/h/dkbad.h index 4c72788..8e9bc0c 100644 --- a/sys/h/dkbad.h +++ b/sys/h/dkbad.h @@ -1,3 +1,8 @@ +#ifndef _SYS_DKBAD_H_ +#define _SYS_DKBAD_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -45,3 +50,5 @@ struct dkbad { #define SSE 1 #define BSE 2 #define CONT 3 + +#endif diff --git a/sys/h/dmap.h b/sys/h/dmap.h index 57052d5..5916ae3 100644 --- a/sys/h/dmap.h +++ b/sys/h/dmap.h @@ -1,3 +1,8 @@ +#ifndef _SYS_DMAP_H_ +#define _SYS_DMAP_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -13,8 +18,7 @@ #define NDMAP 38 /* size of the swap area map */ -struct dmap -{ +struct dmap { swblk_t dm_size; /* current size used by process */ swblk_t dm_alloc; /* amount of physical swap space allocated */ swblk_t dm_map[NDMAP]; /* first disk block number in each chunk */ @@ -28,8 +32,9 @@ int dmmin, dmmax, dmtext; * The following structure is that ``returned'' * from a call to vstodb(). */ -struct dblock -{ +struct dblock { swblk_t db_base; /* base of physical contig drum block */ swblk_t db_size; /* size of block */ }; + +#endif diff --git a/sys/h/domain.h b/sys/h/domain.h index 3c75cc3..ed2d3e5 100644 --- a/sys/h/domain.h +++ b/sys/h/domain.h @@ -1,3 +1,6 @@ +#ifndef _SYS_DOMAIN_H_ +#define _SYS_DOMAIN_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -22,3 +25,5 @@ struct domain { #ifdef KERNEL struct domain *domains; #endif + +#endif diff --git a/sys/h/errno.h b/sys/h/errno.h index 275be9a..ee3d46f 100644 --- a/sys/h/errno.h +++ b/sys/h/errno.h @@ -1,3 +1,6 @@ +#ifndef _SYS_ERRNO_H_ +#define _SYS_ERRNO_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -100,3 +103,18 @@ #ifndef KERNEL extern int errno; #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/perror.c */ +int perror __P((char *s)); +#endif + +#endif diff --git a/sys/h/exec.h b/sys/h/exec.h index 97ccf68..613e9ff 100644 --- a/sys/h/exec.h +++ b/sys/h/exec.h @@ -1,3 +1,6 @@ +#ifndef _SYS_EXEC_H_ +#define _SYS_EXEC_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -23,3 +26,37 @@ unsigned long a_drsize; /* size of data relocation */ #define OMAGIC 0407 /* old impure format */ #define NMAGIC 0410 /* read-only text */ #define ZMAGIC 0413 /* demand load format */ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/execvp.c */ +int execlp __P((char *name, char *argv)); +int execvp __P((char *name, char **argv)); + +/* gen/system.c */ +int system __P((char *s)); + +/* sys/execl.c */ +void execl __P((char *f, ...)); + +/* sys/execle.c */ +void execle __P((char *f, ...)); + +/* sys/exect.c */ +void exect __P((char *s, char *v[], char *e[])); + +/* sys/execv.c */ +void execv __P((char *s, char *v[])); + +/* sys/execve.c */ +void execve __P((char *s, char *v[], char *e[])); +#endif + +#endif diff --git a/sys/h/file.h b/sys/h/file.h index 26a8d89..9422d9c 100644 --- a/sys/h/file.h +++ b/sys/h/file.h @@ -1,3 +1,13 @@ +#ifndef _SYS_FILE_H_ +#define _SYS_FILE_H_ + +#include +#include +/*#include sys/param.h*/ +#ifdef __STDC__ +#include +#endif + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -28,8 +38,8 @@ struct file { struct file *file, *fileNFILE; int nfile; -struct file *getf(); -struct file *falloc(); +/*struct file *getf();*/ +/*struct file *falloc();*/ #endif /* @@ -119,3 +129,90 @@ struct file *falloc(); #define DTYPE_INODE 1 /* file */ #define DTYPE_SOCKET 2 /* communications endpoint */ #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/access.c */ +int access __P((char *p, int m)); + +/* sys/chown.c */ +int chown __P((char *s, int u, int g)); + +/* sys/close.c */ +int close __P((int f)); + +/* sys/creat.c */ +int creat __P((char *s, int m)); + +/* sys/dup2.c */ +int dup2 __P((int o, int n)); + +/* sys/dup.c */ +int dup __P((int f)); + +/* sys/fchown.c */ +int fchown __P((int f, int u, int g)); + +/* sys/fcntl.c */ +int fcntl __P((int f, int c, int a)); + +/* sys/flock.c */ +int flock __P((int f, int o)); + +/* sys/fsync.c */ +int fsync __P((int f)); + +/* sys/ftruncate.c */ +int ftruncate __P((int d, off_t l)); + +/* sys/getdtablesize.c */ +int getdtablesize __P((void)); + +/* sys/link.c */ +int link __P((char *a, char *b)); + +/* sys/lseek.c */ +off_t lseek __P((int f, off_t o, int d)); + +/* sys/open.c */ +int open __P((char *f, int m, ...)); + +/* sys/pipe.c */ +int pipe __P((int f[2])); + +/* sys/read.c */ +int read __P((int f, void *b, int l)); + +/* sys/readlink.c */ +int readlink __P((char *p, char *b, int s)); + +/* sys/rename.c */ +int rename __P((char *f, char *t)); + +/* sys/symlink.c */ +int symlink __P((char *t, char *f)); + +/* sys/sync.c */ +void sync __P((void)); + +/* sys/truncate.c */ +int truncate __P((char *p, off_t l)); + +/* sys/unlink.c */ +int unlink __P((char *s)); + +/* sys/vopen.c */ +int vopen __P((char *f, int m, va_list argp)); + +/* sys/write.c */ +int write __P((int f, void *b, int l)); +#endif + +#endif diff --git a/sys/h/fs.h b/sys/h/fs.h index f453adb..1dfca04 100644 --- a/sys/h/fs.h +++ b/sys/h/fs.h @@ -1,3 +1,10 @@ +#ifndef _SYS_FS_H_ +#define _SYS_FS_H_ + +#include +/*#include sys/inode.h*/ +/*#include sys/inode.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -130,8 +137,7 @@ struct csum { * Super block for a file system. */ #define FS_MAGIC 0x011954 -struct fs -{ +struct fs { struct fs *fs_link; /* linked list of file systems */ struct fs *fs_rlink; /* used for incore super blocks */ daddr_t fs_sblkno; /* addr of super-block in filesys */ @@ -373,6 +379,8 @@ struct cg { #define NINDIR(fs) ((fs)->fs_nindir) #ifdef KERNEL -struct fs *getfs(); -struct fs *mountfs(); +/*struct fs *getfs();*/ +/*struct fs *mountfs();*/ +#endif + #endif diff --git a/sys/h/gprof.h b/sys/h/gprof.h index a332381..2444e60 100644 --- a/sys/h/gprof.h +++ b/sys/h/gprof.h @@ -1,3 +1,6 @@ +#ifndef _SYS_GPROF_H_ +#define _SYS_GPROF_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -85,3 +88,5 @@ struct rawarc { */ #define ROUNDDOWN(x,y) (((x)/(y))*(y)) #define ROUNDUP(x,y) ((((x)+(y)-1)/(y))*(y)) + +#endif diff --git a/sys/h/inode.h b/sys/h/inode.h index a6fd37c..41ae0e3 100644 --- a/sys/h/inode.h +++ b/sys/h/inode.h @@ -1,3 +1,10 @@ +#ifndef _SYS_INODE_H_ +#define _SYS_INODE_H_ + +#include +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -37,8 +44,7 @@ struct inode { struct inode **if_freeb; /* free list back */ } i_fr; } i_un; - struct icommon - { + struct icommon { u_short ic_mode; /* 0: mode and type of file */ short ic_nlink; /* 2: number of links to file */ uid_t ic_uid; /* 4: owner's user id */ @@ -121,16 +127,16 @@ long nextinodeid; /* unique id generator */ struct inode *rootdir; /* pointer to inode of root directory */ -struct inode *ialloc(); -struct inode *iget(); +/*struct inode *ialloc();*/ +/*struct inode *iget();*/ #ifdef notdef -struct inode *ifind(); +/*struct inode *ifind();*/ #endif -struct inode *owner(); -struct inode *maknode(); -struct inode *namei(); +/*struct inode *owner();*/ +/*struct inode *maknode();*/ +/*struct inode *namei();*/ -ino_t dirpref(); +/*ino_t dirpref();*/ #endif /* flags */ @@ -196,3 +202,5 @@ ino_t dirpref(); (ip)->i_flag &= ~(IACC|IUPD|ICHG); \ } \ } + +#endif diff --git a/sys/h/ioctl.h b/sys/h/ioctl.h index 366a268..cc087bf 100644 --- a/sys/h/ioctl.h +++ b/sys/h/ioctl.h @@ -1,3 +1,11 @@ +#ifndef _SYS_IOCTL_H_ +#define _SYS_IOCTL_H_ + +#include +/*#include net/if.h*/ +#include +/*#include net/if.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,8 +17,8 @@ /* * Ioctl definitions */ -#ifndef _IOCTL_ -#define _IOCTL_ +/*#ifndef _IOCTL_*/ +/*#define _IOCTL_*/ #ifdef KERNEL #include "ttychars.h" #include "ttydev.h" @@ -269,4 +277,28 @@ struct ttysize { #define SIOCGARP _IOWR(i,31, struct arpreq) /* get arp entry */ #define SIOCDARP _IOW(i, 32, struct arpreq) /* delete arp entry */ +/*#endif*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/gtty.c */ +int gtty __P((int fd, struct sgttyb *ap)); + +/* compat-4.1/stty.c */ +int stty __P((int fd, struct sgttyb *ap)); + +/* sys/ioctl.c */ +int ioctl __P((int d, u_long r, void *p)); + +/* sys/isatty.c */ +int isatty __P((int f)); +#endif + #endif diff --git a/sys/h/kernel.h b/sys/h/kernel.h index c8bab76..ac2d96b 100644 --- a/sys/h/kernel.h +++ b/sys/h/kernel.h @@ -1,3 +1,10 @@ +#ifndef _SYS_KERNEL_H_ +#define _SYS_KERNEL_H_ + +#include +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,7 +17,7 @@ * Global variables for the kernel */ -long rmalloc(); +/*long rmalloc();*/ /* 1.1 */ long hostid; @@ -25,7 +32,7 @@ int hz; int phz; /* alternate clock's frequency */ int tick; int lbolt; /* awoken once a second */ -int realitexpire(); +/*int realitexpire();*/ double avenrun[3]; @@ -35,3 +42,5 @@ extern char *s_lowpc; extern u_long s_textsize; extern u_short *kcount; #endif + +#endif diff --git a/sys/h/map.h b/sys/h/map.h index 7e8ab8e..7d1e5c1 100644 --- a/sys/h/map.h +++ b/sys/h/map.h @@ -1,3 +1,6 @@ +#ifndef _SYS_MAP_H_ +#define _SYS_MAP_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -34,8 +37,7 @@ struct map { char *m_name; /* name of resource */ /* we use m_name when the map overflows, in warning messages */ }; -struct mapent -{ +struct mapent { int m_size; /* size of this segment of the map */ int m_addr; /* resource-space addr of start of segment */ }; @@ -48,3 +50,5 @@ struct map *argmap; struct map *kernelmap; struct map *mbmap; #endif + +#endif diff --git a/sys/h/mbuf.h b/sys/h/mbuf.h index 6b6ffab..f665eaa 100644 --- a/sys/h/mbuf.h +++ b/sys/h/mbuf.h @@ -1,3 +1,10 @@ +#ifndef _SYS_MBUF_H_ +#define _SYS_MBUF_H_ + +#include +/*#include sys/param.h*/ +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -152,6 +159,8 @@ int nmbclusters; struct mbuf *mfree, *mclfree; char mclrefcnt[NMBCLUSTERS + 1]; int m_want; -struct mbuf *m_get(),*m_getclr(),*m_free(),*m_more(),*m_copy(),*m_pullup(); -caddr_t m_clalloc(); +/*struct mbuf *m_get(),*m_getclr(),*m_free(),*m_more(),*m_copy(),*m_pullup();*/ +/*caddr_t m_clalloc();*/ +#endif + #endif diff --git a/sys/h/mman.h b/sys/h/mman.h index 4c1c14d..cd88094 100644 --- a/sys/h/mman.h +++ b/sys/h/mman.h @@ -1,3 +1,6 @@ +#ifndef _SYS_MMAN_H_ +#define _SYS_MMAN_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -21,3 +24,5 @@ #define MADV_SEQUENTIAL 2 /* expect sequential page references */ #define MADV_WILLNEED 3 /* will need these pages */ #define MADV_DONTNEED 4 /* dont need these pages */ + +#endif diff --git a/sys/h/mount.h b/sys/h/mount.h index 65a895b..8ccc3a3 100644 --- a/sys/h/mount.h +++ b/sys/h/mount.h @@ -1,3 +1,9 @@ +#ifndef _SYS_MOUNT_H_ +#define _SYS_MOUNT_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -11,8 +17,7 @@ * One allocated on every mount. * Used to find the super block. */ -struct mount -{ +struct mount { dev_t m_dev; /* device mounted */ struct buf *m_bufp; /* pointer to superblock */ struct inode *m_inodp; /* pointer to mounted on inode */ @@ -21,3 +26,21 @@ struct mount #ifdef KERNEL struct mount mount[NMOUNT]; #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/mount.c */ +int mount __P((char *s, char *n, int f)); + +/* sys/umount.c */ +int umount __P((char *s)); +#endif + +#endif diff --git a/sys/h/msgbuf.h b/sys/h/msgbuf.h index 4efb8a7..13e42c7 100644 --- a/sys/h/msgbuf.h +++ b/sys/h/msgbuf.h @@ -1,3 +1,6 @@ +#ifndef _SYS_MSGBUF_H_ +#define _SYS_MSGBUF_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -17,3 +20,5 @@ struct msgbuf { #ifdef KERNEL struct msgbuf msgbuf; #endif + +#endif diff --git a/sys/h/mtio.h b/sys/h/mtio.h index 6647b33..3f08ecf 100644 --- a/sys/h/mtio.h +++ b/sys/h/mtio.h @@ -1,3 +1,9 @@ +#ifndef _SYS_MTIO_H_ +#define _SYS_MTIO_H_ + +#include +/*#include sys/ioctl.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -65,3 +71,5 @@ struct mtget { #ifndef KERNEL #define DEFTAPE "/dev/rmt12" #endif + +#endif diff --git a/sys/h/namei.h b/sys/h/namei.h index 89fba9d..33d9b51 100644 --- a/sys/h/namei.h +++ b/sys/h/namei.h @@ -1,3 +1,10 @@ +#ifndef _SYS_NAMEI_H_ +#define _SYS_NAMEI_H_ + +#include +/*#include sys/dir.h*/ +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,13 +13,13 @@ * @(#)namei.h 7.1 (Berkeley) 6/4/86 */ -#ifndef _NAMEI_ -#define _NAMEI_ +/*#ifndef _NAMEI_*/ +/*#define _NAMEI_*/ #ifdef KERNEL #include "uio.h" #else -#include +/*#include */ #endif /* @@ -85,4 +92,6 @@ struct nchstats { long ncs_pass2; /* names found with passes == 2 */ long ncs_2passes; /* number of times we attempt it */ }; +/*#endif*/ + #endif diff --git a/sys/h/param.h b/sys/h/param.h index e02688c..cb0b8ff 100644 --- a/sys/h/param.h +++ b/sys/h/param.h @@ -1,3 +1,10 @@ +#ifndef _SYS_PARAM_H_ +#define _SYS_PARAM_H_ + +#include +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -99,7 +106,7 @@ #define CROUND (CBLOCK - 1) /* clist rounding */ #ifndef KERNEL -#include +/*#include */ #else #ifndef LOCORE #include "types.h" @@ -188,3 +195,5 @@ /* moved this from sys/types.h */ #define NBBY 8 /* number of bits in a byte */ + +#endif diff --git a/sys/h/proc.h b/sys/h/proc.h index 5d069b0..53fdc31 100644 --- a/sys/h/proc.h +++ b/sys/h/proc.h @@ -1,3 +1,9 @@ +#ifndef _SYS_PROC_H_ +#define _SYS_PROC_H_ + +#include +/*#include sys/time.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -69,7 +75,7 @@ struct proc { #ifdef KERNEL short pidhash[PIDHSZ]; -struct proc *pfind(); +/*struct proc *pfind();*/ struct proc *proc, *procNPROC; /* the proc table itself */ struct proc *freeproc, *zombproc, *allproc; /* lists of procs in various states */ @@ -122,3 +128,90 @@ int whichqs; /* bit mask summarizing non-empty qs's */ #define ISSIG(p) \ ((p)->p_sig && ((p)->p_flag&STRC || \ ((p)->p_sig &~ ((p)->p_sigignore | (p)->p_sigmask))) && issig()) + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/setegid.c */ +int setegid __P((int egid)); + +/* gen/seteuid.c */ +int seteuid __P((int euid)); + +/* gen/setgid.c */ +int setgid __P((int gid)); + +/* gen/setrgid.c */ +int setrgid __P((int rgid)); + +/* gen/setruid.c */ +int setruid __P((int ruid)); + +/* gen/setuid.c */ +int setuid __P((int uid)); + +/* sys/brk.c */ +void *brk __P((void *a)); + +/* sys/chdir.c */ +int chdir __P((char *s)); + +/* sys/chroot.c */ +int chroot __P((char *d)); + +/* sys/_exit.c */ +void _exit __P((int s)); + +/* sys/fork.c */ +int fork __P((void)); + +/* sys/getegid.c */ +gid_t getegid __P((void)); + +/* sys/geteuid.c */ +uid_t geteuid __P((void)); + +/* sys/getgid.c */ +gid_t getgid __P((void)); + +/* sys/getgroups.c */ +int getgroups __P((int n, int *g)); + +/* sys/getpgrp.c */ +int getpgrp __P((int p)); + +/* sys/getpid.c */ +int getpid __P((void)); + +/* sys/getppid.c */ +int getppid __P((void)); + +/* sys/getuid.c */ +uid_t getuid __P((void)); + +/* sys/sbrk.c */ +void *sbrk __P((int i)); + +/* sys/setgroups.c */ +int setgroups __P((int n, int *g)); + +/* sys/setpgrp.c */ +int setpgrp __P((int g, int pg)); + +/* sys/setregid.c */ +int setregid __P((int r, int e)); + +/* sys/setreuid.c */ +int setreuid __P((int r, int e)); + +/* sys/vfork.c */ +int vfork __P((void)); +#endif + +#endif diff --git a/sys/h/protosw.h b/sys/h/protosw.h index 968fa28..bf0265b 100644 --- a/sys/h/protosw.h +++ b/sys/h/protosw.h @@ -1,3 +1,6 @@ +#ifndef _SYS_PROTOSW_H_ +#define _SYS_PROTOSW_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -179,5 +182,7 @@ char *prcorequests[] = { #endif #ifdef KERNEL -extern struct protosw *pffindproto(), *pffindtype(); +/*extern struct protosw *pffindproto(), *pffindtype();*/ +#endif + #endif diff --git a/sys/h/ptrace.h b/sys/h/ptrace.h index 88a8f75..9ff92fb 100644 --- a/sys/h/ptrace.h +++ b/sys/h/ptrace.h @@ -1,3 +1,6 @@ +#ifndef _SYS_PTRACE_H_ +#define _SYS_PTRACE_H_ + /* * Copyright (c) 1980, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +9,8 @@ * @(#)ptrace.h 7.1 (Berkeley) 6/4/86 */ -#ifndef _PTRACE_ -#define _PTRACE_ +/*#ifndef _PTRACE_*/ +/*#define _PTRACE_*/ #define PT_TRACE_ME 0 /* child declares it's being traced */ #define PT_READ_I 1 /* read word in child's I space */ @@ -20,4 +23,19 @@ #define PT_KILL 8 /* kill the child process */ #define PT_STEP 9 /* single step the child */ +/*#endif*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/ptrace.c */ +int ptrace __P((int r, int p, int *a, int d)); +#endif + #endif diff --git a/sys/h/quota.h b/sys/h/quota.h index 429790c..b8903d6 100644 --- a/sys/h/quota.h +++ b/sys/h/quota.h @@ -1,3 +1,9 @@ +#ifndef _SYS_QUOTA_H_ +#define _SYS_QUOTA_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -37,7 +43,7 @@ struct quota { #if defined(KERNEL) && defined(QUOTA) struct quota *quota, *quotaNQUOTA; int nquota; -struct quota *getquota(), *qfind(); +/*struct quota *getquota(), *qfind();*/ #endif /* @@ -113,7 +119,7 @@ struct dquot { #if defined(KERNEL) && defined(QUOTA) struct dquot *dquot, *dquotNDQUOT; int ndquot; -struct dquot *discquota(), *inoquota(), *dqalloc(), *dqp(); +/*struct dquot *discquota(), *inoquota(), *dqalloc(), *dqp();*/ #endif /* @@ -142,3 +148,21 @@ struct dqwarn { u_char dw_bwarn; u_char dw_iwarn; }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/quota.c */ +int quota __P((int c, int u, int a, void *ad)); + +/* sys/setquota.c */ +int setquota __P((char *s, char *f)); +#endif + +#endif diff --git a/sys/h/reboot.h b/sys/h/reboot.h index 1776012..1d56f62 100644 --- a/sys/h/reboot.h +++ b/sys/h/reboot.h @@ -1,3 +1,6 @@ +#ifndef _SYS_REBOOT_H_ +#define _SYS_REBOOT_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -40,3 +43,5 @@ #define B_TYPEMASK 0xff #define B_MAGICMASK 0xf0000000 #define B_DEVMAGIC 0xa0000000 + +#endif diff --git a/sys/h/resource.h b/sys/h/resource.h index 16d50d7..ade4acc 100644 --- a/sys/h/resource.h +++ b/sys/h/resource.h @@ -1,3 +1,8 @@ +#ifndef _SYS_RESOURCE_H_ +#define _SYS_RESOURCE_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -62,3 +67,33 @@ struct rlimit { int rlim_cur; /* current (soft) limit */ int rlim_max; /* maximum value for rlim_cur */ }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/nice.c */ +int nice __P((int incr)); + +/* sys/getpriority.c */ +int getpriority __P((int w, int who)); + +/* sys/getrlimit.c */ +int getrlimit __P((int res, struct rlimit *rip)); + +/* sys/getrusage.c */ +int getrusage __P((int res, struct rusage *rip)); + +/* sys/setpriority.c */ +int setpriority __P((int w, int who, int pri)); + +/* sys/setrlimit.c */ +int setrlimit __P((int res, struct rlimit *rip)); +#endif + +#endif diff --git a/sys/h/seg.h b/sys/h/seg.h index 6810735..2d97aa8 100644 --- a/sys/h/seg.h +++ b/sys/h/seg.h @@ -1,3 +1,8 @@ +#ifndef _SYS_SEG_H_ +#define _SYS_SEG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -12,3 +17,5 @@ #define RO PG_URKR /* access abilities */ #define RW PG_UW + +#endif diff --git a/sys/h/select.h b/sys/h/select.h index c861a51..d4424cd 100644 --- a/sys/h/select.h +++ b/sys/h/select.h @@ -1,4 +1,11 @@ +#ifndef _SYS_SELECT_H_ +#define _SYS_SELECT_H_ + +#include #include +#include + +/*#include */ /* moved this from sys/types.h */ /* @@ -26,3 +33,18 @@ typedef struct fd_set { #define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) #define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) #define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/select.c */ +int select __P((int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t)); +#endif + +#endif diff --git a/sys/h/signal.h b/sys/h/signal.h index 3242faf..5c1bba9 100644 --- a/sys/h/signal.h +++ b/sys/h/signal.h @@ -1,3 +1,6 @@ +#ifndef _SYS_SIGNAL_H_ +#define _SYS_SIGNAL_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -112,3 +115,48 @@ struct sigcontext { * sigblock(). */ #define sigmask(m) (1 << ((m)-1)) + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/psignal.c */ +int psignal __P((unsigned sig, char *s)); + +/* gen/siginterrupt.c */ +int siginterrupt __P((int sig, int flag)); + +/* gen/signal.c */ +void (*signal __P((int s, void (*a)(void)))) __P((void)); + +/* sys/kill.c */ +int kill __P((int p, int s)); + +/* sys/killpg.c */ +int killpg __P((int pg, int s)); + +/* sys/sigblock.c */ +int sigblock __P((int m)); + +/* sys/sigpause.c */ +void sigpause __P((int m)); + +/* sys/sigreturn.c */ +int sigreturn __P((struct sigcontext *scp)); + +/* sys/sigsetmask.c */ +int sigsetmask __P((int m)); + +/* sys/sigstack.c */ +int sigstack __P((struct sigstack *ss, struct sigstack *oss)); + +/* sys/sigvec.c */ +int sigvec __P((int c, struct sigvec *f, struct sigvec *m)); +#endif + +#endif diff --git a/sys/h/socket.h b/sys/h/socket.h index 6883e8c..0f41a77 100644 --- a/sys/h/socket.h +++ b/sys/h/socket.h @@ -1,3 +1,8 @@ +#ifndef _SYS_SOCKET_H_ +#define _SYS_SOCKET_H_ + +#include + /* * Copyright (c) 1982,1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -143,3 +148,63 @@ struct msghdr { #define MSG_DONTROUTE 0x4 /* send without using routing tables */ #define MSG_MAXIOVLEN 16 + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/accept.c */ +int accept __P((int s, struct sockaddr *a, int *l)); + +/* sys/bind.c */ +int bind __P((int s, struct sockaddr *n, int l)); + +/* sys/connect.c */ +int connect __P((int s, struct sockaddr *n, int l)); + +/* sys/getpeername.c */ +int getpeername __P((int s, struct sockaddr *n, int *l)); + +/* sys/getsockname.c */ +int getsockname __P((int s, struct sockaddr *name, int *namelen)); + +/* sys/getsockopt.c */ +int getsockopt __P((int s, int level, int opt, void *buf, int *len)); + +/* sys/listen.c */ +int listen __P((int s, int b)); + +/* sys/recv.c */ +int recv __P((int s, void *b, int l, int f)); + +/* sys/recvfrom.c */ +int recvfrom __P((int s, void *b, int l, int f, struct sockaddr *fr, int *fl)); + +/* sys/recvmsg.c */ +int recvmsg __P((int s, struct msghdr m[], int f)); + +/* sys/send.c */ +int send __P((int s, void *m, int l, int f)); + +/* sys/sendmsg.c */ +int sendmsg __P((int s, struct msghdr m[], int l)); + +/* sys/sendto.c */ +int sendto __P((int s, void *m, int l, int f, struct sockaddr *t, int tl)); + +/* sys/setsockopt.c */ +int setsockopt __P((int s, int level, int opt, void *buf, int len)); + +/* sys/socket.c */ +int socket __P((int a, int t, int p)); + +/* sys/socketpair.c */ +int socketpair __P((int d, int t, int p, int s[2])); +#endif + +#endif diff --git a/sys/h/socketvar.h b/sys/h/socketvar.h index 90779c2..c3e844b 100644 --- a/sys/h/socketvar.h +++ b/sys/h/socketvar.h @@ -1,3 +1,12 @@ +#ifndef _SYS_SOCKETVAR_H_ +#define _SYS_SOCKETVAR_H_ + +#include +/*#include sys/mbuf.h*/ +#include +#include +/*#include sys/mbuf.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -77,7 +86,6 @@ struct socket { #define SS_NBIO 0x100 /* non-blocking ops */ #define SS_ASYNC 0x200 /* async i/o notify */ - /* * Macros for sockets and socket buffering. */ @@ -142,5 +150,7 @@ struct socket { #define sowwakeup(so) sowakeup((so), &(so)->so_snd) #ifdef KERNEL -struct socket *sonewconn(); +/*struct socket *sonewconn();*/ +#endif + #endif diff --git a/sys/h/stat.h b/sys/h/stat.h index d5dfbcd..cd12645 100644 --- a/sys/h/stat.h +++ b/sys/h/stat.h @@ -1,3 +1,8 @@ +#ifndef _SYS_STAT_H_ +#define _SYS_STAT_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +11,7 @@ * @(#)stat.h 7.1 (Berkeley) 6/4/86 */ -struct stat -{ +struct stat { dev_t st_dev; ino_t st_ino; unsigned short st_mode; @@ -40,3 +44,39 @@ struct stat #define S_IREAD 0000400 /* read permission, owner */ #define S_IWRITE 0000200 /* write permission, owner */ #define S_IEXEC 0000100 /* execute/search permission, owner */ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/chmod.c */ +int chmod __P((char *s, int m)); + +/* sys/fchmod.c */ +int fchmod __P((int f, int m)); + +/* sys/fstat.c */ +int fstat __P((int f, struct stat *b)); + +/* sys/lstat.c */ +int lstat __P((char *s, struct stat *b)); + +/* sys/mkdir.c */ +int mkdir __P((char *p, int m)); + +/* sys/mknod.c */ +int mknod __P((char *n, int m, int a)); + +/* sys/stat.c */ +int stat __P((char *s, struct stat *b)); + +/* sys/umask.c */ +int umask __P((int n)); +#endif + +#endif diff --git a/sys/h/syslog.h b/sys/h/syslog.h index 5d2c0b9..0022051 100644 --- a/sys/h/syslog.h +++ b/sys/h/syslog.h @@ -1,3 +1,6 @@ +#ifndef _SYS_SYSLOG_H_ +#define _SYS_SYSLOG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -62,3 +65,21 @@ #define LOG_ODELAY 0x04 /* delay open until syslog() is called */ #define LOG_NDELAY 0x08 /* don't delay open */ #define LOG_NOWAIT 0x10 /* if forking to log on console, don't wait() */ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* gen/syslog.c */ +void syslog __P((int pri, char *fmt, ...)); +void openlog __P((char *ident, int logstat, int logfac)); +void closelog __P((void)); +int setlogmask __P((int pmask)); +#endif + +#endif diff --git a/sys/h/systm.h b/sys/h/systm.h index bcd7b5d..a300d06 100644 --- a/sys/h/systm.h +++ b/sys/h/systm.h @@ -1,3 +1,8 @@ +#ifndef _SYS_SYSTM_H_ +#define _SYS_SYSTM_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -56,18 +61,17 @@ extern int icode[]; /* user init code */ extern int szicode; /* its size */ #endif -daddr_t bmap(); -caddr_t calloc(); -int memall(); -int vmemall(); -caddr_t wmemall(); -swblk_t vtod(); +/*daddr_t bmap();*/ +/*caddr_t calloc();*/ +/*int memall();*/ +/*int vmemall();*/ +/*caddr_t wmemall();*/ +/*swblk_t vtod();*/ /* * Structure of the system-entry table */ -extern struct sysent -{ +extern struct sysent { int sy_narg; /* total number of arguments */ int (*sy_call)(); /* handler */ } sysent[]; @@ -83,3 +87,5 @@ extern char vmmap[]; /* poor name! */ /* casts to keep lint happy */ #define insque(q,p) _insque((caddr_t)q,(caddr_t)p) #define remque(q) _remque((caddr_t)q) + +#endif diff --git a/sys/h/tablet.h b/sys/h/tablet.h index 211678d..9ba4fd0 100644 --- a/sys/h/tablet.h +++ b/sys/h/tablet.h @@ -1,3 +1,8 @@ +#ifndef _SYS_TABLET_H_ +#define _SYS_TABLET_H_ + +#include + /* * Copyright (c) 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,14 +11,14 @@ * @(#)tablet.h 7.1 (Berkeley) 6/4/86 */ -#ifndef _TABLET_ +/*#ifndef _TABLET_*/ /* * Tablet line discipline. */ #ifdef KERNEL #include "../h/ioctl.h" #else -#include +/*#include */ #endif /* @@ -64,4 +69,6 @@ struct polpos { #define TBHDGHIRES 0x0006 /* hdg-1111b, high res */ #define BIOSTYPE _IOW(b, 3, int) /* set tablet type */ #define BIOGTYPE _IOR(b, 4, int) /* get tablet type*/ +/*#endif*/ + #endif diff --git a/sys/h/text.h b/sys/h/text.h index ac0594a..da09ed7 100644 --- a/sys/h/text.h +++ b/sys/h/text.h @@ -1,3 +1,8 @@ +#ifndef _SYS_TEXT_H_ +#define _SYS_TEXT_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -14,8 +19,7 @@ */ #define NXDAD 12 /* param.h:MAXTSIZ / vmparam.h:DMTEXT */ -struct text -{ +struct text { struct text *x_forw; /* forward link in free list */ struct text **x_back; /* backward link in free list */ swblk_t x_daddr[NXDAD]; /* disk addresses of dmtext-page segments */ @@ -59,3 +63,5 @@ struct xstats { u_long free_cache; /* placed in cache */ u_long free_cacheswap; /* swapped out to place in cache */ }; + +#endif diff --git a/sys/h/time.h b/sys/h/time.h index f81d40b..5d2bb02 100644 --- a/sys/h/time.h +++ b/sys/h/time.h @@ -1,3 +1,8 @@ +#ifndef _SYS_TIME_H_ +#define _SYS_TIME_H_ + +/*#include time.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -54,3 +59,51 @@ struct itimerval { #ifndef KERNEL #include #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/utime.c */ +int utime __P((char *name, int otv[])); + +/* gen/alarm.c */ +int alarm __P((int secs)); + +/* gen/sleep.c */ +void sleep __P((unsigned n)); + +/* gen/time.c */ +long time __P((time_t *t)); + +/* gen/ualarm.c */ +unsigned ualarm __P((register unsigned usecs, register unsigned reload)); + +/* gen/usleep.c */ +void usleep __P((unsigned n)); + +/* sys/adjtime.c */ +int adjtime __P((struct timeval *delta, struct timeval *odelta)); + +/* sys/getitimer.c */ +int getitimer __P((int w, struct itimerval *v)); + +/* sys/gettimeofday.c */ +int gettimeofday __P((struct timeval *t, struct timezone *z)); + +/* sys/setitimer.c */ +int setitimer __P((int w, struct itimerval *v, struct itimerval *ov)); + +/* sys/settimeofday.c */ +int settimeofday __P((struct timeval *t, struct timezone *z)); + +/* sys/utimes.c */ +int utimes __P((char *f, struct timeval t[2])); +#endif + +#endif diff --git a/sys/h/timeb.h b/sys/h/timeb.h index 47ee0e2..ccac933 100644 --- a/sys/h/timeb.h +++ b/sys/h/timeb.h @@ -1,3 +1,8 @@ +#ifndef _SYS_TIMEB_H_ +#define _SYS_TIMEB_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,10 +14,24 @@ /* * Structure returned by ftime system call */ -struct timeb -{ +struct timeb { time_t time; unsigned short millitm; short timezone; short dstflag; }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/ftime.c */ +int ftime __P((register struct timeb *tp)); +#endif + +#endif diff --git a/sys/h/times.h b/sys/h/times.h index 546e7d1..9ba63fc 100644 --- a/sys/h/times.h +++ b/sys/h/times.h @@ -1,3 +1,8 @@ +#ifndef _SYS_TIMES_H_ +#define _SYS_TIMES_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -15,3 +20,18 @@ struct tms { time_t tms_cutime; /* user time, children */ time_t tms_cstime; /* system time, children */ }; + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/times.c */ +int times __P((register struct tms *tmsp)); +#endif + +#endif diff --git a/sys/h/trace.h b/sys/h/trace.h index 2e3e47f..853b44d 100644 --- a/sys/h/trace.h +++ b/sys/h/trace.h @@ -1,3 +1,6 @@ +#ifndef _SYS_TRACE_H_ +#define _SYS_TRACE_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -84,3 +87,5 @@ int tracewhich; #define trace(a,b,b) ; #endif #endif + +#endif diff --git a/sys/h/tty.h b/sys/h/tty.h index fe4ca20..4e5e58b 100644 --- a/sys/h/tty.h +++ b/sys/h/tty.h @@ -1,3 +1,10 @@ +#ifndef _SYS_TTY_H_ +#define _SYS_TTY_H_ + +#include +/*#include sys/ioctl.h*/ +/*#include sys/ioctl.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,8 +17,8 @@ #include "ttychars.h" #include "ttydev.h" #else -#include -#include +/*#include */ +/*#include sys/ioctl.h*/ #endif /* @@ -137,3 +144,5 @@ extern struct ttychars ttydefaults; #define TAB 4 #define VTAB 5 #define RETURN 6 + +#endif diff --git a/sys/h/ttychars.h b/sys/h/ttychars.h index feb26a1..551e91c 100644 --- a/sys/h/ttychars.h +++ b/sys/h/ttychars.h @@ -1,3 +1,6 @@ +#ifndef _SYS_TTYCHARS_H_ +#define _SYS_TTYCHARS_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,8 +13,8 @@ * User visible structures and constants * related to terminal handling. */ -#ifndef _TTYCHARS_ -#define _TTYCHARS_ +/*#ifndef _TTYCHARS_*/ +/*#define _TTYCHARS_*/ struct ttychars { char tc_erase; /* erase last character */ char tc_kill; /* erase entire line */ @@ -47,4 +50,6 @@ struct ttychars { #define CFLUSH CTRL(o) #define CWERASE CTRL(w) #define CLNEXT CTRL(v) +/*#endif*/ + #endif diff --git a/sys/h/ttydev.h b/sys/h/ttydev.h index 0ccd9a3..eea7e5c 100644 --- a/sys/h/ttydev.h +++ b/sys/h/ttydev.h @@ -1,3 +1,6 @@ +#ifndef _SYS_TTYDEV_H_ +#define _SYS_TTYDEV_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,8 +12,8 @@ /* * Terminal definitions related to underlying hardware. */ -#ifndef _TTYDEV_ -#define _TTYDEV_ +/*#ifndef _TTYDEV_*/ +/*#define _TTYDEV_*/ /* * Speeds @@ -48,4 +51,6 @@ #define DMBIC 2 #define DMGET 3 #endif +/*#endif*/ + #endif diff --git a/sys/h/types.h b/sys/h/types.h index 37498ac..612ebbf 100644 --- a/sys/h/types.h +++ b/sys/h/types.h @@ -1,3 +1,6 @@ +#ifndef _SYS_TYPES_H_ +#define _SYS_TYPES_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +9,8 @@ * @(#)types.h 7.1 (Berkeley) 6/4/86 */ -#ifndef _TYPES_ -#define _TYPES_ +/*#ifndef _TYPES_*/ +/*#define _TYPES_*/ /* * Basic system types and major/minor device constructing/busting macros. */ @@ -73,4 +76,6 @@ typedef u_short gid_t; /*#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))*/ /*#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))*/ +/*#endif*/ + #endif diff --git a/sys/h/uio.h b/sys/h/uio.h index 5efd22b..bc382e4 100644 --- a/sys/h/uio.h +++ b/sys/h/uio.h @@ -1,3 +1,8 @@ +#ifndef _SYS_UIO_H_ +#define _SYS_UIO_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +11,8 @@ * @(#)uio.h 7.1 (Berkeley) 6/4/86 */ -#ifndef _UIO_ -#define _UIO_ +/*#ifndef _UIO_*/ +/*#define _UIO_*/ struct iovec { caddr_t iov_base; @@ -30,4 +35,22 @@ enum uio_rw { UIO_READ, UIO_WRITE }; #define UIO_USERSPACE 0 /* from user data space */ #define UIO_SYSSPACE 1 /* from system space */ #define UIO_USERISPACE 2 /* from user I space */ +/*#endif*/ + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/readv.c */ +int readv __P((int d, struct iovec *v, int l)); + +/* sys/writev.c */ +int writev __P((int f, struct iovec *v, int l)); +#endif + #endif diff --git a/sys/h/un.h b/sys/h/un.h index 9b7b6ee..7d1dce3 100644 --- a/sys/h/un.h +++ b/sys/h/un.h @@ -1,3 +1,6 @@ +#ifndef _SYS_UN_H_ +#define _SYS_UN_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -15,5 +18,7 @@ struct sockaddr_un { }; #ifdef KERNEL -int unp_discard(); +/*int unp_discard();*/ +#endif + #endif diff --git a/sys/h/unpcb.h b/sys/h/unpcb.h index 504b48d..39954a3 100644 --- a/sys/h/unpcb.h +++ b/sys/h/unpcb.h @@ -1,3 +1,8 @@ +#ifndef _SYS_UNPCB_H_ +#define _SYS_UNPCB_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -44,3 +49,5 @@ struct unpcb { }; #define sotounpcb(so) ((struct unpcb *)((so)->so_pcb)) + +#endif diff --git a/sys/h/user.h b/sys/h/user.h index e7cc971..66ec4af 100644 --- a/sys/h/user.h +++ b/sys/h/user.h @@ -1,3 +1,15 @@ +#ifndef _SYS_USER_H_ +#define _SYS_USER_H_ + +#include +#include +/*#include sys/namei.h*/ +#include +#include +/*#include sys/resource.h*/ +/*#include sys/dmap.h*/ +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -14,10 +26,10 @@ #include "namei.h" #else #include -#include -#include -#include -#include +/*#include */ +/*#include */ +/*#include */ +/*#include */ #endif /* @@ -145,3 +157,5 @@ extern struct user xswap2utl; extern struct user pushutl; extern struct user vfutl; #endif + +#endif diff --git a/sys/h/vadvise.h b/sys/h/vadvise.h index 81650cf..ea748b0 100644 --- a/sys/h/vadvise.h +++ b/sys/h/vadvise.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VADVISE_H_ +#define _SYS_VADVISE_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -20,3 +23,5 @@ #define VA_ANOM 1 #define VA_SEQL 2 #define VA_FLUSH 3 + +#endif diff --git a/sys/h/vcmd.h b/sys/h/vcmd.h index 58d0255..7e8391b 100644 --- a/sys/h/vcmd.h +++ b/sys/h/vcmd.h @@ -1,3 +1,8 @@ +#ifndef _SYS_VCMD_H_ +#define _SYS_VCMD_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,7 +15,7 @@ #ifdef KERNEL #include "ioctl.h" #else -#include +/*#include */ #endif #endif @@ -20,3 +25,5 @@ #define VGETSTATE _IOR(v, 0, int) #define VSETSTATE _IOW(v, 1, int) + +#endif diff --git a/sys/h/vlimit.h b/sys/h/vlimit.h index 25b829a..eb25a7b 100644 --- a/sys/h/vlimit.h +++ b/sys/h/vlimit.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VLIMIT_H_ +#define _SYS_VLIMIT_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -20,3 +23,18 @@ #define NLIMITS 6 #define INFINITY 0x7fffffff + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/vlimit.c */ +int vlimit __P((int limit, int value)); +#endif + +#endif diff --git a/sys/h/vm.h b/sys/h/vm.h index 441e4d1..76c7d8d 100644 --- a/sys/h/vm.h +++ b/sys/h/vm.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VM_H_ +#define _SYS_VM_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -22,3 +25,5 @@ #include #include #endif + +#endif diff --git a/sys/h/vmmac.h b/sys/h/vmmac.h index 6581ea6..01c5cf4 100644 --- a/sys/h/vmmac.h +++ b/sys/h/vmmac.h @@ -1,3 +1,15 @@ +#ifndef _SYS_VMMAC_H_ +#define _SYS_VMMAC_H_ + +/*#include vax/vmparam.h*/ +#include +/*#include sys/param.h*/ +/*#include sys/param.h*/ +/*#include vax/pcb.h*/ +#include +/*#include sys/param.h*/ +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -62,7 +74,7 @@ (((v) < (p)->p_tsize + (p)->p_dsize) ? ((p)->p_p0br + (v)) : \ ((p)->p_addr - (BTOPUSRSTACK - (v)))) #ifdef notdef -struct pte *vtopte(); +/*struct pte *vtopte();*/ #endif /* Bytes to pages without rounding, and back */ @@ -164,3 +176,5 @@ struct pte *vtopte(); /* moved this from sys/vmmac.h to avoid a circular dependency */ #define mapin(pte, v, pfnum, count, prot) \ (*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v))) + +#endif diff --git a/sys/h/vmmeter.h b/sys/h/vmmeter.h index 9a04350..29d80fe 100644 --- a/sys/h/vmmeter.h +++ b/sys/h/vmmeter.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VMMETER_H_ +#define _SYS_VMMETER_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,8 +12,7 @@ /* * Virtual memory related instrumentation */ -struct vmmeter -{ +struct vmmeter { #define v_first v_swtch unsigned v_swtch; /* context switches */ unsigned v_trap; /* calls to trap */ @@ -50,8 +52,7 @@ struct vmmeter cnt, rate, sum; #endif /* systemwide totals computed every five seconds */ -struct vmtotal -{ +struct vmtotal { short t_rq; /* length of the run queue */ short t_dw; /* jobs in ``disk wait'' (neg priority) */ short t_pw; /* jobs in page wait */ @@ -108,3 +109,5 @@ int rres; unsigned rectime; /* accumulator for reclaim times */ unsigned pgintime; /* accumulator for page in times */ #endif + +#endif diff --git a/sys/h/vmparam.h b/sys/h/vmparam.h index deecc6a..ed851b2 100644 --- a/sys/h/vmparam.h +++ b/sys/h/vmparam.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VMPARAM_H_ +#define _SYS_VMPARAM_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -22,3 +25,5 @@ int klin; int kltxt; int klout; #endif + +#endif diff --git a/sys/h/vmsystm.h b/sys/h/vmsystm.h index 972a585..2e1b69c 100644 --- a/sys/h/vmsystm.h +++ b/sys/h/vmsystm.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VMSYSTM_H_ +#define _SYS_VMSYSTM_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -33,8 +36,7 @@ int fastscan; /* fastest scan rate, clusters/second */ /* * Fork/vfork accounting. */ -struct forkstat -{ +struct forkstat { int cntfork; int cntvfork; int sizfork; @@ -47,8 +49,7 @@ struct forkstat forkstat; /* * Swap kind accounting. */ -struct swptstat -{ +struct swptstat { int pteasy; /* easy pt swaps */ int ptexpand; /* pt expansion swaps */ int ptshrink; /* pt shrinking swaps */ @@ -57,3 +58,5 @@ struct swptstat #ifdef KERNEL struct swptstat swptstat; #endif + +#endif diff --git a/sys/h/vsio.h b/sys/h/vsio.h index 7a6fd1d..0c0d677 100644 --- a/sys/h/vsio.h +++ b/sys/h/vsio.h @@ -1,3 +1,9 @@ +#ifndef _SYS_VSIO_H_ +#define _SYS_VSIO_H_ + +#include +/*#include sys/ioctl.h*/ + /* @(#)vsio.h 7.1 (MIT) 6/4/86 */ /**************************************************************************** * * @@ -47,7 +53,6 @@ #define VSIOUSERWAIT _IO(V, 15) /* wait for user I/O completion */ #define VSIOWAITGO _IOW(V, 16, caddr_t) /* wait then go */ - #define VSIO_OFF 0 /* option off */ #define VSIO_ON 1 /* option on */ @@ -117,3 +122,5 @@ typedef struct _vsIoAddr { vsBox mbox; /* atomic read/write */ } vsIoAddr; typedef vsIoAddr *vsIoAddrAddr; + +#endif diff --git a/sys/h/vtimes.h b/sys/h/vtimes.h index f970bd3..112a670 100644 --- a/sys/h/vtimes.h +++ b/sys/h/vtimes.h @@ -1,3 +1,6 @@ +#ifndef _SYS_VTIMES_H_ +#define _SYS_VTIMES_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -28,3 +31,18 @@ struct vtimes { #ifdef KERNEL #endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* compat-4.1/vtimes.c */ +int vtimes __P((register struct vtimes *par, register struct vtimes *chi)); +#endif + +#endif diff --git a/sys/h/wait.h b/sys/h/wait.h index ff44983..748182f 100644 --- a/sys/h/wait.h +++ b/sys/h/wait.h @@ -1,3 +1,8 @@ +#ifndef _SYS_WAIT_H_ +#define _SYS_WAIT_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -46,7 +51,6 @@ union wait { #define w_stopval w_S.w_Stopval #define w_stopsig w_S.w_Stopsig - #define WSTOPPED 0177 /* value of s.stopval if process is stopped */ /* @@ -64,3 +68,21 @@ union wait { #define WIFSTOPPED(x) ((x).w_stopval == WSTOPPED) #define WIFSIGNALED(x) ((x).w_stopval != WSTOPPED && (x).w_termsig != 0) #define WIFEXITED(x) ((x).w_stopval != WSTOPPED && (x).w_termsig == 0) + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* sys/wait3.c */ +int wait3 __P((int *s, int o, struct rusage *r)); + +/* sys/wait.c */ +int wait __P((int *s)); +#endif + +#endif diff --git a/sys/net/af.h b/sys/net/af.h index 676507b..7a00375 100644 --- a/sys/net/af.h +++ b/sys/net/af.h @@ -1,3 +1,8 @@ +#ifndef _NET_AF_H_ +#define _NET_AF_H_ + +#include + /* * Copyright (c) 1980, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -33,3 +38,5 @@ struct afhash { #ifdef KERNEL struct afswitch afswitch[]; #endif + +#endif diff --git a/sys/net/if.h b/sys/net/if.h index 5a0cc23..308c9af 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,3 +1,10 @@ +#ifndef _NET_IF_H_ +#define _NET_IF_H_ + +#include +/*#include net/if_arp.h*/ +/*#include net/if_arp.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -207,8 +214,10 @@ struct ifconf { #include "../net/if_arp.h" struct ifqueue rawintrq; /* raw packet input queue */ struct ifnet *ifnet; -struct ifaddr *ifa_ifwithaddr(), *ifa_ifwithnet(); -struct ifaddr *ifa_ifwithdstaddr(); -#else KERNEL +/*struct ifaddr *ifa_ifwithaddr(), *ifa_ifwithnet();*/ +/*struct ifaddr *ifa_ifwithdstaddr();*/ +#else #include -#endif KERNEL +#endif + +#endif diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 4701f41..efa09b9 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -1,3 +1,9 @@ +#ifndef _NET_IF_ARP_H_ +#define _NET_IF_ARP_H_ + +#include +/*#include sys/socket.h*/ + /* * Copyright (c) 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -49,3 +55,5 @@ struct arpreq { #define ATF_PERM 0x04 /* permanent entry */ #define ATF_PUBL 0x08 /* publish entry (respond for other host) */ #define ATF_USETRAILERS 0x10 /* has requested trailers */ + +#endif diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 6691e5f..77d190d 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -1,3 +1,8 @@ +#ifndef _NET_NETISR_H_ +#define _NET_NETISR_H_ + +#include + /* * Copyright (c) 1980, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -36,3 +41,5 @@ int netisr; /* scheduling bits for network */ #endif #endif + +#endif diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index 3b8912a..ec7a9c7 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -1,3 +1,10 @@ +#ifndef _NET_RAW_CB_H_ +#define _NET_RAW_CB_H_ + +#include +/*#include net/route.h*/ +/*#include net/route.h*/ + /* * Copyright (c) 1980, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -53,3 +60,5 @@ struct raw_header { #ifdef KERNEL struct rawcb rawcb; /* head of list */ #endif + +#endif diff --git a/sys/net/route.h b/sys/net/route.h index 0fc82da..27c7597 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,3 +1,9 @@ +#ifndef _NET_ROUTE_H_ +#define _NET_ROUTE_H_ + +#include +/*#include sys/socket.h*/ + /* * Copyright (c) 1980, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -78,3 +84,5 @@ struct mbuf *rthost[RTHASHSIZ]; struct mbuf *rtnet[RTHASHSIZ]; struct rtstat rtstat; #endif + +#endif diff --git a/sys/netimp/if_imp.h b/sys/netimp/if_imp.h index 32535ac..90464fb 100644 --- a/sys/netimp/if_imp.h +++ b/sys/netimp/if_imp.h @@ -1,3 +1,9 @@ +#ifndef _NETIMP_IF_IMP_H_ +#define _NETIMP_IF_IMP_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -158,3 +164,5 @@ char *impleaders[IMPTYPE_READY+1] = { "NOTIFY", "TRYING", "READY" }; #endif + +#endif diff --git a/sys/netimp/if_imphost.h b/sys/netimp/if_imphost.h index 3b7bf4b..3104760 100644 --- a/sys/netimp/if_imphost.h +++ b/sys/netimp/if_imphost.h @@ -1,3 +1,12 @@ +#ifndef _NETIMP_IF_IMPHOST_H_ +#define _NETIMP_IF_IMPHOST_H_ + +#include +#include +#include +#include +/*#include netimp/if_imp.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -85,7 +94,9 @@ struct hmbuf { }; #ifdef KERNEL -struct host *hostlookup(); -struct host *hostenter(); -struct mbuf *hostdeque(); +/*struct host *hostlookup();*/ +/*struct host *hostenter();*/ +/*struct mbuf *hostdeque();*/ +#endif + #endif diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index 482615a..2c50dc5 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -1,3 +1,8 @@ +#ifndef _NETINET_ICMP_VAR_H_ +#define _NETINET_ICMP_VAR_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -28,3 +33,5 @@ struct icmpstat { #ifdef KERNEL struct icmpstat icmpstat; #endif + +#endif diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 20167e8..401b72c 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -1,3 +1,11 @@ +#ifndef _NETINET_IF_ETHER_H_ +#define _NETINET_IF_ETHER_H_ + +#include +/*#include net/if.h*/ +#include +/*#include net/if.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -50,7 +58,6 @@ struct ether_arp { #define arp_pln ea_hdr.ar_pln #define arp_op ea_hdr.ar_op - /* * Structure shared between the ethernet driver modules and * the address resolution code. For example, each ec_softc or il_softc @@ -75,6 +82,8 @@ struct arptab { #ifdef KERNEL u_char etherbroadcastaddr[6]; -struct arptab *arptnew(); -char *ether_sprintf(); +/*struct arptab *arptnew();*/ +/*char *ether_sprintf();*/ +#endif + #endif diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 1921022..440c42e 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_IN_H_ +#define _NETINET_IN_H_ + +#include +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -26,7 +33,6 @@ #define IPPROTO_RAW 255 /* raw IP packet */ #define IPPROTO_MAX 256 - /* * Ports < IPPORT_RESERVED are reserved for * privileged processes (e.g. root). @@ -93,12 +99,14 @@ struct sockaddr_in { /* * Functions for number representation conversion. */ -u_short ntohs(), htons(); -u_long ntohl(), htonl(); +/*u_short ntohs(), htons();*/ +/*u_long ntohl(), htonl();*/ #ifdef KERNEL extern struct domain inetdomain; extern struct protosw inetsw[]; -struct in_addr in_makeaddr(); -u_long in_netof(), in_lnaof(); +/*struct in_addr in_makeaddr();*/ +/*u_long in_netof(), in_lnaof();*/ +#endif + #endif diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index bba0e0f..534a66d 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_IN_PCB_H_ +#define _NETINET_IN_PCB_H_ + +#include +#include +/*#include net/route.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -34,5 +41,7 @@ struct inpcb { #define sotoinpcb(so) ((struct inpcb *)(so)->so_pcb) #ifdef KERNEL -struct inpcb *in_pcblookup(); +/*struct inpcb *in_pcblookup();*/ +#endif + #endif diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index 1825d88..60d7a12 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -1,3 +1,8 @@ +#ifndef _NETINET_IN_SYSTM_H_ +#define _NETINET_IN_SYSTM_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -25,5 +30,7 @@ typedef u_long n_long; /* long as received from the net */ typedef u_long n_time; /* ms since 00:00 GMT, byte rev */ #ifdef KERNEL -n_time iptime(); +/*n_time iptime();*/ +#endif + #endif diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 9225938..1f9e12d 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_IN_VAR_H_ +#define _NETINET_IN_VAR_H_ + +#include +#include +/*#include net/if.h*/ + /* * Copyright (c) 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -38,6 +45,8 @@ struct in_ifaddr { #ifdef KERNEL struct in_ifaddr *in_ifaddr; -struct in_ifaddr *in_iaonnetof(); +/*struct in_ifaddr *in_iaonnetof();*/ struct ifqueue ipintrq; /* ip packet input queue */ #endif + +#endif diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h index 809778c..fbf53d8 100644 --- a/sys/netinet/ip.h +++ b/sys/netinet/ip.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_IP_H_ +#define _NETINET_IP_H_ + +#include +#include +/*#include netinet/in.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -106,3 +113,5 @@ struct ip_timestamp { #define IPTTLDEC 1 /* subtracted when forwarding */ #define IP_MSS 576 /* default maximum segment size */ + +#endif diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index a342e31..40f8a6b 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -1,3 +1,11 @@ +#ifndef _NETINET_IP_ICMP_H_ +#define _NETINET_IP_ICMP_H_ + +/*#include netinet/ip.h*/ +/*#include netinet/ip.h*/ +#include +/*#include netinet/in.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -98,3 +106,5 @@ struct icmp { #define ICMP_MASKREPLY 18 /* address mask reply */ #define ICMP_MAXTYPE 18 + +#endif diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index d28c3f8..c5b1892 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_IP_VAR_H_ +#define _NETINET_IP_VAR_H_ + +#include +#include +/*#include netinet/in.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -93,5 +100,7 @@ struct ipstat ipstat; struct ipq ipq; /* ip reass. queue */ u_short ip_id; /* ip packet ctr, for ids */ -struct mbuf *ip_srcroute(); +/*struct mbuf *ip_srcroute();*/ +#endif + #endif diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 8409c43..f6fbd89 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -1,3 +1,11 @@ +#ifndef _NETINET_TCP_H_ +#define _NETINET_TCP_H_ + +#include +#include +#include +/*#include netinet/ip.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -54,3 +62,5 @@ struct tcphdr { */ #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ #define TCP_MAXSEG 0x02 /* set maximum segment size */ + +#endif diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index 3dd6279..51c236a 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -1,3 +1,11 @@ +#ifndef _NETINET_TCP_DEBUG_H_ +#define _NETINET_TCP_DEBUG_H_ + +/*#include netinet/tcp_var.h*/ +#include +#include +/*#include netinet/in_systm.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -30,3 +38,5 @@ char *tanames[] = #define TCP_NDEBUG 100 struct tcp_debug tcp_debug[TCP_NDEBUG]; int tcp_debx; + +#endif diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index 3ef9026..0b60692 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_TCP_FSM_H_ +#define _NETINET_TCP_FSM_H_ + +#include +/*#include netinet/tcp.h*/ +/*#include netinet/tcp.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -56,3 +63,5 @@ char *tcpstates[] = { "LAST_ACK", "FIN_WAIT_2", "TIME_WAIT", }; #endif + +#endif diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h index 14c2865..deddd92 100644 --- a/sys/netinet/tcp_seq.h +++ b/sys/netinet/tcp_seq.h @@ -1,3 +1,8 @@ +#ifndef _NETINET_TCP_SEQ_H_ +#define _NETINET_TCP_SEQ_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -33,3 +38,5 @@ #ifdef KERNEL tcp_seq tcp_iss; /* tcp initial send seq # */ #endif + +#endif diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index d6071fd..8aef842 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -1,3 +1,8 @@ +#ifndef _NETINET_TCP_TIMER_H_ +#define _NETINET_TCP_TIMER_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -108,3 +113,5 @@ float tcp_alpha, tcp_beta; if ((tv) > (tvmax)) \ (tv) = (tvmax); \ } + +#endif diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index f1745ea..096d8dd 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,3 +1,11 @@ +#ifndef _NETINET_TCP_VAR_H_ +#define _NETINET_TCP_VAR_H_ + +#include +#include +#include +/*#include netinet/in_pcb.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -86,7 +94,9 @@ struct tcpstat { #ifdef KERNEL struct inpcb tcb; /* head of queue of active tcpcb's */ struct tcpstat tcpstat; /* tcp statistics */ -struct tcpiphdr *tcp_template(); -struct tcpcb *tcp_close(), *tcp_drop(); -struct tcpcb *tcp_timers(), *tcp_disconnect(), *tcp_usrclosed(); +/*struct tcpiphdr *tcp_template();*/ +/*struct tcpcb *tcp_close(), *tcp_drop();*/ +/*struct tcpcb *tcp_timers(), *tcp_disconnect(), *tcp_usrclosed();*/ +#endif + #endif diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h index 8356c39..354ae4e 100644 --- a/sys/netinet/tcpip.h +++ b/sys/netinet/tcpip.h @@ -1,3 +1,9 @@ +#ifndef _NETINET_TCPIP_H_ +#define _NETINET_TCPIP_H_ + +/*#include netinet/tcp.h*/ +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -30,3 +36,5 @@ struct tcpiphdr { #define ti_win ti_t.th_win #define ti_sum ti_t.th_sum #define ti_urp ti_t.th_urp + +#endif diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h index 6a7f020..6c25e77 100644 --- a/sys/netinet/udp.h +++ b/sys/netinet/udp.h @@ -1,3 +1,8 @@ +#ifndef _NETINET_UDP_H_ +#define _NETINET_UDP_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -16,3 +21,5 @@ struct udphdr { short uh_ulen; /* udp length */ u_short uh_sum; /* udp checksum */ }; + +#endif diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index cfca943..b6022fe 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -1,3 +1,10 @@ +#ifndef _NETINET_UDP_VAR_H_ +#define _NETINET_UDP_VAR_H_ + +#include +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -37,3 +44,5 @@ struct udpstat { struct inpcb udb; struct udpstat udpstat; #endif + +#endif diff --git a/sys/netns/idp.h b/sys/netns/idp.h index ba6eef8..90bca6b 100644 --- a/sys/netns/idp.h +++ b/sys/netns/idp.h @@ -1,3 +1,9 @@ +#ifndef _NETNS_IDP_H_ +#define _NETNS_IDP_H_ + +#include +/*#include netns/ns.h*/ + /* * Copyright (c) 1984, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -17,3 +23,5 @@ struct idp { struct ns_addr idp_dna; /* Destination Network Address */ struct ns_addr idp_sna; /* Source Network Address */ }; + +#endif diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h index 0c86598..8171a15 100644 --- a/sys/netns/idp_var.h +++ b/sys/netns/idp_var.h @@ -1,3 +1,6 @@ +#ifndef _NETNS_IDP_VAR_H_ +#define _NETNS_IDP_VAR_H_ + /* * Copyright (c) 1984, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -20,3 +23,5 @@ struct idpstat { #ifdef KERNEL struct idpstat idpstat; #endif + +#endif diff --git a/sys/netns/ns.h b/sys/netns/ns.h index 5fdf1e7..fa23b58 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -1,3 +1,10 @@ +#ifndef _NETNS_NS_H_ +#define _NETNS_NS_H_ + +#include +#include +/*#include sys/socket.h*/ + /* * Copyright (c) 1984, 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -22,7 +29,6 @@ #define NSPROTO_RAW 255 /* Placemarker*/ #define NSPROTO_MAX 256 /* Placemarker*/ - /* * Port/Socket numbers: network standard functions */ @@ -55,7 +61,6 @@ #define SO_ALL_PACKETS 7 #define SO_MTU 8 - /* * NS addressing */ @@ -106,8 +111,8 @@ struct sockaddr_ns { /* * Functions for number representation conversion. */ -u_short ntohs(), htons(); -u_long ntohl(), htonl(); +/*u_short ntohs(), htons();*/ +/*u_long ntohl(), htonl();*/ #ifdef KERNEL extern struct domain nsdomain; @@ -116,5 +121,23 @@ union ns_host ns_zerohost; union ns_host ns_broadhost; union ns_net ns_zeronet; union ns_net ns_broadnet; -u_short ns_cksum(); +/*u_short ns_cksum();*/ +#endif + +#ifndef KERNEL +#ifndef __P +#ifdef __STDC__ +#define __P(args) args +#else +#define __P(args) () +#endif +#endif + +/* ns/ns_addr.c */ +struct ns_addr ns_addr __P((char *name)); + +/* ns/ns_ntoa.c */ +char *ns_ntoa __P((struct ns_addr addr)); +#endif + #endif diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h index c98119f..da01dc3 100644 --- a/sys/netns/ns_error.h +++ b/sys/netns/ns_error.h @@ -1,3 +1,9 @@ +#ifndef _NETNS_NS_ERROR_H_ +#define _NETNS_NS_ERROR_H_ + +#include +/*#include netns/idp.h*/ + /* * Copyright (c) 1984, 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -62,3 +68,5 @@ struct ns_errstat { #ifdef KERNEL struct ns_errstat ns_errstat; #endif + +#endif diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index a349ab4..1f87ca7 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -1,3 +1,10 @@ +#ifndef _NETNS_NS_IF_H_ +#define _NETNS_NS_IF_H_ + +#include +#include +/*#include net/if.h*/ + /* * Copyright (c) 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -48,6 +55,8 @@ struct nsip_req { #ifdef KERNEL struct ns_ifaddr *ns_ifaddr; -struct ns_ifaddr *ns_iaonnetof(); +/*struct ns_ifaddr *ns_iaonnetof();*/ struct ifqueue nsintrq; /* XNS input packet queue */ #endif + +#endif diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h index 06a8487..9ffe9a5 100644 --- a/sys/netns/ns_pcb.h +++ b/sys/netns/ns_pcb.h @@ -1,3 +1,10 @@ +#ifndef _NETNS_NS_PCB_H_ +#define _NETNS_NS_PCB_H_ + +#include +#include +/*#include net/route.h*/ + /* * Copyright (c) 1984, 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -46,8 +53,9 @@ struct nspcb { #define NSSNDQ 2048 #define NSRCVQ 2048 - #ifdef KERNEL struct nspcb nspcb; /* head of list */ -struct nspcb *ns_pcblookup(); +/*struct nspcb *ns_pcblookup();*/ +#endif + #endif diff --git a/sys/netns/sp.h b/sys/netns/sp.h index bf13709..53ee606 100644 --- a/sys/netns/sp.h +++ b/sys/netns/sp.h @@ -1,3 +1,8 @@ +#ifndef _NETNS_SP_H_ +#define _NETNS_SP_H_ + +#include + /* * Copyright (c) 1984, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -23,3 +28,5 @@ struct sphdr { u_short sp_ack; /* acknowledge number */ u_short sp_alo; /* allocation number */ }; + +#endif diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h index 10715ad..6d960e1 100644 --- a/sys/netns/spidp.h +++ b/sys/netns/spidp.h @@ -1,3 +1,9 @@ +#ifndef _NETNS_SPIDP_H_ +#define _NETNS_SPIDP_H_ + +#include +#include + /* * Copyright (c) 1984, 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -33,3 +39,5 @@ struct spidp_q { #define si_seq si_s.sp_seq #define si_ack si_s.sp_ack #define si_alo si_s.sp_alo + +#endif diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h index 1f06c96..1448afa 100644 --- a/sys/netns/spp_debug.h +++ b/sys/netns/spp_debug.h @@ -1,3 +1,10 @@ +#ifndef _NETNS_SPP_DEBUG_H_ +#define _NETNS_SPP_DEBUG_H_ + +/*#include netns/spp_var.h*/ +#include +/*#include netns/spidp.h*/ + /* * Copyright (c) 1984, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -30,3 +37,5 @@ char *sanames[] = #define SPP_NDEBUG 100 struct spp_debug spp_debug[SPP_NDEBUG]; int spp_debx; + +#endif diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h index de0bb31..30d1460 100644 --- a/sys/netns/spp_var.h +++ b/sys/netns/spp_var.h @@ -1,3 +1,12 @@ +#ifndef _NETNS_SPP_VAR_H_ +#define _NETNS_SPP_VAR_H_ + +#include +#include +/*#include netns/spidp.h*/ +#include +/*#include netns/ns_pcb.h*/ + /* * Copyright (c) 1984, 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -90,3 +99,5 @@ extern struct sppcb *spp_close(), *spp_disconnect(), #define SSEQ_LEQ(a,b) (((short)((a)-(b))) <= 0) #define SSEQ_GT(a,b) (((short)((a)-(b))) > 0) #define SSEQ_GEQ(a,b) (((short)((a)-(b))) >= 0) + +#endif diff --git a/sys/vax/clock.h b/sys/vax/clock.h index 67a3f95..e70f12f 100644 --- a/sys/vax/clock.h +++ b/sys/vax/clock.h @@ -1,3 +1,8 @@ +#ifndef _VAX_CLOCK_H_ +#define _VAX_CLOCK_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -37,3 +42,5 @@ * Software clock is software interrupt level 8, * implemented as mtpr(SIRR, 0x8) in asm.sed. */ + +#endif diff --git a/sys/vax/cons.h b/sys/vax/cons.h index f947eb4..f674f43 100644 --- a/sys/vax/cons.h +++ b/sys/vax/cons.h @@ -1,3 +1,6 @@ +#ifndef _VAX_CONS_H_ +#define _VAX_CONS_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -37,3 +40,5 @@ #define TXDB_BOOT 0x02 /* reboot */ #define TXDB_CWSI 0x03 /* clear warm start inhibit */ #define TXDB_CCSI 0x04 /* clear cold-start inhibit */ + +#endif diff --git a/sys/vax/cpu.h b/sys/vax/cpu.h index 3acf3fc..5567254 100644 --- a/sys/vax/cpu.h +++ b/sys/vax/cpu.h @@ -1,3 +1,8 @@ +#ifndef _VAX_CPU_H_ +#define _VAX_CPU_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -109,3 +114,5 @@ int cpu; struct percpu percpu[]; #endif #endif + +#endif diff --git a/sys/vax/crl.h b/sys/vax/crl.h index 8759364..53ff4a7 100644 --- a/sys/vax/crl.h +++ b/sys/vax/crl.h @@ -1,3 +1,6 @@ +#ifndef _VAX_CRL_H_ +#define _VAX_CRL_H_ + /* * @(#)crl.h 7.1 (Berkeley) 6/5/86 */ @@ -69,7 +72,6 @@ #define CRL_OPEN 1 #define CRL_BUSY 2 - #define CRLDS_BITS \ "\20\20WDE\17CHE\16WL\15SKTO\14SPE\13WGE\12VC\11DSE\ \10DT\7HS\6CO\5HO\4BH\3STC\2STB\1STA" @@ -77,3 +79,5 @@ #define CRLCS_BITS \ "\20\20CE\17DE\16NXM\15DLT\14DCRC\13OPI\1DRDY" #endif + +#endif diff --git a/sys/vax/dkio.h b/sys/vax/dkio.h index acd4a58..23fb2ed 100644 --- a/sys/vax/dkio.h +++ b/sys/vax/dkio.h @@ -1,3 +1,8 @@ +#ifndef _VAX_DKIO_H_ +#define _VAX_DKIO_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -16,3 +21,5 @@ /* disk io control commands */ #define DKIOCHDR _IO(d, 1) /* next I/O will read/write header */ + +#endif diff --git a/sys/vax/flp.h b/sys/vax/flp.h index faceb76..ba14da6 100644 --- a/sys/vax/flp.h +++ b/sys/vax/flp.h @@ -1,3 +1,6 @@ +#ifndef _VAX_FLP_H_ +#define _VAX_FLP_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -49,3 +52,5 @@ #define FL_OPEN 1 #define FL_BUSY 2 #endif + +#endif diff --git a/sys/vax/frame.h b/sys/vax/frame.h index 347e6a9..750c2b3 100644 --- a/sys/vax/frame.h +++ b/sys/vax/frame.h @@ -1,3 +1,8 @@ +#ifndef _VAX_FRAME_H_ +#define _VAX_FRAME_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -20,3 +25,5 @@ struct frame { int fr_savfp; /* saved frame pointer */ int fr_savpc; /* saved program counter */ }; + +#endif diff --git a/sys/vax/ioa.h b/sys/vax/ioa.h index e2e7ff2..6e41553 100644 --- a/sys/vax/ioa.h +++ b/sys/vax/ioa.h @@ -1,3 +1,8 @@ +#ifndef _VAX_IOA_H_ +#define _VAX_IOA_H_ + +#include + /* * @(#)ioa.h 7.1 (Berkeley) 6/5/86 */ @@ -33,8 +38,7 @@ #define IOA8600(i) ((caddr_t)(0x20080000+IOASIZE*i)) #ifndef LOCORE -struct sbia_regs -{ +struct sbia_regs { int sbi_cfg; int sbi_csr; int sbi_errsum; @@ -81,8 +85,10 @@ struct ioa { }; #ifdef KERNEL struct ioa ioa[MAXNIOA]; -#endif KERNEL -#endif LOCORE +#endif +#endif #define IOA_TYPMSK 0xf0 #define IOA_SBIA 0x10 + +#endif diff --git a/sys/vax/ka630.h b/sys/vax/ka630.h index 8d1a331..871ee32 100644 --- a/sys/vax/ka630.h +++ b/sys/vax/ka630.h @@ -1,3 +1,8 @@ +#ifndef _VAX_KA630_H_ +#define _VAX_KA630_H_ + +#include + /* * @(#)ka630.h 7.1 (Berkeley) 6/5/86 * @@ -76,3 +81,5 @@ struct ka630cpu { }; #endif #endif + +#endif diff --git a/sys/vax/machparam.h b/sys/vax/machparam.h index 04cec5d..2e6dac2 100644 --- a/sys/vax/machparam.h +++ b/sys/vax/machparam.h @@ -1,3 +1,8 @@ +#ifndef _VAX_MACHPARAM_H_ +#define _VAX_MACHPARAM_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -51,6 +56,8 @@ int cpuspeed; #endif #define DELAY(n) { register int N = cpuspeed * (n); while (--N > 0); } -#else KERNEL +#else #define DELAY(n) { register int N = (n); while (--N > 0); } -#endif KERNEL +#endif + +#endif diff --git a/sys/vax/mem.h b/sys/vax/mem.h index e89add7..c8e3ad7 100644 --- a/sys/vax/mem.h +++ b/sys/vax/mem.h @@ -1,3 +1,8 @@ +#ifndef _VAX_MEM_H_ +#define _VAX_MEM_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -83,7 +88,7 @@ struct mcr { \5WR_DT_PE_B0\4CHE_RD_DT_PE\3CHE_SEL\2ANY_REFL\1CP_BW_CHE_DT_PE" #define M8600_MSTAT2_BITS "\20\20CP_BYT_WR\17ABUS_BD_DT_CODE\10MULT_ERR\ \7CHE_TAG_PE\6CHE_TAG_W_PE\5CHE_WRTN_BIT\4NXM\3CP-IO_BUF_ERR\2MBOX_LOCK" -#endif VAX8600 +#endif #if VAX780 #define M780_ICRD 0x40000000 /* inhibit crd interrupts, in [2] */ @@ -168,3 +173,5 @@ int nmcr; struct mcr *mcraddr[MAXNMCR]; int mcrtype[MAXNMCR]; #endif + +#endif diff --git a/sys/vax/mscp.h b/sys/vax/mscp.h index e821159..9bd3546 100644 --- a/sys/vax/mscp.h +++ b/sys/vax/mscp.h @@ -1,3 +1,8 @@ +#ifndef _VAX_MSCP_H_ +#define _VAX_MSCP_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,7 +15,6 @@ * Definitions for the Mass Storage Control Protocol */ - /* * Control message opcodes */ @@ -36,7 +40,6 @@ #define M_OP_ACPTH 0102 /* Access path attention message */ #define M_OP_END 0200 /* End message flag */ - /* * Generic command modifiers */ @@ -89,7 +92,6 @@ */ #define M_MD_PRIMR 0000001 /* Primary replacement block */ - /* * End message flags */ @@ -98,7 +100,6 @@ #define M_EF_ERLOG 0040 /* Error log generated */ #define M_EF_SEREX 0020 /* Serious exception */ - /* * Controller flags */ @@ -110,7 +111,6 @@ #define M_CF_SHADW 0002 /* Shadowing */ #define M_CF_576 0001 /* 576 byte sectors */ - /* * Unit flags */ @@ -126,7 +126,6 @@ #define M_UF_CMPWR 0000002 /* Compare writes */ #define M_UF_CMPRD 0000001 /* Compare reads */ - /* * Status codes */ @@ -271,7 +270,6 @@ struct mscp { #define mscp_cntcmdl mscp_usefrac #define mscp_cntid mscp_unitid - /* * Error Log message format codes */ @@ -318,3 +316,4 @@ struct mslg { #define mslg_busaddr mslg_unitid.val[0] #define mslg_sdecyl mslg_group +#endif diff --git a/sys/vax/mtpr.h b/sys/vax/mtpr.h index eeb0ca1..669380c 100644 --- a/sys/vax/mtpr.h +++ b/sys/vax/mtpr.h @@ -1,3 +1,6 @@ +#ifndef _VAX_MTPR_H_ +#define _VAX_MTPR_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -91,3 +94,5 @@ #define IUR 0x37 /* init unibus register */ #define TB 0x3b /* translation buffer */ #endif + +#endif diff --git a/sys/vax/nexus.h b/sys/vax/nexus.h index 7bb6217..e2ff63e 100644 --- a/sys/vax/nexus.h +++ b/sys/vax/nexus.h @@ -1,3 +1,8 @@ +#ifndef _VAX_NEXUS_H_ +#define _VAX_NEXUS_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -41,7 +46,7 @@ #if VAX8600 #define MAXNNEXUS (2 * NNEXSBI) -#else +#else #define MAXNNEXUS NNEXSBI #endif @@ -115,3 +120,5 @@ struct nexus nexus[MAXNNEXUS]; #define NEX_MEM256U 0x72 /* 256K chips, non-interleaved, upper */ #define NEX_MEM256UI 0x73 /* 256K chips, ext-interleaved, upper */ #define NEX_MEM256I 0x74 /* 256K chips, interleaved */ + +#endif diff --git a/sys/vax/pcb.h b/sys/vax/pcb.h index fe970aa..b280893 100644 --- a/sys/vax/pcb.h +++ b/sys/vax/pcb.h @@ -1,3 +1,8 @@ +#ifndef _VAX_PCB_H_ +#define _VAX_PCB_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,8 +15,7 @@ * VAX process control block */ -struct pcb -{ +struct pcb { int pcb_ksp; /* kernel stack pointer */ int pcb_esp; /* exec stack pointer */ int pcb_ssp; /* supervisor stack pointer */ @@ -65,3 +69,5 @@ struct pcb { \ mtpr(ASTLVL, ASTLVL_NONE); \ } + +#endif diff --git a/sys/vax/psl.h b/sys/vax/psl.h index 40917ee..5f19c21 100644 --- a/sys/vax/psl.h +++ b/sys/vax/psl.h @@ -1,3 +1,6 @@ +#ifndef _VAX_PSL_H_ +#define _VAX_PSL_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -31,3 +34,5 @@ #define PSL_USERSET (PSL_PRVMOD|PSL_CURMOD) #define PSL_USERCLR (PSL_IS|PSL_IPL|PSL_MBZ) + +#endif diff --git a/sys/vax/pte.h b/sys/vax/pte.h index 86d0987..0c29781 100644 --- a/sys/vax/pte.h +++ b/sys/vax/pte.h @@ -1,3 +1,6 @@ +#ifndef _VAX_PTE_H_ +#define _VAX_PTE_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -17,8 +20,7 @@ */ #ifndef LOCORE -struct pte -{ +struct pte { unsigned int pg_pfnum:21, /* core page frame number or 0 */ :2, pg_vreadm:1, /* modified since vread (or with _m) */ @@ -28,14 +30,12 @@ unsigned int pg_pfnum:21, /* core page frame number or 0 */ pg_prot:4, /* access control */ pg_v:1; /* valid bit */ }; -struct hpte -{ +struct hpte { unsigned int pg_pfnum:21, :2, pg_high:9; /* special for clustering */ }; -struct fpte -{ +struct fpte { unsigned int pg_blkno:24, /* file system block number */ pg_fileno:1, /* file mapped from or TEXT or ZERO */ pg_fod:1, /* is fill on demand (=1) */ @@ -93,3 +93,5 @@ extern struct pte Ka630map[]; #endif #endif #endif + +#endif diff --git a/sys/vax/reg.h b/sys/vax/reg.h index 6847fd2..a6c2420 100644 --- a/sys/vax/reg.h +++ b/sys/vax/reg.h @@ -1,3 +1,6 @@ +#ifndef _VAX_REG_H_ +#define _VAX_REG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -31,3 +34,5 @@ #define SP (-5) #define PS (-1) #define PC (-2) + +#endif diff --git a/sys/vax/rpb.h b/sys/vax/rpb.h index 0ec2eb3..f5342a9 100644 --- a/sys/vax/rpb.h +++ b/sys/vax/rpb.h @@ -1,3 +1,6 @@ +#ifndef _VAX_RPB_H_ +#define _VAX_RPB_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -21,3 +24,5 @@ struct rpb { #ifdef KERNEL extern struct rpb rpb; #endif + +#endif diff --git a/sys/vax/rsp.h b/sys/vax/rsp.h index 3b5279c..c0829b9 100644 --- a/sys/vax/rsp.h +++ b/sys/vax/rsp.h @@ -1,3 +1,9 @@ +#ifndef _VAX_RSP_H_ +#define _VAX_RSP_H_ + +#include +/*#include stdio.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -83,3 +89,4 @@ struct packet { */ #define TUSW_MRSP 010 /* use Modified RSP */ +#endif diff --git a/sys/vax/scb.h b/sys/vax/scb.h index fa438c5..e497212 100644 --- a/sys/vax/scb.h +++ b/sys/vax/scb.h @@ -1,3 +1,6 @@ +#ifndef _VAX_SCB_H_ +#define _VAX_SCB_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -64,3 +67,5 @@ extern struct scb scb; #define SCB_ISTACK 1 #define SCB_WCS 2 #define SCB_HALT 3 + +#endif diff --git a/sys/vax/tmscp.h b/sys/vax/tmscp.h index 91de976..87c3f02 100644 --- a/sys/vax/tmscp.h +++ b/sys/vax/tmscp.h @@ -1,3 +1,8 @@ +#ifndef _VAX_TMSCP_H_ +#define _VAX_TMSCP_H_ + +#include + /* @(#)tmscp.h 7.1 (Berkeley) 6/5/86 */ /* @@ -320,3 +325,4 @@ struct mslg { #define mslg_busaddr mslg_unitid.val[0] #define mslg_sdecyl mslg_group +#endif diff --git a/sys/vax/trap.h b/sys/vax/trap.h index b46d1c5..23ec8f6 100644 --- a/sys/vax/trap.h +++ b/sys/vax/trap.h @@ -1,3 +1,6 @@ +#ifndef _VAX_TRAP_H_ +#define _VAX_TRAP_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -26,3 +29,5 @@ #define T_COMPATFLT 11 /* compatibility mode fault */ #define T_PAGEFLT 12 /* page fault */ #define T_TABLEFLT 13 /* page table fault */ + +#endif diff --git a/sys/vax/vmparam.h b/sys/vax/vmparam.h index a17cf61..f016450 100644 --- a/sys/vax/vmparam.h +++ b/sys/vax/vmparam.h @@ -1,3 +1,9 @@ +#ifndef _VAX_VMPARAM_H_ +#define _VAX_VMPARAM_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -159,3 +165,5 @@ /* moved this to sys/vmmac.h to avoid a circular dependency */ /*#define mapin(pte, v, pfnum, count, prot) \ (*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v)))*/ + +#endif diff --git a/sys/vaxif/if_accreg.h b/sys/vaxif/if_accreg.h index 4b501ff..5842ad8 100644 --- a/sys/vaxif/if_accreg.h +++ b/sys/vaxif/if_accreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_ACCREG_H_ +#define _VAXIF_IF_ACCREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -63,3 +68,5 @@ struct accdevice { #define ACC_OUTBITS \ "\20\20ERR\17NXM\12TMR\10RDY\7IE\4BBACK\3ENLB\2RESET\1GO" + +#endif diff --git a/sys/vaxif/if_cssreg.h b/sys/vaxif/if_cssreg.h index 1934eac..e013692 100644 --- a/sys/vaxif/if_cssreg.h +++ b/sys/vaxif/if_cssreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_CSSREG_H_ +#define _VAXIF_IF_CSSREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -56,7 +61,6 @@ struct cssdevice { #define CSS_INBITS \ "\20\20ERR\17NXM\16ATTN\15MAINT\14EOM\13IMPNR\12RLE\11CYCLE\10RDY\7IE\6XBA17\5XBA16\4WE\3HRDY\2CLR\1GO" - /* * Output Control Status Register */ @@ -65,3 +69,5 @@ struct cssdevice { #define CSS_OUTBITS \ "\20\20ERR\17NXM\16ATTN\15MAINT\11CYCLE\10RDY\7IE\6XBA17\5XBA16\4TXEC\3ENLB\2CLR\1GO" + +#endif diff --git a/sys/vaxif/if_ddnreg.h b/sys/vaxif/if_ddnreg.h index c541842..58d38fb 100644 --- a/sys/vaxif/if_ddnreg.h +++ b/sys/vaxif/if_ddnreg.h @@ -1,5 +1,9 @@ -/* @(#)if_ddnreg.h 7.1 (Berkeley) 6/5/86 */ +#ifndef _VAXIF_IF_DDNREG_H_ +#define _VAXIF_IF_DDNREG_H_ + +#include +/* @(#)if_ddnreg.h 7.1 (Berkeley) 6/5/86 */ /************************************************************************\ @@ -27,7 +31,6 @@ part of this software must include a copy of ACC's copyright notice. - File: if_ddnreg.h @@ -126,3 +129,5 @@ struct ddnregs { /* device registers */ #define DDNXODD 2 /* start with odd address */ #define DDNNUMR 4 /* non-UMR transfer */ #define DDNXABT 8 /* abort transfer */ + +#endif diff --git a/sys/vaxif/if_ddnvar.h b/sys/vaxif/if_ddnvar.h index 4e63eb8..4e950b5 100644 --- a/sys/vaxif/if_ddnvar.h +++ b/sys/vaxif/if_ddnvar.h @@ -1,6 +1,7 @@ -/* @(#)if_ddnvar.h 7.1 (Berkeley) 6/5/86 */ - +#ifndef _VAXIF_IF_DDNVAR_H_ +#define _VAXIF_IF_DDNVAR_H_ +/* @(#)if_ddnvar.h 7.1 (Berkeley) 6/5/86 */ /************************************************************************\ @@ -28,7 +29,6 @@ part of this software must include a copy of ACC's copyright notice. - File: if_ddnvar.h @@ -118,3 +118,5 @@ typedef int boolean; /* X25 protocols */ #define X25_PROTO_IP 0xcc /* X25 IP protocol type code */ + +#endif diff --git a/sys/vaxif/if_dereg.h b/sys/vaxif/if_dereg.h index 7c9dd9c..6e3a527 100644 --- a/sys/vaxif/if_dereg.h +++ b/sys/vaxif/if_dereg.h @@ -1,3 +1,9 @@ +#ifndef _VAXIF_IF_DEREG_H_ +#define _VAXIF_IF_DEREG_H_ + +#include +/*#include netinet/if_ether.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -189,3 +195,5 @@ struct de_buf { char db_data[ETHERMTU]; /* packet data */ int db_crc; /* CRC - on receive only */ }; + +#endif diff --git a/sys/vaxif/if_dmc.h b/sys/vaxif/if_dmc.h index b391532..497ba58 100644 --- a/sys/vaxif/if_dmc.h +++ b/sys/vaxif/if_dmc.h @@ -1,3 +1,6 @@ +#ifndef _VAXIF_IF_DMC_H_ +#define _VAXIF_IF_DMC_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -98,3 +101,5 @@ struct dmc_header { #define DMC_FATAL (DMC_ERROR|DMC_NEXMEM|DMC_START|DMC_LOSTDATA|DMC_MAINTREC) #define CNTLO_BITS \ "\10\12ERROR\11NEXMEM\10START\7DISC\5LSTDATA\4MAINT\3NOBUF\2TIMEO\1DATACK" + +#endif diff --git a/sys/vaxif/if_ecreg.h b/sys/vaxif/if_ecreg.h index 28b76b5..8347d2e 100644 --- a/sys/vaxif/if_ecreg.h +++ b/sys/vaxif/if_ecreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXIF_IF_ECREG_H_ +#define _VAXIF_IF_ECREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -63,3 +66,5 @@ struct ecdevice { #define ECRHBF 15 /* Last buffer for receive */ #define ECRDOFF 528 /* Packet offset in read buffer */ + +#endif diff --git a/sys/vaxif/if_en.h b/sys/vaxif/if_en.h index d82b785..2f34b1f 100644 --- a/sys/vaxif/if_en.h +++ b/sys/vaxif/if_en.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_EN_H_ +#define _VAXIF_IF_EN_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -28,3 +33,5 @@ struct en_header { #define ENTYPE_NTRAILER 16 #define EN_BROADCAST 0 /* Hardware broadcast address */ + +#endif diff --git a/sys/vaxif/if_enreg.h b/sys/vaxif/if_enreg.h index 623ad80..61936ac 100644 --- a/sys/vaxif/if_enreg.h +++ b/sys/vaxif/if_enreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXIF_IF_ENREG_H_ +#define _VAXIF_IF_ENREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -36,3 +39,5 @@ struct endevice { #define EN_BITS "\10\20ERR\10OPDONE\7IEN\2PROM\1GO" #define spl_enet() spl5() + +#endif diff --git a/sys/vaxif/if_exreg.h b/sys/vaxif/if_exreg.h index 68a0968..05c3c69 100644 --- a/sys/vaxif/if_exreg.h +++ b/sys/vaxif/if_exreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_EXREG_H_ +#define _VAXIF_IF_EXREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +11,6 @@ * @(#)if_exreg.h 7.1 (Berkeley) 6/5/86 */ - struct exdevice { char xd_porta; /* write on porta resets EXOS */ char xd_pad_a; @@ -248,3 +252,4 @@ struct confmsg { /*80*/ }; +#endif diff --git a/sys/vaxif/if_hdhreg.h b/sys/vaxif/if_hdhreg.h index 2f8f625..8cf0b5c 100644 --- a/sys/vaxif/if_hdhreg.h +++ b/sys/vaxif/if_hdhreg.h @@ -1,5 +1,9 @@ -/* @(#)if_hdhreg.h 7.1 (Berkeley) 6/5/86 */ +#ifndef _VAXIF_IF_HDHREG_H_ +#define _VAXIF_IF_HDHREG_H_ + +#include +/* @(#)if_hdhreg.h 7.1 (Berkeley) 6/5/86 */ /* $Header$ */ @@ -99,3 +103,5 @@ struct hdhregs { /* device registers */ #define HDHDTERR (HDHSUP+0x0600) /* host data error detected */ #define HDHSQRCV (HDHSUP+0x0700) /* HDLC sequence error detected by IMP */ #define HDHSQERR (HDHSUP+0x0800) /* HDLC sequence error detected by if-11 */ + +#endif diff --git a/sys/vaxif/if_hy.h b/sys/vaxif/if_hy.h index af50b7f..1fb85b2 100644 --- a/sys/vaxif/if_hy.h +++ b/sys/vaxif/if_hy.h @@ -1,3 +1,10 @@ +#ifndef _VAXIF_IF_HY_H_ +#define _VAXIF_IF_HY_H_ + +/*#include sys/ioctl.h*/ +#include +/*#include net/if.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -45,7 +52,6 @@ * */ - /* * Structure of a HYPERchannel adapter header */ @@ -60,7 +66,6 @@ struct hy_hdr { short hyh_type; /* record type */ }; - #define hyh_to hyh_uto.hyh_addr #define hyh_to_port hyh_uto.hyh_baddr[1] #define hyh_to_adapter hyh_uto.hyh_baddr[0] @@ -304,3 +309,4 @@ char *hy_state_names[] = { }; #endif +#endif diff --git a/sys/vaxif/if_hyreg.h b/sys/vaxif/if_hyreg.h index ca7dec3..638c087 100644 --- a/sys/vaxif/if_hyreg.h +++ b/sys/vaxif/if_hyreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_HYREG_H_ +#define _VAXIF_IF_HYREG_H_ + +#include + /* * @(#)if_hyreg.h 7.1 (Berkeley) 6/5/86 * @@ -10,7 +15,6 @@ * */ - /* * Network Systems Corporation Hyperchannel interface * @@ -183,3 +187,5 @@ struct hydevice { #define HYF_END_OP 0xE4 /* end operation */ #define HYF_CLRWFMSG 0xE6 /* clear wait for mwssage */ #define HYF_WAITFORMSG 0xE8 /* wait for message */ + +#endif diff --git a/sys/vaxif/if_il.h b/sys/vaxif/if_il.h index 75ba5dc..5a6cf0a 100644 --- a/sys/vaxif/if_il.h +++ b/sys/vaxif/if_il.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_IL_H_ +#define _VAXIF_IF_IL_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -50,3 +55,5 @@ struct il_collis { u_short ilc_length; /* Length (should be 0-32) */ u_short ilc_delay[16]; /* Delay Times */ }; + +#endif diff --git a/sys/vaxif/if_ilreg.h b/sys/vaxif/if_ilreg.h index 0cad2f1..da3e6e2 100644 --- a/sys/vaxif/if_ilreg.h +++ b/sys/vaxif/if_ilreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXIF_IF_ILREG_H_ +#define _VAXIF_IF_ILREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -120,3 +123,5 @@ char *ildiag[NILDIAGS] = { #define ILFSTAT_C 0x1 /* CRC error */ #define ILFSTAT_A 0x2 /* alignment error */ #define ILFSTAT_L 0x4 /* 1+ frames lost just before */ + +#endif diff --git a/sys/vaxif/if_ix.h b/sys/vaxif/if_ix.h index c708c1a..179a4b0 100644 --- a/sys/vaxif/if_ix.h +++ b/sys/vaxif/if_ix.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_IX_H_ +#define _VAXIF_IF_IX_H_ + +#include + /* * Copyright (c) 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -54,3 +59,5 @@ union ix_stats { #define IXC_CSCLR IXC_MAP(10) /* Clear Channel Statistics */ #define IXC_RESET IXC_MAP(11) /* Reset DLA module */ #define IXC_LDPA IXC_MAP(12) /* Load Physical Address */ + +#endif diff --git a/sys/vaxif/if_pclreg.h b/sys/vaxif/if_pclreg.h index 8841025..b88660a 100644 --- a/sys/vaxif/if_pclreg.h +++ b/sys/vaxif/if_pclreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_PCLREG_H_ +#define _VAXIF_IF_PCLREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -57,3 +62,5 @@ struct pcldevice { #define PCL_RERRBITS "\20\20ERR\17NXL\16MEM_OFL\15TXM_ERR\14PARITY\13TIM_OUT\12BC_OFL\11DTO_RDY\10SUC_TXF\07BUSY\06REJ_COMP\05CHN_OPN" #define PCL_RCSRBITS "\20\20REJ\17RC_NPR\16RCV_WD\10LD_SILO\07IE\04DTI_RDY\03INH_ADI\02RC_INIT\01RCV_DAT" + +#endif diff --git a/sys/vaxif/if_qereg.h b/sys/vaxif/if_qereg.h index 7293f70..e57ebb1 100644 --- a/sys/vaxif/if_qereg.h +++ b/sys/vaxif/if_qereg.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_QEREG_H_ +#define _VAXIF_IF_QEREG_H_ + +#include + /* @(#)if_qereg.h 7.1 (Berkeley) 6/5/86 */ /* @(#)if_qereg.h 1.2 (ULTRIX) 1/3/85 */ @@ -133,3 +138,5 @@ struct qe_ring { #define QE_NOTYET 0x8000 /* Descriptor not in use yet */ #define QE_INUSE 0x4000 /* Descriptor being used by QNA */ #define QE_MASK 0xc000 /* Lastnot/error/used mask */ + +#endif diff --git a/sys/vaxif/if_uba.h b/sys/vaxif/if_uba.h index f9d3805..90de07f 100644 --- a/sys/vaxif/if_uba.h +++ b/sys/vaxif/if_uba.h @@ -1,3 +1,9 @@ +#ifndef _VAXIF_IF_UBA_H_ +#define _VAXIF_IF_UBA_H_ + +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -101,5 +107,7 @@ struct ifuba { if_ubaget(&(ifu)->ifu_info, &(ifu)->ifu_r, totlen, off0, ifp) #define if_wubaput(ifu, m) \ if_ubaput(&(ifu)->ifu_info, &(ifu)->ifu_xmt, m) -struct mbuf *if_ubaget(); +/*struct mbuf *if_ubaget();*/ +#endif + #endif diff --git a/sys/vaxif/if_vv.h b/sys/vaxif/if_vv.h index 0bc18d6..3994e1b 100644 --- a/sys/vaxif/if_vv.h +++ b/sys/vaxif/if_vv.h @@ -1,3 +1,8 @@ +#ifndef _VAXIF_IF_VV_H_ +#define _VAXIF_IF_VV_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -110,3 +115,5 @@ struct vvreg { #define VVIDENTSUCC 5 /* number of successes required in self-test */ #define VVIDENTRETRY 10 /* identify loop attempt limit */ #define VVTIMEOUT 60 /* seconds before a transmit timeout */ + +#endif diff --git a/sys/vaxmba/hpreg.h b/sys/vaxmba/hpreg.h index a2b7a3d..36e7c00 100644 --- a/sys/vaxmba/hpreg.h +++ b/sys/vaxmba/hpreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXMBA_HPREG_H_ +#define _VAXMBA_HPREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +9,7 @@ * @(#)hpreg.h 7.1 (Berkeley) 6/5/86 */ -struct hpdevice -{ +struct hpdevice { int hpcs1; /* control and status register 1 */ int hpds; /* drive status */ int hper1; /* error register 1 */ @@ -164,3 +166,5 @@ struct hpdevice #define SIRM03 0x8000 /* RM03 indication */ #define SIRM05 0x0000 /* RM05 pseudo-indication */ + +#endif diff --git a/sys/vaxmba/htreg.h b/sys/vaxmba/htreg.h index 91b4802..051b535 100644 --- a/sys/vaxmba/htreg.h +++ b/sys/vaxmba/htreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXMBA_HTREG_H_ +#define _VAXMBA_HTREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,8 +9,7 @@ * @(#)htreg.h 7.1 (Berkeley) 6/5/86 */ -struct htdevice -{ +struct htdevice { int htcs1; /* control status register */ int htds; /* drive status register */ int hter; /* error register */ @@ -110,3 +112,5 @@ struct htdevice #define b_repcnt b_bcount #define b_command b_resid + +#endif diff --git a/sys/vaxmba/mbareg.h b/sys/vaxmba/mbareg.h index 3a5a9a9..9b652f0 100644 --- a/sys/vaxmba/mbareg.h +++ b/sys/vaxmba/mbareg.h @@ -1,3 +1,8 @@ +#ifndef _VAXMBA_MBAREG_H_ +#define _VAXMBA_MBAREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -10,8 +15,7 @@ * VAX MASSBUS adapter registers */ -struct mba_regs -{ +struct mba_regs { int mba_csr; /* configuration register */ int mba_cr; /* control register */ int mba_sr; /* status register */ @@ -133,3 +137,5 @@ extern char mbsr_bits[]; #define MBDT_TU45 052 #define MBDT_TU77 054 #define MBDT_TU78 0101 + +#endif diff --git a/sys/vaxmba/mbavar.h b/sys/vaxmba/mbavar.h index 04c7c78..4103ed7 100644 --- a/sys/vaxmba/mbavar.h +++ b/sys/vaxmba/mbavar.h @@ -1,3 +1,8 @@ +#ifndef _VAXMBA_MBAVAR_H_ +#define _VAXMBA_MBAVAR_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -137,9 +142,11 @@ struct mba_driver { int nummba; #if NMBA > 0 struct mba_hd mba_hd[NMBA]; -extern Xmba0int(), Xmba1int(), Xmba2int(), Xmba3int(); +/*extern Xmba0int(), Xmba1int(), Xmba2int(), Xmba3int();*/ extern struct mba_device mbdinit[]; extern struct mba_slave mbsinit[]; #endif #endif + +#endif diff --git a/sys/vaxmba/mtreg.h b/sys/vaxmba/mtreg.h index 05f6b6e..138326a 100644 --- a/sys/vaxmba/mtreg.h +++ b/sys/vaxmba/mtreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXMBA_MTREG_H_ +#define _VAXMBA_MTREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -129,3 +132,5 @@ struct mtdevice { #define b_repcnt b_bcount #define b_command b_resid + +#endif diff --git a/sys/vaxuba/adreg.h b/sys/vaxuba/adreg.h index 9455b65..fd3a631 100644 --- a/sys/vaxuba/adreg.h +++ b/sys/vaxuba/adreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_ADREG_H_ +#define _VAXUBA_ADREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -27,3 +32,5 @@ struct addevice { #define AD_DONE 0200 #define AD_INCENABLE 040000 #define AD_ERROR 0100000 + +#endif diff --git a/sys/vaxuba/dhreg.h b/sys/vaxuba/dhreg.h index f672234..00c3a4b 100644 --- a/sys/vaxuba/dhreg.h +++ b/sys/vaxuba/dhreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_DHREG_H_ +#define _VAXUBA_DHREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -51,3 +56,5 @@ struct dhdevice { #define DH_PE 0010000 /* parity error */ #define DH_FE 0020000 /* framing error */ #define DH_DO 0040000 /* data overrun */ + +#endif diff --git a/sys/vaxuba/dhureg.h b/sys/vaxuba/dhureg.h index cacb946..ca629f6 100644 --- a/sys/vaxuba/dhureg.h +++ b/sys/vaxuba/dhureg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_DHUREG_H_ +#define _VAXUBA_DHUREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -139,3 +142,5 @@ struct dhudevice { #define DML_RTS 0000004 /* request to send */ #define DML_DTR 0000002 /* data terminal ready */ #define DML_LE 0000001 /* line enable */ + +#endif diff --git a/sys/vaxuba/dmfreg.h b/sys/vaxuba/dmfreg.h index 333b00e..a756ba7 100644 --- a/sys/vaxuba/dmfreg.h +++ b/sys/vaxuba/dmfreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_DMFREG_H_ +#define _VAXUBA_DMFREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -145,3 +150,5 @@ struct dmfdevice { #define DMFC_LP 0x2000 /* LP dma parallel lineprinter i'face */ #define DMFC_SYNC 0x4000 /* Synchronous serial interface */ #define DMFC_ASYNC 0x8000 /* 8 Serial ports */ + +#endif diff --git a/sys/vaxuba/dmreg.h b/sys/vaxuba/dmreg.h index 49aefc4..c431b6f 100644 --- a/sys/vaxuba/dmreg.h +++ b/sys/vaxuba/dmreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_DMREG_H_ +#define _VAXUBA_DMREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -41,3 +44,5 @@ struct dmdevice { #define DML_ON (DML_DTR|DML_RTS|DML_LE) #define DML_OFF (DML_LE) + +#endif diff --git a/sys/vaxuba/dmzreg.h b/sys/vaxuba/dmzreg.h index efe6cec..79e74be 100644 --- a/sys/vaxuba/dmzreg.h +++ b/sys/vaxuba/dmzreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_DMZREG_H_ +#define _VAXUBA_DMZREG_H_ + +#include + /* * Copyright (c) 1985, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -127,7 +132,6 @@ struct dmzdevice { #define DMZ_ON (DMZ_DTR|DMZ_RTS|DMZ_LCE) #define DMZ_OFF DMZ_LCE - /* bits in octet_tcc */ #define DMZ_HA 0140000 /* high address bits */ @@ -143,3 +147,5 @@ struct dmzdevice { #define DMZ_NOC_MASK 03 #define DMZ_INTERFACE 000 + +#endif diff --git a/sys/vaxuba/dzreg.h b/sys/vaxuba/dzreg.h index 872a402..cfb6e7b 100644 --- a/sys/vaxuba/dzreg.h +++ b/sys/vaxuba/dzreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_DZREG_H_ +#define _VAXUBA_DZREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -87,3 +90,5 @@ struct dzdevice { #define DML_RTS 0000004 /* request to send */ #define DML_DTR 0000002 /* data terminal ready */ #define DML_LE 0000001 /* line enable */ + +#endif diff --git a/sys/vaxuba/idcreg.h b/sys/vaxuba/idcreg.h index caa47cf..20799d6 100644 --- a/sys/vaxuba/idcreg.h +++ b/sys/vaxuba/idcreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_IDCREG_H_ +#define _VAXUBA_IDCREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -13,8 +16,7 @@ #define NRB80TRK 14 /* RB80 tracks/cylinder */ #define NRB80CYL 559 /* RB80 cylinders/disk */ -struct idcdevice -{ +struct idcdevice { int idccsr; /* control status register */ int idcbar; /* bus address register */ int idcbcr; /* byte count register */ @@ -103,3 +105,5 @@ struct idcdevice #define IDCRB80DS_BITS \ "\10\16WTP\15DRDY\14ONCY\13SKE\12PLGV\11FLT\5SEC4\4SEC3\3SEC2\2SEC1\1SEC0" + +#endif diff --git a/sys/vaxuba/ikreg.h b/sys/vaxuba/ikreg.h index 5d11725..e461b9a 100644 --- a/sys/vaxuba/ikreg.h +++ b/sys/vaxuba/ikreg.h @@ -1,3 +1,9 @@ +#ifndef _VAXUBA_IKREG_H_ +#define _VAXUBA_IKREG_H_ + +#include +/*#include sys/ioctl.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -112,3 +118,5 @@ struct ikdevice { */ #define FMG0 060200000 + +#endif diff --git a/sys/vaxuba/npreg.h b/sys/vaxuba/npreg.h index bb62761..fcab961 100644 --- a/sys/vaxuba/npreg.h +++ b/sys/vaxuba/npreg.h @@ -1,3 +1,9 @@ +#ifndef _VAXUBA_NPREG_H_ +#define _VAXUBA_NPREG_H_ + +#include +/*#include sys/buf.h*/ + /* * Copyright (c) 1986 MICOM-Interlan, Inc., Boxborough Mass * All rights reserved. The Berkeley software License Agreement @@ -16,7 +22,6 @@ * Specification. */ - #define NNPCNN 4 /* Number of connections per board */ #define NPUNIT(a) ((minor(a) >> 4) & 0x0F) #define NPCONN(a) ((minor(a)) & 0x03) @@ -133,12 +138,10 @@ typedef unsigned short unsign16; /* 16 bit unsigned value */ typedef unsigned unsign32; /* 32 bit unsigned value */ typedef long paddr_t; /* Physical addresses */ - /* * Tunables */ - #define NUMCQE 40 /* Number of CQE's per board */ /* Host configuration word in Status Block */ @@ -467,3 +470,5 @@ struct npbase { #define DEBCSR 0x1000 /* debug CSR commands */ #define DEBLOCK 0x2000 /* debug lock / unlock calls */ #define NOBOARD 0x4000 /* debug user/host interface */ + +#endif diff --git a/sys/vaxuba/pdma.h b/sys/vaxuba/pdma.h index b19e03d..7517cbb 100644 --- a/sys/vaxuba/pdma.h +++ b/sys/vaxuba/pdma.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_PDMA_H_ +#define _VAXUBA_PDMA_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -13,3 +16,5 @@ struct pdma { int p_arg; int (*p_fcn)(); }; + +#endif diff --git a/sys/vaxuba/psreg.h b/sys/vaxuba/psreg.h index efa46f5..dc916df 100644 --- a/sys/vaxuba/psreg.h +++ b/sys/vaxuba/psreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_PSREG_H_ +#define _VAXUBA_PSREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +11,6 @@ * @(#)psreg.h 7.1 (Berkeley) 6/5/86 */ - /* * The Real Nitty Gritty Device Registers */ @@ -205,3 +209,5 @@ struct psdevice { #define FSWR 0177626 #define FSLR 0177627 + +#endif diff --git a/sys/vaxuba/rkreg.h b/sys/vaxuba/rkreg.h index 5c8b4aa..08e3cba 100644 --- a/sys/vaxuba/rkreg.h +++ b/sys/vaxuba/rkreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_RKREG_H_ +#define _VAXUBA_RKREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -11,8 +16,7 @@ #define NRKSECT 22 #define NRKTRK 3 -struct rkdevice -{ +struct rkdevice { short rkcs1; /* control status reg 1 */ short rkwc; /* word count */ u_short rkba; /* bus address */ @@ -134,3 +138,5 @@ struct rkdevice #define RKAS_M800 0240 /* -800 RK06, -400 RK07 */ #define RKAS_P1200 0060 /* +800 RK06, +400 RK07 */ #define RKAS_M1200 0260 /* -1200 RK06, -1200 RK07 */ + +#endif diff --git a/sys/vaxuba/rlreg.h b/sys/vaxuba/rlreg.h index e7d6304..5155067 100644 --- a/sys/vaxuba/rlreg.h +++ b/sys/vaxuba/rlreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_RLREG_H_ +#define _VAXUBA_RLREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -111,3 +116,5 @@ struct rldevice { #define RLER_BITS \ "\10\20WDE\17CHE\16WL\15SKTO\14SPE\13WGE\12VC\11DSE\ \10DT\7HS\6CO\5HO\4BH\3STC\2STB\1STA" + +#endif diff --git a/sys/vaxuba/rxreg.h b/sys/vaxuba/rxreg.h index e1c80e9..3eeb202 100644 --- a/sys/vaxuba/rxreg.h +++ b/sys/vaxuba/rxreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_RXREG_H_ +#define _VAXUBA_RXREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -9,7 +14,7 @@ #ifdef KERNEL #include "ioctl.h" #else -#include +/*#include */ #endif /* @@ -103,3 +108,5 @@ struct rxdeferr { { 0, "Undefined error code" } }; #endif + +#endif diff --git a/sys/vaxuba/tmreg.h b/sys/vaxuba/tmreg.h index bf77bd3..e3be2e9 100644 --- a/sys/vaxuba/tmreg.h +++ b/sys/vaxuba/tmreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_TMREG_H_ +#define _VAXUBA_TMREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -95,4 +100,6 @@ struct tmdevice { #define FSR_BITS \ "\10\20REJ\17TMS\16OVRN\15DATACHK\14SSC\13EOTS\12WRTS\11ROMPS\10CRERR\ \7ONLS\6BOTS\5HDENS\4BUPER\3FPTS\2REWS\1RDYS" -#endif AVIV +#endif + +#endif diff --git a/sys/vaxuba/tmscpreg.h b/sys/vaxuba/tmscpreg.h index 19ea140..e7b79b1 100644 --- a/sys/vaxuba/tmscpreg.h +++ b/sys/vaxuba/tmscpreg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_TMSCPREG_H_ +#define _VAXUBA_TMSCPREG_H_ + /* @(#)tmscpreg.h 7.1 (Berkeley) 6/5/86 */ /* @(#)tmscpreg.h 1.1 11/2/84 84/09/25 */ @@ -80,3 +83,5 @@ struct mscp_header { char tmscp_credits; /* low 4 bits: credits, high 4 bits: msgtype */ char tmscp_vcid; /* virtual circuit id (connection id) */ }; + +#endif diff --git a/sys/vaxuba/tsreg.h b/sys/vaxuba/tsreg.h index b7aaf4d..ea0e5c4 100644 --- a/sys/vaxuba/tsreg.h +++ b/sys/vaxuba/tsreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_TSREG_H_ +#define _VAXUBA_TSREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -122,7 +127,6 @@ struct ts_sts { #define TSXS3_BITS \ "\10\10LMX\7OPI\6REV\5CRF\4DCK\3NOI\2LXS\1RIB" - /* command message */ struct ts_cmd { u_short c_cmd; /* command */ @@ -158,9 +162,10 @@ struct ts_char { u_short char_mode; /* characteristics */ }; - /* characteristics */ #define TS_ESS 0200 /* enable skip tape marks stop */ #define TS_ENB 0100 /* ??? */ #define TS_EAI 0040 /* enable attention interrupts */ #define TS_ERI 0020 /* enable message buffer release interrupts */ + +#endif diff --git a/sys/vaxuba/ubareg.h b/sys/vaxuba/ubareg.h index 4474995..86aeed2 100644 --- a/sys/vaxuba/ubareg.h +++ b/sys/vaxuba/ubareg.h @@ -1,3 +1,11 @@ +#ifndef _VAXUBA_UBAREG_H_ +#define _VAXUBA_UBAREG_H_ + +/*#include vax/cpu.h*/ +#include +#include +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -26,8 +34,7 @@ /* * UBA hardware registers */ -struct uba_regs -{ +struct uba_regs { int uba_cnfgr; /* configuration register */ int uba_cr; /* control register */ int uba_sr; /* status register */ @@ -137,8 +144,6 @@ struct uba_regs #define UBAPURGE(uba, bdp) #endif - - /* uba_mr[] */ #define UBAMR_MRV 0x80000000 /* map register valid */ #define UBAMR_BO 0x02000000 /* byte offset bit */ @@ -189,3 +194,4 @@ struct uba_regs */ #define ubdevreg(addr) (0760000|((addr)&017777)) +#endif diff --git a/sys/vaxuba/ubavar.h b/sys/vaxuba/ubavar.h index c9e71ad..810718f 100644 --- a/sys/vaxuba/ubavar.h +++ b/sys/vaxuba/ubavar.h @@ -1,3 +1,11 @@ +#ifndef _VAXUBA_UBAVAR_H_ +#define _VAXUBA_UBAVAR_H_ + +#include +/*#include sys/buf.h*/ +/*#include sys/buf.h*/ +/*#include sys/buf.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -200,7 +208,9 @@ extern int (*UNI1vec[])(); /* unibus vec for uba1 */ * UNIbus adaptors to vector to locore unibus adaptor interrupt dispatchers * which make 780's look like the other VAXen. */ -extern Xua0int(), Xua1int(), Xua2int(), Xua3int(); -#endif VAX780 -#endif KERNEL -#endif !LOCORE +/*extern Xua0int(), Xua1int(), Xua2int(), Xua3int();*/ +#endif +#endif +#endif + +#endif diff --git a/sys/vaxuba/udareg.h b/sys/vaxuba/udareg.h index 6f8adfd..b659ce3 100644 --- a/sys/vaxuba/udareg.h +++ b/sys/vaxuba/udareg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_UDAREG_H_ +#define _VAXUBA_UDAREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -27,7 +30,6 @@ struct udadevice { #define UDA_PI 0000001 /* host requests adapter purge interrupts */ #define UDA_GO 0000001 /* start operation, after init */ - /* * UDA Communications Area */ @@ -55,3 +57,5 @@ struct mscp_header { char uda_credits; /* low 4 bits: credits, high 4 bits: msgtype */ char uda_vcid; /* virtual circuit id */ }; + +#endif diff --git a/sys/vaxuba/upreg.h b/sys/vaxuba/upreg.h index c0d8802..6820d7f 100644 --- a/sys/vaxuba/upreg.h +++ b/sys/vaxuba/upreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_UPREG_H_ +#define _VAXUBA_UPREG_H_ + +#include + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -11,8 +16,7 @@ * registers and bits. */ -struct updevice -{ +struct updevice { u_short upcs1; /* control and status register 1 */ short upwc; /* word count register */ u_short upba; /* UNIBUS address register */ @@ -164,3 +168,5 @@ struct updevice #define UPOF_M800 0240 /* -800 uinches */ #define UPOF_P1200 0060 /* +1200 uinches */ #define UPOF_M1200 0260 /* -1200 uinches */ + +#endif diff --git a/sys/vaxuba/utreg.h b/sys/vaxuba/utreg.h index 7a0442d..622f2ce 100644 --- a/sys/vaxuba/utreg.h +++ b/sys/vaxuba/utreg.h @@ -1,3 +1,9 @@ +#ifndef _VAXUBA_UTREG_H_ +#define _VAXUBA_UTREG_H_ + +#include +/*#include sys/buf.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -173,3 +179,5 @@ struct utdevice { #define b_repcnt b_bcount #define b_command b_resid #define b_state b_active + +#endif diff --git a/sys/vaxuba/uureg.h b/sys/vaxuba/uureg.h index de64ab7..29fbb97 100644 --- a/sys/vaxuba/uureg.h +++ b/sys/vaxuba/uureg.h @@ -1,3 +1,6 @@ +#ifndef _VAXUBA_UUREG_H_ +#define _VAXUBA_UUREG_H_ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -6,7 +9,6 @@ * @(#)uureg.h 7.1 (Berkeley) 6/5/86 */ - /* * DL11-E/DL11-W UNIBUS (for TU58) controller registers */ @@ -35,3 +37,4 @@ struct uudevice { #define UUDB_DMASK 0x00ff /* data mask (send and receive data) */ +#endif diff --git a/sys/vaxuba/vpreg.h b/sys/vaxuba/vpreg.h index 13860bb..ed9b5a8 100644 --- a/sys/vaxuba/vpreg.h +++ b/sys/vaxuba/vpreg.h @@ -1,3 +1,9 @@ +#ifndef _VAXUBA_VPREG_H_ +#define _VAXUBA_VPREG_H_ + +#include +/*#include sys/param.h*/ + /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement @@ -30,3 +36,5 @@ struct vpdevice { #define VP_CLRCOM 0000004 #define VP_RESET 0000002 #define VP_SPP 0000001 + +#endif diff --git a/sys/vaxuba/vsreg.h b/sys/vaxuba/vsreg.h index b799d52..aaec333 100644 --- a/sys/vaxuba/vsreg.h +++ b/sys/vaxuba/vsreg.h @@ -1,3 +1,8 @@ +#ifndef _VAXUBA_VSREG_H_ +#define _VAXUBA_VSREG_H_ + +#include + /* @(#)vsreg.h 7.1 (MIT) 6/5/86 */ /**************************************************************************** * * @@ -208,7 +213,6 @@ struct vs_fparm{ #define vs_cxr vs_csr5 #define vs_cyr vs_csr6 - /* * CSR 7 - Interrupt vector in fiber cable machines */ @@ -232,3 +236,5 @@ struct vs_fparm{ */ #define vs_ivr2 vs_csrf + +#endif -- 2.34.1