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

touched up glob.c and glob.h

Browse Source
This commit is contained in:
hyung-hwan
2014-12-15 04:26:41 +00:00
parent ac61c3044a
commit 1ef7fc2569
7 changed files with 76 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qse/lib/cmn/glob.c
View File

@ -115,7 +115,7 @@ typedef enum segment_type_t segment_type_t;
#define get_next_segment mbs_get_next_segment
#define handle_non_wild_segments mbs_handle_non_wild_segments
#define CHAR_IS_MCHAR
#undef DECLARE_MBUF
#undef INCLUDE_MBUF
#include "glob.h"
/* -------------------------------------------------------------------- */
@ -156,7 +156,7 @@ typedef enum segment_type_t segment_type_t;
#undef get_next_segment
#undef handle_non_wild_segments
#undef CHAR_IS_MCHAR
#undef DECLARE_MBUF
#undef INCLUDE_MBUF
/* -------------------------------------------------------------------- */
@ -198,6 +198,6 @@ typedef enum segment_type_t segment_type_t;
#define handle_non_wild_segments wcs_handle_non_wild_segments
#undef CHAR_IS_MCHAR
#if !defined(_WIN32)
# define DECLARE_MBUF 1
# define INCLUDE_MBUF 1
#endif
#include "glob.h"

9
qse/lib/cmn/glob.h
View File

@ -41,7 +41,7 @@ struct glob_t
str_t path;
str_t tbuf; /* temporary buffer */
#if defined(DECLARE_MBUF)
#if defined(INCLUDE_MBUF)
qse_mbs_t mbuf;
#endif
@ -83,7 +83,7 @@ struct stack_node_t
};
#endif
#if defined(DECLARE_MBUF)
#if defined(INCLUDE_MBUF)
static qse_mchar_t* wcs_to_mbuf (glob_t* g, const qse_wchar_t* wcs, qse_mbs_t* mbs)
{
qse_size_t ml, wl;
@ -104,6 +104,7 @@ static int path_exists (glob_t* g, const char_t* name)
#if !defined(INVALID_FILE_ATTRIBUTES)
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
#if defined(CHAR_IS_MCHAR)
return (GetFileAttributesA(name) != INVALID_FILE_ATTRIBUTES)? 1: 0;
#else
@ -563,7 +564,7 @@ int glob (const char_t* pattern, cbimpl_t cbimpl, void* cbctx, int flags, qse_mm
return -1;
}
#if defined(DECLARE_MBUF)
#if defined(INCLUDE_MBUF)
if (qse_mbs_init (&g.mbuf, mmgr, 512) <= -1)
{
str_fini (&g.path);
@ -579,7 +580,7 @@ int glob (const char_t* pattern, cbimpl_t cbimpl, void* cbctx, int flags, qse_mm
x = search (&g, &seg);
#if defined(DECLARE_MBUF)
#if defined(INCLUDE_MBUF)
qse_mbs_fini (&g.mbuf);
#endif
str_fini (&g.tbuf);

1
qse/lib/cmn/mbwc.c
View File

@ -48,7 +48,6 @@ static qse_cmgr_t builtin_cmgr[] =
{ qse_cp949touc, qse_uctocp949 },
{ qse_cp950touc, qse_uctocp950 }
#endif
};
static qse_cmgr_t* dfl_cmgr = &builtin_cmgr[QSE_CMGR_SLMB];

6
qse/lib/http/httpd-dir.c
View File

@ -148,7 +148,6 @@ static qse_size_t format_dirent (
const qse_httpd_dirent_t* dirent,
qse_mchar_t* buf, int bufsz)
{
/* TODO: page encoding?? utf-8??? or derive name from cmgr or current locale??? */
qse_size_t x;
qse_mchar_t* encname;
@ -332,8 +331,11 @@ static int task_main_dseg (
qpath_esc = qse_httpd_escapehtml (httpd, ctx->qpath.ptr);
if (qpath_esc == QSE_NULL) return -1;
/* TODO: page encoding?? utf-8??? or derive name from cmgr or current locale??? */
/* TODO: SUPPORT character set. DON't HARD_CODE it to UTF8 */
x = qse_mbsxfmts (&ctx->buf[ctx->buflen], ctx->bufrem,
QSE_MT("<html><head>%s</head>\n<body>\n<div class='header'>%s</div>\n<div class='body'><table>%s"), ctx->head.ptr, qpath_esc,
QSE_MT("<html><meta http-equiv=\"Content-Type\" content=\"text/html; charset='UTF-8'\">\n<head>%s</head>\n<body>\n<div class='header'>%s</div>\n<div class='body'><table>%s"),
ctx->head.ptr, qpath_esc,
(is_root? QSE_MT(""): QSE_MT("<tr><td class='name'><a href='../' class='dir'>..</a></td><td class='time'></td><td class='size'></td></tr>\n"))
);