denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libpts: Respect path separators when concatenating database filenames

Browse Source 
As we can't use the system native directory separator on cross-platform
measurements, we determine the path separator from the base directory format.
This commit is contained in:
Martin Willi
2014-06-04 15:53:10 +02:00
parent 0731d41ca9
commit 0b78661042
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/pts_database.c
+15 -6
View File
@@ -48,7 +48,7 @@ METHOD(pts_database_t, get_pathname, char*,
private_pts_database_t *this, bool is_dir, int id) private_pts_database_t *this, bool is_dir, int id)
{ {
enumerator_t *e; enumerator_t *e;
char *path, *name, *pathname; char *path, *name, *sep, *pathname = NULL;
if (is_dir) if (is_dir)
{ {
@@ -70,11 +70,21 @@ METHOD(pts_database_t, get_pathname, char*,
"SELECT d.path, f.name FROM files AS f " "SELECT d.path, f.name FROM files AS f "
"JOIN directories AS d ON d.id = f.dir WHERE f.id = ?", "JOIN directories AS d ON d.id = f.dir WHERE f.id = ?",
DB_INT, id, DB_TEXT, DB_TEXT); DB_INT, id, DB_TEXT, DB_TEXT);
if (!e || !e->enumerate(e, &path, &name) || if (e && e->enumerate(e, &path, &name))
asprintf(&pathname, "%s%s%s",
path, streq(path, "/") ? "" : "/", name) == -1)
{ {
pathname = NULL; if (path[0] == '/')
{ /* Unix style absolute path */
sep = "/";
}
else
{ /* Windows absolute path */
sep = "\\";
}
if (asprintf(&pathname, "%s%s%s",
path, streq(path, "/") ? "" : sep, name) == -1)
{
pathname = NULL;
}
} }
} }
DESTROY_IF(e); DESTROY_IF(e);
@@ -420,4 +430,3 @@ pts_database_t *pts_database_create(imv_database_t *imv_db)
return &this->public; return &this->public;
} }