diff --git a/qse/bld/msdos-watcom/makefile b/qse/bld/msdos-watcom/makefile index 7d386e8f..744013cd 100644 --- a/qse/bld/msdos-watcom/makefile +++ b/qse/bld/msdos-watcom/makefile @@ -224,6 +224,7 @@ LIBQSECMN_OBJECTS = & $(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_make.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & @@ -570,6 +571,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_del $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile index cdeace6a..7ef3b751 100644 --- a/qse/bld/os2-watcom/makefile +++ b/qse/bld/os2-watcom/makefile @@ -342,6 +342,7 @@ DLLQSECMN_OBJECTS = & $(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_make.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj & @@ -438,6 +439,7 @@ LIBQSECMN_OBJECTS = & $(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_make.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & @@ -1103,6 +1105,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(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) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1382,6 +1387,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(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) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl index 1d19b289..be2b8d98 100644 --- a/qse/bld/qse.bkl +++ b/qse/bld/qse.bkl @@ -174,6 +174,7 @@ fs.c fs-delete.c fs-err.c + fs-make.c fs-move.c glob.c hton.c diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile index 07f7dc0e..fe7051cf 100644 --- a/qse/bld/win32-borland/makefile +++ b/qse/bld/win32-borland/makefile @@ -110,6 +110,7 @@ DLLQSECMN_OBJECTS = \ $(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_make.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj \ @@ -207,6 +208,7 @@ LIBQSECMN_OBJECTS = \ $(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_make.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj \ @@ -1051,6 +1053,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(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 +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c + $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c @@ -1330,6 +1335,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(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 +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c + $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile index c118acfe..c672ea93 100644 --- a/qse/bld/win32-msvc/makefile +++ b/qse/bld/win32-msvc/makefile @@ -79,6 +79,7 @@ DLLQSECMN_OBJECTS = \ $(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_make.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj \ @@ -178,6 +179,7 @@ LIBQSECMN_OBJECTS = \ $(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_make.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj \ @@ -1130,6 +1132,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(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 +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c @@ -1409,6 +1414,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(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 +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile index ca926c8a..b13a14bf 100644 --- a/qse/bld/win32-watcom/makefile +++ b/qse/bld/win32-watcom/makefile @@ -331,6 +331,7 @@ DLLQSECMN_OBJECTS = & $(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_make.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj & @@ -427,6 +428,7 @@ LIBQSECMN_OBJECTS = & $(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_make.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & @@ -1092,6 +1094,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(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) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1371,6 +1376,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(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) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< diff --git a/qse/include/qse/cmn/fs.h b/qse/include/qse/cmn/fs.h index f26446f7..b7b34e86 100644 --- a/qse/include/qse/cmn/fs.h +++ b/qse/include/qse/cmn/fs.h @@ -129,6 +129,11 @@ enum qse_fs_trait_t }; typedef enum qse_fs_trait_t qse_fs_trait_t; +typedef int (*qse_fs_cbs_mk_t) ( + qse_fs_t* fs, + const qse_char_t* path +); + typedef int (*qse_fs_cbs_del_t) ( qse_fs_t* fs, const qse_char_t* path @@ -136,6 +141,7 @@ typedef int (*qse_fs_cbs_del_t) ( struct qse_fs_cbs_t { + qse_fs_cbs_mk_t mk; qse_fs_cbs_del_t del; }; typedef struct qse_fs_cbs_t qse_fs_cbs_t; @@ -270,7 +276,7 @@ QSE_EXPORT int qse_fs_mkdirmbs ( QSE_EXPORT int qse_fs_mkdirwcs ( qse_fs_t* fs, - const qse_mchar_t* path + const qse_wchar_t* path ); QSE_EXPORT int qse_fs_delfilembs ( diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index 832f3986..e9e30e78 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -47,6 +47,7 @@ libqsecmn_la_SOURCES = \ fs.c \ fs-delete.c \ fs-err.c \ + fs-make.c \ fs-move.c \ glob.c \ hton.c \ diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 0f202a21..0a27319b 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -108,28 +108,28 @@ libqsecmn_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \ alg-sort.c assert.c chr.c dir.c dll.c env.c gdl.c htb.c fio.c \ fma.c fmt-intmax.c fmt-out.c fs.c fs-delete.c fs-err.c \ - fs-move.c glob.c hton.c ipad.c lda.c main.c mb8.c mbwc.c \ - mbwc-str.c mem.c mux.c nwad.c nwad-skad.c nwif.c nwif-cfg.c \ - nwio.c oht.c opt.c path-base.c path-canon.c pio.c pma.c rbt.c \ - rex.c sck.c sio.c sll.c slmb.c str-beg.c str-cat.c str-chr.c \ - str-cnv.c str-cmp.c str-cpy.c str-del.c str-dup.c str-dyn.c \ - str-end.c str-excl.c str-fcpy.c str-fmt.c str-fnmat.c \ - str-incl.c str-join.c str-len.c str-pac.c str-pbrk.c str-put.c \ - str-rev.c str-rot.c str-set.c str-spl.c str-spn.c str-str.c \ - str-subst.c str-tok.c str-trm.c str-word.c task.c time.c tio.c \ - tmr.c tre.c tre-ast.c tre-compile.c tre-match-bt.c \ - tre-match-pa.c tre-parse.c tre-stack.c uri.c utf8.c xma.c \ - uni.c cp949.c cp950.c + fs-make.c fs-move.c glob.c hton.c ipad.c lda.c main.c mb8.c \ + mbwc.c mbwc-str.c mem.c mux.c nwad.c nwad-skad.c nwif.c \ + nwif-cfg.c nwio.c oht.c opt.c path-base.c path-canon.c pio.c \ + pma.c rbt.c rex.c sck.c sio.c sll.c slmb.c str-beg.c str-cat.c \ + str-chr.c str-cnv.c str-cmp.c str-cpy.c str-del.c str-dup.c \ + str-dyn.c str-end.c str-excl.c str-fcpy.c str-fmt.c \ + str-fnmat.c str-incl.c str-join.c str-len.c str-pac.c \ + str-pbrk.c str-put.c str-rev.c str-rot.c str-set.c str-spl.c \ + str-spn.c str-str.c str-subst.c str-tok.c str-trm.c str-word.c \ + task.c time.c tio.c tmr.c tre.c tre-ast.c tre-compile.c \ + tre-match-bt.c tre-match-pa.c tre-parse.c tre-stack.c uri.c \ + utf8.c xma.c uni.c cp949.c cp950.c @ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo @ENABLE_XCMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \ alg-sort.lo assert.lo chr.lo dir.lo dll.lo env.lo gdl.lo \ htb.lo fio.lo fma.lo fmt-intmax.lo fmt-out.lo fs.lo \ - fs-delete.lo fs-err.lo fs-move.lo glob.lo hton.lo ipad.lo \ - lda.lo main.lo mb8.lo mbwc.lo mbwc-str.lo mem.lo mux.lo \ - nwad.lo nwad-skad.lo nwif.lo nwif-cfg.lo nwio.lo oht.lo opt.lo \ - path-base.lo path-canon.lo pio.lo pma.lo rbt.lo rex.lo sck.lo \ - sio.lo sll.lo slmb.lo str-beg.lo str-cat.lo str-chr.lo \ + fs-delete.lo fs-err.lo fs-make.lo fs-move.lo glob.lo hton.lo \ + ipad.lo lda.lo main.lo mb8.lo mbwc.lo mbwc-str.lo mem.lo \ + mux.lo nwad.lo nwad-skad.lo nwif.lo nwif-cfg.lo nwio.lo oht.lo \ + opt.lo path-base.lo path-canon.lo pio.lo pma.lo rbt.lo rex.lo \ + sck.lo sio.lo sll.lo slmb.lo str-beg.lo str-cat.lo str-chr.lo \ str-cnv.lo str-cmp.lo str-cpy.lo str-del.lo str-dup.lo \ str-dyn.lo str-end.lo str-excl.lo str-fcpy.lo str-fmt.lo \ str-fnmat.lo str-incl.lo str-join.lo str-len.lo str-pac.lo \ @@ -414,19 +414,19 @@ noinst_HEADERS = \ libqsecmn_la_SOURCES = alg-base64.c alg-rand.c alg-search.c alg-sort.c \ assert.c chr.c dir.c dll.c env.c gdl.c htb.c fio.c fma.c \ - fmt-intmax.c fmt-out.c fs.c fs-delete.c fs-err.c fs-move.c \ - glob.c hton.c ipad.c lda.c main.c mb8.c mbwc.c mbwc-str.c \ - mem.c mux.c nwad.c nwad-skad.c nwif.c nwif-cfg.c nwio.c oht.c \ - opt.c path-base.c path-canon.c pio.c pma.c rbt.c rex.c sck.c \ - sio.c sll.c slmb.c str-beg.c str-cat.c str-chr.c str-cnv.c \ - str-cmp.c str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c \ - str-excl.c str-fcpy.c str-fmt.c str-fnmat.c str-incl.c \ - str-join.c str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c \ - str-rot.c str-set.c str-spl.c str-spn.c str-str.c str-subst.c \ - str-tok.c str-trm.c str-word.c task.c time.c tio.c tmr.c tre.c \ - tre-ast.c tre-compile.c tre-match-bt.c tre-match-pa.c \ - tre-parse.c tre-stack.c uri.c utf8.c xma.c $(am__append_1) \ - $(am__append_2) + fmt-intmax.c fmt-out.c fs.c fs-delete.c fs-err.c fs-make.c \ + fs-move.c glob.c hton.c ipad.c lda.c main.c mb8.c mbwc.c \ + mbwc-str.c mem.c mux.c nwad.c nwad-skad.c nwif.c nwif-cfg.c \ + nwio.c oht.c opt.c path-base.c path-canon.c pio.c pma.c rbt.c \ + rex.c sck.c sio.c sll.c slmb.c str-beg.c str-cat.c str-chr.c \ + str-cnv.c str-cmp.c str-cpy.c str-del.c str-dup.c str-dyn.c \ + str-end.c str-excl.c str-fcpy.c str-fmt.c str-fnmat.c \ + str-incl.c str-join.c str-len.c str-pac.c str-pbrk.c str-put.c \ + str-rev.c str-rot.c str-set.c str-spl.c str-spn.c str-str.c \ + str-subst.c str-tok.c str-trm.c str-word.c task.c time.c tio.c \ + tmr.c tre.c tre-ast.c tre-compile.c tre-match-bt.c \ + tre-match-pa.c tre-parse.c tre-stack.c uri.c utf8.c xma.c \ + $(am__append_1) $(am__append_2) libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined libqsecmn_la_LIBADD = $(SOCKET_LIBS) $(QUADMATH_LIBS) @ENABLE_CXX_TRUE@libqsecmnxx_la_SOURCES = \ @@ -530,6 +530,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt-out.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-delete.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-err.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-make.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-move.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdl.Plo@am__quote@ diff --git a/qse/lib/cmn/fs-make.c b/qse/lib/cmn/fs-make.c new file mode 100644 index 00000000..a2429428 --- /dev/null +++ b/qse/lib/cmn/fs-make.c @@ -0,0 +1,130 @@ +/* + * $Id$ + * + Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "fs.h" + +static int make_directory_in_fs (qse_fs_t* fs, const qse_fs_char_t* fspath) +{ + +#if defined(_WIN32) + + if (CreateDirectory (fspath, QSE_NULL) == FALSE) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, GetLastError()); + return -1; + } + +#elif defined(__OS2__) + + APIRET rc; + + rc = DosMkDir (fspath); + if (rc != NO_ERROR) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, rc); + return -1; + } + +#elif defined(__DOS__) + + if (mkdir (fspath) <= -1) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, errno); + return -1; + } + +#else + + if (QSE_MKDIR (fspath, 0755) <= -1) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, errno); + return -1; + } + +#endif + + return 0; +} + +/* --------------------------------------------------------------------- */ + +static int make_directory_with_mbs (qse_fs_t* fs, const qse_mchar_t* path) +{ + qse_fs_char_t* fspath; + int ret; + + if (fs->cbs.mk) + { + + 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); + + return ret; +} + + +static int make_directory_with_wcs (qse_fs_t* fs, const qse_wchar_t* path) +{ + qse_fs_char_t* fspath; + int ret; + + if (fs->cbs.mk) + { + 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); + + return ret; +} + +/* --------------------------------------------------------------------- */ +int qse_fs_mkdirmbs (qse_fs_t* fs, const qse_mchar_t* path) +{ + + return 0; +} + +int qse_fs_mkdirwcs (qse_fs_t* fs, const qse_wchar_t* path) +{ + return 0; +}