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

Unix-Style File Metadata returns relative pathnames

Browse Source
This commit is contained in:
Andreas Steffen
2011-11-28 14:39:52 +01:00
parent ba361d3cd7
commit 96d611f585
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/pts.c
+2 -5
View File
@@ -597,8 +597,6 @@ static bool file_metadata(char *pathname, pts_file_metadata_t **entry)
return FALSE; return FALSE;
} }
this->filename = strdup(pathname);
if (S_ISREG(st.st_mode)) if (S_ISREG(st.st_mode))
{ {
this->type = PTS_FILE_REGULAR; this->type = PTS_FILE_REGULAR;
@@ -677,6 +675,7 @@ METHOD(pts_t, get_metadata, pts_file_meta_t*,
metadata->destroy(metadata); metadata->destroy(metadata);
return NULL; return NULL;
} }
entry->filename = strdup(rel_name);
metadata->add(metadata, entry); metadata->add(metadata, entry);
} }
} }
@@ -684,14 +683,12 @@ METHOD(pts_t, get_metadata, pts_file_meta_t*,
} }
else else
{ {
char *filename;
if (!file_metadata(pathname, &entry)) if (!file_metadata(pathname, &entry))
{ {
metadata->destroy(metadata); metadata->destroy(metadata);
return NULL; return NULL;
} }
filename = get_filename(pathname); entry->filename = strdup(get_filename(pathname));
metadata->add(metadata, entry); metadata->add(metadata, entry);
} }