openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: file: Replace use of 'strsep' with virStringSplit 

Use our helper instead of the gnulib one.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-11-14 10:25:31 +01:00
parent 4bb2c51a9c
commit 38bc2e8c1b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/virfile.c
View File

@ -1634,9 +1634,8 @@ char *
virFindFileInPath(const char *file)
{
const char *origpath = NULL;
g_autofree char *path = NULL;
char *pathiter;
char *pathseg;
VIR_AUTOSTRINGLIST paths = NULL;
char **pathiter;
if (file == NULL)
return NULL;
@ -1668,14 +1667,16 @@ virFindFileInPath(const char *file)
origpath = getenv("PATH");
if (!origpath)
origpath = "/bin:/usr/bin";
path = g_strdup(origpath);
/* for each path segment, append the file to search for and test for
* it. return it if found.
*/
pathiter = path;
while ((pathseg = strsep(&pathiter, ":")) != NULL) {
g_autofree char *fullpath = g_strdup_printf("%s/%s", pathseg, file);
if (!(paths = virStringSplit(origpath, ":", 0)))
return NULL;
for (pathiter = paths; *pathiter; pathiter++) {
g_autofree char *fullpath = g_strdup_printf("%s/%s", *pathiter, file);
if (virFileIsExecutable(fullpath))
return g_steal_pointer(&fullpath);
}