hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added QSE_CANONPATH_EMPTYSINGLEDOT, QSE_CANONPATH_KEEPDOUBLESLASHES, QSE_CANONDROPTRAILINGSEP

Browse Source
This commit is contained in:
hyung-hwan
2011-10-26 00:19:20 +00:00
parent e31e2c41ec
commit 4eb8cb62ee
5 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
qse/lib/cmn/path-canon.c
View File

@ -61,7 +61,7 @@ int qse_isdrivecurpath (const qse_char_t* path)
return 0;
}
qse_size_t qse_canonpath (const qse_char_t* path, qse_char_t* canon)
qse_size_t qse_canonpath (const qse_char_t* path, qse_char_t* canon, int flags)
{
const qse_char_t* ptr;
qse_char_t* dst;
@ -155,7 +155,8 @@ qse_size_t qse_canonpath (const qse_char_t* path, qse_char_t* canon)
{
/* eat up . */
}
else if (seglen == 2 && seg[0] == QSE_T('.') && seg[1] == QSE_T('.'))
else if (!(flags & QSE_CANONPATH_KEEPDOUBLEDOTS) &&
seglen == 2 && seg[0] == QSE_T('.') && seg[1] == QSE_T('.'))
{
/* eat up the previous segment */
qse_char_t* tmp;
@ -242,11 +243,13 @@ qse_size_t qse_canonpath (const qse_char_t* path, qse_char_t* canon)
}
while (1);
if (dst > non_root_start && ISSEP(dst[-1]) && !ISSEP(ptr[-1]))
if (dst > non_root_start && ISSEP(dst[-1]) &&
((flags & QSE_CANONPATH_DROPTRAILINGSEP) || !ISSEP(ptr[-1])))
{
/* if the canoncal path composed so far ends with a separator
* and the original path didn't end with the separator, delete
* the ending separator.
* the ending separator.
* also delete it if QSE_CANONPATH_DROPTRAILINGSEP is set.
*
* dst > non_root_start:
* there is at least 1 character after the root directory part.
@ -267,11 +270,14 @@ qse_size_t qse_canonpath (const qse_char_t* path, qse_char_t* canon)
if (canon_len <= 0)
{
/* when resolving to a single dot, a trailing separator is not
* retained though the orignal path name contains it. */
canon[0] = QSE_T('.');
canon[1] = QSE_T('\0');
canon_len = 1;
if (!(flags & QSE_CANONPATH_EMPTYSINGLEDOT))
{
/* when resolving to a single dot, a trailing separator is not
* retained though the orignal path name contains it. */
canon[0] = QSE_T('.');
canon[1] = QSE_T('\0');
canon_len = 1;
}
}
else
{

4
qse/lib/fs/dir.c
View File

@ -264,7 +264,7 @@ int qse_dir_change (qse_dir_t* dir, const qse_char_t* name)
return -1;
}
idx = qse_canonpath (dirname, dirname);
idx = qse_canonpath (dirname, dirname, 0);
/* Put an asterisk after canonicalization to prevent side-effects.
* otherwise, .\* would be transformed to * by qse_canonpath() */
dirname[idx-1] = QSE_T('*');
@ -323,7 +323,7 @@ int qse_dir_change (qse_dir_t* dir, const qse_char_t* name)
return -1;
}
qse_canonpath (dirname, dirname);
qse_canonpath (dirname, dirname, 0);
#if defined(QSE_CHAR_IS_MCHAR)
mdirname = dirname;