|
From: <sv...@va...> - 2013-07-17 14:57:27
|
tom 2013-07-17 15:57:18 +0100 (Wed, 17 Jul 2013)
New Revision: 13462
Log:
Handle FIOCLEX and FIONCLEX ioctls. Patch from Ben Noordhuis. BZ#305170.
Modified files:
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/include/vki/vki-linux.h
Modified: trunk/include/vki/vki-linux.h (+3 -0)
===================================================================
--- trunk/include/vki/vki-linux.h 2013-07-17 15:36:57 +01:00 (rev 13461)
+++ trunk/include/vki/vki-linux.h 2013-07-17 15:57:18 +01:00 (rev 13462)
@@ -2860,6 +2860,9 @@
// From linux-2.6.39-rc2/include/asm_generic/ioctls.h
//----------------------------------------------------------------------
+#define VKI_FIONCLEX 0x5450
+#define VKI_FIOCLEX 0x5451
+
#ifndef VKI_FIOQSIZE
#define VKI_FIOQSIZE 0x5460 /* Value differs on some platforms */
#endif
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c (+8 -0)
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c 2013-07-17 15:36:57 +01:00 (rev 13461)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2013-07-17 15:57:18 +01:00 (rev 13462)
@@ -5262,6 +5262,10 @@
// scalar/non-pointer argument).
switch (ARG2 /* request */) {
+ /* asm-generic/ioctls.h */
+ case VKI_FIOCLEX:
+ case VKI_FIONCLEX:
+
/* linux/soundcard interface (ALSA) */
case VKI_SNDRV_PCM_IOCTL_HW_FREE:
case VKI_SNDRV_PCM_IOCTL_HWSYNC:
@@ -6801,6 +6805,10 @@
break;
case VKI_FIONBIO:
break;
+ case VKI_FIONCLEX:
+ break;
+ case VKI_FIOCLEX:
+ break;
case VKI_FIOASYNC:
break;
case VKI_FIONREAD: /* identical to SIOCINQ */
|
|
From: Dejan J. <dej...@rt...> - 2013-07-18 10:31:48
|
On 07/17/2013 04:57 PM, sv...@va... wrote: > tom 2013-07-17 15:57:18 +0100 (Wed, 17 Jul 2013) > > New Revision: 13462 > > Log: > Handle FIOCLEX and FIONCLEX ioctls. Patch from Ben Noordhuis. BZ#305170. > > Modified files: > trunk/coregrind/m_syswrap/syswrap-linux.c > trunk/include/vki/vki-linux.h > > > Modified: trunk/include/vki/vki-linux.h (+3 -0) > =================================================================== > --- trunk/include/vki/vki-linux.h 2013-07-17 15:36:57 +01:00 (rev 13461) > +++ trunk/include/vki/vki-linux.h 2013-07-17 15:57:18 +01:00 (rev 13462) > @@ -2860,6 +2860,9 @@ > // From linux-2.6.39-rc2/include/asm_generic/ioctls.h > //---------------------------------------------------------------------- > > +#define VKI_FIONCLEX 0x5450 > +#define VKI_FIOCLEX 0x5451 > + Hello all, in revisions 13461 and 13462 Tom defined: #define VKI_SOL_SOCKET 1 #define VKI_FIONCLEX 0x5450 #define VKI_FIOCLEX 0x5451 These values for mips32/64 are: #define VKI_SOL_SOCKET 0xffff #define VKI_FIONCLEX 0x6602 #define VKI_FIOCLEX 0x6601 VKI_SOL_SOCKET is already defined in vki-arch-linux.h. Can you remove VKI_SOL_SOCKET from vki-linux.h and define VKI_FIONCLEX and VKI_FIOCLEX in vki-arch-linux.h. Regards, Dejan |