Clean up the ifdef swamp.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1609 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -92,6 +92,7 @@ aix_setup(void)
|
|||||||
#define AIX_ENTRY_POINTS 5
|
#define AIX_ENTRY_POINTS 5
|
||||||
#define UNKNOWN_ENTRY_POINT 6
|
#define UNKNOWN_ENTRY_POINT 6
|
||||||
static int afs_entry_point = UNKNOWN_ENTRY_POINT;
|
static int afs_entry_point = UNKNOWN_ENTRY_POINT;
|
||||||
|
static int afs_syscalls[2];
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -101,34 +102,20 @@ k_pioctl(char *a_path,
|
|||||||
int a_followSymlinks)
|
int a_followSymlinks)
|
||||||
{
|
{
|
||||||
#ifndef NO_AFS
|
#ifndef NO_AFS
|
||||||
#ifdef AFS_SYSCALL
|
switch(afs_entry_point){
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT)
|
case SINGLE_ENTRY_POINT:
|
||||||
return syscall(AFS_SYSCALL, AFSCALL_PIOCTL,
|
case SINGLE_ENTRY_POINT2:
|
||||||
|
case SINGLE_ENTRY_POINT3:
|
||||||
|
return syscall(afs_syscalls[0], AFSCALL_PIOCTL,
|
||||||
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
||||||
#endif
|
case MULTIPLE_ENTRY_POINT:
|
||||||
|
return syscall(afs_syscalls[0],
|
||||||
#ifdef AFS_PIOCTL
|
|
||||||
if (afs_entry_point == MULTIPLE_ENTRY_POINT)
|
|
||||||
return syscall(AFS_PIOCTL,
|
|
||||||
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AFS_SYSCALL2
|
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT2)
|
|
||||||
return syscall(AFS_SYSCALL2, AFSCALL_PIOCTL,
|
|
||||||
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AFS_SYSCALL3
|
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT3)
|
|
||||||
return syscall(AFS_SYSCALL3, AFSCALL_PIOCTL,
|
|
||||||
a_path, o_opcode, a_paramsP, a_followSymlinks);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _AIX
|
#ifdef _AIX
|
||||||
if (afs_entry_point == AIX_ENTRY_POINTS)
|
case AIX_ENTRY_POINTS:
|
||||||
return Pioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
|
return Pioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
errno = ENOSYS;
|
errno = ENOSYS;
|
||||||
#ifdef SIGSYS
|
#ifdef SIGSYS
|
||||||
@@ -161,30 +148,18 @@ int
|
|||||||
k_setpag(void)
|
k_setpag(void)
|
||||||
{
|
{
|
||||||
#ifndef NO_AFS
|
#ifndef NO_AFS
|
||||||
#ifdef AFS_SYSCALL
|
switch(afs_entry_point){
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT)
|
case SINGLE_ENTRY_POINT:
|
||||||
return syscall(AFS_SYSCALL, AFSCALL_SETPAG);
|
case SINGLE_ENTRY_POINT2:
|
||||||
#endif
|
case SINGLE_ENTRY_POINT3:
|
||||||
|
return syscall(afs_syscalls[0], AFSCALL_SETPAG);
|
||||||
#ifdef AFS_SETPAG
|
case MULTIPLE_ENTRY_POINT:
|
||||||
if (afs_entry_point == MULTIPLE_ENTRY_POINT)
|
return syscall(afs_syscalls[1]);
|
||||||
return syscall(AFS_SETPAG);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AFS_SYSCALL2
|
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT2)
|
|
||||||
return syscall(AFS_SYSCALL2, AFSCALL_SETPAG);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AFS_SYSCALL3
|
|
||||||
if (afs_entry_point == SINGLE_ENTRY_POINT3)
|
|
||||||
return syscall(AFS_SYSCALL3, AFSCALL_SETPAG);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _AIX
|
#ifdef _AIX
|
||||||
if (afs_entry_point == AIX_ENTRY_POINTS)
|
case AIX_ENTRY_POINTS:
|
||||||
return Setpag();
|
return Setpag();
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
errno = ENOSYS;
|
errno = ENOSYS;
|
||||||
#ifdef SIGSYS
|
#ifdef SIGSYS
|
||||||
@@ -243,6 +218,7 @@ k_hasafs(void)
|
|||||||
if (errno == EINVAL)
|
if (errno == EINVAL)
|
||||||
{
|
{
|
||||||
afs_entry_point = SINGLE_ENTRY_POINT;
|
afs_entry_point = SINGLE_ENTRY_POINT;
|
||||||
|
afs_syscalls[0] = AFS_SYSCALL;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -256,6 +232,8 @@ k_hasafs(void)
|
|||||||
if (errno == EINVAL)
|
if (errno == EINVAL)
|
||||||
{
|
{
|
||||||
afs_entry_point = MULTIPLE_ENTRY_POINT;
|
afs_entry_point = MULTIPLE_ENTRY_POINT;
|
||||||
|
afs_syscalls[0] = AFS_PIOCTL;
|
||||||
|
afs_syscalls[1] = AFS_SETPAG;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -269,6 +247,7 @@ k_hasafs(void)
|
|||||||
if (errno == EINVAL)
|
if (errno == EINVAL)
|
||||||
{
|
{
|
||||||
afs_entry_point = SINGLE_ENTRY_POINT2;
|
afs_entry_point = SINGLE_ENTRY_POINT2;
|
||||||
|
afs_syscalls[0] = AFS_SYSCALL2;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -282,6 +261,7 @@ k_hasafs(void)
|
|||||||
if (errno == EINVAL)
|
if (errno == EINVAL)
|
||||||
{
|
{
|
||||||
afs_entry_point = SINGLE_ENTRY_POINT3;
|
afs_entry_point = SINGLE_ENTRY_POINT3;
|
||||||
|
afs_syscalls[0] = AFS_SYSCALL3;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -295,7 +275,7 @@ k_hasafs(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
done:
|
done:
|
||||||
#ifdef SIGSYS
|
#ifdef SIGSYS
|
||||||
signal(SIGSYS, saved_func);
|
signal(SIGSYS, saved_func);
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user