Skip to content

Commit 5d68f46

Browse files
committed
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.
1 parent f4d6a0d commit 5d68f46

File tree

3 files changed

+44
-14
lines changed

3 files changed

+44
-14
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ strace_SOURCES = \
6161
fchownat.c \
6262
fetch_seccomp_fprog.c \
6363
file.c \
64+
flock.c \
6465
futex.c \
6566
get_robust_list.c \
6667
getcpu.c \

desc.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030

3131
#include "defs.h"
3232
#include <fcntl.h>
33-
#include <sys/file.h>
3433

3534
#include "xlat/fcntlcmds.h"
3635
#include "xlat/fdflags.h"
37-
#include "xlat/flockcmds.h"
3836
#include "xlat/lockfcmds.h"
3937
#include "xlat/notifyflags.h"
4038

@@ -224,18 +222,6 @@ SYS_FUNC(fcntl)
224222
return 0;
225223
}
226224

227-
#ifdef LOCK_SH
228-
229-
SYS_FUNC(flock)
230-
{
231-
printfd(tcp, tcp->u_arg[0]);
232-
tprints(", ");
233-
printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
234-
235-
return RVAL_DECODED;
236-
}
237-
#endif /* LOCK_SH */
238-
239225
SYS_FUNC(close)
240226
{
241227
printfd(tcp, tcp->u_arg[0]);

flock.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (c) 1991, 1992 Paul Kranenburg <[email protected]>
3+
* Copyright (c) 1993 Branko Lankester <[email protected]>
4+
* Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <[email protected]>
5+
* Copyright (c) 1996-1999 Wichert Akkerman <[email protected]>
6+
* All rights reserved.
7+
*
8+
* Redistribution and use in source and binary forms, with or without
9+
* modification, are permitted provided that the following conditions
10+
* are met:
11+
* 1. Redistributions of source code must retain the above copyright
12+
* notice, this list of conditions and the following disclaimer.
13+
* 2. Redistributions in binary form must reproduce the above copyright
14+
* notice, this list of conditions and the following disclaimer in the
15+
* documentation and/or other materials provided with the distribution.
16+
* 3. The name of the author may not be used to endorse or promote products
17+
* derived from this software without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
20+
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
21+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28+
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
#include "defs.h"
32+
#include <sys/file.h>
33+
34+
#include "xlat/flockcmds.h"
35+
36+
SYS_FUNC(flock)
37+
{
38+
printfd(tcp, tcp->u_arg[0]);
39+
tprints(", ");
40+
printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
41+
42+
return RVAL_DECODED;
43+
}

0 commit comments

Comments
 (0)