diff --git a/qse/configure b/qse/configure
index 94a2e5ca..17c5f595 100755
--- a/qse/configure
+++ b/qse/configure
@@ -18578,7 +18578,7 @@ QSE_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}"
QSE_PROJECT_URL="${PACKAGE_URL}"
-ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/cut/Makefile include/qse/sed/Makefile include/qse/stx/Makefile include/qse/net/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/cut/Makefile lib/sed/Makefile lib/stx/Makefile lib/net/Makefile cmd/Makefile cmd/awk/Makefile cmd/cut/Makefile cmd/fs/Makefile cmd/sed/Makefile cmd/stx/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/cut/Makefile samples/sed/Makefile samples/net/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/page/Makefile doc/image/Makefile doc/Doxyfile tools/Makefile"
+ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/cut/Makefile include/qse/sed/Makefile include/qse/stx/Makefile include/qse/net/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/cut/Makefile lib/sed/Makefile lib/stx/Makefile lib/net/Makefile cmd/Makefile cmd/awk/Makefile cmd/cut/Makefile cmd/sed/Makefile cmd/stx/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/cut/Makefile samples/sed/Makefile samples/net/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/page/Makefile doc/image/Makefile doc/Doxyfile tools/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19723,7 +19723,6 @@ do
"cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;
"cmd/awk/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/Makefile" ;;
"cmd/cut/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/cut/Makefile" ;;
- "cmd/fs/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/fs/Makefile" ;;
"cmd/sed/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/sed/Makefile" ;;
"cmd/stx/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/stx/Makefile" ;;
"samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
diff --git a/qse/configure.ac b/qse/configure.ac
index 3e8b65c6..d7dafdf8 100644
--- a/qse/configure.ac
+++ b/qse/configure.ac
@@ -361,7 +361,6 @@ AC_CONFIG_FILES([
cmd/Makefile
cmd/awk/Makefile
cmd/cut/Makefile
- cmd/fs/Makefile
cmd/sed/Makefile
cmd/stx/Makefile
samples/Makefile
diff --git a/qse/lib/cmn/nwio.c b/qse/lib/cmn/nwio.c
index 783801f3..54c2d7df 100644
--- a/qse/lib/cmn/nwio.c
+++ b/qse/lib/cmn/nwio.c
@@ -282,14 +282,20 @@ int qse_nwio_init (
#else
int addrlen;
#endif
- int family;
- int type;
+ int family, type;
+ int tmp;
QSE_MEMSET (nwio, 0, QSE_SIZEOF(*nwio));
nwio->mmgr = mmgr;
nwio->flags = flags;
- addrlen = nwad_to_sockaddr (nwad, &family, &addr);
+ tmp = nwad_to_sockaddr (nwad, &family, &addr);
+ if (tmp <= -1)
+ {
+ nwio->errnum = QSE_NWIO_EINVAL;
+ return -1;
+ }
+ addrlen = tmp;
if (flags & QSE_NWIO_TCP) type = SOCK_STREAM;
else if (flags & QSE_NWIO_UDP) type = SOCK_DGRAM;
diff --git a/qse/lib/fs/Makefile.am b/qse/lib/fs/Makefile.am
deleted file mode 100644
index 94972bc0..00000000
--- a/qse/lib/fs/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AUTOMAKE_OPTIONS = nostdinc
-
-AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
- -I$(includedir)
-
-lib_LTLIBRARIES = libqsefs.la
-libqsefs_la_SOURCES = \
- dir.c
-
-libqsefs_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L$(libdir)
-libqsefs_la_LIBADD = -lqsecmn
diff --git a/qse/lib/fs/Makefile.in b/qse/lib/fs/Makefile.in
deleted file mode 100644
index 4d5ac414..00000000
--- a/qse/lib/fs/Makefile.in
+++ /dev/null
@@ -1,558 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/fs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_numval.m4 \
- $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/qse/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libqsefs_la_DEPENDENCIES =
-am_libqsefs_la_OBJECTS = dir.lo
-libqsefs_la_OBJECTS = $(am_libqsefs_la_OBJECTS)
-libqsefs_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libqsefs_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES =
-depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libqsefs_la_SOURCES)
-DIST_SOURCES = $(libqsefs_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_MODE = @BUILD_MODE@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHAR_MODE = @CHAR_MODE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_CXX = @HAVE_CXX@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-QSE_PROJECT_AUTHOR = @QSE_PROJECT_AUTHOR@
-QSE_PROJECT_URL = @QSE_PROJECT_URL@
-QSE_SIZEOF_CHAR = @QSE_SIZEOF_CHAR@
-QSE_SIZEOF_DOUBLE = @QSE_SIZEOF_DOUBLE@
-QSE_SIZEOF_FLOAT = @QSE_SIZEOF_FLOAT@
-QSE_SIZEOF_INT = @QSE_SIZEOF_INT@
-QSE_SIZEOF_LONG = @QSE_SIZEOF_LONG@
-QSE_SIZEOF_LONG_DOUBLE = @QSE_SIZEOF_LONG_DOUBLE@
-QSE_SIZEOF_LONG_LONG = @QSE_SIZEOF_LONG_LONG@
-QSE_SIZEOF_SHORT = @QSE_SIZEOF_SHORT@
-QSE_SIZEOF_VOID_P = @QSE_SIZEOF_VOID_P@
-QSE_SIZEOF_WCHAR_T = @QSE_SIZEOF_WCHAR_T@
-RANLIB = @RANLIB@
-RM = @RM@
-RMDIR = @RMDIR@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TRUE = @TRUE@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
- -I$(includedir)
-
-lib_LTLIBRARIES = libqsefs.la
-libqsefs_la_SOURCES = \
- dir.c
-
-libqsefs_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L$(libdir)
-libqsefs_la_LIBADD = -lqsecmn
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/fs/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lib/fs/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libqsefs.la: $(libqsefs_la_OBJECTS) $(libqsefs_la_DEPENDENCIES)
- $(libqsefs_la_LINK) -rpath $(libdir) $(libqsefs_la_OBJECTS) $(libqsefs_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/qse/lib/fs/dir.c b/qse/lib/fs/dir.c
deleted file mode 100644
index 85794082..00000000
--- a/qse/lib/fs/dir.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * $Id$
- *
- Copyright 2006-2011 Chung, Hyung-Hwan.
- This file is part of QSE.
-
- QSE is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
-
- QSE is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with QSE. If not, see .
- */
-
-#include
-#include
-#include
-#include "../cmn/mem.h"
-
-#if defined(_WIN32)
-# include
-#elif defined(__OS2__)
-# error NOT IMPLEMENTED
-#elif defined(__DOS__)
-# error NOT IMPLEMENTED
-#else
-# include "../cmn/syscall.h"
-# include
-# include
-#endif
-
-typedef struct info_t info_t;
-struct info_t
-{
- qse_xstr_t name;
-
-#if defined(_WIN32)
- HANDLE handle;
- WIN32_FIND_DATA wfd;
- int just_changed_dir;
-#elif defined(__OS2__)
-#elif defined(__DOS__)
-#else
- DIR* handle;
- qse_mchar_t* mcurdir;
-#endif
-};
-
-#if defined(_WIN32)
-static QSE_INLINE qse_dir_errnum_t syserr_to_errnum (DWORD e)
-{
- switch (e)
- {
- case ERROR_INVALID_NAME:
- case ERROR_DIRECTORY:
- return QSE_DIR_EINVAL;
-
- case ERROR_ACCESS_DENIED:
- return QSE_DIR_EACCES;
-
- case ERROR_FILE_NOT_FOUND:
- case ERROR_PATH_NOT_FOUND:
- return QSE_DIR_ENOENT;
-
- case ERROR_NOT_ENOUGH_MEMORY:
- case ERROR_OUTOFMEMORY:
- return QSE_DIR_ENOMEM;
-
- default:
- return QSE_DIR_ESYSTEM;
- }
-}
-#else
-static QSE_INLINE qse_dir_errnum_t syserr_to_errnum (int e)
-{
- switch (e)
- {
- case EINVAL:
- return QSE_DIR_EINVAL;
-
- case EACCES:
- return QSE_DIR_EACCES;
-
- case ENOENT:
- case ENOTDIR:
- return QSE_DIR_ENOENT;
-
- case ENOMEM:
- return QSE_DIR_ENOMEM;
-
- default:
- return QSE_DIR_ESYSTEM;
- }
-}
-#endif
-
-QSE_IMPLEMENT_COMMON_FUNCTIONS (dir)
-
-qse_dir_t* qse_dir_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
-{
- qse_dir_t* dir;
-
- dir = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(*dir) + xtnsize);
- if (dir == QSE_NULL) return QSE_NULL;
-
- if (qse_dir_init (dir, mmgr) <= -1)
- {
- QSE_MMGR_FREE (mmgr, dir);
- return QSE_NULL;
- }
-
- return dir;
-}
-
-void qse_dir_close (qse_dir_t* dir)
-{
- qse_dir_fini (dir);
- QSE_MMGR_FREE (dir->mmgr, dir);
-}
-
-int qse_dir_init (qse_dir_t* dir, qse_mmgr_t* mmgr)
-{
- QSE_MEMSET (dir, 0, QSE_SIZEOF(*dir));
- dir->mmgr = mmgr;
- return 0;
-}
-
-void qse_dir_fini (qse_dir_t* dir)
-{
- info_t* info;
-
- info = dir->info;
- if (info)
- {
- if (info->name.ptr)
- {
- QSE_ASSERT (info->name.len > 0);
- QSE_MMGR_FREE (dir->mmgr, info->name.ptr);
- info->name.ptr = QSE_NULL;
- info->name.len = 0;
- }
-
-#if defined(_WIN32)
- if (info->handle != INVALID_HANDLE_VALUE)
- {
- FindClose (info->handle);
- info->handle = INVALID_HANDLE_VALUE;
- }
-#elif defined(__OS2__)
-# error NOT IMPLEMENTED
-#elif defined(__DOS__)
-# error NOT IMPLEMENTED
-#else
- if (info->mcurdir && info->mcurdir != dir->curdir)
- QSE_MMGR_FREE (dir->mmgr, info->mcurdir);
- info->mcurdir = QSE_NULL;
-
- if (info->handle)
- {
- closedir (info->handle);
- info->handle = QSE_NULL;
- }
-#endif
-
- QSE_MMGR_FREE (dir->mmgr, info);
- dir->info = QSE_NULL;
- }
-
- if (dir->curdir)
- {
- QSE_MMGR_FREE (dir->mmgr, dir->curdir);
- dir->curdir = QSE_NULL;
- }
-}
-
-static QSE_INLINE info_t* get_info (qse_dir_t* dir)
-{
- info_t* info;
-
- info = dir->info;
- if (info == QSE_NULL)
- {
- info = QSE_MMGR_ALLOC (dir->mmgr, QSE_SIZEOF(*info));
- if (info == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return QSE_NULL;
- }
-
- QSE_MEMSET (info, 0, QSE_SIZEOF(*info));
-#if defined(_WIN32)
- info->handle = INVALID_HANDLE_VALUE;
-#endif
- dir->info = info;
- }
-
- return info;
-}
-
-int qse_dir_change (qse_dir_t* dir, const qse_char_t* name)
-{
- qse_char_t* dirname;
- info_t* info;
-
-#if defined(_WIN32)
- HANDLE handle;
- WIN32_FIND_DATA wfd;
- const qse_char_t* tmp_name[4];
- qse_size_t idx;
-#elif defined(__OS2__)
-# error NOT IMPLEMENTED
-#elif defined(__DOS__)
-# error NOT IMPLEMENTED
-#else
- DIR* handle;
- qse_mchar_t* mdirname;
- const qse_char_t* tmp_name[4];
- qse_size_t idx;
-#endif
-
- if (name[0] == QSE_T('\0'))
- {
- dir->errnum = QSE_DIR_EINVAL;
- return -1;
- }
-
- info = get_info (dir);
- if (info == QSE_NULL) return -1;
-
-#if defined(_WIN32)
- idx = 0;
- if (!qse_isabspath(name) && dir->curdir)
- tmp_name[idx++] = dir->curdir;
- tmp_name[idx++] = name;
-
- if (qse_isdrivecurpath(name))
- tmp_name[idx++] = QSE_T(" ");
- else
- tmp_name[idx++] = QSE_T("\\ ");
-
- tmp_name[idx] = QSE_NULL;
-
- dirname = qse_stradup (tmp_name, dir->mmgr);
- if (dirname == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return -1;
- }
-
- 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('*');
-
- /* Using FindExInfoBasic won't resolve cAlternatFileName.
- * so it can get faster a little bit. The problem is that
- * it is not supported on old windows. just stick to the
- * simple API instead. */
- #if 0
- handle = FindFirstFileEx (
- dirname, FindExInfoBasic,
- &wfd, FindExSearchNameMatch,
- NULL, 0/*FIND_FIRST_EX_CASE_SENSITIVE*/);
- #endif
- handle = FindFirstFile (dirname, &wfd);
- if (handle == INVALID_HANDLE_VALUE)
- {
- dir->errnum = syserr_to_errnum (GetLastError());
- QSE_MMGR_FREE (dir->mmgr, dirname);
- return -1;
- }
-
- if (info->handle != INVALID_HANDLE_VALUE)
- FindClose (info->handle);
-
- QSE_MEMSET (info, 0, QSE_SIZEOF(*info));
- info->handle = handle;
- info->wfd = wfd;
- info->just_changed_dir = 1;
-
- if (dir->curdir) QSE_MMGR_FREE (dir->mmgr, dir->curdir);
- dirname[idx-1] = QSE_T('\0'); /* drop the asterisk */
- dir->curdir = dirname;
-
- return 0;
-
-#elif defined(__OS2__)
-# error NOT IMPLEMENTED
-#elif defined(__DOS__)
-# error NOT IMPLEMENTED
-#else
-
- idx = 0;
- if (!qse_isabspath(name) && dir->curdir)
- {
- tmp_name[idx++] = dir->curdir;
- tmp_name[idx++] = QSE_T("/");
- }
- tmp_name[idx++] = name;
- tmp_name[idx] = QSE_NULL;
-
- dirname = qse_stradup (tmp_name, dir->mmgr);
- if (dirname == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return -1;
- }
-
- qse_canonpath (dirname, dirname, 0);
-
-#if defined(QSE_CHAR_IS_MCHAR)
- mdirname = dirname;
-#else
- mdirname = qse_wcstombsdup (dirname, dir->mmgr);
- if (mdirname == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- QSE_MMGR_FREE (dir->mmgr, dirname);
- return -1;
- }
-#endif
-
- handle = opendir (mdirname);
-
- if (handle == QSE_NULL)
- {
- dir->errnum = syserr_to_errnum (errno);
- if (mdirname != dirname)
- QSE_MMGR_FREE (dir->mmgr, mdirname);
- QSE_MMGR_FREE (dir->mmgr, dirname);
- return -1;
- }
-
- if (info->handle) closedir (info->handle);
- info->handle = handle;
-
- if (info->mcurdir && info->mcurdir != dir->curdir)
- QSE_MMGR_FREE (dir->mmgr, info->mcurdir);
- info->mcurdir = mdirname;
-
- if (dir->curdir) QSE_MMGR_FREE (dir->mmgr, dir->curdir);
- dir->curdir = dirname;
-
- return 0;
-#endif
-}
-
-#if defined(QSE_CHAR_IS_MCHAR) || defined(_WIN32)
-static int set_entry_name (qse_dir_t* dir, const qse_char_t* name)
-#else
-static int set_entry_name (qse_dir_t* dir, const qse_mchar_t* name)
-#endif
-{
- info_t* info;
- qse_size_t len;
-
- info = dir->info;
- QSE_ASSERT (info != QSE_NULL);
-
-#if defined(QSE_CHAR_IS_MCHAR) || defined(_WIN32)
- len = qse_strlen (name);
-#else
- {
- qse_size_t mlen;
-
- /* TODO: ignore MBWCERR */
- mlen = qse_mbstowcslen (name, &len);
- if (name[mlen] != QSE_MT('\0'))
- {
- /* invalid name ??? */
- return -1;
- }
- }
-#endif
-
- if (len > info->name.len)
- {
- qse_char_t* tmp;
-
-/* TOOD: round up len to the nearlest multiples of something (32, 64, ??)*/
- tmp = QSE_MMGR_REALLOC (
- dir->mmgr,
- info->name.ptr,
- (len + 1) * QSE_SIZEOF(*tmp)
- );
- if (tmp == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return -1;
- }
-
- info->name.len = len;
- info->name.ptr = tmp;
- }
-
-#if defined(QSE_CHAR_IS_MCHAR) || defined(_WIN32)
- qse_strcpy (info->name.ptr, name);
-#else
- len++;
- qse_mbstowcs (name, info->name.ptr, &len);
-#endif
-
- dir->ent.name.base = info->name.ptr;
- dir->ent.flags |= QSE_DIR_ENT_NAME;
- return 0;
-}
-
-#if defined(_WIN32)
-static QSE_INLINE qse_ntime_t filetime_to_ntime (const FILETIME* ft)
-{
- /* reverse of http://support.microsoft.com/kb/167296/en-us */
- ULARGE_INTEGER li;
- li.LowPart = ft->dwLowDateTime;
- li.HighPart = ft->dwHighDateTime;
-
-#if (QSE_SIZEOF_LONG_LONG>=8)
- li.QuadPart -= 116444736000000000ull;
-#elif (QSE_SIZEOF___INT64>=8)
- li.QuadPart -= 116444736000000000ui64;
-#else
-# error Unsupported 64bit integer type
-#endif
- /*li.QuadPart /= 10000000;*/
- li.QuadPart /= 10000;
-
- return li.QuadPart;
-}
-#endif
-
-qse_dir_ent_t* qse_dir_read (qse_dir_t* dir, int flags)
-{
-#if defined(_WIN32)
- info_t* info;
-
- info = dir->info;
- if (info == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENODIR;
- return QSE_NULL;
- }
-
- if (info->just_changed_dir)
- {
- info->just_changed_dir = 0;
- }
- else
- {
- if (FindNextFile (info->handle, &info->wfd) == FALSE)
- {
- DWORD e = GetLastError();
- if (e == ERROR_NO_MORE_FILES)
- {
- dir->errnum = QSE_DIR_ENOERR;
- return QSE_NULL;
- }
- else
- {
- dir->errnum = syserr_to_errnum (GetLastError());
- return QSE_NULL;
- }
- }
- }
-
- /* call set_entry_name before changing other fields
- * in dir->ent not to pollute it in case set_entry_name fails */
- QSE_MEMSET (&dir->ent, 0, QSE_SIZEOF(dir->ent));
- if (set_entry_name (dir, info->wfd.cFileName) <= -1) return QSE_NULL;
-
- if (flags & QSE_DIR_ENT_TYPE)
- {
- if (info->wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- {
- dir->ent.type = QSE_DIR_ENT_SUBDIR;
- }
- else if ((info->wfd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
- (info->wfd.dwReserved0 == IO_REPARSE_TAG_SYMLINK))
- {
- dir->ent.type = QSE_DIR_ENT_SYMLINK;
- }
- else
- {
- HANDLE h;
- qse_char_t* tmp_name[4];
- qse_char_t* fname;
-
-/* TODO: use a buffer in info... instead of allocating an deallocating every time */
- tmp_name[0] = dir->curdir;
- tmp_name[1] = QSE_T("\\");
- tmp_name[2] = info->wfd.cFileName;
- tmp_name[3] = QSE_NULL;
- fname = qse_stradup (tmp_name, dir->mmgr);
- if (fname == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return QSE_NULL;
- }
-
- h = CreateFile (
- fname,
- GENERIC_READ,
- FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
- QSE_NULL,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- 0
- );
-
- QSE_MMGR_FREE (dir->mmgr, fname);
-
- if (h != INVALID_HANDLE_VALUE)
- {
- DWORD t = GetFileType (h);
- switch (t)
- {
- case FILE_TYPE_CHAR:
- dir->ent.type = QSE_DIR_ENT_CHRDEV;
- break;
- case FILE_TYPE_DISK:
- dir->ent.type = QSE_DIR_ENT_BLKDEV;
- break;
- case FILE_TYPE_PIPE:
- dir->ent.type = QSE_DIR_ENT_PIPE;
- break;
- default:
- dir->ent.type = QSE_DIR_ENT_UNKNOWN;
- break;
- }
- CloseHandle (h);
- }
- else
- {
- dir->ent.type = QSE_DIR_ENT_UNKNOWN;
- }
- }
- dir->ent.type |= QSE_DIR_ENT_TYPE;
- }
-
- if (flags & QSE_DIR_ENT_SIZE)
- {
- LARGE_INTEGER li;
- li.LowPart = info->wfd.nFileSizeLow;
- li.HighPart = info->wfd.nFileSizeHigh;
- dir->ent.size = li.QuadPart;
- dir->ent.type |= QSE_DIR_ENT_SIZE;
- }
-
- if (flags & QSE_DIR_ENT_TIME)
- {
- dir->ent.time.create = filetime_to_ntime (&info->wfd.ftCreationTime);
- dir->ent.time.access = filetime_to_ntime (&info->wfd.ftLastAccessTime);
- dir->ent.time.modify = filetime_to_ntime (&info->wfd.ftLastWriteTime);
- dir->ent.type |= QSE_DIR_ENT_TIME;
- }
-
-#elif defined(__OS2__)
-# error NOT IMPLEMENTED
-#elif defined(__DOS__)
-# error NOT IMPLEMENTED
-#else
-
- info_t* info;
- struct dirent* ent;
- int x;
-
- int stat_needed;
- #if defined(QSE_LSTAT64)
- struct stat64 st;
- #else
- struct stat st;
- #endif
-
- info = dir->info;
- if (info == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENODIR;
- return QSE_NULL;
- }
-
- errno = 0;
- ent = readdir (info->handle);
- if (ent == QSE_NULL)
- {
- if (errno != 0) dir->errnum = syserr_to_errnum (errno);
- return QSE_NULL;
- }
-
- QSE_MEMSET (&dir->ent, 0, QSE_SIZEOF(dir->ent));
- if (set_entry_name (dir, ent->d_name) <= -1) return QSE_NULL;
-
- stat_needed =
- #if !defined(HAVE_STRUCT_DIRENT_D_TYPE)
- (flags & QSE_DIR_ENT_TYPE) ||
- #endif
- (flags & QSE_DIR_ENT_SIZE) ||
- (flags & QSE_DIR_ENT_TIME);
- if (stat_needed)
- {
- qse_mchar_t* tmp_name[4];
- qse_mchar_t* mfname;
-
-/* TODO: use a buffer in info... instead of allocating an deallocating every time */
- tmp_name[0] = info->mcurdir;
- tmp_name[1] = QSE_MT("/");
- tmp_name[2] = ent->d_name;
- tmp_name[3] = QSE_NULL;
- mfname = qse_mbsadup (tmp_name, dir->mmgr);
- if (mfname == QSE_NULL)
- {
- dir->errnum = QSE_DIR_ENOMEM;
- return QSE_NULL;
- }
-
- #if defined(QSE_LSTAT64)
- x = QSE_LSTAT64 (mfname, &st);
- #else
- x = QSE_LSTAT (mfname, &st);
- #endif
- QSE_MMGR_FREE (dir->mmgr, mfname);
-
- if (x == -1)
- {
- dir->errnum = syserr_to_errnum (errno);
- return QSE_NULL;
- }
- }
-
- if (flags & QSE_DIR_ENT_TYPE)
- {
- #if defined(HAVE_STRUCT_DIRENT_D_TYPE)
- switch (ent->d_type)
- {
- case DT_DIR:
- dir->ent.type = QSE_DIR_ENT_SUBDIR;
- break;
-
- case DT_REG:
- dir->ent.type = QSE_DIR_ENT_REGULAR;
- break;
-
- case DT_LNK:
- dir->ent.type = QSE_DIR_ENT_SYMLINK;
- break;
-
- case DT_BLK:
- dir->ent.type = QSE_DIR_ENT_BLKDEV;
- break;
-
- case DT_CHR:
- dir->ent.type = QSE_DIR_ENT_CHRDEV;
- break;
-
- case DT_FIFO:
- #if defined(DT_SOCK)
- case DT_SOCK:
- #endif
- dir->ent.type = QSE_DIR_ENT_PIPE;
- break;
-
- default:
- dir->ent.type = QSE_DIR_ENT_UNKNOWN;
- break;
- }
-
- #else
- #define IS_TYPE(st,type) ((st.st_mode & S_IFMT) == S_IFDIR)
- dir->ent.type = IS_TYPE(st,S_IFDIR)? QSE_DIR_ENT_SUBDIR:
- IS_TYPE(st,S_IFREG)? QSE_DIR_ENT_REGULAR:
- IS_TYPE(st,S_IFLNK)? QSE_DIR_ENT_SYMLINK:
- IS_TYPE(st,S_IFCHR)? QSE_DIR_ENT_CHRDEV:
- IS_TYPE(st,S_IFBLK)? QSE_DIR_ENT_BLKDEV:
- IS_TYPE(st,S_IFIFO)? QSE_DIR_ENT_PIPE:
- IS_TYPE(st,S_IFSOCK)? QSE_DIR_ENT_PIPE:
- QSE_DIR_ENT_UNKNOWN;
- #undef IS_TYPE
- #endif
- dir->ent.flags |= QSE_DIR_ENT_TYPE;
- }
-
- if (flags & QSE_DIR_ENT_SIZE)
- {
- dir->ent.size = st.st_size;
- dir->ent.flags |= QSE_DIR_ENT_SIZE;
- }
-
- if (flags & QSE_DIR_ENT_TIME)
- {
- #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
- #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIME)
- dir->ent.time.create =
- QSE_SECNSEC_TO_MSEC(st.st_birthtim.tv_sec,st.st_birthtim.tv_nsec);
- #endif
- dir->ent.time.access =
- QSE_SECNSEC_TO_MSEC(st.st_atim.tv_sec,st.st_atim.tv_nsec);
- dir->ent.time.modify =
- QSE_SECNSEC_TO_MSEC(st.st_mtim.tv_sec,st.st_mtim.tv_nsec);
- dir->ent.time.change =
- QSE_SECNSEC_TO_MSEC(st.st_ctim.tv_sec,st.st_ctim.tv_nsec);
- #elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC)
- #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIME)
- dir->ent.time.create = st.st_birthtime;
- QSE_SECNSEC_TO_MSEC(st.st_birthtimespec.tv_sec,st.st_birthtimespec.tv_nsec);
- #endif
- dir->ent.time.access =
- QSE_SECNSEC_TO_MSEC(st.st_atimespec.tv_sec,st.st_atimespec.tv_nsec);
- dir->ent.time.modify =
- QSE_SECNSEC_TO_MSEC(st.st_mtimespec.tv_sec,st.st_mtimespec.tv_nsec);
- dir->ent.time.change =
- QSE_SECNSEC_TO_MSEC(st.st_ctimespec.tv_sec,st.st_ctimespec.tv_nsec);
- #else
- #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIME)
- dir->ent.time.create = st.st_birthtime * QSE_MSECS_PER_SEC;
- #endif
- dir->ent.time.access = st.st_atime * QSE_MSECS_PER_SEC;
- dir->ent.time.modify = st.st_mtime * QSE_MSECS_PER_SEC;
- dir->ent.time.change = st.st_ctime * QSE_MSECS_PER_SEC;
- #endif
- dir->ent.flags |= QSE_DIR_ENT_TIME;
- }
-#endif
-
- return &dir->ent;
-}
-
-int qse_dir_rewind (qse_dir_t* dir)
-{
- return 0;
-}
-
-qse_dir_errnum_t qse_dir_geterrnum (qse_dir_t* dir)
-{
- return dir->errnum;
-}
-
-const qse_char_t* qse_dir_geterrmsg (qse_dir_t* dir)
-{
- static const qse_char_t* errstr[] =
- {
- QSE_T("no error"),
- QSE_T("internal error that should never have happened"),
-
- QSE_T("insufficient memory"),
- QSE_T("invalid parameter or data"),
- QSE_T("permission denined"),
- QSE_T("no such entry"),
- QSE_T("no working directory set"),
- QSE_T("system error")
- };
-
- return (dir->errnum >= 0 && dir->errnum < QSE_COUNTOF(errstr))?
- errstr[dir->errnum]: QSE_T("unknown error");
-}