From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 15 Dec 2016 15:34:16 +0000 (+0300)
Subject: ipc_sem: print 4th argument of semctl syscall as an address
X-Git-Tag: v4.16~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=762b155643019fa7824adcc8bd90247f57c91bf4;p=strace

ipc_sem: print 4th argument of semctl syscall as an address

* ipc_sem.c (SYS_FUNC(semctl)): Print 4th argument using printaddr.
* tests/ipc_sem.c (cleanup): Update expected output.
---

diff --git a/ipc_sem.c b/ipc_sem.c
index b2a7e125..4a703783 100644
--- a/ipc_sem.c
+++ b/ipc_sem.c
@@ -126,7 +126,7 @@ SYS_FUNC(semctl)
 	   ) {
 		printnum_ptr(tcp, tcp->u_arg[3]);
 	} else {
-		tprintf("%#" PRI_klx, tcp->u_arg[3]);
+		printaddr(tcp->u_arg[3]);
 	}
 	return RVAL_DECODED;
 }
diff --git a/tests/ipc_sem.c b/tests/ipc_sem.c
index 926fa898..5524b868 100644
--- a/tests/ipc_sem.c
+++ b/tests/ipc_sem.c
@@ -49,7 +49,8 @@ static void
 cleanup(void)
 {
 	semctl(id, 0, IPC_RMID, 0);
-	printf("semctl\\(%d, 0, (IPC_64\\|)?IPC_RMID, \\[?0\\]?\\) += 0\n", id);
+	printf("semctl\\(%d, 0, (IPC_64\\|)?IPC_RMID, \\[?NULL\\]?\\) += 0\n",
+	       id);
 	id = -1;
 }
 
@@ -91,7 +92,7 @@ main(void)
 #ifdef __GLIBC__
 # define SEMCTL_BOGUS_ARG_FMT "(%#lx|\\[(%#lx|0)\\])"
 #else
-# define SEMCTL_BOGUS_ARG_FMT "(%#lx|\\[(%#lx|0)\\]|0)"
+# define SEMCTL_BOGUS_ARG_FMT "(%#lx|\\[(%#lx|0)\\]|NULL)"
 #endif
 	printf("semctl\\(%d, %d, (IPC_64\\|)?%#x /\\* SEM_\\?\\?\\? \\*/"
 	       ", " SEMCTL_BOGUS_ARG_FMT "\\) += %s\n",