glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

file.c: move mknod, mknodat, and xmknod parsers to a separate file

Browse Source 
* mknod.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* file.c: Move sys_mknod, sys_mknodat, sys_xmknod, and related code
to mknod.c.
This commit is contained in:
Дмитрий Левин 2014-12-06 03:53:16 +00:00
parent 9514ac73c7
commit db23b3414c
3 changed files with 80 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -40,6 +40,7 @@ strace_SOURCES = \
ldt.c \
loop.c \
mem.c \
mknod.c \
mount.c \
mtd.c \
net.c \

65
file.c
View File

@ -1279,28 +1279,6 @@ sys_lxstat(struct tcb *tcp)
return 0;
}
int
sys_xmknod(struct tcb *tcp)
{
int mode = tcp->u_arg[2];
if (entering(tcp)) {
tprintf("%ld, ", tcp->u_arg[0]);
printpath(tcp, tcp->u_arg[1]);
tprintf(", %s", sprintmode(mode));
switch (mode & S_IFMT) {
case S_IFCHR: case S_IFBLK:
tprintf(", makedev(%lu, %lu)",
(unsigned long) ((tcp->u_arg[3] >> 18) & 0x3fff),
(unsigned long) (tcp->u_arg[3] & 0x3ffff));
break;
default:
break;
}
}
return 0;
}
#endif /* SPARC[64] */
/* directory */
@ -1598,46 +1576,3 @@ sys_utime(struct tcb *tcp)
}
return 0;
}
static int
decode_mknod(struct tcb *tcp, int offset)
{
int mode = tcp->u_arg[offset + 1];
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[offset]);
tprintf(", %s", sprintmode(mode));
switch (mode & S_IFMT) {
case S_IFCHR:
case S_IFBLK:
#if defined(SPARC) || defined(SPARC64)
if (current_personality == 1)
tprintf(", makedev(%lu, %lu)",
(unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
(unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
else
#endif
tprintf(", makedev(%lu, %lu)",
(unsigned long) major(tcp->u_arg[offset + 2]),
(unsigned long) minor(tcp->u_arg[offset + 2]));
break;
default:
break;
}
}
return 0;
}
int
sys_mknod(struct tcb *tcp)
{
return decode_mknod(tcp, 0);
}
int
sys_mknodat(struct tcb *tcp)
{
if (entering(tcp))
print_dirfd(tcp, tcp->u_arg[0]);
return decode_mknod(tcp, 1);
}

79
mknod.c Normal file
View File

@ -0,0 +1,79 @@
#include "defs.h"
#include <fcntl.h>
#ifdef MAJOR_IN_SYSMACROS
# include <sys/sysmacros.h>
#endif
#ifdef MAJOR_IN_MKDEV
# include <sys/mkdev.h>
#endif
static int
decode_mknod(struct tcb *tcp, int offset)
{
int mode = tcp->u_arg[offset + 1];
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[offset]);
tprintf(", %s", sprintmode(mode));
switch (mode & S_IFMT) {
case S_IFCHR:
case S_IFBLK:
#if defined(SPARC) || defined(SPARC64)
if (current_personality == 1)
tprintf(", makedev(%lu, %lu)",
(unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
(unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
else
#endif /* SPARC || SPARC64 */
tprintf(", makedev(%lu, %lu)",
(unsigned long) major(tcp->u_arg[offset + 2]),
(unsigned long) minor(tcp->u_arg[offset + 2]));
break;
default:
break;
}
}
return 0;
}
int
sys_mknod(struct tcb *tcp)
{
return decode_mknod(tcp, 0);
}
int
sys_mknodat(struct tcb *tcp)
{
if (entering(tcp))
print_dirfd(tcp, tcp->u_arg[0]);
return decode_mknod(tcp, 1);
}
#if defined(SPARC) || defined(SPARC64)
int
sys_xmknod(struct tcb *tcp)
{
int mode = tcp->u_arg[2];
if (entering(tcp)) {
tprintf("%ld, ", tcp->u_arg[0]);
printpath(tcp, tcp->u_arg[1]);
tprintf(", %s", sprintmode(mode));
switch (mode & S_IFMT) {
case S_IFCHR:
case S_IFBLK:
tprintf(", makedev(%lu, %lu)",
(unsigned long) ((tcp->u_arg[3] >> 18) & 0x3fff),
(unsigned long) (tcp->u_arg[3] & 0x3ffff));
break;
default:
break;
}
}
return 0;
}
#endif /* SPARC || SPARC64 */