diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-10-27 06:41:09 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-28 14:39:52 +0100 |
| commit | 96d611f585b5a8714e59b411e5e44d47348faa2c (patch) | |
| tree | 802dc9e110febcb35e6f3f09bb396917de7c71a9 /src | |
| parent | ba361d3cd7988bedf3e68074b9b28005acccfa61 (diff) | |
| download | strongswan-96d611f585b5a8714e59b411e5e44d47348faa2c.tar.bz2 strongswan-96d611f585b5a8714e59b411e5e44d47348faa2c.tar.xz | |
Unix-Style File Metadata returns relative pathnames
Diffstat (limited to 'src')
| -rw-r--r-- | src/libpts/pts/pts.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c index 5f0943674..269be4108 100644 --- a/src/libpts/pts/pts.c +++ b/src/libpts/pts/pts.c @@ -597,8 +597,6 @@ static bool file_metadata(char *pathname, pts_file_metadata_t **entry) return FALSE; } - this->filename = strdup(pathname); - if (S_ISREG(st.st_mode)) { this->type = PTS_FILE_REGULAR; @@ -677,6 +675,7 @@ METHOD(pts_t, get_metadata, pts_file_meta_t*, metadata->destroy(metadata); return NULL; } + entry->filename = strdup(rel_name); metadata->add(metadata, entry); } } @@ -684,14 +683,12 @@ METHOD(pts_t, get_metadata, pts_file_meta_t*, } else { - char *filename; - if (!file_metadata(pathname, &entry)) { metadata->destroy(metadata); return NULL; } - filename = get_filename(pathname); + entry->filename = strdup(get_filename(pathname)); metadata->add(metadata, entry); } |