file.c: export sprintmode and move it to a separate file

* printmode.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h (sprintmode): New prototype.
* file.c (sprintmode): Make global and move to printmode.c.
This commit is contained in:
Дмитрий Левин 2014-12-06 03:53:16 +00:00
parent a836430dbb
commit 9514ac73c7
4 changed files with 32 additions and 27 deletions

View File

@ -46,6 +46,7 @@ strace_SOURCES = \
or1k_atomic.c \
pathtrace.c \
personality.c \
printmode.c \
process.c \
ptp.c \
quota.c \

1
defs.h
View File

@ -672,6 +672,7 @@ extern int printargs_ld(struct tcb *);
extern void addflags(const struct xlat *, int);
extern int printflags(const struct xlat *, int, const char *);
extern const char *sprintflags(const char *, const struct xlat *, int);
extern const char *sprintmode(int);
extern void dumpiov_in_msghdr(struct tcb *, long);
extern void dumpiov_in_mmsghdr(struct tcb *, long);
extern void dumpiov(struct tcb *, int, long);

27
file.c
View File

@ -506,33 +506,6 @@ sys_ftruncate64(struct tcb *tcp)
/* several stats */
#include "xlat/modetypes.h"
static const char *
sprintmode(int mode)
{
static char buf[sizeof("S_IFSOCK|S_ISUID|S_ISGID|S_ISVTX|%o")
+ sizeof(int)*3
+ /*paranoia:*/ 8];
const char *s;
if ((mode & S_IFMT) == 0)
s = "";
else if ((s = xlookup(modetypes, mode & S_IFMT)) == NULL) {
sprintf(buf, "%#o", mode);
return buf;
}
s = buf + sprintf(buf, "%s%s%s%s", s,
(mode & S_ISUID) ? "|S_ISUID" : "",
(mode & S_ISGID) ? "|S_ISGID" : "",
(mode & S_ISVTX) ? "|S_ISVTX" : "");
mode &= ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX);
if (mode)
sprintf((char*)s, "|%#o", mode);
s = (*buf == '|') ? buf + 1 : buf;
return *s ? s : "0";
}
static char *
sprinttime(time_t t)
{

30
printmode.c Normal file
View File

@ -0,0 +1,30 @@
#include "defs.h"
#include <fcntl.h>
#include "xlat/modetypes.h"
const char *
sprintmode(int mode)
{
static char buf[sizeof("S_IFSOCK|S_ISUID|S_ISGID|S_ISVTX|%o")
+ sizeof(int)*3
+ /*paranoia:*/ 8];
const char *s;
if ((mode & S_IFMT) == 0)
s = "";
else if ((s = xlookup(modetypes, mode & S_IFMT)) == NULL) {
sprintf(buf, "%#o", mode);
return buf;
}
s = buf + sprintf(buf, "%s%s%s%s", s,
(mode & S_ISUID) ? "|S_ISUID" : "",
(mode & S_ISGID) ? "|S_ISGID" : "",
(mode & S_ISVTX) ? "|S_ISVTX" : "");
mode &= ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX);
if (mode)
sprintf((char*)s, "|%#o", mode);
s = (*buf == '|') ? buf + 1 : buf;
return *s ? s : "0";
}