Minor fixes for problems pointed out by Greg Parker:

* The wrapper for fcntl(F_SETOWN) and fcntl(F_SETSIG) ignores ARG3,
  but should not.

* Linux PRE(sys_umount) doesn't print ARG2.

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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 80ae123bd97c6ed4e7636377a1143d90a9f988b7..41c257e2b62ec751cbd3e4885c24a916cde7fe57 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -2600,9 +2600,7 @@ PRE(sys_fcntl)
    case VKI_F_GETFD:
    case VKI_F_GETFL:
    case VKI_F_GETOWN:
-   case VKI_F_SETOWN:
    case VKI_F_GETSIG:
-   case VKI_F_SETSIG:
    case VKI_F_GETLEASE:
       PRINT("sys_fcntl ( %d, %d )", ARG1,ARG2);
       PRE_REG_READ2(long, "fcntl", unsigned int, fd, unsigned int, cmd);
@@ -2614,6 +2612,8 @@ PRE(sys_fcntl)
    case VKI_F_SETFL:
    case VKI_F_SETLEASE:
    case VKI_F_NOTIFY:
+   case VKI_F_SETOWN:
+   case VKI_F_SETSIG:
       PRINT("sys_fcntl[ARG3=='arg'] ( %d, %d, %d )", ARG1,ARG2,ARG3);
       PRE_REG_READ3(long, "fcntl",
                     unsigned int, fd, unsigned int, cmd, unsigned long, arg);

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index c4d7a24ba775226b069aa2eefb9c4dc2186464f8..089425cad9ef59ffef5e65efb422d6ea9dea98a9 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -168,7 +168,7 @@ PRE(sys_oldumount)
 
 PRE(sys_umount)
 {
-   PRINT("sys_umount( %p )", ARG1);
+   PRINT("sys_umount( %p, %d )", ARG1, ARG2);
    PRE_REG_READ2(long, "umount2", char *, path, int, flags);
    PRE_MEM_RASCIIZ( "umount2(path)", ARG1);
 }