From: Jim Rees Date: Fri, 14 Sep 2001 00:19:17 +0000 (+0000) Subject: Initial OpenBSD support. Most of user space builds. No kernel module yet. X-Git-Tag: openafs-devel-1_3_0~301 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=b80f8ab2cbbb3c28328964879f0bb25c05c0a61b Initial OpenBSD support. Most of user space builds. No kernel module yet. --- diff --git a/Makefile.in b/Makefile.in index d9e69e2..8498c03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,7 +311,7 @@ login: project kauth rxkad ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ sun4x_* | hp_ux11* | *linux* | *fbsd* ) \ ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \ - ppc_darwin* ) \ + ppc_darwin* | *_obsd* ) \ echo Skipping login for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} login ${COMPILE_PART2} ;; \ @@ -372,7 +372,7 @@ libafs_tree: libafs_setup ${KERNELDIR} libuafs: libuafs_setup ${UKERNELDIR} set -x; \ case ${SYS_NAME} in \ - hp_ux102* ) \ + hp_ux102* | *_obsd* ) \ echo Skipping libuafs for ${SYS_NAME} ;; \ * ) \ ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \ diff --git a/configure-libafs.in b/configure-libafs.in index a1182e3..0529412 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -189,6 +189,10 @@ case $system in MKAFS_OSTYPE=FBSD AC_MSG_RESULT(i386_fbsd) ;; + *-openbsd*) + MKAFS_OSTYPE=OBSD + AC_MSG_RESULT(i386_obsd) + ;; *) AC_MSG_RESULT($system) ;; diff --git a/configure.in b/configure.in index 224f166..f858aee 100644 --- a/configure.in +++ b/configure.in @@ -189,6 +189,10 @@ case $system in MKAFS_OSTYPE=FBSD AC_MSG_RESULT(i386_fbsd) ;; + *-openbsd*) + MKAFS_OSTYPE=OBSD + AC_MSG_RESULT(i386_obsd) + ;; *) AC_MSG_RESULT($system) ;; diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 0475ced..14c42fb 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -10,6 +10,39 @@ #ifndef __AFS_SYSINCLUDESH__ #define __AFS_SYSINCLUDESH__ 1 +#ifdef AFS_OBSD_ENV +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#else /* AFS_OBSD_ENV */ #ifdef AFS_LINUX22_ENV #include #include @@ -336,5 +369,6 @@ struct vfspage; /* for vnode.h compiler warnings */ #endif /* AFS_OSF_ENV */ #endif /* AFS_LINUX22_ENV */ +#endif /* AFS_OBSD_ENV */ #endif /* __AFS_SYSINCLUDESH__ so idempotent */ diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index dd393f2..3edd97e 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -146,7 +146,7 @@ void set_staticaddrs(void); #if AFS_HAVE_STATVFS #include #else -#if !defined(AFS_OSF_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_OSF_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif diff --git a/src/config/Makefile.i386_obsd29.in b/src/config/Makefile.i386_obsd29.in new file mode 100644 index 0000000..d4ec3ee --- /dev/null +++ b/src/config/Makefile.i386_obsd29.in @@ -0,0 +1,47 @@ +# Copyright 1998 Transarc Corporation +# +# Keep macros within each section in sorted order for clean diff displays. +# +# AFS_OSTYPE used to indicate suffixes and os specific subdirectories. +AFS_OSTYPE = OBSD +# Base directory for linux kernel source. Actually a prefix which is complete +# when LINUX_VERS is appended to it. +# LINUX_SRCDIR = /usr/src/linux- +# Default list of Linux kernels to build. Build will run only if all +# can be built. To build a different set, specify LINUX_VERS to make. +# LINUX_VERS = 2.2.5-15 2.2.10 2.2.12 2.2.12-20 2.2.13 2.2.14 + +# +# compilation and link editor flags +DBG=-g +OPTMZ=-O2 +PAM_CFLAGS = -O2 -pipe -fpic +# Put -O2 here to _ensure_ all Makefiles pick it up. +XCFLAGS= -O2 +MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} +XLDFLAGS= +SHARE_LDFLAGS = -shared -Xlinker -x +SHLIB_SUFFIX=so +SHLIB_CFLAGS= -fpic +# +# libraries +MTLIBS=-pthread +TXLIBS= /usr/lib/libcurses.so +XLIBS=@LIB_AFSDB@ -lcompat + +# +# programs +AR=ar +AS=as +CP=cp +INSTALL=${TOP_SRCDIR}/pinstall/pinstall +LD=ld +MT_CC=cc +MV=mv +RANLIB=ranlib +RM=rm +# +# Other OS specific requirements +# +YACC =yacc +LEX =flex -l diff --git a/src/config/param.i386_obsd29.h b/src/config/param.i386_obsd29.h new file mode 100644 index 0000000..405bfb3 --- /dev/null +++ b/src/config/param.i386_obsd29.h @@ -0,0 +1,115 @@ +/* + * Jim Rees, University of Michigan CITI + */ + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#ifndef IGNORE_STDS_H +#include +#include +#endif + +#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ +#define AFS_X86_XBSD_ENV 1 + +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_OBSD_ENV 1 +#define AFS_NONFSTRANS 1 +#define AFS_KERBEROS_ENV 1 +#define FTRUNC O_TRUNC + +#define IUPD 0x0010 +#define IACC 0x0020 +#define ICHG 0x0040 +#define IMOD 0x0080 + +#define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ + (struct simplelock *)0, curproc) +#define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ + (struct simplelock *)0, curproc) + +#define AFS_VM_RDWR_ENV 0 +#define AFS_VFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_GREEDY43_ENV 1 +#define AFS_ENV 1 + +#define AFS_SYSCALL 210 +#define AFS_MOUNT_AFS "afs" + +#if 0 +#ifndef MOUNT_UFS +#define MOUNT_UFS "ufs" +#endif + +#ifndef MOUNT_AFS +#define MOUNT_AFS AFS_MOUNT_AFS +#endif +#endif /* 0 */ +#define SYS_NAME "i386_obsd29" +#define SYS_NAME_ID 2002 + +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ + +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + +#define AFSLITTLE_ENDIAN 1 + +/* Extra kernel definitions (from kdefs file) */ +#ifdef _KERNEL +#define AFS_GLOBAL_SUNLOCK 1 +#define AFS_VFS34 1 /* What is VFS34??? */ +#define AFS_SHORTGID 0 /* are group id's short? */ +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_resid uio_resid +#define AFS_UIOSYS UIO_SYSSPACE +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES MB_CLBYTES +#define osi_GetTime(x) microtime(x) +#define AFS_KALLOC(x) kalloc(x) +#define AFS_KFREE(x,y) kfree(x,y) +#define v_count v_usecount +#define v_vfsp v_mount +#define vfs_bsize mnt_stat.f_bsize +#define vfs_fsid mnt_stat.f_fsid +#define va_nodeid va_fileid +#define vfs_vnodecovered mnt_vnodecovered +#define direct dirent +#define vnode_t struct vnode + +#ifndef MUTEX_DEFAULT +#define MUTEX_DEFAULT 0 +#endif /* MUTEX_DEFAULT */ + +#ifndef SSYS +#define SSYS 0x00002 +#endif /* SSYS */ + +#define p_rcred p_ucred + +#define VN_RELE(vp) vrele(((struct vnode *)(vp))) +#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) +enum vcexcl {NONEXCL, EXCL}; + +#ifdef KERNEL +#ifndef MIN +#define MIN(A,B) ((A) < (B) ? (A) : (B)) +#endif +#ifndef MAX +#define MAX(A,B) ((A) > (B) ? (A) : (B)) +#endif +#endif /* KERNEL */ + +#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ +#endif /* _KERNEL */ + +#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_obsd29_usr.h b/src/config/param.i386_obsd29_usr.h new file mode 100644 index 0000000..3045895 --- /dev/null +++ b/src/config/param.i386_obsd29_usr.h @@ -0,0 +1,60 @@ +/* + * Jim Rees, University of Michigan CITI + */ + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + + +#define UKERNEL 1 /* user space kernel */ +#define AFS_ENV 1 +#define AFS_VFSINCL_ENV 1 +#define AFS_OBSD_ENV 1 +#define AFS_386i_ENV 1 /* 386 Architecture--for lwp stuff */ +#define AFS_NONFSTRANS 1 +#define AFS_KERBEROS_ENV + +#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ +#define AFS_SYSCALL 210 +#define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + +/* Machine / Operating system information */ +#define SYS_NAME "i386_obsd29" +#define SYS_NAME_ID 2002 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + +#define afsio_iov uio_iov +#define afsio_iovcnt uio_iovcnt +#define afsio_offset uio_offset +#define afsio_seg uio_segflg +#define afsio_fmode uio_fmode +#define afsio_resid uio_resid +#define AFS_UIOSYS 1 +#define AFS_UIOUSER UIO_USERSPACE +#define AFS_CLBYTES MB_CLBYTES +#define AFS_MINCHANGE 2 +#define VATTR_NULL usr_vattr_null + +#define AFS_DIRENT +#ifndef CMSERVERPREF +#define CMSERVERPREF +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* AFS_PARAM_H */ diff --git a/src/des/andrew-conf.h b/src/des/andrew-conf.h index c294e85..edf8d0e 100644 --- a/src/des/andrew-conf.h +++ b/src/des/andrew-conf.h @@ -39,6 +39,9 @@ #ifdef AFS_NT40_ENV #include "conf-winnt.h" #else +#ifdef AFS_XBSD_ENV +#include "conf-i386-obsd.h" +#else #if defined(AFS_LINUX20_ENV) || defined(AFS_DJGPP_ENV) #ifdef AFS_PPC_LINUX20_ENV #include "conf-ppc-linux.h" @@ -74,6 +77,7 @@ Figure out what the machine looks like and fix this file to include it. #endif #endif /* AFS_LINUX20_ENV */ #endif /* AFS_NT40_ENV */ +#endif /* AFS_XBSD_ENV */ #endif /* NCR || X86 */ #endif /* __alpha */ #endif /* SGI */ diff --git a/src/des/conf-i386-obsd.h b/src/des/conf-i386-obsd.h new file mode 100644 index 0000000..1fc9f96 --- /dev/null +++ b/src/des/conf-i386-obsd.h @@ -0,0 +1,5 @@ +#define NOASM +#define BITS32 +#define BIG +#define BSDUNIX +#define LSBFIRST diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c index 5249652..f28881a 100644 --- a/src/des/read_pssword.c +++ b/src/des/read_pssword.c @@ -62,7 +62,7 @@ static int intrupt; #endif static int intrupt; -#if defined(AFS_SGI_ENV) || defined (AFS_AIX_ENV) || defined(AFS_FBSD_ENV) /*|| defined (AFS_HPUX_ENV) || defined(AFS_SUN5_ENV)*/ +#if defined(AFS_SGI_ENV) || defined (AFS_AIX_ENV) || defined(AFS_XBSD_ENV) /*|| defined (AFS_HPUX_ENV) || defined(AFS_SUN5_ENV)*/ #undef BSDUNIX #endif @@ -112,7 +112,7 @@ lose: return ok; } -#if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) static void catch(int); #endif @@ -134,12 +134,12 @@ des_read_pw_string(s,maxa,prompt,verify) { int ok = 0, cnt1=0; char *ptr; -#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) register int fno; struct sigaction newsig, oldsig; struct termios save_ttyb, ttyb; #endif -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) FILE *fi; #endif #if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV) @@ -172,7 +172,7 @@ des_read_pw_string(s,maxa,prompt,verify) return -1; } -#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if ((fi = fopen("/dev/tty", "r")) == NULL) return -1; setbuf(fi, (char *)NULL); /* We don't want any buffering for our i/o. */ @@ -310,7 +310,7 @@ lose: if (!ok) memset(s, 0, maxa); printf("\n"); -#if defined(AFS_HPUX_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_XBSD_ENV) /* * Restore the terminal to its previous characteristics. * Restore the old signal handler for SIGINT. @@ -400,7 +400,7 @@ sig_restore() #endif -#if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) static void catch(int junk) { diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index cade640..c8a83d3 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -55,7 +55,7 @@ int MinHours = 0; int npwSums = KA_NPWSUMS; /* needs to be variable sometime */ #include -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #undef vfprintf #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream) #endif diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c index ff388e1..0e768d4 100644 --- a/src/kauth/klogin.c +++ b/src/kauth/klogin.c @@ -23,7 +23,7 @@ RCSID("$Header$"); -#if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) &&!defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #define quota(a,b,c,d) 0 diff --git a/src/kauth/user.c b/src/kauth/user.c index ffd281d..0050970 100644 --- a/src/kauth/user.c +++ b/src/kauth/user.c @@ -186,7 +186,7 @@ afs_int32 ka_UserAuthenticateGeneral ( } #endif -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_XBSD_ENV) /* handle smoothly the case where no AFS system calls exists (yet) */ old = (int (*)())signal(SIGSYS, SIG_IGN); #endif diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in new file mode 100644 index 0000000..31e172c --- /dev/null +++ b/src/libafs/MakefileProto.OBSD.in @@ -0,0 +1,152 @@ +#/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ +# +# MakefileProto for OpenBSD systems +# +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ +SYS_NAME=@AFS_SYSNAME@ + +include ../config/Makefile.${SYS_NAME} + +# OS specific object files: +AFS_OS_OBJS = \ + osi_groups.o \ + osi_file.o \ + osi_inode.o \ + osi_misc.o \ + osi_sleep.o \ + osi_vm.o \ + osi_vnodeops.o \ + xdr_int64.o + +AFS_OS_NFSOBJS = \ + osi_vfsops_nfs.o + +AFS_OS_NONFSOBJS = \ + osi_vfsops.o + + +# System specific build commands and flags +# KDEFS=-DLANGUAGE_C -I/usr/sys/include -I../include \ +# -I/usr/src/sys/${HEADER_RT} -I/usr/src/sys/sys \ +# -DSWAPTYPE=1 -DUERF -DOSF -DCOMPAT_43 -DUFS \ +# -DRT -DKERNEL -D_KERNEL +KDEFS=-Wall -fformat-extensions -ansi -nostdinc -I/usr/include -D_KERNEL \ + -elf -mpreferred-stack-boundary=2 -I/usr/src/sys/sys -I../afs +DBUG = -O2 +DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT +OPTF=${OPT} +OPTF2=${OPT2} +CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} + + +# Name of directory to hold object files and libraries. +KOBJ = STATIC + +# This tells Makefile.common to use its single directory build target. +COMPDIRS = single_compdir +INSTDIRS = single_instdir +DESTDIRS = single_destdir + +include Makefile.common + +setup: + -mkdir $(KOBJ) + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + ln -s ../Makefile $(KOBJ)/Makefile + ln -s ../Makefile.common $(KOBJ)/Makefile.common + ln -s ../config $(KOBJ)/config + -$(RM) -f h net netinet rpc ufs nfs machine sys vm + -ln -s /usr/src/sys/net net + -ln -s /usr/src/sys/i386/include machine + -ln -s /usr/src/sys/netinet netinet + -ln -s /usr/src/sys/nfs nfs + -ln -s /usr/include/rpc rpc + -ln -s /usr/src/sys/sys sys + -ln -s /usr/src/sys/ufs/ufs ufs + -ln -s /usr/src/sys/sys h + -ln -s /usr/src/sys/vm vm + -touch $(KOBJ)/sec_net.h + + +# Below this line are targets when in the COMMON directory: +LIBAFS = libafs.o +LIBAFSNONFS = libafs.nonfs.o + +INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} + +DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS} +DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS} + + +# libafs: $(LIBAFS) $(LIBAFSNONFS) +# libafs: $(LIBAFSNONFS) +# install_libafs: $(INST_LIBAFS) $(INST_LIBAFSNONFS) +# install_libafs: $(INST_LIBAFSNONFS) +# dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS) +# dest_libafs: $(DEST_LIBAFSNONFS) +libafs: + echo WARNING: No kernel module for ${SYS_NAME} + +install_libafs: + echo WARNING: No kernel module for ${SYS_NAME} + +dest_libafs: + echo WARNING: No kernel module for ${SYS_NAME} + + +$(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + +$(INST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ + +$(DEST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + +$(DEST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ + +${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) + $(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS} + +${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) + $(LD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS} + + +# Object build rules: +osi_groups.o: $(AFS)/osi_groups.c + $(CRULE1) +osi_file.o: $(AFS)/osi_file.c + $(CRULE1) +osi_inode.o: $(AFS)/osi_inode.c + $(CRULE1) +osi_misc.o: $(AFS)/osi_misc.c + $(CRULE1) +osi_sleep.o: $(AFS)/osi_sleep.c + $(CRULE1) +osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c + $(CRULE1) -o osi_vfsops_nfs.o +osi_vfsops.o: $(AFS)/osi_vfsops.c + $(CRULE1) -DAFS_NONFSTRANS +osi_vm.o: $(AFS)/osi_vm.c + $(CRULE1) +osi_vnodeops.o: $(AFS)/osi_vnodeops.c + $(CRULE1) +xdr_int64.o: $(RX)/xdr_int64.c + $(CRULE1) diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 553460a..ffb0679 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -82,6 +82,11 @@ process.o : process.s process.c alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \ ${AS} -v process.i -o process.o;; \ + *_obsd* ) \ + cp process.s process.S ; \ + ${CC} -E -I${TOP_INCDIR} process.S >process.ss ; \ + ${AS} process.ss -o process.o ; \ + $(RM) -f process.S ;;\ hp_ux110 ) \ ${CC} ${CFLAGS} -c process.c;; \ *) \ diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c index e678eed..ff6bd0d 100644 --- a/src/lwp/preempt.c +++ b/src/lwp/preempt.c @@ -19,7 +19,7 @@ RCSID("$Header$"); -#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DJGPP_ENV) +#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_DJGPP_ENV) int PRE_Block = 0; #else #include diff --git a/src/lwp/process.s b/src/lwp/process.s index d24af7c..f6f38a1 100644 --- a/src/lwp/process.s +++ b/src/lwp/process.s @@ -349,9 +349,17 @@ _returnto: #include #include #else +#ifdef AFS_XBSD_ENV +#include +#define ST_FLUSH_WINDOWS ST_FLUSHWIN +#define MINFRAME 92 +#define SA(x) (((x)+7)&~7) +#define STACK_ALIGN 8 +#else /* SunOS 4: */ #include #include #endif +#endif .data #ifdef AFS_SUN5_ENV .globl PRE_Block @@ -1153,7 +1161,7 @@ LEAF(returnto,1) END(returnto) #endif -#if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV) +#if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) /* Sun 386i... I hope this does the right thing!!! * * Written by Derek Atkins @@ -1187,7 +1195,7 @@ LEAF(returnto,1) .set newsp,16 -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) .globl _PRE_Block .globl _savecontext _savecontext: @@ -1199,7 +1207,7 @@ savecontext: pushl %ebp /* New Frame! */ movl %esp,%ebp pusha /* Push all registers */ -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) movl $1,_PRE_Block /* Pre-emption code */ #else movl $1,PRE_Block /* Pre-emption code */ @@ -1215,7 +1223,7 @@ L1: /* Shouldnt be here....*/ -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) call _abort #else call abort @@ -1229,7 +1237,7 @@ L1: /* stack offset */ .set area2,8 -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) .globl _returnto _returnto: #else @@ -1241,7 +1249,7 @@ returnto: movl area2(%ebp),%eax /* eax = area2 */ movl (%eax),%esp /* restore esp */ popa -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) movl $0,_PRE_Block /* clear it up... */ #else movl $0,PRE_Block /* clear it up... */ @@ -1251,7 +1259,7 @@ returnto: /* I see, said the blind man, as he picked up his hammer and saw! */ pushl $1234 -#ifdef AFS_DJGPP_ENV +#if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) call _abort #else call abort diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c index 764ec96..235f19f 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -164,7 +164,7 @@ int LWP_WaitForKeystroke(int seconds) if (stdin->_IO_read_ptr < stdin->_IO_read_end) return 1; #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if (stdin->_bf._size > 0) return 1; #else diff --git a/src/pinstall/install.c b/src/pinstall/install.c index bfa7eac..dd8b9de 100644 --- a/src/pinstall/install.c +++ b/src/pinstall/install.c @@ -89,7 +89,7 @@ extern int sys_nerr; #if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) extern char *sys_errlist[]; #endif -#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) extern struct passwd *getpwnam(); int stripcalled = 0; #endif @@ -152,7 +152,7 @@ atoo(astr) return value; } -#if defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) /* * Implementation lifted from that for AIX 3.1, since there didn't seem to be any * reason why it wouldn't work. @@ -204,6 +204,7 @@ char *iname, *oname; { return -1; } +#ifndef AFS_OBSD_ENV /* * done the copy, now strip if desired. */ @@ -234,6 +235,7 @@ char *iname, *oname; { return -1; } } +#endif return status; } @@ -473,7 +475,7 @@ main (argc, argv) #endif /* AFS_HPUX_ENV */ char pnametmp[1024]; int pnamelen; -#if defined (AFS_AIX_ENV) || defined(AFS_FBSD_ENV) +#if defined (AFS_AIX_ENV) || defined(AFS_XBSD_ENV) afs_int32 newcode; static char diskBuffer[BUFSIZE]; /* must be static to avoid compiler bugs for large stuff */ #endif @@ -684,7 +686,7 @@ main (argc, argv) continue; } } -#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) stripcalled = 0; if (strip == 1 || ((strip == -1 && ((istat.st_mode & 0111) == 0111) && stripName(newNames[i])) && AIXobject(fnames[i]))) diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c index ad8751c..6c19b3e 100644 --- a/src/rx/rx_getaddr.c +++ b/src/rx/rx_getaddr.c @@ -21,7 +21,7 @@ RCSID("$Header$"); #include #include #include -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #include @@ -108,7 +108,7 @@ afs_int32 rxi_getaddr () #undef socket #endif /* UKERNEL */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) @@ -135,7 +135,7 @@ rt_xaddrs(cp, cplim, rtinfo) /* this function returns the total number of interface addresses ** the buffer has to be passed in by the caller */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int rx_getAllAddr (buffer,maxSize) afs_int32 buffer[]; int maxSize; /* sizeof of buffer in afs_int32 units */ @@ -342,13 +342,13 @@ int maxSize; /* sizeof of buffer in afs_int32 units */ len = ifc.ifc_len / sizeof(struct ifreq); if (len > NIFS) len = NIFS; -#if defined(AFS_AIX41_ENV) || defined (AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_AIX41_ENV) || defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if ( ifc.ifc_len > sizeof(ifs) ) /* safety check */ ifc.ifc_len = sizeof(ifs); for ( cp = (char *)ifc.ifc_buf, cplim= ifc.ifc_buf+ifc.ifc_len; cp < cplim; -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) cp += _SIZEOF_ADDR_IFREQ(*ifr)) #else cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a))) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 6072092..53a57c5 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -427,7 +427,7 @@ register struct rx_peer *pp; */ -#if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX20_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_FBSD_ENV) +#if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX20_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_XBSD_ENV) /* Routine called during the afsd "-shutdown" process to put things back to * the initial state. */ @@ -552,7 +552,7 @@ afs_int32 rxi_Findcbi(addr) #else /* AFS_USERSPACE_IP_ADDR */ -#if !defined(AFS_AIX41_ENV) && !defined(AFS_DUX40_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_AIX41_ENV) && !defined(AFS_DUX40_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #define IFADDR2SA(f) (&((f)->ifa_addr)) #else /* AFS_AIX41_ENV */ #define IFADDR2SA(f) ((f)->ifa_addr) @@ -573,14 +573,14 @@ int rxi_GetIFInfo() memset(addrs, 0, sizeof(addrs)); memset(mtus, 0, sizeof(mtus)); -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) TAILQ_FOREACH(ifn, &ifnet, if_link) { if (i >= ADDRSPERSITE) break; #else for (ifn = ifnet; ifn != NULL && i < ADDRSPERSITE; ifn = ifn->if_next) { #endif rxmtu = (ifn->if_mtu - RX_IPUDP_SIZE); -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) TAILQ_FOREACH(ifad, &ifn->if_addrhead, ifa_link) { if (i >= ADDRSPERSITE) break; #else @@ -640,7 +640,7 @@ rxi_FindIfnet(addr, pifad) /* if we're given an address, skip everything until we find it */ if (!*pifad) -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) *pifad = TAILQ_FIRST(&in_ifaddrhead); #else *pifad = in_ifaddr; @@ -648,14 +648,14 @@ rxi_FindIfnet(addr, pifad) else { if (((ppaddr & (*pifad)->ia_subnetmask) == (*pifad)->ia_subnet)) match_value = 2; /* don't find matching nets, just subnets */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) *pifad = TAILQ_NEXT(*pifad, ia_link); #else *pifad = (*pifad)->ia_next; #endif } -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) for (ifa = *pifad; ifa; ifa = TAILQ_NEXT(ifa, ia_link) ) { #else for (ifa = *pifad; ifa; ifa = ifa->ia_next ) { @@ -717,7 +717,7 @@ struct osi_socket *rxk_NewSocket(short aport) #endif AFS_STATCNT(osi_NewSocket); -#if (defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)) && defined(KERNEL_FUNNEL) +#if (defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)) && defined(KERNEL_FUNNEL) thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL); #endif #if defined(AFS_HPUX102_ENV) @@ -730,7 +730,7 @@ struct osi_socket *rxk_NewSocket(short aport) #else #ifdef AFS_SGI65_ENV code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP); -#elif defined(AFS_FBSD_ENV) +#elif defined(AFS_XBSD_ENV) code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP, curproc); #else code = socreate(AF_INET, &newSocket, SOCK_DGRAM, 0); @@ -766,9 +766,9 @@ struct osi_socket *rxk_NewSocket(short aport) if (code) osi_Panic("osi_NewSocket: last attempt to reserve 32K failed!\n"); } -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) myaddr.sin_len = sizeof(myaddr); -#if defined(AFS_FBSD_ENV) +#if defined(AFS_XBSD_ENV) code = sobind(newSocket, (struct sockaddr *)&myaddr, curproc); #else code = sobind(newSocket, (struct sockaddr *)&myaddr); @@ -785,7 +785,7 @@ struct osi_socket *rxk_NewSocket(short aport) nam = m_get(M_WAIT, MT_SONAME); #endif if (nam == NULL) { -#if !defined(AFS_SUN5_ENV) && !defined(AFS_OSF_ENV) && !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_OSF_ENV) && !defined(AFS_SGI64_ENV) && !defined(AFS_XBSD_ENV) setuerror(ENOBUFS); #endif goto bad; @@ -799,7 +799,7 @@ struct osi_socket *rxk_NewSocket(short aport) BHV_PDATA(&bhv) = (void*)newSocket; code = sobind(&bhv, nam); m_freem(nam); -#elif defined(AFS_FBSD_ENV) +#elif defined(AFS_XBSD_ENV) code = sobind(newSocket, nam, curproc); #else code = sobind(newSocket, nam); @@ -1000,7 +1000,7 @@ void rxk_Listener(void) #ifdef AFS_SUN5_ENV rxk_ListenerPid = ttoproc(curthread)->p_pidp->pid_id; #endif /* AFS_SUN5_ENV */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) rxk_ListenerPid = current_proc()->p_pid; #endif #if defined(RX_ENABLE_LOCKS) && !defined(AFS_SUN5_ENV) @@ -1042,7 +1042,7 @@ void rxk_Listener(void) #endif /* AFS_SUN5_ENV */ } -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_LINUX20_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) /* The manner of stopping the rx listener thread may vary. Most unix's should * be able to call soclose. */ diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 389d66a..a11c145 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -35,19 +35,19 @@ typedef unsigned short etap_event_t; #ifndef AFS_LINUX22_ENV #include "../h/socketvar.h" #include "../h/protosw.h" -#if !defined(AFS_SUN5_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) #include "../h/domain.h" #include "../h/dir.h" #include "../h/buf.h" #include "../h/mbuf.h" #else -#if defined(AFS_FBSD_ENV) +#if defined(AFS_XBSD_ENV) #include "../h/dirent.h" #include "../h/socket.h" #include "../h/domain.h" #include "../h/buf.h" #include "../h/mbuf.h" -#endif /* AFS_FBSD_ENV */ +#endif /* AFS_XBSD_ENV */ #endif #endif /* AFS_LINUX22_ENV */ #ifdef AFS_SGI62_ENV @@ -114,8 +114,8 @@ extern struct ifnet *rxi_FindIfnet(); extern int rxk_initDone; -#if defined(AFS_FBSD_ENV) +#if defined(AFS_XBSD_ENV) extern struct domain inetdomain; -#endif /* AFS_FBSD_ENV */ +#endif /* AFS_XBSD_ENV */ #endif /* _RX_KCOMMON_H_ */ diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index b77cffe..36d2456 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -41,7 +41,7 @@ #define MAX(a,b) ((a)>(b)?(a):(b)) #endif #else /* AFS_NT40_ENV */ -#if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_USR_FBSD_ENV) +#if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) #include /* MIN, MAX on Solaris */ #endif #include /* MIN, MAX elsewhere */ diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index 50fcc1d..ffadf87 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -18,7 +18,7 @@ RCSID("$Header$"); #ifdef KERNEL #ifndef UKERNEL -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include "../afs/sysincludes.h" #else #include "../h/types.h" diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 71a2787..4cede5c 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -95,7 +95,7 @@ int debug = 0; static char *cmdname; #ifdef AFS_SUN5_ENV static char CPP[] = "/usr/ccs/lib/cpp"; -#elif defined(AFS_FBSD_ENV) +#elif defined(AFS_XBSD_ENV) static char CPP[] = "/usr/bin/cpp"; #elif defined(AFS_NT40_ENV) static char CPP[MAXCMDLINE]; diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index bf6943d..30f3af8 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -110,7 +110,7 @@ syscall.o: syscall.s $(RM) -f syscall.ss syscall.i;; \ hp_ux11? ) \ touch syscall.o;; \ - i386_fbsd* ) \ + i386_*bsd* ) \ touch syscall.o;; \ *) \ /lib/cpp ${SFLAGS} syscall.s syscall.ss; \ diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index c095d49..335c103 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -44,7 +44,7 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ RXGEN=${TOP_SRCDIR}/rxgen/rxgen COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -all: test ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client +all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c index 020f3a1..c103dd9 100644 --- a/src/usd/usd_file.c +++ b/src/usd/usd_file.c @@ -26,7 +26,7 @@ RCSID("$Header$"); #endif #include #endif /* AFS_AIX_ENV */ -#ifdef AFS_DUX40_ENV +#if defined(AFS_DUX40_ENV) || defined(AFS_OBSD_ENV) #include #endif #include diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 49b02c6..b5cc861 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -78,7 +78,7 @@ RCSID("$Header$"); #include #include #include -#if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #if !defined(AFS_NT40_ENV) @@ -89,7 +89,7 @@ RCSID("$Header$"); #include #include #else -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif diff --git a/src/vol/devname.c b/src/vol/devname.c index 1652502..90813e0 100644 --- a/src/vol/devname.c +++ b/src/vol/devname.c @@ -25,7 +25,7 @@ RCSID("$Header$"); #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else @@ -33,7 +33,7 @@ RCSID("$Header$"); #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c index 8396541..54fa527 100644 --- a/src/vol/listinodes.c +++ b/src/vol/listinodes.c @@ -52,7 +52,7 @@ int *forcep, forceR; #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #define itod ino_to_fsba @@ -1254,7 +1254,7 @@ int ListViceInodes(devname, mountedOn, resultFile, judgeInode, judgeParam, force if ( (super.fs.fs_magic != FS_MAGIC) || (super.fs.fs_ncg < 1) -#if defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || (super.fs.fs_cpg < 1) #else || (super.fs.fs_cpg < 1 || super.fs.fs_cpg > MAXCPG) diff --git a/src/vol/partition.c b/src/vol/partition.c index 1e585ca..fc8703a 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -32,7 +32,7 @@ RCSID("$Header$"); #if AFS_HAVE_STATVFS #include #endif /* AFS_HAVE_STATVFS */ -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #endif @@ -46,7 +46,7 @@ RCSID("$Header$"); #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else @@ -54,7 +54,7 @@ RCSID("$Header$"); #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ @@ -456,7 +456,7 @@ int VAttachPartitions(void) } #endif -#if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int VAttachPartitions(void) { int errors = 0; diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index 608aa58..9d4ab5f 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -122,7 +122,7 @@ RCSID("$Header$"); #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else @@ -133,7 +133,7 @@ RCSID("$Header$"); #ifdef AFS_OSF_ENV #include #else /* AFS_OSF_ENV */ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif diff --git a/src/vol/volume.c b/src/vol/volume.c index e9b05ac..8769d0c 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -35,7 +35,7 @@ RCSID("$Header$"); #ifdef AFS_SUN5_ENV #include #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else @@ -43,7 +43,7 @@ RCSID("$Header$"); #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */