|
From: <sv...@va...> - 2009-05-23 02:10:22
|
Author: njn
Date: 2009-05-23 02:51:39 +0100 (Sat, 23 May 2009)
New Revision: 10120
Log:
Trunk sync: sys_readlink layout.
Modified:
branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-05-23 01:18:44 UTC (rev 10119)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-05-23 01:51:39 UTC (rev 10120)
@@ -3661,8 +3661,7 @@
PRE(sys_readlink)
{
- Bool done = False;
- Word saved = SYSNO;
+ Word saved = SYSNO;
PRINT("sys_readlink ( %#lx(%s), %#lx, %llu )", ARG1,(char*)ARG1,ARG2,(ULong)ARG3);
PRE_REG_READ3(long, "readlink",
@@ -3670,28 +3669,28 @@
PRE_MEM_RASCIIZ( "readlink(path)", ARG1 );
PRE_MEM_WRITE( "readlink(buf)", ARG2,ARG3 );
-#if HAVE_PROC
- /*
- * Handle the case where readlink is looking at /proc/self/exe or
- * /proc/<pid>/exe.
- */
{
+#if HAVE_PROC
+ /*
+ * Handle the case where readlink is looking at /proc/self/exe or
+ * /proc/<pid>/exe.
+ */
HChar name[25];
- VG_(sprintf)(name, "/proc/%d/exe", VG_(getpid)());
- if (ML_(safe_to_deref)((void*)ARG1, 1)
- && (VG_(strcmp)((Char *)ARG1, name) == 0
- || VG_(strcmp)((Char *)ARG1, "/proc/self/exe") == 0)) {
- VG_(sprintf)(name, "/proc/self/fd/%d", VG_(cl_exec_fd));
- SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, (UWord)name,
- ARG2, ARG3));
- done = True;
- }
- }
+ Char* arg1s = (Char*) ARG1;
+ VG_(sprintf)(name, "/proc/%d/exe", VG_(getpid)());
+ if (ML_(safe_to_deref)(arg1s, 1) &&
+ (VG_STREQ(arg1s, name) || VG_STREQ(arg1s, "/proc/self/exe"))
+ )
+ {
+ VG_(sprintf)(name, "/proc/self/fd/%d", VG_(cl_exec_fd));
+ SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, (UWord)name,
+ ARG2, ARG3));
+ } else
#endif
-
- if (!done) {
- /* Normal case */
- SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, ARG1, ARG2, ARG3));
+ {
+ /* Normal case */
+ SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, ARG1, ARG2, ARG3));
+ }
}
if (SUCCESS && RES > 0)
|