From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 6 Dec 2014 03:53:16 +0000 (+0000)
Subject: file.c: move renameat and renameat2 parsers to a separate file
X-Git-Tag: v4.10~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d20a0b9a3973127140a0eb69d4e0bc8e16c6822;p=strace

file.c: move renameat and renameat2 parsers to a separate file

* renameat.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* file.c: Move sys_renameat, sys_renameat2, and related code
to renameat.c.
---

diff --git a/Makefile.am b/Makefile.am
index e4b78521..324be2b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,7 @@ strace_SOURCES =	\
 	ptp.c		\
 	quota.c		\
 	reboot.c	\
+	renameat.c	\
 	resource.c	\
 	scsi.c		\
 	signal.c	\
diff --git a/file.c b/file.c
index e66fdfc0..9fa2ee1c 100644
--- a/file.c
+++ b/file.c
@@ -1356,35 +1356,3 @@ sys_readlinkat(struct tcb *tcp)
 		print_dirfd(tcp, tcp->u_arg[0]);
 	return decode_readlink(tcp, 1);
 }
-
-static void
-decode_renameat(struct tcb *tcp)
-{
-	print_dirfd(tcp, tcp->u_arg[0]);
-	printpath(tcp, tcp->u_arg[1]);
-	tprints(", ");
-	print_dirfd(tcp, tcp->u_arg[2]);
-	printpath(tcp, tcp->u_arg[3]);
-}
-
-int
-sys_renameat(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		decode_renameat(tcp);
-	}
-	return 0;
-}
-
-#include "xlat/rename_flags.h"
-
-int
-sys_renameat2(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		decode_renameat(tcp);
-		tprints(", ");
-		printflags(rename_flags, tcp->u_arg[4], "RENAME_??");
-	}
-	return 0;
-}
diff --git a/renameat.c b/renameat.c
new file mode 100644
index 00000000..bf3dd793
--- /dev/null
+++ b/renameat.c
@@ -0,0 +1,33 @@
+#include "defs.h"
+
+static void
+decode_renameat(struct tcb *tcp)
+{
+	print_dirfd(tcp, tcp->u_arg[0]);
+	printpath(tcp, tcp->u_arg[1]);
+	tprints(", ");
+	print_dirfd(tcp, tcp->u_arg[2]);
+	printpath(tcp, tcp->u_arg[3]);
+}
+
+int
+sys_renameat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		decode_renameat(tcp);
+	}
+	return 0;
+}
+
+#include "xlat/rename_flags.h"
+
+int
+sys_renameat2(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		decode_renameat(tcp);
+		tprints(", ");
+		printflags(rename_flags, tcp->u_arg[4], "RENAME_??");
+	}
+	return 0;
+}