Commit 8c9c575a authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Cyrill Gorcunov

util: Move get_image_path to util.c

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 4baff50c
...@@ -203,30 +203,6 @@ void close_cr_fdset(struct cr_fdset **cr_fdset) ...@@ -203,30 +203,6 @@ void close_cr_fdset(struct cr_fdset **cr_fdset)
*cr_fdset = NULL; *cr_fdset = NULL;
} }
int get_image_path(char *path, int size, const char *fmt, int pid)
{
int image_dir_size = strlen(image_dir);
int ret;
strncpy(path, image_dir, size);
if (size <= image_dir_size)
goto err;
path[image_dir_size] = '/';
size -= image_dir_size + 1;
ret = snprintf(path + image_dir_size + 1, size, fmt, pid);
if (ret == -1 || ret >= size)
goto err;
return 0;
err:
pr_err("can't get image path\n");
return -1;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
pid_t pid = 0; pid_t pid = 0;
......
...@@ -158,6 +158,30 @@ int move_img_fd(int *img_fd, int want_fd) ...@@ -158,6 +158,30 @@ int move_img_fd(int *img_fd, int want_fd)
return 0; return 0;
} }
int get_image_path(char *path, int size, const char *fmt, int pid)
{
int image_dir_size = strlen(image_dir);
int ret;
strncpy(path, image_dir, size);
if (size <= image_dir_size)
goto err;
path[image_dir_size] = '/';
size -= image_dir_size + 1;
ret = snprintf(path + image_dir_size + 1, size, fmt, pid);
if (ret == -1 || ret >= size)
goto err;
return 0;
err:
pr_err("can't get image path\n");
return -1;
}
int open_image_ro_nocheck(const char *fmt, int pid) int open_image_ro_nocheck(const char *fmt, int pid)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment