From c8db31cc2bf9b59d8b8cf7e5310079ff6c9e4a96 Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Fri, 12 Aug 2005 22:26:09 +0000 Subject: [PATCH] openbsd38-20050812 With thanks to "Todd T. Fries" OpenBSD 3.8. Introduce HAVE_STRCASESTR. --- acinclude.m4 | 5 ++- src/afs/sysincludes.h | 2 ++ src/afsmonitor/afsmonitor.c | 2 +- src/config/afs_sysnames.h | 1 + src/config/param.i386_obsd38.h | 66 ++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/config/param.i386_obsd38.h diff --git a/acinclude.m4 b/acinclude.m4 index 3f77d8db5..1b6639c43 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -254,6 +254,9 @@ else i?86-*-openbsd3.7) AFS_SYSNAME="i386_obsd37" ;; + i?86-*-openbsd3.8) + AFS_SYSNAME="i386_obsd38" + ;; i?86-*-freebsd4.2*) AFS_SYSNAME="i386_fbsd_42" ;; @@ -1019,7 +1022,7 @@ fi AC_SUBST(BUILD_LOGIN) AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec) -AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror) +AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr) AC_CHECK_FUNCS(regcomp regexec regerror) AC_MSG_CHECKING([for POSIX regex library]) diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 587288c57..20f876b47 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -39,7 +39,9 @@ #include #include #include +#ifndef AFS_OBSD38_ENV #include +#endif #include #ifndef MLEN #include diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index 1a724ad1a..93f13b50d 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -272,7 +272,7 @@ extern char *cm_categories[]; /* cache manager data category names */ -#if !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN70_ENV) && !defined(AFS_NBSD20_ENV) +#ifndef HAVE_STRCASESTR /* strcasestr(): Return first occurence of pattern s2 in s1, case insensitive. diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 87dc96ab2..905de7480 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -215,6 +215,7 @@ #define SYS_NAME_ID_i386_obsd35 2604 #define SYS_NAME_ID_i386_obsd36 2605 #define SYS_NAME_ID_i386_obsd37 2606 +#define SYS_NAME_ID_i386_obsd38 2607 #define SYS_NAME_ID_amd64_linux2 2700 #define SYS_NAME_ID_amd64_linux22 2701 diff --git a/src/config/param.i386_obsd38.h b/src/config/param.i386_obsd38.h new file mode 100644 index 000000000..52b03fdca --- /dev/null +++ b/src/config/param.i386_obsd38.h @@ -0,0 +1,66 @@ +/* + * Jim Rees, University of Michigan CITI + */ + +#ifndef AFS_PARAM_H +#define AFS_PARAM_H + +#ifndef IGNORE_STDS_H +#include +#endif + +#define SYS_NAME "i386_obsd38" +#define SYS_NAME_ID SYS_NAME_ID_i386_obsd38 + +#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_ENV 1 +#define AFS_64BIT_CLIENT 1 +#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ +#define AFS_OBSD_ENV 1 +#define AFS_OBSD34_ENV 1 +#define AFS_OBSD35_ENV 1 +#define AFS_OBSD36_ENV 1 +#define AFS_OBSD37_ENV 1 +#define AFS_OBSD38_ENV 1 +#define AFS_NONFSTRANS 1 +#define AFS_VM_RDWR_ENV 1 +#define AFS_VFS_ENV 1 +#define AFS_VFSINCL_ENV 1 + +#define FTRUNC O_TRUNC + +#define AFS_SYSCALL 208 +#define AFS_MOUNT_AFS "afs" + +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + +#define AFSLITTLE_ENDIAN 1 + +#ifndef IGNORE_STDS_H +#include +#endif + +/* Extra kernel definitions (from kdefs file) */ +#ifdef _KERNEL +#define AFS_GLOBAL_SUNLOCK 1 +#define AFS_SHORTGID 0 /* are group id's short? */ + +#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) +enum vcexcl { NONEXCL, EXCL }; + +#ifndef MIN +#define MIN(A,B) ((A) < (B) ? (A) : (B)) +#endif +#ifndef MAX +#define MAX(A,B) ((A) > (B) ? (A) : (B)) +#endif + +#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ +#endif /* _KERNEL */ + +#endif /* AFS_PARAM_H */ -- 2.39.5