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

added qse_getpathcore()/qse_getmbspathcore()/qse_getwcspathcore()

Browse Source 
added qse_fs_dupfspathforwcs()
improved qse_fs_mkdirXXX()
This commit is contained in:
hyung-hwan
2014-11-27 15:58:51 +00:00
parent 99e9160c53
commit 947f5a8d8d
7 changed files with 286 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
qse/include/qse/cmn/fs.h
View File

@ -129,11 +129,9 @@ enum qse_fs_trait_t
};
typedef enum qse_fs_trait_t qse_fs_trait_t;
typedef int (*qse_fs_cbs_mk_t) (
qse_fs_t* fs,
const qse_char_t* path
);
/**
* \return -1 on failure, 0 to skip, 1 to delete
*/
typedef int (*qse_fs_cbs_del_t) (
qse_fs_t* fs,
const qse_char_t* path
@ -141,7 +139,6 @@ typedef int (*qse_fs_cbs_del_t) (
struct qse_fs_cbs_t
{
qse_fs_cbs_mk_t mk;
qse_fs_cbs_del_t del;
};
typedef struct qse_fs_cbs_t qse_fs_cbs_t;
@ -170,6 +167,15 @@ enum qse_fs_opt_t
typedef enum qse_fs_opt_t qse_fs_opt_t;
enum qse_fs_mkdir_flag_t
{
QSE_FS_MKDIR_PARENT = (1 << 0),
QSE_FS_MKDIRMBS_PARENT = QSE_FS_MKDIR_PARENT,
QSE_FS_MKDIRWCS_PARENT = QSE_FS_MKDIR_PARENT
};
typedef enum qse_fs_mkdir_flag_t qse_fs_mkdir_flag_t;
enum qse_fs_delfile_flag_t
{
QSE_FS_DELFILE_GLOB = (1 << 0),
@ -271,12 +277,14 @@ QSE_EXPORT int qse_fs_move (
QSE_EXPORT int qse_fs_mkdirmbs (
qse_fs_t* fs,
const qse_mchar_t* path
const qse_mchar_t* path,
int flags
);
QSE_EXPORT int qse_fs_mkdirwcs (
qse_fs_t* fs,
const qse_wchar_t* path
const qse_wchar_t* path,
int flags
);
QSE_EXPORT int qse_fs_delfilembs (
@ -304,11 +312,11 @@ QSE_EXPORT int qse_fs_deldirwcs (
);
#if defined(QSE_CHAR_IS_MCHAR)
# define qse_fs_mkdir(fs,path) qse_fs_mkdirmbs(fs,path)
# define qse_fs_mkdir(fs,path,flags) qse_fs_mkdirmbs(fs,path,flags)
# define qse_fs_delfile(fs,path,flags) qse_fs_delfilembs(fs,path,flags)
# define qse_fs_deldir(fs,path,flags) qse_fs_deldirmbs(fs,path,flags)
#else
# define qse_fs_mkdir(fs,path) qse_fs_mkdirwcs(fs,path)
# define qse_fs_mkdir(fs,path,flags) qse_fs_mkdirwcs(fs,path,flags)
# define qse_fs_delfile(fs,path,flags) qse_fs_delfilewcs(fs,path,flags)
# define qse_fs_deldir(fs,path,flags) qse_fs_deldirwcs(fs,path,flags)
#endif

64
qse/include/qse/cmn/path.h
View File

@ -27,7 +27,7 @@
#ifndef _QSE_CMN_PATH_H_
#define _QSE_CMN_PATH_H_
/** @file
/** \file
* This file provides functions for path name manipulation.
*/
@ -91,7 +91,7 @@ QSE_EXPORT const qse_wchar_t* qse_wcsbasename (
* A path name beginning with a segment separator is absolute.
* On Win32/OS2/DOS, it also returns 1 if a path name begins with a drive
* letter followed by a colon.
* @return 1 if absolute, 0 if not.
* \return 1 if absolute, 0 if not.
*/
QSE_EXPORT int qse_ismbsabspath (
const qse_mchar_t* path
@ -122,27 +122,35 @@ QSE_EXPORT int qse_ismbsdrivecurpath (
);
/**
* The qse_canonmbspath() function canonicalizes a path name @a path by deleting
* The qse_getmbspathroot() function returns the core part of \a path
* excluding a special prefix.
*/
QSE_EXPORT qse_mchar_t* qse_getmbspathcore (
const qse_mchar_t* path
);
/**
* The qse_canonmbspath() function canonicalizes a path name \a path by deleting
* unnecessary path segments from it and stores the result to a memory buffer
* pointed to by @a canon. Canonicalization is purely performed on the path
* pointed to by \a canon. Canonicalization is purely performed on the path
* name without refering to actual file systems. It null-terminates the
* canonical path in @a canon and returns the number of characters excluding
* canonical path in \a canon and returns the number of characters excluding
* the terminating null.
*
* @code
* \code
* qse_mchar_t buf[64];
* qse_canonmbspath (QSE_MT("/usr/local/../bin/sh"), buf);
* qse_printf (QSE_T("%hs\n")); // prints /usr/bin/sh
* @endcode
* \endcode
*
* If #QSE_CANONPATH_EMPTYSINGLEDOT is clear in the @a flags, a single dot
* is produced if the input @a path resolves to the current directory logically.
* If #QSE_CANONPATH_EMPTYSINGLEDOT is clear in the \a flags, a single dot
* is produced if the input \a path resolves to the current directory logically.
* For example, dir/.. is canonicalized to a single period; If it is set,
* an empty string is produced. Even a single period as an input produces
* an empty string if it is set.
*
* The output is empty returning 0 regardless of @a flags if the input
* @a path is empty.
* The output is empty returning 0 regardless of \a flags if the input
* \a path is empty.
*
* The caller must ensure that it is large enough to hold the resulting
* canonical path before calling because this function does not check the
@ -151,7 +159,7 @@ QSE_EXPORT int qse_ismbsdrivecurpath (
* buffer as long as the number of characters and a terminating null in
* the original path.
*
* @return number of characters in the resulting canonical path excluding
* \return number of characters in the resulting canonical path excluding
* the terminating null.
*/
QSE_EXPORT qse_size_t qse_canonmbspath (
@ -165,7 +173,7 @@ QSE_EXPORT qse_size_t qse_canonmbspath (
* A path name beginning with a segment separator is absolute.
* On Win32/OS2/DOS, it also returns 1 if a path name begins with a drive
* letter followed by a colon.
* @return 1 if absolute, 0 if not.
* \return 1 if absolute, 0 if not.
*/
QSE_EXPORT int qse_iswcsabspath (
const qse_wchar_t* path
@ -196,27 +204,35 @@ QSE_EXPORT int qse_iswcsdrivecurpath (
);
/**
* The qse_canonwcspath() function canonicalizes a path name @a path by deleting
* The qse_getwcspathroot() function returns the core part of \a path
* excluding a special prefix.
*/
QSE_EXPORT qse_wchar_t* qse_getwcspathcore (
const qse_wchar_t* path
);
/**
* The qse_canonwcspath() function canonicalizes a path name \a path by deleting
* unnecessary path segments from it and stores the result to a memory buffer
* pointed to by @a canon. Canonicalization is purely performed on the path
* pointed to by \a canon. Canonicalization is purely performed on the path
* name without refering to actual file systems. It null-terminates the
* canonical path in @a canon and returns the number of characters excluding
* canonical path in \a canon and returns the number of characters excluding
* the terminating null.
*
* @code
* \code
* qse_wchar_t buf[64];
* qse_canonwcspath (QSE_WT("/usr/local/../bin/sh"), buf);
* qse_printf (QSE_T("%ls\n")); // prints /usr/bin/sh
* @endcode
* \endcode
*
* If #QSE_CANONPATH_EMPTYSINGLEDOT is clear in the @a flags, a single dot
* is produced if the input @a path resolves to the current directory logically.
* If #QSE_CANONPATH_EMPTYSINGLEDOT is clear in the \a flags, a single dot
* is produced if the input \a path resolves to the current directory logically.
* For example, dir/.. is canonicalized to a single period; If it is set,
* an empty string is produced. Even a single period as an input produces
* an empty string if it is set.
*
* The output is empty returning 0 regardless of @a flags if the input
* @a path is empty.
* The output is empty returning 0 regardless of \a flags if the input
* \a path is empty.
*
* The caller must ensure that it is large enough to hold the resulting
* canonical path before calling because this function does not check the
@ -225,7 +241,7 @@ QSE_EXPORT int qse_iswcsdrivecurpath (
* buffer as long as the number of characters and a terminating null in
* the original path.
*
* @return number of characters in the resulting canonical path excluding
* \return number of characters in the resulting canonical path excluding
* the terminating null.
*/
QSE_EXPORT qse_size_t qse_canonwcspath (
@ -239,12 +255,14 @@ QSE_EXPORT qse_size_t qse_canonwcspath (
# define qse_isdrivepath(p) qse_ismbsdrivepath(p)
# define qse_isdriveabspath(p) qse_ismbsdriveabspath(p)
# define qse_isdrivecurpath(p) qse_ismbsdrivecurpath(p)
# define qse_getpathcore(p) qse_getmbspathcore(p)
# define qse_canonpath(p,c,f) qse_canonmbspath(p,c,f)
#else
# define qse_isabspath(p) qse_iswcsabspath(p)
# define qse_isdrivepath(p) qse_iswcsdrivepath(p)
# define qse_isdriveabspath(p) qse_iswcsdriveabspath(p)
# define qse_isdrivecurpath(p) qse_iswcsdrivecurpath(p)
# define qse_getpathcore(p) qse_getwcspathcore(p)
# define qse_canonpath(p,c,f) qse_canonwcspath(p,c,f)
#endif