Handle the TIOCMGET ioctl.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4291

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 94b5c71b72339760dbbbf44c554043a3fee2ab36..a60f6182a8aad8e9d2bf4e28c050afabba2b9059 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3096,6 +3096,9 @@ PRE(sys_ioctl)
    case VKI_TIOCMSET:
       PRE_MEM_READ( "ioctl(TIOCMSET)",    ARG3, sizeof(unsigned int) );
       break;
+   case VKI_TIOCMGET:
+      PRE_MEM_WRITE( "ioctl(TIOCMGET)",   ARG3, sizeof(unsigned int) );
+      break;
    case VKI_TIOCLINUX:
       PRE_MEM_READ( "ioctl(TIOCLINUX)",   ARG3, sizeof(char *) );
       if (*(char *)ARG3 == 11) {
@@ -3888,6 +3891,9 @@ POST(sys_ioctl)
    case VKI_TIOCMBIC:
    case VKI_TIOCMSET:
       break;
+   case VKI_TIOCMGET:
+      POST_MEM_WRITE( ARG3, sizeof(unsigned int) );
+      break;
    case VKI_TIOCLINUX:
       POST_MEM_WRITE( ARG3, sizeof(char *) );
       break;

diff --git a/include/vki-amd64-linux.h b/include/vki-amd64-linux.h
index 934a2769aa2e31b7a09dac6444f3543f1ecf191b..d1c28769901ba963cb3c38914d77d9b53f8d3d68 100644 (file)
--- a/include/vki-amd64-linux.h
+++ b/include/vki-amd64-linux.h
@@ -417,6 +417,7 @@ struct vki_termios {
 #define VKI_TIOCOUTQ   0x5411
 #define VKI_TIOCGWINSZ 0x5413
 #define VKI_TIOCSWINSZ 0x5414
+#define VKI_TIOCMGET   0x5415
 #define VKI_TIOCMBIS   0x5416
 #define VKI_TIOCMBIC   0x5417
 #define VKI_TIOCMSET   0x5418

diff --git a/include/vki-ppc32-linux.h b/include/vki-ppc32-linux.h
index 85940d0984887d94f1b0b4822f0f9d299b7d265c..647254add2bf1cbdf19c47e259dde31aa7fb877a 100644 (file)
--- a/include/vki-ppc32-linux.h
+++ b/include/vki-ppc32-linux.h
@@ -524,7 +524,7 @@ extern unsigned int __VKI_invalid_size_argument_for_IOC;
 #define VKI_TIOCSCTTY          0x540E
 
 //#define VKI_TIOCSTI          0x5412
-//#define VKI_TIOCMGET         0x5415
+#define VKI_TIOCMGET           0x5415
 #define VKI_TIOCMBIS           0x5416
 #define VKI_TIOCMBIC           0x5417
 #define VKI_TIOCMSET           0x5418

diff --git a/include/vki-x86-linux.h b/include/vki-x86-linux.h
index 990c71c93bc7f515dbe8a4928ff659ff77fe0f3b..550402adc606eb1e5b18b86cd2cd98a1e9217cef 100644 (file)
--- a/include/vki-x86-linux.h
+++ b/include/vki-x86-linux.h
@@ -520,6 +520,7 @@ extern unsigned int __vki_invalid_size_argument_for_IOC;
 #define VKI_TIOCOUTQ   0x5411
 #define VKI_TIOCGWINSZ 0x5413
 #define VKI_TIOCSWINSZ 0x5414
+#define VKI_TIOCMGET   0x5415
 #define VKI_TIOCMBIS   0x5416
 #define VKI_TIOCMBIC   0x5417
 #define VKI_TIOCMSET   0x5418