From fb470f350ee9091a7b4f5f069aac28e8185446ec Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sat, 6 Dec 2014 03:53:16 +0000
Subject: [PATCH] file.c: move utime parser to a separate file

* utime.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* file.c (sys_utime): Move to utime.c.
---
 Makefile.am |  1 +
 file.c      | 36 ------------------------------------
 utime.c     | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 utime.c

diff --git a/Makefile.am b/Makefile.am
index 0516344f..ae535d42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,6 +72,7 @@ strace_SOURCES =	\
 	time.c		\
 	umount.c	\
 	util.c		\
+	utime.c		\
 	v4l2.c		\
 	vsprintf.c	\
 	xattr.c
diff --git a/file.c b/file.c
index af091890..502eb524 100644
--- a/file.c
+++ b/file.c
@@ -1519,39 +1519,3 @@ sys_utimensat(struct tcb *tcp)
 	}
 	return 0;
 }
-
-int
-sys_utime(struct tcb *tcp)
-{
-	union {
-		long utl[2];
-		int uti[2];
-		long paranoia_for_huge_wordsize[4];
-	} u;
-	unsigned wordsize;
-
-	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-		tprints(", ");
-
-		wordsize = current_wordsize;
-		if (!tcp->u_arg[1])
-			tprints("NULL");
-		else if (!verbose(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
-		else if (umoven(tcp, tcp->u_arg[1], 2 * wordsize, (char *) &u) < 0)
-			tprints("[?, ?]");
-		else if (wordsize == sizeof u.utl[0]) {
-			tprintf("[%s,", sprinttime(u.utl[0]));
-			tprintf(" %s]", sprinttime(u.utl[1]));
-		}
-		else if (wordsize == sizeof u.uti[0]) {
-			tprintf("[%s,", sprinttime(u.uti[0]));
-			tprintf(" %s]", sprinttime(u.uti[1]));
-		}
-		else
-			tprintf("<decode error: unsupported wordsize %d>",
-				wordsize);
-	}
-	return 0;
-}
diff --git a/utime.c b/utime.c
new file mode 100644
index 00000000..6e396b05
--- /dev/null
+++ b/utime.c
@@ -0,0 +1,37 @@
+#include "defs.h"
+
+int
+sys_utime(struct tcb *tcp)
+{
+	union {
+		long utl[2];
+		int uti[2];
+		long paranoia_for_huge_wordsize[4];
+	} u;
+	unsigned wordsize;
+
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+		tprints(", ");
+
+		wordsize = current_wordsize;
+		if (!tcp->u_arg[1])
+			tprints("NULL");
+		else if (!verbose(tcp))
+			tprintf("%#lx", tcp->u_arg[1]);
+		else if (umoven(tcp, tcp->u_arg[1], 2 * wordsize, (char *) &u) < 0)
+			tprints("[?, ?]");
+		else if (wordsize == sizeof u.utl[0]) {
+			tprintf("[%s,", sprinttime(u.utl[0]));
+			tprintf(" %s]", sprinttime(u.utl[1]));
+		}
+		else if (wordsize == sizeof u.uti[0]) {
+			tprintf("[%s,", sprinttime(u.uti[0]));
+			tprintf(" %s]", sprinttime(u.uti[1]));
+		}
+		else
+			tprintf("<decode error: unsupported wordsize %d>",
+				wordsize);
+	}
+	return 0;
+}
-- 
2.34.1