#include <stdio.h>
#include <sys/types.h>
-#if !defined(AFS_SUN3_ENV) && !defined(sys_vax_ul43) && !defined(AFS_DARWIN_ENV)
+#if !defined(AFS_SUN3_ENV) && !defined(sys_vax_ul43)
#include <time.h>
/*#ifdef AFS_AIX_ENV*/
#include <sys/time.h>
#include <afs/icl.h>
#include <afs/afsutil.h>
-#if defined(AFS_ALPHA_ENV) || defined(AFS_SGI61_ENV) || (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL))
+#if defined(AFS_OSF_ENV) || defined(AFS_SGI61_ENV) || (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL))
/* For SGI 6.2, this is changed to 1 if it's a 32 bit kernel. */
int afs_icl_sizeofLong = 2;
#else
printfParms[pfpix] <<= 32;
printfParms[pfpix] |= alp[pix + 1];
}
-#else /* AFS_SGI61_ENV */
-#ifdef AFS_ALPHA_ENV
+#elif defined(AFS_OSF_ENV)
printfParms[pfpix] = alp[pix + 1];
printfParms[pfpix] |= (alp[pix] <<= 32);
-#else /* AFS_ALPHA_ENV */
+#else /* !AFS_OSF_ENV && !AFS_SGI61_ENV */
printfParms[pfpix] = alp[pix];
-#endif /* AFS_ALPHA_ENV */
-#endif /* AFS_SGI61_ENV */
+#endif
pfpix++;
break;
case ICL_TYPE_INT32:
char nls_filename[11];
char alt_filename[80];
char *message;
+#if defined(AFS_64BITPOINTER_ENV)
+ long J;
+#else
int J;
+#endif
static char *facility_names[] = {
"xxx",
"afs"
catd = (nl_catd) catopen1(nls_filename, 0);
#endif
#else
+#if defined(AFS_64BITPOINTER_ENV)
+ J = (long)catopen(nls_filename, 0);
+#else
J = (int)catopen(nls_filename, 0);
+#endif
catd = (nl_catd) J;
#endif
if (catd == (nl_catd) - 1) {
catd = (nl_catd) catopen1(alt_filename, 0);
#endif
#else
+#if defined(AFS_64BITPOINTER_ENV)
+ J = (long)catopen(alt_filename, 0);
+#else
J = (int)catopen(alt_filename, 0);
+#endif
catd = (nl_catd) J;
#endif
if (catd == (nl_catd) - 1) {
afs_syscall(call, parm0, parm1, parm2, parm3, parm4, parm5, parm6)
long call, parm0, parm1, parm2, parm3, parm4, parm5, parm6;
{
- int code;
+ int code, rval;
#ifdef AFS_LINUX20_ENV
#if defined AFS_LINUX_64BIT_KERNEL
long long eparm[4];
#endif
/* Linux can only handle 5 arguments in the actual syscall. */
if (call == AFSCALL_ICL) {
- code = syscall(AFS_SYSCALL, call, parm0, parm1, parm2, eparm);
+ rval = proc_afs_syscall(call, parm0, parm1, parm2, eparm, &code);
+ if (rval)
+ code = syscall(AFS_SYSCALL, call, parm0, parm1, parm2, eparm);
} else {
- code = syscall(AFS_SYSCALL, call, parm0, parm1, parm2, parm3);
+ rval = proc_afs_syscall(call, parm0, parm1, parm2, parm3, &code);
+ if (rval)
+ code = syscall(AFS_SYSCALL, call, parm0, parm1, parm2, parm3);
}
#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV)
/* on sparc this function returns none value, so do it myself */
- __asm__ __volatile__("
- mov %o0, %i0
- ret
- restore
-");
+ __asm__ __volatile__("mov %o0, %i0; ret; restore");
#endif
#else
+#ifdef AFS_DARWIN80_ENV
+ code = ioctl_afs_syscall(call, parm0, parm1, parm2, parm3, parm4, parm5, &rval);
+ if (!code) code = rval;
+#else
#if !defined(AFS_SGI_ENV) && !defined(AFS_AIX32_ENV)
code = syscall(AFS_SYSCALL, call, parm0, parm1, parm2, parm3, parm4);
#else
code = syscall(AFSCALL_ICL, parm0, parm1, parm2, parm3, parm4);
#endif
#endif
+#endif
#endif /* AFS_LINUX20_ENV */
return code;
}