mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 00:29:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3032 from promlow/lxcbasename_fix

Browse Source 
proposed fix for #2892 - fix lxcbasename in lxc/lxccontainer.c
This commit is contained in:
Christian Brauner
2019-06-07 02:35:39 +02:00
committed by GitHub
parent 20a64b0b0d 85e02f5600
commit e9ab177d3f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/lxccontainer.c
View File

@@ -1320,12 +1320,13 @@ static struct lxc_storage *do_storage_create(struct lxc_container *c,
return bdev;
}
static char *lxcbasename(char *path)
/* Strip path and return name of file for argv[0] passed to execvp */
static char *lxctemplatefilename(char *tpath)
{
char *p;
p = path + strlen(path) - 1;
while (*p != '/' && p > path)
p = tpath + strlen(tpath) - 1;
while ( (p-1) >= tpath && *(p-1) != '/')
p--;
return p;
@@ -1451,7 +1452,7 @@ static bool create_run_template(struct lxc_container *c, char *tpath,
newargv = malloc(nargs * sizeof(*newargv));
if (!newargv)
_exit(EXIT_FAILURE);
newargv[0] = lxcbasename(tpath);
newargv[0] = lxctemplatefilename(tpath);
/* --path */
len = strlen(c->config_path) + strlen(c->name) + strlen("--path=") + 2;