mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

proc_parse: Convert parse_pid_status to BFD engine

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov
2014-11-10 11:13:08 +03:00
committed by Pavel Emelyanov
parent 8f937e0461
commit 88031bf89e
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
proc_parse.c
View File

@@ -665,7 +665,7 @@ static int ids_parse(char *str, unsigned int *arr)
arr[1] = strtol(end + 1, &end, 10); arr[1] = strtol(end + 1, &end, 10);
arr[2] = strtol(end + 1, &end, 10); arr[2] = strtol(end + 1, &end, 10);
arr[3] = strtol(end + 1, &end, 10); arr[3] = strtol(end + 1, &end, 10);
if (*end != '\n') if (*end)
return -1; return -1;
else else
return 0; return 0;
@@ -687,17 +687,22 @@ static int cap_parse(char *str, unsigned int *res)
int parse_pid_status(pid_t pid, struct proc_status_creds *cr) int parse_pid_status(pid_t pid, struct proc_status_creds *cr)
{ {
struct bfd f;
int done = 0; int done = 0;
FILE *f; int ret = -1;
char str[64]; char *str;
f = fopen_proc(pid, "status"); f.fd = open_proc(pid, "status");
if (f == NULL) { if (f.fd < 0) {
pr_perror("Can't open proc status"); pr_perror("Can't open proc status");
return -1; return -1;
} }
while (done < 8 && fgets(str, sizeof(str), f)) { if (bfdopen(&f, O_RDONLY))
return -1;
while (done < 8 && (str = breadline(&f))) {
pr_debug("str: `%s'\n", str);
if (!strncmp(str, "State:", 6)) { if (!strncmp(str, "State:", 6)) {
cr->state = str[7]; cr->state = str[7];
done++; done++;
@@ -754,15 +759,14 @@ int parse_pid_status(pid_t pid, struct proc_status_creds *cr)
} }
} }
if (done != 8) { if (done == 8)
err_parse: ret = 0;
pr_err("Error parsing proc status file\n");
fclose(f);
return -1;
}
fclose(f); err_parse:
return 0; if (ret)
pr_err("Error parsing proc status file\n");
bclose(&f);
return ret;
} }
struct opt2flag { struct opt2flag {