diff --git a/qse/bld/msdos-watcom/makefile b/qse/bld/msdos-watcom/makefile
index a1750ac3..7d386e8f 100644
--- a/qse/bld/msdos-watcom/makefile
+++ b/qse/bld/msdos-watcom/makefile
@@ -222,6 +222,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj &
@@ -241,7 +242,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_nwio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_pio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj &
@@ -288,8 +289,8 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_ast.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_stack.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_uri.obj &
@@ -563,6 +564,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_ou
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj :  .AUTODEPEND ..\..\lib\cmn\fs.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj :  .AUTODEPEND ..\..\lib\cmn\fs-delete.c
+	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj :  .AUTODEPEND ..\..\lib\cmn\fs-err.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
@@ -620,7 +624,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.ob
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj :  .AUTODEPEND ..\..\lib\cmn\opt.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj :  .AUTODEPEND ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj :  .AUTODEPEND ..\..\lib\cmn\path-base.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj :  .AUTODEPEND ..\..\lib\cmn\path-canon.c
@@ -761,10 +765,10 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_as
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj :  .AUTODEPEND ..\..\lib\cmn\tre-compile.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-bt.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-pa.c
 	$(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj :  .AUTODEPEND ..\..\lib\cmn\tre-parse.c
diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile
index 1efbff40..cdeace6a 100644
--- a/qse/bld/os2-watcom/makefile
+++ b/qse/bld/os2-watcom/makefile
@@ -340,6 +340,7 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj &
@@ -359,7 +360,7 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_nwio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_oht.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj &
@@ -406,8 +407,8 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_ast.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_stack.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_uri.obj &
@@ -435,6 +436,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj &
@@ -454,7 +456,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_nwio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj &
@@ -501,8 +503,8 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_ast.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_stack.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_uri.obj &
@@ -1095,6 +1097,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj :  .AUTODEPEND ..\..\lib\cmn\fs.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj :  .AUTODEPEND ..\..\lib\cmn\fs-delete.c
+	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj :  .AUTODEPEND ..\..\lib\cmn\fs-err.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
@@ -1152,7 +1157,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj :  .AUTODEPEND ..\..\lib\cmn\opt.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj :  .AUTODEPEND ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj :  .AUTODEPEND ..\..\lib\cmn\path-base.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj :  .AUTODEPEND ..\..\lib\cmn\path-canon.c
@@ -1293,10 +1298,10 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj :  .AUTODEPEND ..\..\lib\cmn\tre-compile.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-bt.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-pa.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj :  .AUTODEPEND ..\..\lib\cmn\tre-parse.c
@@ -1371,6 +1376,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj :  .AUTODEPEND ..\..\lib\cmn\fs.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj :  .AUTODEPEND ..\..\lib\cmn\fs-delete.c
+	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj :  .AUTODEPEND ..\..\lib\cmn\fs-err.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
@@ -1428,7 +1436,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj :  .AUTODEPEND ..\..\lib\cmn\opt.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj :  .AUTODEPEND ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj :  .AUTODEPEND ..\..\lib\cmn\path-base.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj :  .AUTODEPEND ..\..\lib\cmn\path-canon.c
@@ -1569,10 +1577,10 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj :  .AUTODEPEND ..\..\lib\cmn\tre-compile.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-bt.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-pa.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj :  .AUTODEPEND ..\..\lib\cmn\tre-parse.c
diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl
index 04880f53..1d19b289 100644
--- a/qse/bld/qse.bkl
+++ b/qse/bld/qse.bkl
@@ -172,6 +172,7 @@
 		fmt-intmax.c 
 		fmt-out.c
 		fs.c 
+		fs-delete.c
 		fs-err.c 
 		fs-move.c 
 		glob.c 
@@ -191,7 +192,7 @@
 		nwio.c 
 		oht.c 
 		opt.c 
-		path-basename.c 
+		path-base.c 
 		path-canon.c 
 		pio.c 
 		pma.c 
@@ -238,8 +239,8 @@
 		tre.c 
 		tre-ast.c 
 		tre-compile.c 
-		tre-match-backtrack.c 
-		tre-match-parallel.c 
+		tre-match-bt.c 
+		tre-match-pa.c 
 		tre-parse.c 
 		tre-stack.c 
 		uri.c 
diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile
index fcd18154..07f7dc0e 100644
--- a/qse/bld/win32-borland/makefile
+++ b/qse/bld/win32-borland/makefile
@@ -108,6 +108,7 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \
@@ -127,7 +128,7 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_nwio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_oht.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj \
@@ -174,8 +175,8 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_ast.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_stack.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_uri.obj \
@@ -204,6 +205,7 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \
@@ -223,7 +225,7 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_nwio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj \
@@ -270,8 +272,8 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_ast.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_stack.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_uri.obj \
@@ -1043,6 +1045,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj: ..\..\lib\cmn\fs.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs.c
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c
+	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c
 
@@ -1100,8 +1105,8 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj: ..\..\lib\cmn\opt.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\opt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj: ..\..\lib\cmn\path-basename.c
-	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj: ..\..\lib\cmn\path-base.c
+	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-base.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj: ..\..\lib\cmn\path-canon.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-canon.c
@@ -1241,11 +1246,11 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj: ..\..\lib\cmn\tre-compile.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-compile.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj: ..\..\lib\cmn\tre-match-backtrack.c
-	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj: ..\..\lib\cmn\tre-match-bt.c
+	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-bt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj: ..\..\lib\cmn\tre-match-parallel.c
-	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj: ..\..\lib\cmn\tre-match-pa.c
+	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-pa.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj: ..\..\lib\cmn\tre-parse.c
 	$(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-parse.c
@@ -1319,6 +1324,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj: ..\..\lib\cmn\fs.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs.c
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c
+	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c
 
@@ -1376,8 +1384,8 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj: ..\..\lib\cmn\opt.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\opt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj: ..\..\lib\cmn\path-basename.c
-	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj: ..\..\lib\cmn\path-base.c
+	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-base.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj: ..\..\lib\cmn\path-canon.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-canon.c
@@ -1517,11 +1525,11 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj: ..\..\lib\cmn\tre-compile.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-compile.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj: ..\..\lib\cmn\tre-match-backtrack.c
-	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj: ..\..\lib\cmn\tre-match-bt.c
+	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-bt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj: ..\..\lib\cmn\tre-match-parallel.c
-	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj: ..\..\lib\cmn\tre-match-pa.c
+	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-pa.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj: ..\..\lib\cmn\tre-parse.c
 	$(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-parse.c
diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile
index 58e9939b..c118acfe 100644
--- a/qse/bld/win32-msvc/makefile
+++ b/qse/bld/win32-msvc/makefile
@@ -77,6 +77,7 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \
@@ -96,7 +97,7 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_nwio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_oht.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj \
@@ -143,8 +144,8 @@ DLLQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_ast.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_stack.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_uri.obj \
@@ -175,6 +176,7 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \
@@ -194,7 +196,7 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_nwio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pio.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj \
@@ -241,8 +243,8 @@ LIBQSECMN_OBJECTS =  \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_ast.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj \
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj \
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_stack.obj \
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_uri.obj \
@@ -1122,6 +1124,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj: ..\..\lib\cmn\fs.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs.c
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c
+	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c
 
@@ -1179,8 +1184,8 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj: ..\..\lib\cmn\opt.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\opt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj: ..\..\lib\cmn\path-basename.c
-	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj: ..\..\lib\cmn\path-base.c
+	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-base.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj: ..\..\lib\cmn\path-canon.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\path-canon.c
@@ -1320,11 +1325,11 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj: ..\..\lib\cmn\tre-compile.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-compile.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj: ..\..\lib\cmn\tre-match-backtrack.c
-	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj: ..\..\lib\cmn\tre-match-bt.c
+	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-bt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj: ..\..\lib\cmn\tre-match-parallel.c
-	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj: ..\..\lib\cmn\tre-match-pa.c
+	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-pa.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj: ..\..\lib\cmn\tre-parse.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\tre-parse.c
@@ -1398,6 +1403,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj: ..\..\lib\cmn\fs.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs.c
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c
+	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c
 
@@ -1455,8 +1463,8 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj: ..\..\lib\cmn\opt.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\opt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj: ..\..\lib\cmn\path-basename.c
-	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj: ..\..\lib\cmn\path-base.c
+	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-base.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj: ..\..\lib\cmn\path-canon.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\path-canon.c
@@ -1596,11 +1604,11 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj: ..\..\lib\cmn\tre-compile.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-compile.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj: ..\..\lib\cmn\tre-match-backtrack.c
-	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj: ..\..\lib\cmn\tre-match-bt.c
+	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-bt.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj: ..\..\lib\cmn\tre-match-parallel.c
-	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj: ..\..\lib\cmn\tre-match-pa.c
+	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-match-pa.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj: ..\..\lib\cmn\tre-parse.c
 	$(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\tre-parse.c
diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile
index ba47472b..ca926c8a 100644
--- a/qse/bld/win32-watcom/makefile
+++ b/qse/bld/win32-watcom/makefile
@@ -329,6 +329,7 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj &
@@ -348,7 +349,7 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_nwio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_oht.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj &
@@ -395,8 +396,8 @@ DLLQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_ast.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_stack.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_uri.obj &
@@ -424,6 +425,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj &
@@ -443,7 +445,7 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_nwio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_oht.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pio.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj &
@@ -490,8 +492,8 @@ LIBQSECMN_OBJECTS =  &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_ast.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj &
-	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj &
+	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_stack.obj &
 	$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_uri.obj &
@@ -1084,6 +1086,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj :  .AUTODEPEND ..\..\lib\cmn\fs.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj :  .AUTODEPEND ..\..\lib\cmn\fs-delete.c
+	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj :  .AUTODEPEND ..\..\lib\cmn\fs-err.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
@@ -1141,7 +1146,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_opt.obj :  .AUTODEPEND ..\..\lib\cmn\opt.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_basename.obj :  .AUTODEPEND ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_base.obj :  .AUTODEPEND ..\..\lib\cmn\path-base.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_path_canon.obj :  .AUTODEPEND ..\..\lib\cmn\path-canon.c
@@ -1282,10 +1287,10 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_compile.obj :  .AUTODEPEND ..\..\lib\cmn\tre-compile.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_backtrack.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_bt.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-bt.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_parallel.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_match_pa.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-pa.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_tre_parse.obj :  .AUTODEPEND ..\..\lib\cmn\tre-parse.c
@@ -1360,6 +1365,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj :  .AUTODEPEND ..\..\lib\cmn\fs.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj :  .AUTODEPEND ..\..\lib\cmn\fs-delete.c
+	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
+
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj :  .AUTODEPEND ..\..\lib\cmn\fs-err.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
@@ -1417,7 +1425,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_opt.obj :  .AUTODEPEND ..\..\lib\cmn\opt.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_basename.obj :  .AUTODEPEND ..\..\lib\cmn\path-basename.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_base.obj :  .AUTODEPEND ..\..\lib\cmn\path-base.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_path_canon.obj :  .AUTODEPEND ..\..\lib\cmn\path-canon.c
@@ -1558,10 +1566,10 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_compile.obj :  .AUTODEPEND ..\..\lib\cmn\tre-compile.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_backtrack.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-backtrack.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_bt.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-bt.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_parallel.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-parallel.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_match_pa.obj :  .AUTODEPEND ..\..\lib\cmn\tre-match-pa.c
 	$(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_tre_parse.obj :  .AUTODEPEND ..\..\lib\cmn\tre-parse.c
diff --git a/qse/include/qse/cmn/fs.h b/qse/include/qse/cmn/fs.h
index 68dee2cc..f26446f7 100644
--- a/qse/include/qse/cmn/fs.h
+++ b/qse/include/qse/cmn/fs.h
@@ -117,20 +117,9 @@ struct qse_fs_ent_t
 
 typedef struct qse_fs_ent_t qse_fs_ent_t;
 
-struct qse_fs_t
-{
-	qse_mmgr_t*     mmgr;
-	qse_cmgr_t*     cmgr; /* for name conversion */
-
-	qse_fs_errnum_t errnum;
-	qse_fs_ent_t    ent;
-	qse_char_t*     curdir;
-	void*           info;
-};
-
 typedef struct qse_fs_t qse_fs_t;
 
-enum qse_fs_option_t
+enum qse_fs_trait_t
 { 
 	/**< don't follow a symbolic link in qse_fs_chdir() */
 	QSE_FS_NOFOLLOW = (1 << 1),
@@ -138,15 +127,53 @@ enum qse_fs_option_t
 	/**< check directories against file system in qse_fs_chdir() */
 	QSE_FS_REALPATH = (1 << 2)  
 };
-typedef enum qse_fs_option_t qse_fs_option_t;
+typedef enum qse_fs_trait_t qse_fs_trait_t;
+
+typedef int (*qse_fs_cbs_del_t) (
+	qse_fs_t*         fs,
+	const qse_char_t* path
+);
+
+struct qse_fs_cbs_t
+{
+	qse_fs_cbs_del_t del;
+};
+typedef struct qse_fs_cbs_t qse_fs_cbs_t;
+
+struct qse_fs_t
+{
+	qse_mmgr_t*     mmgr;
+	qse_cmgr_t*     cmgr; /* for name conversion */
+
+	qse_fs_errnum_t errnum;
+	int             trait;
+	qse_fs_cbs_t    cbs;
+
+	qse_fs_ent_t    ent;
+	qse_char_t*     curdir;
+	void*           info;
+};
+
+
+
+enum qse_fs_opt_t
+{
+	QSE_FS_TRAIT,
+	QSE_FS_CBS
+};
+typedef enum qse_fs_opt_t qse_fs_opt_t;
 
 
 enum qse_fs_delfile_flag_t
 {
-	QSE_FS_DELFILE_GLOB = (1 << 0),
+	QSE_FS_DELFILE_GLOB      = (1 << 0),
+	QSE_FS_DELFILE_RECURSIVE = (1 << 1),
 
-	QSE_FS_DELFILEMBS_GLOB = QSE_FS_DELFILE_GLOB,
-	QSE_FS_DELFILEWCS_GLOB = QSE_FS_DELFILE_GLOB
+	QSE_FS_DELFILEMBS_GLOB      = QSE_FS_DELFILE_GLOB,
+	QSE_FS_DELFILEMBS_RECURSIVE = QSE_FS_DELFILE_RECURSIVE,
+
+	QSE_FS_DELFILEWCS_GLOB      = QSE_FS_DELFILE_GLOB,
+	QSE_FS_DELFILEWCS_RECURSIVE = QSE_FS_DELFILE_RECURSIVE
 };
 typedef enum qse_fs_delfile_flag_t qse_fs_delfile_flag_t;
 
@@ -197,6 +224,18 @@ QSE_EXPORT qse_fs_errnum_t qse_fs_geterrnum (
 	qse_fs_t* fs
 );
 
+QSE_EXPORT int qse_fs_getopt (
+	qse_fs_t*    fs,
+	qse_fs_opt_t id,
+	void*        value
+);
+
+QSE_EXPORT int qse_fs_setopt (
+	qse_fs_t*    fs,
+	qse_fs_opt_t id,
+	const void*  value
+);
+
 QSE_EXPORT qse_fs_ent_t* qse_fs_read (
 	qse_fs_t* fs,
 	int       flags
diff --git a/qse/include/qse/cmn/rex.h b/qse/include/qse/cmn/rex.h
index 9cbdc997..36f67a30 100644
--- a/qse/include/qse/cmn/rex.h
+++ b/qse/include/qse/cmn/rex.h
@@ -252,16 +252,16 @@ QSE_EXPORT qse_rex_node_t* qse_rex_yield (
 );
 
 /**
- * The qse_rex_getoption() function returns the current options.
+ * The qse_rex_getopt() function returns the current options.
  */
-QSE_EXPORT int qse_rex_getoption (
+QSE_EXPORT int qse_rex_getopt (
 	const qse_rex_t* rex /**< regular expression processor */
 );
 
 /**
- * The qse_rex_setoption() function overrides the current options with options.
+ * The qse_rex_setopt() function overrides the current options with options.
  */
-QSE_EXPORT void qse_rex_setoption (
+QSE_EXPORT void qse_rex_setopt (
 	qse_rex_t* rex, /**< regular expression processor */
 	int        opts /**< 0 or number XORed of ::qse_rex_option_t enumerators */
 );
diff --git a/qse/include/qse/http/htrd.h b/qse/include/qse/http/htrd.h
index ebd7c958..3c6a549f 100644
--- a/qse/include/qse/http/htrd.h
+++ b/qse/include/qse/http/htrd.h
@@ -159,11 +159,11 @@ QSE_EXPORT void qse_htrd_clear (
 	qse_htrd_t* htrd
 );
 
-QSE_EXPORT int qse_htrd_getoption (
+QSE_EXPORT int qse_htrd_getopt (
 	qse_htrd_t* htrd
 );
 
-QSE_EXPORT void qse_htrd_setoption (
+QSE_EXPORT void qse_htrd_setopt (
 	qse_htrd_t* htrd,
 	int         opts
 );
diff --git a/qse/lib/cmn/fs-delete.c b/qse/lib/cmn/fs-delete.c
index bc2fece7..f3c79186 100644
--- a/qse/lib/cmn/fs-delete.c
+++ b/qse/lib/cmn/fs-delete.c
@@ -26,7 +26,12 @@
 
 #include "fs.h"
 
-static int delete_file (qse_fs_t* fs, const qse_fs_char_t* fspath)
+/* NOTE:
+ * The current implementation require mbs/wcs conversion as
+ * qse_dir_xxx() and qse_glob()  don't support mbs and wcs separately.
+ * while the functions here support them. */
+
+static int delete_file_from_fs (qse_fs_t* fs, const qse_fs_char_t* fspath)
 {
 
 #if defined(_WIN32)
@@ -69,7 +74,7 @@ static int delete_file (qse_fs_t* fs, const qse_fs_char_t* fspath)
 	return 0;
 }
 
-static int delete_directory (qse_fs_t* fs, const qse_fs_char_t* fspath)
+static int delete_directory_from_fs (qse_fs_t* fs, const qse_fs_char_t* fspath)
 {
 #if defined(_WIN32)
 
@@ -111,32 +116,97 @@ static int delete_directory (qse_fs_t* fs, const qse_fs_char_t* fspath)
 	return 0;
 }
 
-static int purge_path (qse_fs_t* fs, const qse_char_t* path)
+/* --------------------------------------------------------------------- */
+
+static int purge_directory_contents (qse_fs_t* fs, const qse_char_t* path);
+static int purge_path (qse_fs_t* fs, const qse_char_t* path);
+static int delete_directory_nocbs (qse_fs_t* fs, const qse_char_t* path);
+
+static int delete_file (qse_fs_t* fs, const qse_char_t* path, int purge)
+{
+	qse_fs_char_t* fspath;
+	int ret;
+
+	if (fs->cbs.del) 
+	{
+		int x;
+		x = fs->cbs.del (fs, path);
+		if (x <= -1) return -1;
+		if (x == 0) return 0; /* skipped */
+	}
+
+	fspath = qse_fs_makefspath(fs, path);
+	if (!fspath) return -1;
+
+	ret = delete_file_from_fs (fs, fspath);
+	qse_fs_freefspath (fs, path, fspath);
+
+	if (ret <= -1 && purge) 
+	{
+		ret = purge_directory_contents (fs, path);
+		if (ret == -99)
+		{
+			/* it has attempted to delete path as a file above. 
+			 * i don't attempt to delete it as a file again here 
+			 * unlike purge path. */
+			ret = -1;
+		}
+		else if (ret <= -1)
+		{
+			/* do nothing */
+		}
+		else
+		{
+			/* path is a directory name and contents have been purged. 
+			 * call delete_directory_nocbs() instead of delete_directory()
+			 * to avoid double calls to cb.del(). it has been called for
+			 * 'path' * in this function above. */
+			ret = delete_directory_nocbs (fs, path);
+		}
+	}
+
+	return ret;
+}
+
+static int delete_directory_nocbs (qse_fs_t* fs, const qse_char_t* path)
+{
+	qse_fs_char_t* fspath;
+	int ret;
+
+	fspath = qse_fs_makefspath(fs, path);
+	if (!fspath) return -1;
+
+	ret = delete_directory_from_fs (fs, fspath);
+	qse_fs_freefspath (fs, path, fspath);
+
+	return ret;
+}
+
+static int delete_directory (qse_fs_t* fs, const qse_char_t* path)
+{
+	if (fs->cbs.del) 
+	{
+		int x;
+		x = fs->cbs.del (fs, path);
+		if (x <= -1) return -1;
+		if (x == 0) return 0; /* skipped */
+	}
+
+	return delete_directory_nocbs (fs, path);
+}
+
+static int purge_directory_contents (qse_fs_t* fs, const qse_char_t* path)
 {
 	qse_dir_t* dir;
 	qse_dir_errnum_t errnum;
-	qse_dir_ent_t ent;
-	qse_fs_char_t* fspath;
-	int ret, x;
 
 	/* 'dir' is asked to skip special entries like . and .. */
 	dir = qse_dir_open (fs->mmgr, 0, path, QSE_DIR_LIMITED, &errnum);
-	if (!dir)
-	{
-		/* not a directory. attempt to delete it as a file */
-		fspath = qse_fs_makefspath(fs, path);
-		if (!fspath) return -1;
-
-/*TODO query: */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-		ret = delete_file (fs, fspath);
-		qse_fs_freefspath (fs, path, fspath);
-
-		return ret;
-	}
-	else
+	if (dir)
 	{
 		/* it must be a directory. delete all entries under it */
+		int ret, x;
+		qse_dir_ent_t ent;
 		const qse_char_t* seg[4];
 		qse_char_t* joined_path;
 
@@ -150,6 +220,7 @@ static int purge_path (qse_fs_t* fs, const qse_char_t* path)
 			}
 			if (x == 0) break; /* no more entries */
 
+			/* join path and ent->name.... */
 			seg[0] = path;
 			seg[1] = DEFAULT_PATH_SEPARATOR;
 			seg[2] = ent.name;
@@ -162,59 +233,140 @@ static int purge_path (qse_fs_t* fs, const qse_char_t* path)
 				goto oops;
 			}
 
-			/* join path and ent->name.... */
-			fspath = qse_fs_makefspath(fs, joined_path);
-			if (!fspath) goto oops;
-/*TODO query: */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-			ret = delete_file (fs, fspath);
-			qse_fs_freefspath  (fs, ent.name, fspath);
-			if (ret <= -1) ret = purge_path(fs, joined_path);
-			
+			ret = delete_file (fs, joined_path, 1);
+
 			QSE_MMGR_FREE (fs->mmgr, joined_path);
 			if (ret <= -1) goto oops;
 		}
 
 		qse_dir_close (dir);
-
-		fspath = qse_fs_makefspath (fs, path);
-		if (!fspath) goto oops;
-
-		ret = delete_directory (fs, fspath);
-
-		qse_fs_freefspath (fs, path, fspath);
-
-		return ret;
+		return 0;
 
 	oops:
 		qse_dir_close (dir);
 		return -1;
 	}
+
+	fs->errnum = qse_fs_direrrtoerrnum (fs, errnum);
+	return -99; /* special return code to indicate no directory */
 }
 
+static int purge_path (qse_fs_t* fs, const qse_char_t* path)
+{
+	int x;
+
+	x = purge_directory_contents (fs, path);
+	if (x == -99)
+	{
+		/* purge_directory_contents() failed 
+		 * because path is not a directory */
+		return delete_file (fs, path, 0);
+	}
+	else if (x <= -1)
+	{
+		return x;
+	}
+	else
+	{
+		/* path is a directory name and contents have been purged */
+		return delete_directory (fs, path);
+	}
+}
+
+static int delete_from_fs_with_mbs (qse_fs_t* fs, const qse_mchar_t* path, int dir)
+{
+	qse_fs_char_t* fspath;
+	int ret;
+
+	fspath = qse_fs_makefspathformbs (fs, path);
+	if (!fspath) return -1;
+
+	if (fs->cbs.del)
+	{
+		qse_char_t* xpath;
+		int x;
+
+		xpath = (qse_char_t*)make_str_with_mbs (fs, path);
+		if (!xpath)
+		{
+			fs->errnum = QSE_FS_ENOMEM;
+			return -1;
+		}
+
+		x = fs->cbs.del (fs, xpath);
+
+		free_str_with_mbs (fs, path, xpath);
+
+		if (x <= -1) return -1;
+		if (x == 0) return 0; /* skipped */
+	}
+
+	ret = dir? delete_directory_from_fs (fs, fspath): 
+	           delete_file_from_fs (fs, fspath);
+
+	qse_fs_freefspathformbs (fs, path, fspath);
+
+	return ret;
+}
+
+static int delete_from_fs_with_wcs (qse_fs_t* fs, const qse_wchar_t* path, int dir)
+{
+	qse_fs_char_t* fspath;
+	int ret;
+
+	if (fs->cbs.del)
+	{
+		qse_char_t* xpath;
+		int x;
+
+		xpath = (qse_char_t*)make_str_with_wcs (fs, path);
+		if (!xpath)
+		{
+			fs->errnum = QSE_FS_ENOMEM;
+			return -1;
+		}
+
+		x = fs->cbs.del (fs, xpath);
+
+		free_str_with_wcs (fs, path, xpath);
+
+		if (x <= -1) return -1;
+		if (x == 0) return 0; /* skipped */
+	}
+
+	fspath = qse_fs_makefspathforwcs (fs, path);
+	if (!fspath) return -1;
+
+	ret = dir? delete_directory_from_fs (fs, fspath): 
+	           delete_file_from_fs (fs, fspath);
+
+	qse_fs_freefspathforwcs (fs, path, fspath);
+
+	return ret;
+}
 
 /* --------------------------------------------------------------------- */
 
-
 static int delete_file_for_glob (const qse_cstr_t* path, void* ctx)
 {
 	qse_fs_t* fs = (qse_fs_t*)ctx;
-	qse_fs_char_t* fspath;
-	int ret;
-
-
-	fspath = qse_fs_makefspath (fs, path->ptr);
-	if (!fspath) return -1;
-
-/*TODO query: */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-	ret = delete_file (fs, fspath);
-
-	qse_fs_freefspath (fs, path->ptr, fspath);
-
-	return ret;
+	return delete_file (fs, path->ptr, 0);
 }
 
+static int delete_directory_for_glob (const qse_cstr_t* path, void* ctx)
+{
+	qse_fs_t* fs = (qse_fs_t*)ctx;
+	return delete_directory (fs, path->ptr);
+}
+
+static int purge_path_for_glob (const qse_cstr_t* path, void* ctx)
+{
+	qse_fs_t* fs = (qse_fs_t*)ctx;
+	return purge_path (fs, path->ptr);
+}
+
+/* --------------------------------------------------------------------- */
+
 int qse_fs_delfilembs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 {
 	int ret;
@@ -230,7 +382,14 @@ int qse_fs_delfilembs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 			return -1;
 		}
 
-		ret = qse_glob (xpath, delete_file_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		if (flags & QSE_FS_DELFILEMBS_RECURSIVE)
+		{
+			ret = qse_glob (xpath, purge_path_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		}
+		else
+		{
+			ret = qse_glob (xpath, delete_file_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		}
 
 		free_str_with_mbs (fs, path, xpath);
 
@@ -240,18 +399,25 @@ int qse_fs_delfilembs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 			return -1;
 		}
 	}
+	else if (flags & QSE_FS_DELFILEMBS_RECURSIVE)
+	{
+		qse_char_t* xpath;
+
+		/* if RECURSIVE is set, it's not differnt from qse_fs_deldirmbs() */
+		xpath = (qse_char_t*)make_str_with_mbs (fs, path);
+		if (!xpath)
+		{
+			fs->errnum = QSE_FS_ENOMEM;
+			return -1;
+		}
+
+		ret = purge_path (fs, xpath);
+
+		free_str_with_mbs (fs, path, xpath);
+	}
 	else
 	{
-		qse_fs_char_t* fspath;
-
-		fspath = qse_fs_makefspathformbs (fs, path);
-		if (!fspath) return -1;
-
-/* TODO: query */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-		ret = delete_file (fs, fspath);
-
-		qse_fs_freefspathformbs (fs, path, fspath);
+		ret = delete_from_fs_with_mbs (fs, path, 0);
 	}
 
 	return ret;
@@ -272,7 +438,14 @@ int qse_fs_delfilewcs (qse_fs_t* fs, const qse_wchar_t* path, int flags)
 			return -1;
 		}
 
-		ret = qse_glob (xpath, delete_file_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		if (flags & QSE_FS_DELFILEWCS_RECURSIVE)
+		{
+			ret = qse_glob (xpath, purge_path_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		}
+		else
+		{
+			ret = qse_glob (xpath, delete_file_for_glob, fs, DEFAULT_GLOB_FLAGS, fs->mmgr, fs->cmgr);
+		}
 
 		free_str_with_wcs (fs, path, xpath);
 
@@ -282,18 +455,25 @@ int qse_fs_delfilewcs (qse_fs_t* fs, const qse_wchar_t* path, int flags)
 			return -1;
 		}
 	}
+	else if (flags & QSE_FS_DELFILEWCS_RECURSIVE)
+	{
+		qse_char_t* xpath;
+
+		/* if RECURSIVE is set, it's not differnt from qse_fs_deldirwcs() */
+		xpath = (qse_char_t*)make_str_with_wcs (fs, path);
+		if (!xpath)
+		{
+			fs->errnum = QSE_FS_ENOMEM;
+			return -1;
+		}
+
+		ret = purge_path (fs, xpath);
+
+		free_str_with_wcs (fs, path, xpath);
+	}
 	else
 	{
-		qse_fs_char_t* fspath;
-
-		fspath = qse_fs_makefspathforwcs (fs, path);
-		if (!fspath) return -1;
-
-/* TODO: query */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-		ret = delete_file (fs, fspath);
-
-		qse_fs_freefspathforwcs (fs, path, fspath);
+		ret = delete_from_fs_with_wcs (fs, path, 0);
 	}
 
 	return ret;
@@ -302,35 +482,6 @@ int qse_fs_delfilewcs (qse_fs_t* fs, const qse_wchar_t* path, int flags)
 
 /* --------------------------------------------------------------------- */
 
-static int delete_directory_for_glob (const qse_cstr_t* path, void* ctx)
-{
-	qse_fs_t* fs = (qse_fs_t*)ctx;
-	qse_fs_char_t* fspath;
-	int ret;
-
-	fspath = qse_fs_makefspath (fs, path->ptr);
-	if (!fspath) return -1;
-
-/*TODO query: */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-	ret = delete_directory (fs, fspath);
-
-	qse_fs_freefspath (fs, path->ptr, fspath);
-
-	return ret;
-}
-
-static int purge_path_for_glob (const qse_cstr_t* path, void* ctx)
-{
-	qse_fs_t* fs = (qse_fs_t*)ctx;
-
-printf ("[%ls]\n", path->ptr);
-
-/*TODO query: */
-/*if (fs->cb.delete) fs->cb.delete (joined_path);*/
-	return purge_path (fs, path->ptr);
-}
-
 int qse_fs_deldirmbs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 {
 	int ret;
@@ -363,6 +514,7 @@ int qse_fs_deldirmbs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 	{
 		qse_char_t* xpath;
 
+		/* if RECURSIVE is set, it's not differnt from qse_fs_delfilembs() */
 		xpath = (qse_char_t*)make_str_with_mbs (fs, path);
 		if (!xpath)
 		{
@@ -376,16 +528,7 @@ int qse_fs_deldirmbs (qse_fs_t* fs, const qse_mchar_t* path, int flags)
 	}
 	else
 	{
-		qse_fs_char_t* fspath;
-
-		fspath = qse_fs_makefspathformbs (fs, path);
-		if (!fspath) return -1;
-
-/* TODO: query */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-		ret = delete_directory (fs, fspath);
-
-		qse_fs_freefspathformbs (fs, path, fspath);
+		ret = delete_from_fs_with_mbs (fs, path, 1);
 	}
 
 	return ret;
@@ -423,6 +566,7 @@ int qse_fs_deldirwcs (qse_fs_t* fs, const qse_wchar_t* path, int flags)
 	{
 		qse_char_t* xpath;
 
+		/* if RECURSIVE is set, it's not differnt from qse_fs_delfilewcs() */
 		xpath = (qse_char_t*)make_str_with_wcs (fs, path);
 		if (!xpath)
 		{
@@ -436,16 +580,7 @@ int qse_fs_deldirwcs (qse_fs_t* fs, const qse_wchar_t* path, int flags)
 	}
 	else
 	{
-		qse_fs_char_t* fspath;
-
-		fspath = qse_fs_makefspathforwcs (fs, path);
-		if (!fspath) return -1;
-
-/* TODO: query */
-/*if (fs->cb.delete) fs->cb.delete (path);*/
-		ret = delete_directory (fs, fspath);
-
-		qse_fs_freefspathforwcs (fs, path, fspath);
+		ret = delete_from_fs_with_wcs (fs, path, 1);
 	}
 
 	return ret;
diff --git a/qse/lib/cmn/fs-move.c b/qse/lib/cmn/fs-move.c
index 1d243fc1..04d2ae5d 100644
--- a/qse/lib/cmn/fs-move.c
+++ b/qse/lib/cmn/fs-move.c
@@ -331,7 +331,7 @@ int qse_fs_move (
 #if 0
 	if (!recursive)
 	{
-		fs->errnum = QSE_FS_E....;	
+		fs->errnum = QSE_FS_E....;
 		goto oops;
 	}
 
diff --git a/qse/lib/cmn/fs.c b/qse/lib/cmn/fs.c
index 21a8233f..2de6373a 100644
--- a/qse/lib/cmn/fs.c
+++ b/qse/lib/cmn/fs.c
@@ -147,6 +147,44 @@ void* qse_fs_getxtn (qse_fs_t* fs)
 	return QSE_XTN (fs);
 }
 
+int qse_fs_getopt (qse_fs_t* fs, qse_fs_opt_t id, void* value)
+{
+	switch (id)
+	{
+		case QSE_FS_TRAIT:
+			*(int*)value = fs->trait;
+			return 0;
+
+		case QSE_FS_CBS:
+			*(qse_fs_cbs_t*)value = fs->cbs;
+			return 0;
+	}
+
+	fs->errnum = QSE_FS_EINVAL;
+	return -1;
+}
+
+int qse_fs_setopt (qse_fs_t* fs, qse_fs_opt_t id, const void* value)
+{
+	switch (id)
+	{
+		case QSE_FS_TRAIT:
+			fs->trait = *(const int*)value;
+			return 0;
+
+
+		case QSE_FS_CBS:
+			fs->cbs = *(qse_fs_cbs_t*)value;
+			return 0;
+
+	}
+
+	fs->errnum = QSE_FS_EINVAL;
+	return -1;
+}
+
+
+
 static QSE_INLINE info_t* get_info (qse_fs_t* fs)
 {
 	info_t* info;
diff --git a/qse/lib/cmn/rex.c b/qse/lib/cmn/rex.c
index 796d8c04..1debec83 100644
--- a/qse/lib/cmn/rex.c
+++ b/qse/lib/cmn/rex.c
@@ -215,12 +215,12 @@ qse_rex_node_t* qse_rex_yield (qse_rex_t* rex)
 	return code;
 }
 
-int qse_rex_getoption (const qse_rex_t* rex)
+int qse_rex_getopt (const qse_rex_t* rex)
 {
 	return rex->option;
 }
 
-void qse_rex_setoption (qse_rex_t* rex, int opts)
+void qse_rex_setopt (qse_rex_t* rex, int opts)
 {
 	rex->option = opts;
 }
@@ -2047,7 +2047,7 @@ void* qse_buildrex (
 	qse_rex_node_t* code;
 
 	qse_rex_init (&rex, mmgr, QSE_NULL);
-	qse_rex_setoption (&rex, option);
+	qse_rex_setopt (&rex, option);
 
 	if (qse_rex_comp (&rex, ptn, len) == QSE_NULL)
 	{
@@ -2073,7 +2073,7 @@ int qse_matchrex (
 	int n;
 
 	qse_rex_init (&rex, mmgr, code);
-	qse_rex_setoption (&rex, option);
+	qse_rex_setopt (&rex, option);
 
 	if ((n = qse_rex_exec (&rex, str, substr, match)) <= -1)
 	{
diff --git a/qse/lib/http/htrd.c b/qse/lib/http/htrd.c
index 7f16f64f..66f3f2d9 100644
--- a/qse/lib/http/htrd.c
+++ b/qse/lib/http/htrd.c
@@ -505,12 +505,12 @@ qse_htrd_errnum_t qse_htrd_geterrnum (qse_htrd_t* htrd)
 	return htrd->errnum;
 }
 
-int qse_htrd_getoption (qse_htrd_t* htrd)
+int qse_htrd_getopt (qse_htrd_t* htrd)
 {
 	return htrd->option;
 }
 
-void qse_htrd_setoption (qse_htrd_t* htrd, int opts)
+void qse_htrd_setopt (qse_htrd_t* htrd, int opts)
 {
 	htrd->option = opts;
 }
diff --git a/qse/lib/http/httpd-cgi.c b/qse/lib/http/httpd-cgi.c
index bf545df2..3ab85b8e 100644
--- a/qse/lib/http/httpd-cgi.c
+++ b/qse/lib/http/httpd-cgi.c
@@ -1469,7 +1469,7 @@ static int task_main_cgi (
 		xtn->task = task;
 		xtn->client = client;
 		qse_htrd_setrecbs (cgi->script_htrd, &cgi_script_htrd_cbs);
-		qse_htrd_setoption (
+		qse_htrd_setopt (
 			cgi->script_htrd, 
 			QSE_HTRD_SKIPINITIALLINE | 
 			QSE_HTRD_PEEKONLY | 
diff --git a/qse/lib/http/httpd-proxy.c b/qse/lib/http/httpd-proxy.c
index 96daa945..6efc2b72 100644
--- a/qse/lib/http/httpd-proxy.c
+++ b/qse/lib/http/httpd-proxy.c
@@ -1039,7 +1039,7 @@ static int task_init_proxy (
 		/* the caller must make sure that the actual content is discarded or completed
 		 * and the following data is treated as contents */
 		QSE_ASSERT (arg->req->state & (QSE_HTRE_DISCARDED | QSE_HTRE_COMPLETED));
-		/*QSE_ASSERT (qse_htrd_getoption(client->htrd) & QSE_HTRD_DUMMY);*/
+		/*QSE_ASSERT (qse_htrd_getopt(client->htrd) & QSE_HTRD_DUMMY);*/
 
 		proxy->req = arg->req;
 		qse_htre_setconcb (proxy->req, proxy_snatch_client_input_raw, task);
@@ -2363,7 +2363,7 @@ static int task_main_proxy (
 		xtn->client = client;
 		xtn->task = task;
 		qse_htrd_setrecbs (proxy->peer_htrd, &proxy_peer_htrd_cbs);
-		qse_htrd_setoption (proxy->peer_htrd, QSE_HTRD_RESPONSE | QSE_HTRD_TRAILERS);
+		qse_htrd_setopt (proxy->peer_htrd, QSE_HTRD_RESPONSE | QSE_HTRD_TRAILERS);
 	}
 
 	proxy->res = qse_mbs_open (httpd->mmgr, 0, 256);
diff --git a/qse/lib/http/httpd.c b/qse/lib/http/httpd.c
index f1d6c733..3e581f6e 100644
--- a/qse/lib/http/httpd.c
+++ b/qse/lib/http/httpd.c
@@ -647,7 +647,7 @@ static qse_httpd_client_t* new_client (qse_httpd_t* httpd, qse_httpd_client_t* t
 		if (qse_httpd_insert_timer_event (httpd, &idle_event, &client->tmr_idle) <= -1) goto oops;
 	}
 
-	qse_htrd_setoption (client->htrd, QSE_HTRD_REQUEST | QSE_HTRD_TRAILERS | QSE_HTRD_CANONQPATH);
+	qse_htrd_setopt (client->htrd, QSE_HTRD_REQUEST | QSE_HTRD_TRAILERS | QSE_HTRD_CANONQPATH);
 
 	/* copy the public fields, 
 	 * keep the private fields initialized at 0 */
diff --git a/qse/samples/cmn/Makefile.am b/qse/samples/cmn/Makefile.am
index c61ceca3..ab34eb9f 100644
--- a/qse/samples/cmn/Makefile.am
+++ b/qse/samples/cmn/Makefile.am
@@ -17,6 +17,7 @@ bin_PROGRAMS = \
 	fmt01 \
 	fmt02 \
 	fs01 \
+	fs02 \
 	htb \
 	glob01 \
 	ipad01 \
diff --git a/qse/samples/cmn/Makefile.in b/qse/samples/cmn/Makefile.in
index 0ebd1eca..10cd4d55 100644
--- a/qse/samples/cmn/Makefile.in
+++ b/qse/samples/cmn/Makefile.in
@@ -53,14 +53,15 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = chr01$(EXEEXT) dir01$(EXEEXT) dll$(EXEEXT) \
 	env01$(EXEEXT) fio01$(EXEEXT) fio02$(EXEEXT) fma$(EXEEXT) \
-	fmt01$(EXEEXT) fmt02$(EXEEXT) fs01$(EXEEXT) htb$(EXEEXT) \
-	glob01$(EXEEXT) ipad01$(EXEEXT) lda$(EXEEXT) main01$(EXEEXT) \
-	main02$(EXEEXT) mbwc01$(EXEEXT) mbwc02$(EXEEXT) \
-	nwad01$(EXEEXT) nwif01$(EXEEXT) nwif02$(EXEEXT) oht$(EXEEXT) \
-	path01$(EXEEXT) pio$(EXEEXT) pma$(EXEEXT) rex01$(EXEEXT) \
-	rbt$(EXEEXT) sio01$(EXEEXT) sio02$(EXEEXT) sio03$(EXEEXT) \
-	sll$(EXEEXT) slmb01$(EXEEXT) str01$(EXEEXT) task01$(EXEEXT) \
-	time$(EXEEXT) tre01$(EXEEXT) uri01$(EXEEXT) xma$(EXEEXT)
+	fmt01$(EXEEXT) fmt02$(EXEEXT) fs01$(EXEEXT) fs02$(EXEEXT) \
+	htb$(EXEEXT) glob01$(EXEEXT) ipad01$(EXEEXT) lda$(EXEEXT) \
+	main01$(EXEEXT) main02$(EXEEXT) mbwc01$(EXEEXT) \
+	mbwc02$(EXEEXT) nwad01$(EXEEXT) nwif01$(EXEEXT) \
+	nwif02$(EXEEXT) oht$(EXEEXT) path01$(EXEEXT) pio$(EXEEXT) \
+	pma$(EXEEXT) rex01$(EXEEXT) rbt$(EXEEXT) sio01$(EXEEXT) \
+	sio02$(EXEEXT) sio03$(EXEEXT) sll$(EXEEXT) slmb01$(EXEEXT) \
+	str01$(EXEEXT) task01$(EXEEXT) time$(EXEEXT) tre01$(EXEEXT) \
+	uri01$(EXEEXT) xma$(EXEEXT)
 @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
 subdir = samples/cmn
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -126,6 +127,10 @@ am_fs01_OBJECTS = fs01.$(OBJEXT)
 fs01_OBJECTS = $(am_fs01_OBJECTS)
 fs01_LDADD = $(LDADD)
 fs01_DEPENDENCIES = $(am__DEPENDENCIES_2)
+fs02_SOURCES = fs02.c
+fs02_OBJECTS = fs02.$(OBJEXT)
+fs02_LDADD = $(LDADD)
+fs02_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_glob01_OBJECTS = glob01.$(OBJEXT)
 glob01_OBJECTS = $(am_glob01_OBJECTS)
 glob01_LDADD = $(LDADD)
@@ -266,7 +271,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(chr01_SOURCES) dir01.c $(dll_SOURCES) $(env01_SOURCES) \
 	$(fio01_SOURCES) $(fio02_SOURCES) $(fma_SOURCES) \
-	$(fmt01_SOURCES) $(fmt02_SOURCES) $(fs01_SOURCES) \
+	$(fmt01_SOURCES) $(fmt02_SOURCES) $(fs01_SOURCES) fs02.c \
 	$(glob01_SOURCES) $(htb_SOURCES) $(ipad01_SOURCES) \
 	$(lda_SOURCES) $(main01_SOURCES) $(main02_SOURCES) \
 	$(mbwc01_SOURCES) $(mbwc02_SOURCES) $(nwad01_SOURCES) nwif01.c \
@@ -278,7 +283,7 @@ SOURCES = $(chr01_SOURCES) dir01.c $(dll_SOURCES) $(env01_SOURCES) \
 DIST_SOURCES = $(chr01_SOURCES) dir01.c $(dll_SOURCES) \
 	$(env01_SOURCES) $(fio01_SOURCES) $(fio02_SOURCES) \
 	$(fma_SOURCES) $(fmt01_SOURCES) $(fmt02_SOURCES) \
-	$(fs01_SOURCES) $(glob01_SOURCES) $(htb_SOURCES) \
+	$(fs01_SOURCES) fs02.c $(glob01_SOURCES) $(htb_SOURCES) \
 	$(ipad01_SOURCES) $(lda_SOURCES) $(main01_SOURCES) \
 	$(main02_SOURCES) $(mbwc01_SOURCES) $(mbwc02_SOURCES) \
 	$(nwad01_SOURCES) nwif01.c nwif02.c $(oht_SOURCES) \
@@ -620,6 +625,9 @@ fmt02$(EXEEXT): $(fmt02_OBJECTS) $(fmt02_DEPENDENCIES) $(EXTRA_fmt02_DEPENDENCIE
 fs01$(EXEEXT): $(fs01_OBJECTS) $(fs01_DEPENDENCIES) $(EXTRA_fs01_DEPENDENCIES) 
 	@rm -f fs01$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(fs01_OBJECTS) $(fs01_LDADD) $(LIBS)
+fs02$(EXEEXT): $(fs02_OBJECTS) $(fs02_DEPENDENCIES) $(EXTRA_fs02_DEPENDENCIES) 
+	@rm -f fs02$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(fs02_OBJECTS) $(fs02_LDADD) $(LIBS)
 glob01$(EXEEXT): $(glob01_OBJECTS) $(glob01_DEPENDENCIES) $(EXTRA_glob01_DEPENDENCIES) 
 	@rm -f glob01$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(glob01_OBJECTS) $(glob01_LDADD) $(LIBS)
@@ -721,6 +729,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt01.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt02.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs01.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs02.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glob01.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipad01.Po@am__quote@
diff --git a/qse/samples/cmn/fs01.c b/qse/samples/cmn/fs01.c
index bd27878a..41e56adc 100644
--- a/qse/samples/cmn/fs01.c
+++ b/qse/samples/cmn/fs01.c
@@ -90,7 +90,7 @@ int qse_main (int argc, qse_achar_t* argv[])
 		qse_setdflcmgrbyid (QSE_CMGR_SLMB);
 	}
 #else
-     setlocale (LC_ALL, "");
+	setlocale (LC_ALL, "");
 	qse_setdflcmgrbyid (QSE_CMGR_SLMB);
 #endif
 	return qse_runmain (argc, argv, fs_main);
diff --git a/qse/samples/cmn/fs02.c b/qse/samples/cmn/fs02.c
new file mode 100644
index 00000000..1eeb3f61
--- /dev/null
+++ b/qse/samples/cmn/fs02.c
@@ -0,0 +1,74 @@
+#include <qse/cmn/fs.h>
+#include <qse/cmn/mem.h>
+#include <qse/cmn/str.h>
+#include <qse/cmn/sio.h>
+#include <qse/cmn/path.h>
+#include <qse/cmn/main.h>
+#include <qse/cmn/mbwc.h>
+#include <locale.h>
+
+static int fs_del (qse_fs_t* fs, const qse_char_t* path)
+{
+	qse_printf (QSE_T("Deleting [%s]\n"), path);
+/*if (qse_strcmp(path, QSE_T("b/c")) == 0) return 0;*/
+	return 1;
+}
+
+static int fs_main (int argc, qse_char_t* argv[])
+{
+	qse_fs_t* fs;
+	qse_fs_cbs_t cbs;
+	int ret = 0;
+
+	if (argc != 2)
+	{
+		qse_fprintf (QSE_STDERR, QSE_T("Usage: %s file-pattern-to-delete\n"), qse_basename(argv[0]));
+		return -1;
+	}
+	fs = qse_fs_open (QSE_MMGR_GETDFL(), 0);	
+
+	qse_memset (&cbs, 0, QSE_SIZEOF(cbs));
+	cbs.del = fs_del;
+	qse_fs_setopt (fs, QSE_FS_CBS, &cbs);
+
+	if (qse_fs_delfile (fs, argv[1], QSE_FS_DELDIRMBS_GLOB | QSE_FS_DELDIRMBS_RECURSIVE) <= -1)
+	{
+		qse_fprintf (QSE_STDERR, QSE_T("cannot delete files - %d\n"), qse_fs_geterrnum(fs));
+		ret = -1;
+	}
+
+	qse_fs_close (fs);
+	return ret;
+}
+
+int main (int argc, qse_achar_t* argv[])
+{
+	int x;
+#if defined(_WIN32)
+ 	char locale[100];
+	UINT codepage = GetConsoleOutputCP();	
+	if (codepage == CP_UTF8)
+	{
+		/*SetConsoleOUtputCP (CP_UTF8);*/
+		qse_setdflcmgrbyid (QSE_CMGR_UTF8);
+	}
+	else
+	{
+		sprintf (locale, ".%u", (unsigned int)codepage);
+		setlocale (LC_ALL, locale);
+		qse_setdflcmgrbyid (QSE_CMGR_SLMB);
+	}
+#else
+	setlocale (LC_ALL, "");
+	qse_setdflcmgrbyid (QSE_CMGR_SLMB);
+#endif
+
+	qse_openstdsios ();
+
+	x = qse_runmain (argc, argv, fs_main);
+
+	qse_closestdsios ();
+
+	return x;
+}
+