From: Roland McGrath <roland@redhat.com>
Date: Thu, 13 Nov 2003 22:32:27 +0000 (+0000)
Subject: 2003-09-06  Dmitry V. Levin <ldv@altlinux.org>
X-Git-Tag: v4.5.18~671
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bc1220fe3f10e16919f182ad394c35619fe2e7f;p=strace

2003-09-06  Dmitry V. Levin <ldv@altlinux.org>

	* util.c (printuid): New function.
	* defs.h: Declare it.
	* file.c (sys_chown): Use it.
	* file.c (sys_fchown): Likewise.
	* process.c (sys_setreuid, sys_setregid, sys_setresuid,
	sys_setresgid): Likewise.
---

diff --git a/defs.h b/defs.h
index 504cbf5f..bec6bebe 100644
--- a/defs.h
+++ b/defs.h
@@ -441,6 +441,7 @@ extern void printsiginfo P((siginfo_t *, int));
 extern void printsock P((struct tcb *, long, int));
 extern void print_sock_optmgmt P((struct tcb *, long, int));
 extern void printrusage P((struct tcb *, long));
+extern void printuid P((const char *, unsigned long));
 extern int clearbpt P((struct tcb *));
 extern int setbpt P((struct tcb *));
 extern int sigishandled P((struct tcb *, int));
diff --git a/file.c b/file.c
index 8205d354..5ab057ca 100644
--- a/file.c
+++ b/file.c
@@ -1721,7 +1721,8 @@ struct tcb *tcp;
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", %lu, %lu", tcp->u_arg[1], tcp->u_arg[2]);
+		printuid(", ", tcp->u_arg[1]);
+		printuid(", ", tcp->u_arg[2]);
 	}
 	return 0;
 }
@@ -1731,8 +1732,9 @@ sys_fchown(tcp)
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %lu, %lu",
-			tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
+		tprintf("%ld", tcp->u_arg[0]);
+		printuid(", ", tcp->u_arg[1]);
+		printuid(", ", tcp->u_arg[2]);
 	}
 	return 0;
 }
diff --git a/util.c b/util.c
index c2ec5fe6..7dcc5b3b 100644
--- a/util.c
+++ b/util.c
@@ -313,6 +313,15 @@ char *fmt;
 	tprintf("]");
 }
 
+void
+printuid(text, uid)
+const char *text;
+unsigned long uid;
+{
+	tprintf("%s", text);
+	tprintf((uid == -1) ? "%ld" : "%lu", uid);
+}
+
 static char path[MAXPATHLEN + 1];
 
 void