Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use SVR4 code for fcntl(F_GETFL) and fcntl(F_SETFL) because the constant 

are not the same.
This commit is contained in:
manu 2002-06-01 16:16:36 +00:00
parent 339203767f
commit 658fcb808d
2 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
sys/compat/irix/irix_fcntl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_fcntl.c,v 1.8 2002/05/22 05:14:00 manu Exp $ */
/* $NetBSD: irix_fcntl.c,v 1.9 2002/06/01 16:16:36 manu Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.8 2002/05/22 05:14:00 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.9 2002/06/01 16:16:36 manu Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@ -69,6 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.8 2002/05/22 05:14:00 manu Exp $");
#include <compat/svr4/svr4_syscallargs.h>
static int fd_truncate __P((struct proc *, int, int, off_t, register_t *));
static int bsd_to_irix_fcntl_flags __P((int));
static int irix_to_bsd_fcntl_flags __P((int));
int
irix_sys_lseek64(p, v, retval)
@ -155,11 +157,34 @@ irix_sys_fcntl(p, v, retval)
cmd = SVR4_F_SETLK;
break;
case IRIX_F_GETFL:
SCARG(&cup, fd) = SCARG(uap, fd);
SCARG(&cup, cmd) = F_GETFL;
SCARG(&cup, arg) = SCARG(uap, arg);
if ((error = sys_fcntl(p, &cup, retval)) != 0)
return error;
*retval = bsd_to_irix_fcntl_flags(*retval);
return 0;
break;
case IRIX_F_SETFL:
/*
* All unsupported flags are silently ignored
* except FDIRECT taht will return EINVAL
*/
if ((int)SCARG(uap, arg) & IRIX_FDIRECT)
return EINVAL;
SCARG(&cup, fd) = SCARG(uap, fd);
SCARG(&cup, arg) =
(char *)irix_to_bsd_fcntl_flags((int)SCARG(uap, arg));
SCARG(&cup, cmd) = F_SETFL;
return sys_fcntl(p, &cup, retval);
break;
case SVR4_F_DUPFD:
case SVR4_F_GETFD:
case SVR4_F_SETFD:
case SVR4_F_GETFL:
case SVR4_F_SETFL:
case SVR4_F_SETLK:
case SVR4_F_SETLKW:
case SVR4_F_CHKFL:
@ -323,3 +348,47 @@ irix_sys_open(p, v, retval)
return 0;
}
static int
irix_to_bsd_fcntl_flags(flags)
int flags;
{
int ret = 0;
if (flags & IRIX_FNDELAY) ret |= FNDELAY;
if (flags & IRIX_FAPPEND) ret |= FAPPEND;
if (flags & IRIX_FSYNC) ret |= FFSYNC;
if (flags & IRIX_FDSYNC) ret |= FDSYNC;
if (flags & IRIX_FASYNC) ret |= FASYNC;
if (flags & IRIX_FRSYNC) ret |= FRSYNC;
if (flags & IRIX_FNONBLOCK) ret |= FNONBLOCK;
if (flags & IRIX_FLARGEFILE)
printf("Warning: ignored fcntl IRIX_FLARGEFILE flag");
if (flags & IRIX_FDIRECT)
printf("Warning: ignored fcntl IRIX_FDIRECT flag");
if (flags & IRIX_FBULK)
printf("Warning: ignored fcntl IRIX_FBULK flag");
if (flags & IRIX_FLCINVAL)
printf("Warning: ignored fcntl IRIX_FLCINVAL flag");
if (flags & IRIX_FLCFLUSH)
printf("Warning: ignored fcntl IRIX_FLCFLUSH flag");
return ret;
}
static int
bsd_to_irix_fcntl_flags(flags)
int flags;
{
int ret = 0;
if (flags & FNDELAY) ret |= IRIX_FNDELAY;
if (flags & FAPPEND) ret |= IRIX_FAPPEND;
if (flags & FFSYNC) ret |= IRIX_FSYNC;
if (flags & FDSYNC) ret |= IRIX_FDSYNC;
if (flags & FRSYNC) ret |= IRIX_FRSYNC;
if (flags & FNONBLOCK) ret |= IRIX_FNONBLOCK;
if (flags & FASYNC) ret |= IRIX_FASYNC;
return ret;
}

16
sys/compat/irix/irix_fcntl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_fcntl.h,v 1.1 2002/04/02 19:58:38 manu Exp $ */
/* $NetBSD: irix_fcntl.h,v 1.2 2002/06/01 16:16:36 manu Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -91,4 +91,18 @@
#define IRIX_F_SETPRIO 57
#define IRIX_F_GETPRIO 58
/* fcntl F_GETFL flags */
#define IRIX_FNDELAY 0x000004
#define IRIX_FAPPEND 0x000008
#define IRIX_FSYNC 0x000010
#define IRIX_FDSYNC 0x000020
#define IRIX_FRSYNC 0x000040
#define IRIX_FNONBLOCK 0x000080
#define IRIX_FASYNC 0x001000
#define IRIX_FLARGEFILE 0x002000
#define IRIX_FDIRECT 0x008000
#define IRIX_FBULK 0x010000
#define IRIX_FLCINVAL 0x020000
#define IRIX_FLCFLUSH 0x040000
#endif /* _IRIX_FCNTL_H_ */