mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-04 00:05:26 +00:00
Code Issues Releases Wiki Activity

proc: Use fopen_proc in fdinfo parsing

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-09-17 00:38:00 +04:00
parent 6b70e4ad81
commit 6e960f1fc5
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proc_parse.c
View File

@@ -1127,7 +1127,7 @@ nodata:
#define fdinfo_field(str, field) !strncmp(str, field":", sizeof(field)) #define fdinfo_field(str, field) !strncmp(str, field":", sizeof(field))
static int parse_fdinfo_pid_s(char *pid, int fd, int type, static int parse_fdinfo_pid_s(int pid, int fd, int type,
int (*cb)(union fdinfo_entries *e, void *arg), void *arg) int (*cb)(union fdinfo_entries *e, void *arg), void *arg)
{ {
FILE *f; FILE *f;
@@ -1135,8 +1135,7 @@ static int parse_fdinfo_pid_s(char *pid, int fd, int type,
bool entry_met = false; bool entry_met = false;
int ret = -1; int ret = -1;
sprintf(str, "/proc/%s/fdinfo/%d", pid, fd); f = fopen_proc(pid, "fdinfo/%d", fd);
f = fopen(str, "r");
if (!f) { if (!f) {
pr_perror("Can't open %s to parse", str); pr_perror("Can't open %s to parse", str);
return -1; return -1;
@@ -1402,16 +1401,13 @@ out:
int parse_fdinfo_pid(int pid, int fd, int type, int parse_fdinfo_pid(int pid, int fd, int type,
int (*cb)(union fdinfo_entries *e, void *arg), void *arg) int (*cb)(union fdinfo_entries *e, void *arg), void *arg)
{ {
char pid_s[10]; return parse_fdinfo_pid_s(pid, fd, type, cb, arg);
sprintf(pid_s, "%d", pid);
return parse_fdinfo_pid_s(pid_s, fd, type, cb, arg);
} }
int parse_fdinfo(int fd, int type, int parse_fdinfo(int fd, int type,
int (*cb)(union fdinfo_entries *e, void *arg), void *arg) int (*cb)(union fdinfo_entries *e, void *arg), void *arg)
{ {
return parse_fdinfo_pid_s("self", fd, type, cb, arg); return parse_fdinfo_pid_s(PROC_SELF, fd, type, cb, arg);
} }
static int parse_file_lock_buf(char *buf, struct file_lock *fl, static int parse_file_lock_buf(char *buf, struct file_lock *fl,