desc.c: move parser of flock syscall to a separate file

* flock.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* desc.c (SYS_FUNC(flock)): Move to flock.c.

diff --git a/Makefile.am b/Makefile.am
index 1d8b1356ae4873f0629823274373842e7cc5088a..01a2df6c88a0676b36850cbe297d72bc4f848ad6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ strace_SOURCES =      \
        fchownat.c      \
        fetch_seccomp_fprog.c \
        file.c          \
+       flock.c         \
        futex.c         \
        get_robust_list.c \
        getcpu.c        \

diff --git a/desc.c b/desc.c
index 0093538ee8aa85502dc120715a55ae62c9eca2a3..039fae66a1e0de8fcbcd1b6fa9a011b7cec0a485 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -30,11 +30,9 @@
 
 #include "defs.h"
 #include <fcntl.h>
-#include <sys/file.h>
 
 #include "xlat/fcntlcmds.h"
 #include "xlat/fdflags.h"
-#include "xlat/flockcmds.h"
 #include "xlat/lockfcmds.h"
 #include "xlat/notifyflags.h"
 
@@ -224,18 +222,6 @@ SYS_FUNC(fcntl)
        return 0;
 }
 
-#ifdef LOCK_SH
-
-SYS_FUNC(flock)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
-
-       return RVAL_DECODED;
-}
-#endif /* LOCK_SH */
-
 SYS_FUNC(close)
 {
        printfd(tcp, tcp->u_arg[0]);

diff --git a/flock.c b/flock.c
new file mode 100644 (file)
index 0000000..6ec43db
--- /dev/null
+++ b/flock.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include <sys/file.h>
+
+#include "xlat/flockcmds.h"
+
+SYS_FUNC(flock)
+{
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
+
+       return RVAL_DECODED;
+}