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

util: Helper for reading a string from image

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2012-06-27 20:57:35 +04:00
parent fc416d8694
commit 57095eb946
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
files-reg.c
View File

@ -394,8 +394,6 @@ int collect_reg_files(void)
return -1; return -1;
while (1) { while (1) {
int len;
rfi = xmalloc(sizeof(*rfi)); rfi = xmalloc(sizeof(*rfi));
ret = -1; ret = -1;
if (rfi == NULL) if (rfi == NULL)
@ -406,18 +404,11 @@ int collect_reg_files(void)
if (ret <= 0) if (ret <= 0)
break; break;
len = rfi->rfe.len; ret = read_img_str(fd, &rfi->path, rfi->rfe.len);
rfi->path = xmalloc(len + 1);
ret = -1;
if (rfi->path == NULL)
break;
ret = read_img_buf(fd, rfi->path, len);
if (ret < 0) if (ret < 0)
break; break;
rfi->remap_path = NULL; rfi->remap_path = NULL;
rfi->path[len] = '\0';
pr_info("Collected [%s] ID %#x\n", rfi->path, rfi->rfe.id); pr_info("Collected [%s] ID %#x\n", rfi->path, rfi->rfe.id);
file_desc_add(&rfi->d, rfi->rfe.id, &reg_desc_ops); file_desc_add(&rfi->d, rfi->rfe.id, &reg_desc_ops);

27
include/util.h
View File

@ -235,6 +235,8 @@ int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
___p; \ ___p; \
}) })
#include <stdlib.h>
#define xstrdup(str) __xalloc(strdup, strlen(str) + 1, str) #define xstrdup(str) __xalloc(strdup, strlen(str) + 1, str)
#define xmalloc(size) __xalloc(malloc, size, size) #define xmalloc(size) __xalloc(malloc, size, size)
#define xzalloc(size) __xalloc(calloc, size, 1, size) #define xzalloc(size) __xalloc(calloc, size, 1, size)
@ -287,4 +289,29 @@ int is_anon_link_type(int lfd, char *type);
((c) >= 'a' && (c) <= 'f') || \ ((c) >= 'a' && (c) <= 'f') || \
((c) >= 'A' && (c) <= 'F')) ((c) >= 'A' && (c) <= 'F'))
/*
* read_img_str -- same as read_img_buf, but allocates memory for
* the buffer and puts the '\0' at the end
*/
static inline int read_img_str(int fd, char **pstr, int size)
{
int ret;
char *str;
str = xmalloc(size + 1);
if (!str)
return -1;
ret = read_img_buf(fd, str, size);
if (ret < 0) {
xfree(str);
return -1;
}
str[size] = '\0';
*pstr = str;
return 0;
}
#endif /* UTIL_H_ */ #endif /* UTIL_H_ */