From: Derrick Brashear Date: Wed, 17 Feb 2010 18:26:43 +0000 (-0500) Subject: kill macos prior to panther X-Git-Tag: openafs-devel-1_5_73~162 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=62016280224d6532f0807e9637b3c38cf025c7fe;p=packages%2Fo%2Fopenafs.git kill macos prior to panther we haven't had a 10.2 machine to build on in quite a while... might as well pull it, it probably doesn't work anymore Change-Id: Iad809e83dadb0e7fa8c61b3f37f574a571042fc8 Reviewed-on: http://gerrit.openafs.org/1335 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/acinclude.m4 b/acinclude.m4 index 720efbef5..554afe510 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -576,69 +576,9 @@ else hppa*-hp-hpux10*) AFS_SYSNAME="hp_ux102" ;; - powerpc-apple-darwin1.2*) - AFS_SYSNAME="ppc_darwin_12" - ;; - powerpc-apple-darwin1.3*) - AFS_SYSNAME="ppc_darwin_13" - ;; - powerpc-apple-darwin1.4*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin5.1*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin5.2*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin5.3*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin5.4*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin5.5*) - AFS_SYSNAME="ppc_darwin_14" - ;; - powerpc-apple-darwin6.0*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin6.1*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin6.2*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin6.3*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin6.4*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin6.5*) - AFS_SYSNAME="ppc_darwin_60" - ;; - powerpc-apple-darwin7.0*) - AFS_SYSNAME="ppc_darwin_70" - ;; - powerpc-apple-darwin7.1*) - AFS_SYSNAME="ppc_darwin_70" - ;; - powerpc-apple-darwin7.2*) - AFS_SYSNAME="ppc_darwin_70" - ;; - powerpc-apple-darwin7.3*) + powerpc-apple-darwin7*) AFS_SYSNAME="ppc_darwin_70" ;; - powerpc-apple-darwin7.4*) - AFS_SYSNAME="ppc_darwin_70" - ;; - powerpc-apple-darwin7.5*) - AFS_SYSNAME="ppc_darwin_70" - ;; - powerpc-apple-darwin8.0*) - AFS_SYSNAME="ppc_darwin_80" - ;; powerpc-apple-darwin8.*) AFS_SYSNAME="ppc_darwin_80" ;; diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h index c9e23d748..6cd6a40d4 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -121,9 +121,6 @@ extern int afs_osi_ctxtp_initialized; /* * Time related macros */ -#ifndef AFS_DARWIN60_ENV -extern struct timeval time; -#endif #ifdef AFS_DARWIN80_ENV static inline time_t osi_Time(void) { struct timeval _now; diff --git a/src/afs/DARWIN/osi_module.c b/src/afs/DARWIN/osi_module.c index 18711f5e7..020a89e9a 100644 --- a/src/afs/DARWIN/osi_module.c +++ b/src/afs/DARWIN/osi_module.c @@ -23,11 +23,7 @@ extern open_close_fcn_t afs_cdev_nop_openclose; extern ioctl_fcn_t afs_cdev_ioctl; static void *afs_cdev_devfs_handle; #else -#ifdef AFS_DARWIN60_ENV /* not in Kernel.framework anymore !?! */ #include -#else -#include "sys/syscall.h" -#endif struct vfsconf afs_vfsconf; #endif #include diff --git a/src/afs/DARWIN/osi_sleep.c b/src/afs/DARWIN/osi_sleep.c index 5c4085efc..d248d0a8a 100644 --- a/src/afs/DARWIN/osi_sleep.c +++ b/src/afs/DARWIN/osi_sleep.c @@ -185,13 +185,8 @@ afs_osi_Sleep(void *event) #else AFS_ASSERT_GLOCK(); AFS_GUNLOCK(); -#ifdef AFS_DARWIN14_ENV /* this is probably safe for all versions, but testing is hard */ sleep(event, PVFS); -#else - assert_wait((event_t) event, 0); - thread_block(0); -#endif AFS_GLOCK(); #endif } @@ -279,7 +274,6 @@ afs_osi_TimedSleep(void *event, afs_int32 ams, int aintok) evp->owner = current_thread(); #else ticks = (ams * afs_hz) / 1000; -#ifdef AFS_DARWIN14_ENV /* this is probably safe for all versions, but testing is hard. */ /* using tsleep instead of assert_wait/thread_set_timer/thread_block * allows shutdown to work in 1.4 */ @@ -293,12 +287,6 @@ afs_osi_TimedSleep(void *event, afs_int32 ams, int aintok) else prio = PVFS; code = tsleep(event, prio, "afs_osi_TimedSleep", ticks); -#else - assert_wait((event_t) event, aintok ? THREAD_ABORTSAFE : THREAD_UNINT); - thread_set_timer(ticks, NSEC_PER_SEC / hz); - thread_block(0); - code = 0; -#endif AFS_GLOCK(); #endif if (seq == evp->seq) @@ -321,12 +309,8 @@ afs_osi_Wakeup(void *event) evp = afs_getevent(event); if (evp->refcount > 1) { evp->seq++; -#ifdef AFS_DARWIN14_ENV /* this is probably safe for all versions, but testing is hard. */ wakeup(event); -#else - thread_wakeup((event_t) event); -#endif ret = 0; } relevent(evp); diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c index 77c2e4cc0..fab2fbb1e 100644 --- a/src/afs/DARWIN/osi_vnodeops.c +++ b/src/afs/DARWIN/osi_vnodeops.c @@ -11,9 +11,7 @@ #include #include #include -#if defined(AFS_DARWIN70_ENV) #include -#endif /* defined(AFS_DARWIN70_ENV) */ #ifdef AFS_DARWIN80_ENV #include #include @@ -68,9 +66,6 @@ int afs_vop_rmdir(struct VOPPROT(rmdir_args) *); int afs_vop_symlink(struct VOPPROT(symlink_args) *); int afs_vop_readdir(struct VOPPROT(readdir_args) *); int afs_vop_readlink(struct VOPPROT(readlink_args) *); -#if !defined(AFS_DARWIN70_ENV) -extern int ufs_abortop(struct vop_abortop_args *); -#endif /* !defined(AFS_DARWIN70_ENV) */ int afs_vop_inactive(struct VOPPROT(inactive_args) *); int afs_vop_reclaim(struct VOPPROT(reclaim_args) *); int afs_vop_strategy(struct VOPPROT(strategy_args) *); @@ -132,13 +127,7 @@ struct vnodeopv_entry_desc afs_vnodeop_entries[] = { {VOPPREF(readdir_desc), (VOPFUNC)afs_vop_readdir}, /* readdir */ {VOPPREF(readlink_desc), (VOPFUNC)afs_vop_readlink}, /* readlink */ #ifndef AFS_DARWIN80_ENV -#if defined(AFS_DARWIN70_ENV) {VOPPREF(abortop_desc), (VOPFUNC)nop_abortop }, /* abortop */ -#else /* ! defined(AFS_DARWIN70_ENV) */ - /* Yes, we use the ufs_abortop call. It just releases the namei - * buffer stuff */ - {VOPPREF(abortop_desc), (VOPFUNC)ufs_abortop}, /* abortop */ -#endif /* defined(AFS_DARWIN70_ENV) */ #endif {VOPPREF(inactive_desc), (VOPFUNC)afs_vop_inactive}, /* inactive */ {VOPPREF(reclaim_desc), (VOPFUNC)afs_vop_reclaim}, /* reclaim */ @@ -484,7 +473,7 @@ afs_vop_open(ap) int error; struct vnode *vp = ap->a_vp; struct vcache *vc = VTOAFS(vp); -#if defined(AFS_DARWIN14_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_DARWIN80_ENV) int didhold = 0; /*---------------------------------------------------------------- * osi_VM_TryReclaim() removes the ubcinfo of a vnode, but that vnode @@ -498,7 +487,7 @@ afs_vop_open(ap) if (vp->v_type == VREG && !(vp->v_flag & VSYSTEM) && vp->v_ubcinfo->ui_refcount < 2) didhold = ubc_hold(vp); -#endif /* AFS_DARWIN14_ENV */ +#endif /* !AFS_DARWIN80_ENV */ AFS_GLOCK(); error = afs_open(&vc, ap->a_mode, vop_cred); #ifdef DIAGNOSTIC @@ -507,10 +496,10 @@ afs_vop_open(ap) #endif osi_FlushPages(vc, vop_cred); AFS_GUNLOCK(); -#if defined(AFS_DARWIN14_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_DARWIN80_ENV) if (error && didhold) ubc_rele(vp); -#endif /* AFS_DARWIN14_ENV */ +#endif /* !AFS_DARWIN80_ENV */ return error; } @@ -1755,7 +1744,6 @@ afs_vop_pathconf(ap) case _PC_PIPE_BUF: return EINVAL; break; -#if defined(AFS_DARWIN70_ENV) case _PC_NAME_CHARS_MAX: *ap->a_retval = NAME_MAX; break; @@ -1765,7 +1753,6 @@ afs_vop_pathconf(ap) case _PC_CASE_PRESERVING: *ap->a_retval = 1; break; -#endif /* defined(AFS_DARWIN70_ENV) */ default: return EINVAL; } @@ -1968,13 +1955,9 @@ afs_vop_print(ap) printf("\n UBC: "); if (UBCINFOEXISTS(vp)) { printf("exists, "); -#ifdef AFS_DARWIN14_ENV printf("refs %d%s%s", vp->v_ubcinfo->ui_refcount, ubc_issetflags(vp, UI_HASOBJREF) ? " HASOBJREF" : "", ubc_issetflags(vp, UI_WASMAPPED) ? " WASMAPPED" : ""); -#else - printf("holdcnt %d", vp->v_ubcinfo->ui_holdcnt); -#endif } else printf("does not exist"); } diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index 1c80de465..b1c1fea42 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -92,9 +92,9 @@ afs_CopyOutAttrs(register struct vcache *avc, register struct vattr *attrs) attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0]; #elif defined(AFS_DARWIN80_ENV) VATTR_RETURN(attrs, va_fsid, vfs_statfs(vnode_mount(AFSTOV(avc)))->f_fsid.val[0]); -#elif defined(AFS_DARWIN70_ENV) +#elif defined(AFS_DARWIN_ENV) attrs->va_fsid = avc->v->v_mount->mnt_stat.f_fsid.val[0]; -#else /* ! AFS_DARWIN70_ENV */ +#else /* ! AFS_DARWIN_ENV */ attrs->va_fsid = 1; #endif if (avc->mvstat == 2) { diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index 076c2e125..e9f0049df 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* !UKERNEL */ diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 298eff7f0..8ed5f484f 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -20,7 +20,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" #endif #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c index 0a6667979..d2091db49 100644 --- a/src/afs/afs_conn.c +++ b/src/afs/afs_conn.c @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_error.c b/src/afs/afs_error.c index e2c84bd53..49f7d9990 100644 --- a/src/afs/afs_error.c +++ b/src/afs/afs_error.c @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* !UKERNEL */ diff --git a/src/afs/afs_icl.c b/src/afs/afs_icl.c index 435553d55..4eaaee299 100644 --- a/src/afs/afs_icl.c +++ b/src/afs/afs_icl.c @@ -20,7 +20,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" #endif #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c index cdb4c4554..e64645d13 100644 --- a/src/afs/afs_pag_call.c +++ b/src/afs/afs_pag_call.c @@ -21,7 +21,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" #endif #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 93e57fa9e..f5e25cfd1 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -45,10 +45,10 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* AFS_HPUX110_ENV */ -#ifdef AFS_DARWIN60_ENV +#ifdef AFS_DARWIN_ENV #include #endif #endif /* !defined(UKERNEL) */ @@ -1137,7 +1137,7 @@ afsi_SetServerIPRank(struct srvAddr *sa, afs_int32 addr, return; } #else /* AFS_USERSPACE_IP_ADDR */ -#if (! defined(AFS_SUN5_ENV)) && !defined(AFS_DARWIN60_ENV) && defined(USEIFADDR) +#if (! defined(AFS_SUN5_ENV)) && !defined(AFS_DARWIN_ENV) && defined(USEIFADDR) void afsi_SetServerIPRank(struct srvAddr *sa, struct in_ifaddr *ifa) { @@ -1174,7 +1174,7 @@ afsi_SetServerIPRank(struct srvAddr *sa, struct in_ifaddr *ifa) #endif /* IFF_POINTTOPOINT */ } #endif /*(!defined(AFS_SUN5_ENV)) && defined(USEIFADDR) */ -#if defined(AFS_DARWIN60_ENV) && defined(USEIFADDR) +#if defined(AFS_DARWIN_ENV) && defined(USEIFADDR) #ifndef afs_min #define afs_min(A,B) ((A)<(B)) ? (A) : (B) #endif @@ -1491,7 +1491,7 @@ static int afs_SetServerPrefs(struct srvAddr *sa) { ifnet_list_free(ifns); } } -#elif defined(AFS_DARWIN60_ENV) +#elif defined(AFS_DARWIN_ENV) { rx_ifnet_t ifn; rx_ifaddr_t ifa; @@ -1499,7 +1499,7 @@ static int afs_SetServerPrefs(struct srvAddr *sa) { TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) { afsi_SetServerIPRank(sa, ifa); }}} -#elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#elif defined(AFS_FBSD_ENV) { struct in_ifaddr *ifa; TAILQ_FOREACH(ifa, &in_ifaddrhead, ia_link) { diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c index 90729edeb..0bdfdf93c 100644 --- a/src/afs/afs_syscall.c +++ b/src/afs/afs_syscall.c @@ -24,7 +24,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" #endif #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index 8fef606f2..7e04e7c22 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index c64fc09f4..bd57d2fcf 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -28,7 +28,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index 5c3775f3f..07c10a728 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -31,7 +31,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_warn.c b/src/afs/afs_warn.c index f65f04e38..f7a566fe1 100644 --- a/src/afs/afs_warn.c +++ b/src/afs/afs_warn.c @@ -29,7 +29,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/butc/dump.c b/src/butc/dump.c index 49b99beff..0c1acc3fe 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -97,7 +97,7 @@ afs_int32 tapeblocks; /* Number of 16K tape datablocks in buffer (!CONF_XBSA) * else \ sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId); -#if defined(AFS_NT40_ENV) || (defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN60_ENV)) || defined(AFS_SUN4_ENV) +#if defined(AFS_NT40_ENV) || defined(AFS_SUN4_ENV) int localtime_r(time_t * t, struct tm *tm) { diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 61e940337..7b798445b 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -473,58 +473,6 @@ case $AFS_SYSNAME in SHLIB_LINKER="${MT_CC} -shared" ;; - ppc_darwin_12) - CC="cc" - CCOBJ="cc" - MT_CC="cc" - AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" - LEX="lex -l" - REGEX_OBJ="regex.o" - XCFLAGS="-traditional-cpp" - SHLIB_LINKER="${MT_CC} -dynamiclib" - SHLIB_SUFFIX="dylib" - ;; - - ppc_darwin_13) - CC="cc" - CCOBJ="cc" - MT_CC="cc" - AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" - LEX="lex -l" - LWP_OPTMZ="-O2" - REGEX_OBJ="regex.o" - XCFLAGS="-no-cpp-precomp" - SHLIB_LINKER="${MT_CC} -dynamiclib" - SHLIB_SUFFIX="dylib" - ;; - - ppc_darwin_14) - CC="cc" - CCOBJ="cc" - MT_CC="cc" - AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" - LEX="lex -l" - LWP_OPTMZ="-O2" - REGEX_OBJ="regex.o" - XCFLAGS="-no-cpp-precomp" - SHLIB_LINKER="${MT_CC} -dynamiclib" - SHLIB_SUFFIX="dylib" - ;; - - ppc_darwin_60) - CC="cc" - CCOBJ="cc" - MT_CC="cc" - AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration" - LEX="lex -l" - LWP_OPTMZ="-O2" - REGEX_OBJ="regex.o" - XCFLAGS="-no-cpp-precomp" - TXLIBS="-lncurses" - SHLIB_LINKER="${MT_CC} -dynamiclib" - SHLIB_SUFFIX="dylib" - ;; - ppc_darwin_70) CC="cc" CCOBJ="cc" diff --git a/src/comerr/error_msg.c b/src/comerr/error_msg.c index bd8227576..21d46fab9 100644 --- a/src/comerr/error_msg.c +++ b/src/comerr/error_msg.c @@ -18,7 +18,7 @@ #ifdef HAVE_LIBINTL #include #endif -#ifdef AFS_DARWIN70_ENV +#ifdef AFS_DARWIN_ENV #include #endif #include @@ -115,7 +115,7 @@ volume_message(int code) return "unknown volume error"; } -#ifdef AFS_DARWIN70_ENV +#ifdef AFS_DARWIN_ENV static_inline const char * _intlize(const char *msg, int base, char *str, size_t len) { diff --git a/src/config/param.ppc_darwin_12.h b/src/config/param.ppc_darwin_12.h deleted file mode 100644 index ea41ec00b..000000000 --- a/src/config/param.ppc_darwin_12.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 -#define AFS_VFSINCL_ENV 1 - -#include - -#define AFS_DARWIN_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define SYS_NAME "ppc_darwin_12" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_12 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#ifdef KERNEL -#undef MACRO_BEGIN -#undef MACRO_END -#include -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 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 - -#define VN_RELE(vp) vrele(((struct vnode *)(vp))) -#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) - -#endif -#endif /* AFS_PARAM_H */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 - -#include -#define AFS_USERSPACE_ENV -#define AFS_USR_DARWIN_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define SYS_NAME "ppc_darwin_12" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_12 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE - -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.ppc_darwin_13.h b/src/config/param.ppc_darwin_13.h deleted file mode 100644 index aac792528..000000000 --- a/src/config/param.ppc_darwin_13.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 -#define AFS_VFSINCL_ENV 1 - -#include - -#define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define SYS_NAME "ppc_darwin_13" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_13 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#ifdef KERNEL -#undef MACRO_BEGIN -#undef MACRO_END -#include -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 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 - -#define VN_RELE(vp) vrele(((struct vnode *)(vp))) -#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) - -#endif -#endif /* AFS_PARAM_H */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 - -#include -#define AFS_USERSPACE_ENV -#define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define SYS_NAME "ppc_darwin_13" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_13 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE - -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.ppc_darwin_14.h b/src/config/param.ppc_darwin_14.h deleted file mode 100644 index 406b5de6e..000000000 --- a/src/config/param.ppc_darwin_14.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 -#define AFS_VFSINCL_ENV 1 - -#include - -#define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define AFS_NAMEI_ENV 1 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define sys_ppc_darwin_14 1 -#define SYS_NAME "ppc_darwin_14" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_14 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#ifdef KERNEL -#undef MACRO_BEGIN -#undef MACRO_END -#include -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 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 - -#define VN_RELE(vp) vrele(((struct vnode *)(vp))) -#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) - -#endif -#endif /* AFS_PARAM_H */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 - -#include -#define AFS_USERSPACE_ENV -#define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define DARWIN_REFBASE 0 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define sys_ppc_darwin_14 1 -#define SYS_NAME "ppc_darwin_14" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_14 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE - -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.ppc_darwin_60.h b/src/config/param.ppc_darwin_60.h deleted file mode 100644 index 13fa53610..000000000 --- a/src/config/param.ppc_darwin_60.h +++ /dev/null @@ -1,129 +0,0 @@ -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 -#define AFS_VFSINCL_ENV 1 - -#include - -#define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 -#define AFS_NAMEI_ENV 1 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define sys_ppc_darwin_14 1 -#define sys_ppc_darwin_60 1 -#define SYS_NAME "ppc_darwin_60" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_60 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#ifdef KERNEL -#undef MACRO_BEGIN -#undef MACRO_END -#include -#define AFS_GLOBAL_SUNLOCK 1 -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 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 - -#define VN_RELE(vp) vrele(((struct vnode *)(vp))) -#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) - -#endif -#endif /* AFS_PARAM_H */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ -#define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ -#define AFS_PPC_ENV 1 - -#include -#define AFS_USERSPACE_ENV -#define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV -#undef AFS_NONFSTRANS -#define AFS_NONFSTRANS -#define AFS_SYSCALL 230 - -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - -/* Machine / Operating system information */ -#define sys_ppc_darwin_12 1 -#define sys_ppc_darwin_13 1 -#define sys_ppc_darwin_14 1 -#define sys_ppc_darwin_60 1 -#define SYS_NAME "ppc_darwin_60" -#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_60 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ - -#define AFS_UIOSYS UIO_SYSSPACE -#define AFS_UIOUSER UIO_USERSPACE - -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ -#define RXK_LISTENER_ENV 1 - -#define AFS_VFS34 1 /* What is VFS34??? */ -#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 VATTR_NULL usr_vattr_null - -#define AFS_DIRENT -#ifndef CMSERVERPREF -#define CMSERVERPREF -#endif - -#endif /* AFS_PARAM_H */ - -#endif /* !defined(UKERNEL) */ diff --git a/src/config/param.ppc_darwin_70.h b/src/config/param.ppc_darwin_70.h index eaddf3648..f937ebd40 100644 --- a/src/config/param.ppc_darwin_70.h +++ b/src/config/param.ppc_darwin_70.h @@ -13,9 +13,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #undef AFS_NONFSTRANS #define AFS_NONFSTRANS @@ -89,9 +86,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #undef AFS_NONFSTRANS #define AFS_NONFSTRANS diff --git a/src/config/param.ppc_darwin_80.h b/src/config/param.ppc_darwin_80.h index bef7fffbf..f9d24f7fb 100644 --- a/src/config/param.ppc_darwin_80.h +++ b/src/config/param.ppc_darwin_80.h @@ -20,9 +20,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #define AFS_DARWIN80_ENV #undef AFS_NONFSTRANS @@ -115,9 +112,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #define AFS_USR_DARWIN80_ENV #undef AFS_NONFSTRANS diff --git a/src/config/param.ppc_darwin_90.h b/src/config/param.ppc_darwin_90.h index 2e4bdf65c..b58a39d96 100644 --- a/src/config/param.ppc_darwin_90.h +++ b/src/config/param.ppc_darwin_90.h @@ -20,9 +20,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #define AFS_DARWIN80_ENV #define AFS_DARWIN90_ENV @@ -118,9 +115,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #define AFS_USR_DARWIN80_ENV #define AFS_USR_DARWIN90_ENV diff --git a/src/config/param.x86_darwin_100.h b/src/config/param.x86_darwin_100.h index 38ede9b84..7558d8d7a 100644 --- a/src/config/param.x86_darwin_100.h +++ b/src/config/param.x86_darwin_100.h @@ -23,9 +23,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #define AFS_DARWIN80_ENV #define AFS_DARWIN90_ENV @@ -154,9 +151,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #define AFS_USR_DARWIN80_ENV #define AFS_USR_DARWIN90_ENV diff --git a/src/config/param.x86_darwin_80.h b/src/config/param.x86_darwin_80.h index 68b3334d3..7126112d3 100644 --- a/src/config/param.x86_darwin_80.h +++ b/src/config/param.x86_darwin_80.h @@ -20,9 +20,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #define AFS_DARWIN80_ENV #undef AFS_NONFSTRANS @@ -114,9 +111,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #define AFS_USR_DARWIN80_ENV #undef AFS_NONFSTRANS diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h index 61e674ac3..49c197052 100644 --- a/src/config/param.x86_darwin_90.h +++ b/src/config/param.x86_darwin_90.h @@ -20,9 +20,6 @@ #include #define AFS_DARWIN_ENV -#define AFS_DARWIN13_ENV -#define AFS_DARWIN14_ENV -#define AFS_DARWIN60_ENV #define AFS_DARWIN70_ENV #define AFS_DARWIN80_ENV #define AFS_DARWIN90_ENV @@ -117,9 +114,6 @@ #include #define AFS_USERSPACE_ENV #define AFS_USR_DARWIN_ENV -#define AFS_USR_DARWIN13_ENV -#define AFS_USR_DARWIN14_ENV -#define AFS_USR_DARWIN60_ENV #define AFS_USR_DARWIN70_ENV #define AFS_USR_DARWIN80_ENV #define AFS_USR_DARWIN90_ENV diff --git a/src/dir/dir.c b/src/dir/dir.c index de69433ac..952714f8c 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -33,7 +33,7 @@ #if defined(AFS_SUN56_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DARWIN80_ENV) #include "afs/sysincludes.h" #endif -#if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_SGI64_ENV) && !defined(AFS_DARWIN_ENV) #include "h/user.h" #endif /* AFS_SGI64_ENV */ #include "h/uio.h" diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index fba22604e..bbb50b634 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -769,10 +769,7 @@ gator_cursesgwin_getdimensions(struct gwin *gwp, struct gwin_sizeparams *aparms) struct gator_cursesgwin *cwp; /*Curses-specific data */ cwp = (struct gator_cursesgwin *)(gwp->w_data); -#if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN60_ENV) - aparms->maxx = cwp->wp->maxx; - aparms->maxy = cwp->wp->maxy; -#elif defined(AFS_NBSD_ENV) || defined(AFS_DARWIN100_ENV) +#if defined(AFS_NBSD_ENV) || defined(AFS_DARWIN100_ENV) aparms->maxx = getmaxx(cwp->wp); aparms->maxy = getmaxy(cwp->wp); #else diff --git a/src/packaging/MacOS/InstallationCheck.7 b/src/packaging/MacOS/InstallationCheck.7 new file mode 100644 index 000000000..0ed3d5353 --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.7 @@ -0,0 +1,19 @@ +#!/bin/sh +majorvers=`uname -r | sed 's/\..*//'` +if [ $majorvers -ne 7 ]; then + exit 112 +fi + +# check for temporary versions of ThisCell and CellAlias +# and move them aside +tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER +tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER +date=`date +%Y%m%d%H%M` +if [ -e $tmpthiscell ]; then + mv -f $tmpthiscell $tmpthiscell.$date +fi +if [ -e $tmpcellalias ]; then + mv -f $tmpcellalias $tmpcellalias.$date +fi + +exit 0 diff --git a/src/packaging/MacOS/InstallationCheck.strings.7 b/src/packaging/MacOS/InstallationCheck.strings.7 new file mode 100644 index 000000000..43017bb1f --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings.7 @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Panther (10.3)"; diff --git a/src/packaging/MacOS/ReadMe.rtf.7 b/src/packaging/MacOS/ReadMe.rtf.7 new file mode 100644 index 000000000..b19ded4dd --- /dev/null +++ b/src/packaging/MacOS/ReadMe.rtf.7 @@ -0,0 +1,11 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww9000\viewh9000\viewkind0 +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.3. (Panther)\ +\ +The included afssettings program is distributed under the Apple Public Source License, version 2.0. See http://www.opensource.apple.com/apsl/2.0.txt or the included file 2.0.txt.\ +\ +Reboot when all of this is done.} \ No newline at end of file diff --git a/src/rx/DARWIN/rx_kmutex.c b/src/rx/DARWIN/rx_kmutex.c index c50253625..1789291f6 100644 --- a/src/rx/DARWIN/rx_kmutex.c +++ b/src/rx/DARWIN/rx_kmutex.c @@ -28,9 +28,7 @@ #include #include #include -#if defined(AFS_DARWIN70_ENV) #include -#endif /* defined(AFS_DARWIN70_ENV) */ lck_grp_t * openafs_lck_grp; static lck_grp_attr_t * openafs_lck_grp_attr; diff --git a/src/rx/DARWIN/rx_kmutex.h b/src/rx/DARWIN/rx_kmutex.h index 6fc153ed5..2a7ae4fae 100644 --- a/src/rx/DARWIN/rx_kmutex.h +++ b/src/rx/DARWIN/rx_kmutex.h @@ -48,7 +48,6 @@ extern boolean_t lck_rw_try_lock(lck_rw_t *lck, lck_rw_type_t lck_rw_type); */ #define CV_INIT(cv,a,b,c) #define CV_DESTROY(cv) -#ifdef AFS_DARWIN14_ENV #ifdef AFS_DARWIN80_ENV #define CV_WAIT(cv, lck) do { \ int isGlockOwner = ISAFS_GLOCK(); \ @@ -99,31 +98,6 @@ extern boolean_t lck_rw_try_lock(lck_rw_t *lck, lck_rw_type_t lck_rw_type); #endif #define CV_SIGNAL(cv) wakeup_one((void *)(cv)) #define CV_BROADCAST(cv) wakeup((void *)(cv)) -#else -#define CV_WAIT(cv, lck) { \ - int isGlockOwner = ISAFS_GLOCK(); \ - if (isGlockOwner) AFS_GUNLOCK(); \ - assert_wait((event_t)(cv), 0); \ - MUTEX_EXIT(lck); \ - thread_block(0); \ - if (isGlockOwner) AFS_GLOCK(); \ - MUTEX_ENTER(lck); \ - } - -#define CV_TIMEDWAIT(cv,lck,t) { \ - int isGlockOwner = ISAFS_GLOCK(); \ - if (isGlockOwner) AFS_GUNLOCK(); \ - assert_wait((event_t)(cv), 0); \ - thread_set_timer(t, NSEC_PER_SEC/hz); \ - MUTEX_EXIT(lck); \ - thread_block(0); \ - if (isGlockOwner) AFS_GLOCK(); \ - MUTEX_ENTER(lck); \ - } - -#define CV_SIGNAL(cv) thread_wakeup_one((event_t)(cv)) -#define CV_BROADCAST(cv) thread_wakeup((event_t)(cv)) -#endif #ifdef AFS_DARWIN80_ENV typedef struct { diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 90e68d15f..d2bf5e008 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -743,7 +743,7 @@ rxi_GetIFInfo(void) return different; } -#if defined(AFS_DARWIN60_ENV) || defined(AFS_XBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) /* Returns ifnet which best matches address */ rx_ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) @@ -762,7 +762,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) return (ifad ? rx_ifaddr_ifnet(ifad) : NULL); } -#else /* DARWIN60 || XBSD */ +#else /* DARWIN || XBSD */ /* Returns ifnet which best matches address */ rx_ifnet_t @@ -805,7 +805,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) *maskp = ifad->ia_subnetmask; return (ifad ? ifad->ia_ifp : NULL); } -#endif /* else DARWIN60 || XBSD */ +#endif /* else DARWIN || XBSD */ #endif /* else AFS_USERSPACE_IP_ADDR */ #endif /* !SUN5 && !SGI62 */ diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index d9a46b9d8..249db800f 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -94,17 +94,17 @@ typedef unsigned short etap_event_t; #include "netinet/in_systm.h" #endif #include "netinet/ip.h" -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) #include "netinet/in_pcb.h" #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */ #ifndef AFS_LINUX22_ENV -#if !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_DARWIN_ENV) #include "netinet/ip_var.h" #endif #include "netinet/ip_icmp.h" #endif /* AFS_LINUX22_ENV */ #include "netinet/udp.h" -#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/udp_var.h" #endif #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV)) @@ -124,7 +124,7 @@ typedef unsigned short etap_event_t; #endif #include "net/if.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */ #if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV) diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 59dc9a2a9..49176f428 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -30,7 +30,7 @@ #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV) #include "h/systm.h" #endif -#if defined(AFS_DARWIN60_ENV) || defined(AFS_OBSD_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) #include "h/kernel.h" #endif #include "h/types.h" diff --git a/src/util/softsig.c b/src/util/softsig.c index 4c202b9f9..b318368da 100644 --- a/src/util/softsig.c +++ b/src/util/softsig.c @@ -37,9 +37,9 @@ static pthread_t softsig_tid; static struct { void (*handler) (int); int pending; -#if !(defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))) +#if !(defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))) int fatal; -#endif /* !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) */ +#endif /* !defined(AFS_DARWIN_ENV) || !defined(AFS_NBSD_ENV) */ int inited; } softsig_sigs[NSIG]; @@ -54,7 +54,7 @@ softsig_thread(void *arg) pthread_sigmask(SIG_BLOCK, &ss, &os); pthread_sigmask(SIG_SETMASK, &os, NULL); sigaddset(&ss, SIGUSR1); -#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) +#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) pthread_sigmask (SIG_BLOCK, &ss, NULL); sigdelset (&os, SIGUSR1); #elif !defined(AFS_HPUX_ENV) @@ -69,11 +69,11 @@ softsig_thread(void *arg) softsig_sigs[i].fatal = 1; } } -#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */ +#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */ while (1) { void (*h) (int); -#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) +#if !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV) int sigw; #endif @@ -82,10 +82,10 @@ softsig_thread(void *arg) for (i = 0; i < NSIG; i++) { if (softsig_sigs[i].handler && !softsig_sigs[i].inited) { sigaddset(&ss, i); -#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) +#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) pthread_sigmask (SIG_BLOCK, &ss, NULL); sigdelset (&os, i); -#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */ +#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */ softsig_sigs[i].inited = 1; } if (softsig_sigs[i].pending) { @@ -95,16 +95,16 @@ softsig_thread(void *arg) } } if (i == NSIG) { -#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) +#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) sigsuspend (&os); -#else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */ +#else /* !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV) */ sigwait(&ss, &sigw); if (sigw != SIGUSR1) { if (softsig_sigs[sigw].fatal) exit(0); softsig_sigs[sigw].pending = 1; } -#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */ +#endif /* defined(AFS_DARWIN_ENV) || defined(AFS_NBSD_ENV) */ } else if (h) h(i); }