diff --git a/qse/cmd/fs/fs.c b/qse/cmd/fs/fs.c index 0808d3a3..411086fa 100644 --- a/qse/cmd/fs/fs.c +++ b/qse/cmd/fs/fs.c @@ -57,7 +57,7 @@ int fs_main (int argc, qse_char_t* argv[]) if (qse_fs_move (fs, argv[1], argv[2]) <= -1) { - qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot move %s to %s - %s\n"), argv[1], argv[2], qse_fs_geterrmsg(fs)); + qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot move %s to %s - code %s\n"), argv[1], argv[2], (int)qse_fs_geterrnum(fs)); qse_fs_close (fs); return -1; } diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c index 13e5d1d6..dc3e607a 100644 --- a/qse/cmd/sed/sed.c +++ b/qse/cmd/sed/sed.c @@ -566,9 +566,7 @@ int sed_main (int argc, qse_char_t* argv[]) if (qse_fs_chdir (fs, QSE_T(".")) <= -1) { qse_fprintf (QSE_STDERR, - QSE_T("ERROR: cannot change direcotry in file system handler - %s\n"), - qse_fs_geterrmsg(fs) - ); + QSE_T("ERROR: cannot change direcotry in file system handler\n")); goto oops; } } @@ -673,6 +671,8 @@ int sed_main (int argc, qse_char_t* argv[]) tmpl_tmpfile = QSE_NULL; if (g_inplace && in[0].u.file.path) { + int retried = 0; + tmpl_tmpfile = qse_strdup2 (in[0].u.file.path, QSE_T(".XXXX"), qse_sed_getmmgr(sed)); if (tmpl_tmpfile == QSE_NULL) { @@ -680,6 +680,7 @@ int sed_main (int argc, qse_char_t* argv[]) goto oops; } + open_temp: out_inplace.type = QSE_SED_IOSTD_SIO; out_inplace.u.sio = qse_sio_open ( qse_sed_getmmgr(sed), @@ -693,9 +694,25 @@ int sed_main (int argc, qse_char_t* argv[]) ); if (out_inplace.u.sio == QSE_NULL) { - qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot open %s\n"), tmpl_tmpfile); - QSE_MMGR_FREE (qse_sed_getmmgr(sed), tmpl_tmpfile); - goto oops; + if (retried) + { + qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot open %s\n"), tmpl_tmpfile); + QSE_MMGR_FREE (qse_sed_getmmgr(sed), tmpl_tmpfile); + goto oops; + } + else + { + /* retry to open the file with shorter names */ + QSE_MMGR_FREE (qse_sed_getmmgr(sed), tmpl_tmpfile); + tmpl_tmpfile = qse_strdup (QSE_T("TMP-XXXX"), qse_sed_getmmgr(sed)); + if (tmpl_tmpfile == QSE_NULL) + { + qse_fprintf (QSE_STDERR, QSE_T("ERROR: out of memory\n")); + goto oops; + } + retried = 1; + goto open_temp; + } } output = &out_inplace; @@ -725,8 +742,8 @@ TODO: if (qse_fs_move (fs, tmpl_tmpfile, in[0].u.file.path) <= -1) { - qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot rename %s to %s. not deleting %s - %s\n"), - tmpl_tmpfile, in[0].u.file.path, tmpl_tmpfile, qse_fs_geterrmsg(fs)); + qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot rename %s to %s. not deleting %s\n"), + tmpl_tmpfile, in[0].u.file.path, tmpl_tmpfile); QSE_MMGR_FREE (qse_sed_getmmgr(sed), tmpl_tmpfile); goto oops; } diff --git a/qse/include/qse/cmn/fio.h b/qse/include/qse/cmn/fio.h index c6a54094..29d4223b 100644 --- a/qse/include/qse/cmn/fio.h +++ b/qse/include/qse/cmn/fio.h @@ -77,7 +77,7 @@ enum qse_fio_errnum_t QSE_FIO_ENOENT, /**< no such file */ QSE_FIO_EEXIST, /**< already exist */ QSE_FIO_EINTR, /**< interrupted */ - QSE_FIO_ESUBSYS, /**< subsystem(system call) error */ + QSE_FIO_ESYSERR, /**< subsystem(system call) error */ QSE_FIO_ENOIMPL, /**< not implemented */ QSE_FIO_EOTHER /**< other error */ diff --git a/qse/include/qse/cmn/fs.h b/qse/include/qse/cmn/fs.h index 36ddce82..0c969a0e 100644 --- a/qse/include/qse/cmn/fs.h +++ b/qse/include/qse/cmn/fs.h @@ -28,18 +28,21 @@ enum qse_fs_errnum_t { QSE_FS_ENOERR = 0, - QSE_FS_EINTERN, - QSE_FS_ENOMEM, - QSE_FS_EINVAL, - QSE_FS_EACCES, - QSE_FS_EPERM, - QSE_FS_ENOENT, + QSE_FS_ENOMEM, /**< out of memory */ + QSE_FS_EINVAL, /**< invalid parameter */ + QSE_FS_EACCES, /**< access denied */ + QSE_FS_ENOENT, /**< no such file */ + QSE_FS_EEXIST, /**< already exist */ + QSE_FS_EINTR, /**< interrupted */ QSE_FS_ENODIR, QSE_FS_EISDIR, - QSE_FS_EEXIST, QSE_FS_EXDEV, - QSE_FS_ESYSTEM + + QSE_FS_ESYSERR, /**< subsystem error */ + QSE_FS_ENOIMPL, /**< not implemented */ + + QSE_FS_EOTHER }; typedef enum qse_fs_errnum_t qse_fs_errnum_t; @@ -135,10 +138,6 @@ qse_fs_errnum_t qse_fs_geterrnum ( qse_fs_t* fs ); -const qse_char_t* qse_fs_geterrmsg ( - qse_fs_t* fs -); - qse_fs_ent_t* qse_fs_read ( qse_fs_t* fs, int flags diff --git a/qse/include/qse/cmn/pio.h b/qse/include/qse/cmn/pio.h index 2a6337d8..7b53f20b 100644 --- a/qse/include/qse/cmn/pio.h +++ b/qse/include/qse/cmn/pio.h @@ -139,7 +139,7 @@ enum qse_pio_errnum_t QSE_PIO_EILSEQ, /**< illegal sequence */ QSE_PIO_EICSEQ, /**< incomplete sequence */ QSE_PIO_EILCHR, /**< illegal character */ - QSE_PIO_ESUBSYS, /**< subsystem error */ + QSE_PIO_ESYSERR, /**< subsystem error */ QSE_PIO_ENOIMPL, /**< not implemented */ QSE_PIO_EOTHER /**< unknown error */ diff --git a/qse/include/qse/cmn/sio.h b/qse/include/qse/cmn/sio.h index b3a2f995..95b40d49 100644 --- a/qse/include/qse/cmn/sio.h +++ b/qse/include/qse/cmn/sio.h @@ -69,11 +69,11 @@ enum qse_sio_errnum_t QSE_SIO_EACCES, /**< access denied */ QSE_SIO_ENOENT, /**< no such file */ QSE_SIO_EEXIST, /**< already exist */ - QSE_SIO_EINTR, /**< already exist */ + QSE_SIO_EINTR, /**< interrupted */ QSE_SIO_EILSEQ, /**< illegal sequence */ QSE_SIO_EICSEQ, /**< incomplete sequence */ QSE_SIO_EILCHR, /**< illegal character */ - QSE_SIO_ESUBSYS, /**< subsystem(system call) error */ + QSE_SIO_ESYSERR, /**< subsystem(system call) error */ QSE_SIO_ENOIMPL, /**< not implemented */ QSE_SIO_EOTHER /**< other error */ diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index 4253dfce..c44bb1f1 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -57,28 +57,28 @@ static qse_fio_errnum_t syserr_to_errnum (DWORD e) switch (e) { + case ERROR_NOT_ENOUGH_MEMORY: + case ERROR_OUTOFMEMORY: + return QSE_FIO_ENOMEM; + case ERROR_INVALID_PARAMETER: case ERROR_INVALID_HANDLE: case ERROR_INVALID_NAME: return QSE_FIO_EINVAL; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_FIO_ENOENT; - case ERROR_ACCESS_DENIED: return QSE_FIO_EACCES; - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_OUTOFMEMORY: - return QSE_FIO_ENOMEM; + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + return QSE_FIO_ENOENT; case ERROR_ALREADY_EXISTS: case ERROR_FILE_EXISTS: return QSE_FIO_EEXIST; default: - return QSE_FIO_ESUBSYS; + return QSE_FIO_ESYSERR; } } #elif defined(__OS2__) @@ -86,26 +86,26 @@ static qse_fio_errnum_t syserr_to_errnum (APIRET e) { switch (e) { + case ERROR_NOT_ENOUGH_MEMORY: + return QSE_FIO_ENOMEM; + case ERROR_INVALID_PARAMETER: case ERROR_INVALID_HANDLE: case ERROR_INVALID_NAME: return QSE_FIO_EINVAL; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_FIO_ENOENT; - case ERROR_ACCESS_DENIED: return QSE_FIO_EACCES; - case ERROR_NOT_ENOUGH_MEMORY: - return QSE_FIO_ENOMEM; + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + return QSE_FIO_ENOENT; case ERROR_ALREADY_EXISTS: return QSE_FIO_EEXIST; default: - return QSE_FIO_ESUBSYS; + return QSE_FIO_ESYSERR; } } #elif defined(__DOS__) @@ -119,17 +119,17 @@ static qse_fio_errnum_t syserr_to_errnum (int e) case EINVAL: return QSE_FIO_EINVAL; - case ENOENT: - return QSE_FIO_ENOENT; - case EACCES: return QSE_FIO_EACCES; + case ENOENT: + return QSE_FIO_ENOENT; + case EEXIST: return QSE_FIO_EEXIST; default: - return QSE_FIO_ESUBSYS; + return QSE_FIO_ESYSERR; } } #else @@ -156,7 +156,7 @@ static qse_fio_errnum_t syserr_to_errnum (int e) return QSE_FIO_EINTR; default: - return QSE_FIO_ESUBSYS; + return QSE_FIO_ESYSERR; } } #endif diff --git a/qse/lib/cmn/fs-err.c b/qse/lib/cmn/fs-err.c index 8d3d5732..189ab221 100644 --- a/qse/lib/cmn/fs-err.c +++ b/qse/lib/cmn/fs-err.c @@ -25,34 +25,17 @@ qse_fs_errnum_t qse_fs_geterrnum (qse_fs_t* fs) return fs->errnum; } -const qse_char_t* qse_fs_geterrmsg (qse_fs_t* fs) -{ - static const qse_char_t* errstr[] = - { - QSE_T("no error"), - QSE_T("internal error that should never have happened"), - - QSE_T("insufficient memory"), - QSE_T("invalid parameter or data"), - QSE_T("access denied"), - QSE_T("operation not permitted"), - QSE_T("no such entry"), - QSE_T("no working directory set"), - QSE_T("operation not permitted on directory"), - QSE_T("entry already exists"), - QSE_T("cross-device operation not allowed"), - QSE_T("system error") - }; - - return (fs->errnum >= 0 && fs->errnum < QSE_COUNTOF(errstr))? - errstr[fs->errnum]: QSE_T("unknown error"); -} - qse_fs_errnum_t qse_fs_syserrtoerrnum (qse_fs_t* fs, qse_fs_syserr_t e) { #if defined(_WIN32) switch (e) { + case ERROR_NOT_ENOUGH_MEMORY: + case ERROR_OUTOFMEMORY: + return QSE_FS_ENOMEM; + + case ERROR_INVALID_PARAMETER: + case ERROR_INVALID_HANDLE: case ERROR_INVALID_NAME: case ERROR_DIRECTORY: return QSE_FS_EINVAL; @@ -64,47 +47,104 @@ qse_fs_errnum_t qse_fs_syserrtoerrnum (qse_fs_t* fs, qse_fs_syserr_t e) case ERROR_PATH_NOT_FOUND: return QSE_FS_ENOENT; - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_OUTOFMEMORY: - return QSE_FS_ENOMEM; - case ERROR_ALREADY_EXISTS: case ERROR_FILE_EXISTS: return QSE_FS_EEXIST; + + case ERROR_NOT_SAME_DEVICE: + return QSE_FS_EXDEV; default: - return QSE_FS_ESYSTEM; + return QSE_FS_ESYSERR; } -#else +#elif defined(__OS2__) + switch (e) { - case EINVAL: + case ERROR_NOT_ENOUGH_MEMORY: + return QSE_FS_ENOMEM; + + case ERROR_INVALID_PARAMETER: + case ERROR_INVALID_HANDLE: + case ERROR_INVALID_NAME: return QSE_FS_EINVAL; + case ERROR_ACCESS_DENIED: + return QSE_FS_EACCES; + + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + return QSE_FS_ENOENT; + + case ERROR_ALREADY_EXISTS: + return QSE_FS_EEXIST; + + case ERROR_NOT_SAME_DEVICE: + return QSE_FS_EXDEV; + + default: + return QSE_FS_ESYSERR; + } + +#elif defined(__DOS__) + + switch (e) + { case ENOMEM: return QSE_FS_ENOMEM; - case EACCES: - return QSE_FS_EACCES; + case EINVAL: + return QSE_FS_EINVAL; + case EACCES: case EPERM: - return QSE_FS_EPERM; + return QSE_FS_EACCES; case ENOENT: case ENOTDIR: return QSE_FS_ENOENT; + case EEXIST: + return QSE_FS_EEXIST; + case EISDIR: return QSE_FS_EISDIR; + default: + return QSE_FS_ESYSERR; + } + +#else + switch (e) + { + case ENOMEM: + return QSE_FS_ENOMEM; + + case EINVAL: + return QSE_FS_EINVAL; + + case EACCES: + case EPERM: + return QSE_FS_EACCES; + + case ENOENT: + case ENOTDIR: + return QSE_FS_ENOENT; + case EEXIST: return QSE_FS_EEXIST; + case EINTR: + return QSE_FS_EINTR; + + case EISDIR: + return QSE_FS_EISDIR; + case EXDEV: return QSE_FS_EXDEV; default: - return QSE_FS_ESYSTEM; + return QSE_FS_ESYSERR; } #endif } diff --git a/qse/lib/cmn/fs-move.c b/qse/lib/cmn/fs-move.c index 70fd6cb8..01b5d00f 100644 --- a/qse/lib/cmn/fs-move.c +++ b/qse/lib/cmn/fs-move.c @@ -45,16 +45,20 @@ struct fop_t #if defined(_WIN32) - qse_wchar_t* old_path; - qse_wchar_t* new_path; - qse_wchar_t* new_path2; + /* nothing yet */ +#elif defined(__OS2__) + qse_mchar_t* old_path; + qse_mchar_t* new_path; +#elif defined(__DOS__) + qse_mchar_t* old_path; + qse_mchar_t* new_path; #else - qse_lstat_t old_stat; - qse_lstat_t new_stat; - qse_mchar_t* old_path; qse_mchar_t* new_path; qse_mchar_t* new_path2; + + qse_lstat_t old_stat; + qse_lstat_t new_stat; #endif }; @@ -63,7 +67,9 @@ typedef struct fop_t fop_t; int qse_fs_move ( qse_fs_t* fs, const qse_char_t* oldpath, const qse_char_t* newpath) { + #if defined(_WIN32) + /* ------------------------------------------------------ */ /* TODO: improve it... */ /* TODO: support cross-volume move, move by copy/delete, etc ... */ @@ -87,21 +93,116 @@ int qse_fs_move ( } return 0; + /* ------------------------------------------------------ */ #elif defined(__OS2__) -# error NOT IMPLEMENTED -#elif defined(__DOS__) -# error NOT IMPLEMENTED -#else + /* ------------------------------------------------------ */ + /* TODO: improve it */ + int ret = 0; fop_t fop; QSE_MEMSET (&fop, 0, QSE_SIZEOF(fop)); -#if defined(QSE_CHAR_IS_MCHAR) + #if defined(QSE_CHAR_IS_MCHAR) fop.old_path = oldpath; fop.new_path = newpath; + #else + fop.old_path = qse_wcstombsdup (oldpath, fs->mmgr); + fop.new_path = qse_wcstombsdup (newpath, fs->mmgr); + if (fop.old_path == QSE_NULL || fop.old_path == QSE_NULL) + { + fs->errnum = QSE_FS_ENOMEM; + ret = -1; + } + #endif + + if (ret == 0) + { + APIRET rc; + + rc = DosMove (fop.old_path, fop.new_path); + if (rc == ERROR_ALREADY_EXISTS) + { + DosDelete (fop.new_path); + rc = DosMove (fop.old_path, fop.new_path); + } + if (rc != NO_ERROR) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, rc); + ret = -1; + } + } + + #if defined(QSE_CHAR_IS_MCHAR) + /* nothing special */ + #else + if (fop.old_path) QSE_MMGR_FREE (fs->mmgr, fop.old_path); + if (fop.new_path) QSE_MMGR_FREE (fs->mmgr, fop.new_path); + #endif + return ret; + + + /* ------------------------------------------------------ */ + +#elif defined(__DOS__) + + /* ------------------------------------------------------ */ +/* TODO: improve it */ + fop_t fop; + int ret = 0; + + QSE_MEMSET (&fop, 0, QSE_SIZEOF(fop)); + + #if defined(QSE_CHAR_IS_MCHAR) + fop.old_path = oldpath; + fop.new_path = newpath; + #else + fop.old_path = qse_wcstombsdup (oldpath, fs->mmgr); + fop.new_path = qse_wcstombsdup (newpath, fs->mmgr); + if (fop.old_path == QSE_NULL || fop.old_path == QSE_NULL) + { + fs->errnum = QSE_FS_ENOMEM; + ret = -1; + } + #endif + + if (ret == 0) + { + if (rename (fop.old_path, fop.new_path) <= -1) + { + /* FYI, rename() on watcom seems to set + * errno to EACCES when the new path exists. */ + + unlink (fop.new_path); + if (rename (fop.old_path, fop.new_path) <= -1) + { + fs->errnum = qse_fs_syserrtoerrnum (fs, errno); + ret = -1; + } + } + } + + #if defined(QSE_CHAR_IS_MCHAR) + /* nothing special */ + #else + if (fop.old_path) QSE_MMGR_FREE (fs->mmgr, fop.old_path); + if (fop.new_path) QSE_MMGR_FREE (fs->mmgr, fop.new_path); + #endif + return ret; + + /* ------------------------------------------------------ */ + #else + + /* ------------------------------------------------------ */ + fop_t fop; + QSE_MEMSET (&fop, 0, QSE_SIZEOF(fop)); + + #if defined(QSE_CHAR_IS_MCHAR) + fop.old_path = oldpath; + fop.new_path = newpath; + #else fop.old_path = qse_wcstombsdup (oldpath, fs->mmgr); fop.new_path = qse_wcstombsdup (newpath, fs->mmgr); if (fop.old_path == QSE_NULL || fop.old_path == QSE_NULL) @@ -109,7 +210,7 @@ int qse_fs_move ( fs->errnum = QSE_FS_ENOMEM; goto oops; } -#endif + #endif /* TOOD: implement confirmatio if (overwrite_callback is set) @@ -226,26 +327,27 @@ qse_printf (QSE_T("TODO: cross-device copy....\n")); copy recursively... #endif + done: -#if defined(QSE_CHAR_IS_MCHAR) + #if defined(QSE_CHAR_IS_MCHAR) if (fop.new_path2) QSE_MMGR_FREE (fs->mmgr, fop.new_path2); -#else + #else if (fop.new_path2) QSE_MMGR_FREE (fs->mmgr, fop.new_path2); QSE_MMGR_FREE (fs->mmgr, fop.old_path); QSE_MMGR_FREE (fs->mmgr, fop.new_path); -#endif + #endif return 0; oops: -#if defined(QSE_CHAR_IS_MCHAR) + #if defined(QSE_CHAR_IS_MCHAR) if (fop.new_path2) QSE_MMGR_FREE (fs->mmgr, fop.new_path2); -#else + #else if (fop.new_path2) QSE_MMGR_FREE (fs->mmgr, fop.new_path2); if (fop.old_path) QSE_MMGR_FREE (fs->mmgr, fop.old_path); if (fop.new_path) QSE_MMGR_FREE (fs->mmgr, fop.new_path); -#endif - + #endif return -1; + /* ------------------------------------------------------ */ #endif } diff --git a/qse/lib/cmn/fs.c b/qse/lib/cmn/fs.c index bbd91361..31706655 100644 --- a/qse/lib/cmn/fs.c +++ b/qse/lib/cmn/fs.c @@ -244,8 +244,10 @@ int qse_fs_chdir (qse_fs_t* fs, const qse_char_t* name) #elif defined(__OS2__) /* TODO: implement this */ + return 0; #elif defined(__DOS__) /* TODO: implement this */ + return 0; #else idx = 0; diff --git a/qse/lib/cmn/fs.h b/qse/lib/cmn/fs.h index 1c4101ae..b76b8eb3 100644 --- a/qse/lib/cmn/fs.h +++ b/qse/lib/cmn/fs.h @@ -24,12 +24,14 @@ # include typedef DWORD qse_fs_syserr_t; #elif defined(__OS2__) -# error NOT IMPLEMENTED +# define INCL_DOSERRORS +# include + typedef APIRET qse_fs_syserr_t; #elif defined(__DOS__) -# error NOT IMPLEMENTED +# include + typedef int qse_fs_syserr_t; #else # include "syscall.h" -# include typedef int qse_fs_syserr_t; #endif diff --git a/qse/lib/cmn/pio.c b/qse/lib/cmn/pio.c index 7ade8bd4..e265ca38 100644 --- a/qse/lib/cmn/pio.c +++ b/qse/lib/cmn/pio.c @@ -52,21 +52,21 @@ static qse_pio_errnum_t syserr_to_errnum (DWORD e) { switch (e) { + case ERROR_NOT_ENOUGH_MEMORY: + case ERROR_OUTOFMEMORY: + return QSE_PIO_ENOMEM; + case ERROR_INVALID_PARAMETER: case ERROR_INVALID_HANDLE: case ERROR_INVALID_NAME: return QSE_PIO_EINVAL; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_PIO_ENOENT; - case ERROR_ACCESS_DENIED: return QSE_PIO_EACCES; - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_OUTOFMEMORY: - return QSE_PIO_ENOMEM; + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + return QSE_PIO_ENOENT; case ERROR_ALREADY_EXISTS: case ERROR_FILE_EXISTS: @@ -76,7 +76,7 @@ static qse_pio_errnum_t syserr_to_errnum (DWORD e) return QSE_PIO_EPIPE; default: - return QSE_PIO_ESUBSYS; + return QSE_PIO_ESYSERR; } } #elif defined(__OS2__) @@ -84,20 +84,20 @@ static qse_pio_errnum_t syserr_to_errnum (APIRET e) { switch (e) { + case ERROR_NOT_ENOUGH_MEMORY: + return QSE_PIO_ENOMEM; + case ERROR_INVALID_PARAMETER: case ERROR_INVALID_HANDLE: case ERROR_INVALID_NAME: return QSE_PIO_EINVAL; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_PIO_ENOENT; - case ERROR_ACCESS_DENIED: return QSE_PIO_EACCES; - case ERROR_NOT_ENOUGH_MEMORY: - return QSE_PIO_ENOMEM; + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + return QSE_PIO_ENOENT; case ERROR_ALREADY_EXISTS: return QSE_PIO_EEXIST; @@ -106,7 +106,7 @@ static qse_pio_errnum_t syserr_to_errnum (APIRET e) return QSE_PIO_EPIPE; default: - return QSE_PIO_ESUBSYS; + return QSE_PIO_ESYSERR; } } #elif defined(__DOS__) @@ -120,17 +120,17 @@ static qse_pio_errnum_t syserr_to_errnum (int e) case EINVAL: return QSE_PIO_EINVAL; - case ENOENT: - return QSE_PIO_ENOENT; - case EACCES: return QSE_PIO_EACCES; + case ENOENT: + return QSE_PIO_ENOENT; + case EEXIST: return QSE_PIO_EEXIST; default: - return QSE_PIO_ESUBSYS; + return QSE_PIO_ESYSERR; } } #else @@ -144,12 +144,12 @@ static qse_pio_errnum_t syserr_to_errnum (int e) case EINVAL: return QSE_PIO_EINVAL; - case ENOENT: - return QSE_PIO_ENOENT; - case EACCES: return QSE_PIO_EACCES; + case ENOENT: + return QSE_PIO_ENOENT; + case EEXIST: return QSE_PIO_EEXIST; @@ -160,7 +160,7 @@ static qse_pio_errnum_t syserr_to_errnum (int e) return QSE_PIO_EPIPE; default: - return QSE_PIO_ESUBSYS; + return QSE_PIO_ESYSERR; } } #endif @@ -1663,7 +1663,7 @@ create_process: return 0; oops: - if (pio->errnum == QSE_PIO_ENOERR) pio->errnum = QSE_PIO_ESUBSYS; + if (pio->errnum == QSE_PIO_ENOERR) pio->errnum = QSE_PIO_ESYSERR; #if defined(_WIN32) if (windevnul != INVALID_HANDLE_VALUE) CloseHandle (windevnul); @@ -2049,7 +2049,7 @@ int qse_pio_wait (qse_pio_t* pio) if (w != WAIT_OBJECT_0) { /* WAIT_FAILED, WAIT_ABANDONED */ - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } @@ -2062,7 +2062,7 @@ int qse_pio_wait (qse_pio_t* pio) CloseHandle (pio->child); pio->child = QSE_PIO_PID_NIL; - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } @@ -2075,7 +2075,7 @@ int qse_pio_wait (qse_pio_t* pio) /* this should not happen as the control reaches here * only when WaitforSingleObject() is successful. * if it happends, close the handle and return an error */ - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } @@ -2108,7 +2108,7 @@ int qse_pio_wait (qse_pio_t* pio) if (rc != NO_ERROR) { /* WAIT_FAILED, WAIT_ABANDONED */ - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } @@ -2225,7 +2225,7 @@ int qse_pio_kill (qse_pio_t* pio) n = TerminateProcess (pio->child, 255 + 1 + 9); if (n == FALSE) { - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } return 0; @@ -2235,7 +2235,7 @@ int qse_pio_kill (qse_pio_t* pio) rc = DosKillProcess (pio->child, DKP_PROCESSTREE); if (rc != NO_ERROR) { - pio->errnum = QSE_PIO_ESUBSYS; + pio->errnum = QSE_PIO_ESYSERR; return -1; } return 0; @@ -2247,7 +2247,7 @@ int qse_pio_kill (qse_pio_t* pio) #else n = QSE_KILL (pio->child, SIGKILL); - if (n <= -1) pio->errnum = QSE_PIO_ESUBSYS; + if (n <= -1) pio->errnum = QSE_PIO_ESYSERR; return n; #endif } diff --git a/qse/lib/cmn/sio.c b/qse/lib/cmn/sio.c index b9ff3a8f..e0061807 100644 --- a/qse/lib/cmn/sio.c +++ b/qse/lib/cmn/sio.c @@ -57,8 +57,8 @@ static qse_sio_errnum_t fio_errnum_to_sio_errnum (qse_fio_t* fio) return QSE_SIO_EEXIST; case QSE_FIO_EINTR: return QSE_SIO_EINTR; - case QSE_FIO_ESUBSYS: - return QSE_SIO_ESUBSYS; + case QSE_FIO_ESYSERR: + return QSE_SIO_ESYSERR; case QSE_FIO_ENOIMPL: return QSE_SIO_ENOIMPL; default: @@ -443,14 +443,14 @@ qse_ssize_t qse_sio_putwcs (qse_sio_t* sio, const qse_wchar_t* str) sio->u.file.handle, cur, left, &count, QSE_NULL) == FALSE) { - sio->errnum = QSE_SIO_ESUBSYS; + sio->errnum = QSE_SIO_ESYSERR; return -1; } if (count == 0) break; if (count > left) { - sio->errnum = QSE_SIO_ESUBSYS; + sio->errnum = QSE_SIO_ESYSERR; return -1; } } @@ -502,7 +502,7 @@ qse_ssize_t qse_sio_putwcsn ( sio->u.file.handle, cur, left, &count, QSE_NULL) == FALSE) { - sio->errnum = QSE_SIO_ESUBSYS; + sio->errnum = QSE_SIO_ESYSERR; return -1; } if (count == 0) break; @@ -517,7 +517,7 @@ qse_ssize_t qse_sio_putwcsn ( */ if (count > left) { - sio->errnum = QSE_SIO_ESUBSYS; + sio->errnum = QSE_SIO_ESYSERR; return -1; } } diff --git a/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt b/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt index e2c0f1ca..d05b8862 100755 --- a/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt +++ b/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -74 +77 11 MItem 3 @@ -275,8 +275,8 @@ WVList 0 63 MItem -28 -../../../../../lib/cmn/gdl.c +31 +../../../../../lib/cmn/fs-err.c 64 WString 4 @@ -293,8 +293,8 @@ WVList 0 67 MItem -28 -../../../../../lib/cmn/htb.c +32 +../../../../../lib/cmn/fs-move.c 68 WString 4 @@ -311,8 +311,8 @@ WVList 0 71 MItem -28 -../../../../../lib/cmn/lda.c +27 +../../../../../lib/cmn/fs.c 72 WString 4 @@ -329,8 +329,8 @@ WVList 0 75 MItem -29 -../../../../../lib/cmn/main.c +28 +../../../../../lib/cmn/gdl.c 76 WString 4 @@ -347,8 +347,8 @@ WVList 0 79 MItem -33 -../../../../../lib/cmn/mbwc-str.c +28 +../../../../../lib/cmn/htb.c 80 WString 4 @@ -365,8 +365,8 @@ WVList 0 83 MItem -29 -../../../../../lib/cmn/mbwc.c +28 +../../../../../lib/cmn/lda.c 84 WString 4 @@ -383,8 +383,8 @@ WVList 0 87 MItem -28 -../../../../../lib/cmn/mem.c +29 +../../../../../lib/cmn/main.c 88 WString 4 @@ -401,8 +401,8 @@ WVList 0 91 MItem -28 -../../../../../lib/cmn/oht.c +33 +../../../../../lib/cmn/mbwc-str.c 92 WString 4 @@ -419,8 +419,8 @@ WVList 0 95 MItem -28 -../../../../../lib/cmn/opt.c +29 +../../../../../lib/cmn/mbwc.c 96 WString 4 @@ -437,8 +437,8 @@ WVList 0 99 MItem -38 -../../../../../lib/cmn/path-basename.c +28 +../../../../../lib/cmn/mem.c 100 WString 4 @@ -455,8 +455,8 @@ WVList 0 103 MItem -35 -../../../../../lib/cmn/path-canon.c +28 +../../../../../lib/cmn/oht.c 104 WString 4 @@ -474,7 +474,7 @@ WVList 107 MItem 28 -../../../../../lib/cmn/pio.c +../../../../../lib/cmn/opt.c 108 WString 4 @@ -491,8 +491,8 @@ WVList 0 111 MItem -28 -../../../../../lib/cmn/pma.c +38 +../../../../../lib/cmn/path-basename.c 112 WString 4 @@ -509,8 +509,8 @@ WVList 0 115 MItem -28 -../../../../../lib/cmn/rbt.c +35 +../../../../../lib/cmn/path-canon.c 116 WString 4 @@ -528,7 +528,7 @@ WVList 119 MItem 28 -../../../../../lib/cmn/rex.c +../../../../../lib/cmn/pio.c 120 WString 4 @@ -546,7 +546,7 @@ WVList 123 MItem 28 -../../../../../lib/cmn/sio.c +../../../../../lib/cmn/pma.c 124 WString 4 @@ -564,7 +564,7 @@ WVList 127 MItem 28 -../../../../../lib/cmn/sll.c +../../../../../lib/cmn/rbt.c 128 WString 4 @@ -581,8 +581,8 @@ WVList 0 131 MItem -29 -../../../../../lib/cmn/slmb.c +28 +../../../../../lib/cmn/rex.c 132 WString 4 @@ -599,8 +599,8 @@ WVList 0 135 MItem -30 -../../../../../lib/cmn/stdio.c +28 +../../../../../lib/cmn/sio.c 136 WString 4 @@ -617,8 +617,8 @@ WVList 0 139 MItem -32 -../../../../../lib/cmn/str-beg.c +28 +../../../../../lib/cmn/sll.c 140 WString 4 @@ -635,8 +635,8 @@ WVList 0 143 MItem -32 -../../../../../lib/cmn/str-cat.c +29 +../../../../../lib/cmn/slmb.c 144 WString 4 @@ -653,8 +653,8 @@ WVList 0 147 MItem -32 -../../../../../lib/cmn/str-chr.c +30 +../../../../../lib/cmn/stdio.c 148 WString 4 @@ -672,7 +672,7 @@ WVList 151 MItem 32 -../../../../../lib/cmn/str-cmp.c +../../../../../lib/cmn/str-beg.c 152 WString 4 @@ -690,7 +690,7 @@ WVList 155 MItem 32 -../../../../../lib/cmn/str-cnv.c +../../../../../lib/cmn/str-cat.c 156 WString 4 @@ -708,7 +708,7 @@ WVList 159 MItem 32 -../../../../../lib/cmn/str-cpy.c +../../../../../lib/cmn/str-chr.c 160 WString 4 @@ -726,7 +726,7 @@ WVList 163 MItem 32 -../../../../../lib/cmn/str-del.c +../../../../../lib/cmn/str-cmp.c 164 WString 4 @@ -744,7 +744,7 @@ WVList 167 MItem 32 -../../../../../lib/cmn/str-dup.c +../../../../../lib/cmn/str-cnv.c 168 WString 4 @@ -761,8 +761,8 @@ WVList 0 171 MItem -33 -../../../../../lib/cmn/str-dynm.c +32 +../../../../../lib/cmn/str-cpy.c 172 WString 4 @@ -779,8 +779,8 @@ WVList 0 175 MItem -33 -../../../../../lib/cmn/str-dynw.c +32 +../../../../../lib/cmn/str-del.c 176 WString 4 @@ -798,7 +798,7 @@ WVList 179 MItem 32 -../../../../../lib/cmn/str-end.c +../../../../../lib/cmn/str-dup.c 180 WString 4 @@ -816,7 +816,7 @@ WVList 183 MItem 33 -../../../../../lib/cmn/str-excl.c +../../../../../lib/cmn/str-dynm.c 184 WString 4 @@ -834,7 +834,7 @@ WVList 187 MItem 33 -../../../../../lib/cmn/str-fcpy.c +../../../../../lib/cmn/str-dynw.c 188 WString 4 @@ -851,8 +851,8 @@ WVList 0 191 MItem -33 -../../../../../lib/cmn/str-incl.c +32 +../../../../../lib/cmn/str-end.c 192 WString 4 @@ -869,8 +869,8 @@ WVList 0 195 MItem -32 -../../../../../lib/cmn/str-len.c +33 +../../../../../lib/cmn/str-excl.c 196 WString 4 @@ -887,8 +887,8 @@ WVList 0 199 MItem -32 -../../../../../lib/cmn/str-pac.c +33 +../../../../../lib/cmn/str-fcpy.c 200 WString 4 @@ -906,7 +906,7 @@ WVList 203 MItem 33 -../../../../../lib/cmn/str-pbrk.c +../../../../../lib/cmn/str-incl.c 204 WString 4 @@ -924,7 +924,7 @@ WVList 207 MItem 32 -../../../../../lib/cmn/str-put.c +../../../../../lib/cmn/str-len.c 208 WString 4 @@ -942,7 +942,7 @@ WVList 211 MItem 32 -../../../../../lib/cmn/str-rev.c +../../../../../lib/cmn/str-pac.c 212 WString 4 @@ -959,8 +959,8 @@ WVList 0 215 MItem -32 -../../../../../lib/cmn/str-rot.c +33 +../../../../../lib/cmn/str-pbrk.c 216 WString 4 @@ -978,7 +978,7 @@ WVList 219 MItem 32 -../../../../../lib/cmn/str-set.c +../../../../../lib/cmn/str-put.c 220 WString 4 @@ -996,7 +996,7 @@ WVList 223 MItem 32 -../../../../../lib/cmn/str-spl.c +../../../../../lib/cmn/str-rev.c 224 WString 4 @@ -1014,7 +1014,7 @@ WVList 227 MItem 32 -../../../../../lib/cmn/str-spn.c +../../../../../lib/cmn/str-rot.c 228 WString 4 @@ -1032,7 +1032,7 @@ WVList 231 MItem 32 -../../../../../lib/cmn/str-str.c +../../../../../lib/cmn/str-set.c 232 WString 4 @@ -1049,8 +1049,8 @@ WVList 0 235 MItem -34 -../../../../../lib/cmn/str-subst.c +32 +../../../../../lib/cmn/str-spl.c 236 WString 4 @@ -1068,7 +1068,7 @@ WVList 239 MItem 32 -../../../../../lib/cmn/str-tok.c +../../../../../lib/cmn/str-spn.c 240 WString 4 @@ -1086,7 +1086,7 @@ WVList 243 MItem 32 -../../../../../lib/cmn/str-trm.c +../../../../../lib/cmn/str-str.c 244 WString 4 @@ -1103,8 +1103,8 @@ WVList 0 247 MItem -33 -../../../../../lib/cmn/str-word.c +34 +../../../../../lib/cmn/str-subst.c 248 WString 4 @@ -1121,8 +1121,8 @@ WVList 0 251 MItem -29 -../../../../../lib/cmn/time.c +32 +../../../../../lib/cmn/str-tok.c 252 WString 4 @@ -1140,7 +1140,7 @@ WVList 255 MItem 32 -../../../../../lib/cmn/tio-get.c +../../../../../lib/cmn/str-trm.c 256 WString 4 @@ -1157,8 +1157,8 @@ WVList 0 259 MItem -32 -../../../../../lib/cmn/tio-put.c +33 +../../../../../lib/cmn/str-word.c 260 WString 4 @@ -1175,8 +1175,8 @@ WVList 0 263 MItem -28 -../../../../../lib/cmn/tio.c +29 +../../../../../lib/cmn/time.c 264 WString 4 @@ -1194,7 +1194,7 @@ WVList 267 MItem 32 -../../../../../lib/cmn/tre-ast.c +../../../../../lib/cmn/tio-get.c 268 WString 4 @@ -1211,8 +1211,8 @@ WVList 0 271 MItem -36 -../../../../../lib/cmn/tre-compile.c +32 +../../../../../lib/cmn/tio-put.c 272 WString 4 @@ -1229,8 +1229,8 @@ WVList 0 275 MItem -44 -../../../../../lib/cmn/tre-match-backtrack.c +28 +../../../../../lib/cmn/tio.c 276 WString 4 @@ -1247,8 +1247,8 @@ WVList 0 279 MItem -43 -../../../../../lib/cmn/tre-match-parallel.c +32 +../../../../../lib/cmn/tre-ast.c 280 WString 4 @@ -1265,8 +1265,8 @@ WVList 0 283 MItem -34 -../../../../../lib/cmn/tre-parse.c +36 +../../../../../lib/cmn/tre-compile.c 284 WString 4 @@ -1283,8 +1283,8 @@ WVList 0 287 MItem -34 -../../../../../lib/cmn/tre-stack.c +44 +../../../../../lib/cmn/tre-match-backtrack.c 288 WString 4 @@ -1301,8 +1301,8 @@ WVList 0 291 MItem -28 -../../../../../lib/cmn/tre.c +43 +../../../../../lib/cmn/tre-match-parallel.c 292 WString 4 @@ -1319,8 +1319,8 @@ WVList 0 295 MItem -29 -../../../../../lib/cmn/utf8.c +34 +../../../../../lib/cmn/tre-parse.c 296 WString 4 @@ -1337,8 +1337,8 @@ WVList 0 299 MItem -28 -../../../../../lib/cmn/xma.c +34 +../../../../../lib/cmn/tre-stack.c 300 WString 4 @@ -1355,55 +1355,109 @@ WVList 0 303 MItem -3 -*.h +28 +../../../../../lib/cmn/tre.c 304 WString -3 -NIL +4 +COBJ 305 WVList 0 306 WVList 0 --1 +11 1 1 0 307 MItem -28 -../../../../../lib/cmn/mem.h +29 +../../../../../lib/cmn/utf8.c 308 WString -3 -NIL +4 +COBJ 309 WVList 0 310 WVList 0 -303 +11 1 1 0 311 MItem -32 -../../../../../lib/cmn/syscall.h +28 +../../../../../lib/cmn/xma.c 312 WString -3 -NIL +4 +COBJ 313 WVList 0 314 WVList 0 -303 +11 +1 +1 +0 +315 +MItem +3 +*.h +316 +WString +3 +NIL +317 +WVList +0 +318 +WVList +0 +-1 +1 +1 +0 +319 +MItem +28 +../../../../../lib/cmn/mem.h +320 +WString +3 +NIL +321 +WVList +0 +322 +WVList +0 +315 +1 +1 +0 +323 +MItem +32 +../../../../../lib/cmn/syscall.h +324 +WString +3 +NIL +325 +WVList +0 +326 +WVList +0 +315 1 1 0 diff --git a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt index 2e4f8935..7994b2eb 100755 --- a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt +++ b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -74 +77 11 MItem 3 @@ -287,8 +287,8 @@ WVList 0 66 MItem -28 -../../../../../lib/cmn/gdl.c +31 +../../../../../lib/cmn/fs-err.c 67 WString 4 @@ -305,8 +305,8 @@ WVList 0 70 MItem -28 -../../../../../lib/cmn/htb.c +32 +../../../../../lib/cmn/fs-move.c 71 WString 4 @@ -323,8 +323,8 @@ WVList 0 74 MItem -28 -../../../../../lib/cmn/lda.c +27 +../../../../../lib/cmn/fs.c 75 WString 4 @@ -341,8 +341,8 @@ WVList 0 78 MItem -29 -../../../../../lib/cmn/main.c +28 +../../../../../lib/cmn/gdl.c 79 WString 4 @@ -359,8 +359,8 @@ WVList 0 82 MItem -33 -../../../../../lib/cmn/mbwc-str.c +28 +../../../../../lib/cmn/htb.c 83 WString 4 @@ -377,8 +377,8 @@ WVList 0 86 MItem -29 -../../../../../lib/cmn/mbwc.c +28 +../../../../../lib/cmn/lda.c 87 WString 4 @@ -395,8 +395,8 @@ WVList 0 90 MItem -28 -../../../../../lib/cmn/mem.c +29 +../../../../../lib/cmn/main.c 91 WString 4 @@ -413,8 +413,8 @@ WVList 0 94 MItem -28 -../../../../../lib/cmn/oht.c +33 +../../../../../lib/cmn/mbwc-str.c 95 WString 4 @@ -431,8 +431,8 @@ WVList 0 98 MItem -28 -../../../../../lib/cmn/opt.c +29 +../../../../../lib/cmn/mbwc.c 99 WString 4 @@ -449,8 +449,8 @@ WVList 0 102 MItem -38 -../../../../../lib/cmn/path-basename.c +28 +../../../../../lib/cmn/mem.c 103 WString 4 @@ -467,8 +467,8 @@ WVList 0 106 MItem -35 -../../../../../lib/cmn/path-canon.c +28 +../../../../../lib/cmn/oht.c 107 WString 4 @@ -486,7 +486,7 @@ WVList 110 MItem 28 -../../../../../lib/cmn/pio.c +../../../../../lib/cmn/opt.c 111 WString 4 @@ -503,8 +503,8 @@ WVList 0 114 MItem -28 -../../../../../lib/cmn/pma.c +38 +../../../../../lib/cmn/path-basename.c 115 WString 4 @@ -521,8 +521,8 @@ WVList 0 118 MItem -28 -../../../../../lib/cmn/rbt.c +35 +../../../../../lib/cmn/path-canon.c 119 WString 4 @@ -540,7 +540,7 @@ WVList 122 MItem 28 -../../../../../lib/cmn/rex.c +../../../../../lib/cmn/pio.c 123 WString 4 @@ -558,7 +558,7 @@ WVList 126 MItem 28 -../../../../../lib/cmn/sio.c +../../../../../lib/cmn/pma.c 127 WString 4 @@ -576,7 +576,7 @@ WVList 130 MItem 28 -../../../../../lib/cmn/sll.c +../../../../../lib/cmn/rbt.c 131 WString 4 @@ -593,8 +593,8 @@ WVList 0 134 MItem -29 -../../../../../lib/cmn/slmb.c +28 +../../../../../lib/cmn/rex.c 135 WString 4 @@ -611,8 +611,8 @@ WVList 0 138 MItem -30 -../../../../../lib/cmn/stdio.c +28 +../../../../../lib/cmn/sio.c 139 WString 4 @@ -629,8 +629,8 @@ WVList 0 142 MItem -32 -../../../../../lib/cmn/str-beg.c +28 +../../../../../lib/cmn/sll.c 143 WString 4 @@ -647,8 +647,8 @@ WVList 0 146 MItem -32 -../../../../../lib/cmn/str-cat.c +29 +../../../../../lib/cmn/slmb.c 147 WString 4 @@ -665,8 +665,8 @@ WVList 0 150 MItem -32 -../../../../../lib/cmn/str-chr.c +30 +../../../../../lib/cmn/stdio.c 151 WString 4 @@ -684,7 +684,7 @@ WVList 154 MItem 32 -../../../../../lib/cmn/str-cmp.c +../../../../../lib/cmn/str-beg.c 155 WString 4 @@ -702,7 +702,7 @@ WVList 158 MItem 32 -../../../../../lib/cmn/str-cnv.c +../../../../../lib/cmn/str-cat.c 159 WString 4 @@ -720,7 +720,7 @@ WVList 162 MItem 32 -../../../../../lib/cmn/str-cpy.c +../../../../../lib/cmn/str-chr.c 163 WString 4 @@ -738,7 +738,7 @@ WVList 166 MItem 32 -../../../../../lib/cmn/str-del.c +../../../../../lib/cmn/str-cmp.c 167 WString 4 @@ -756,7 +756,7 @@ WVList 170 MItem 32 -../../../../../lib/cmn/str-dup.c +../../../../../lib/cmn/str-cnv.c 171 WString 4 @@ -773,8 +773,8 @@ WVList 0 174 MItem -33 -../../../../../lib/cmn/str-dynm.c +32 +../../../../../lib/cmn/str-cpy.c 175 WString 4 @@ -791,8 +791,8 @@ WVList 0 178 MItem -33 -../../../../../lib/cmn/str-dynw.c +32 +../../../../../lib/cmn/str-del.c 179 WString 4 @@ -810,7 +810,7 @@ WVList 182 MItem 32 -../../../../../lib/cmn/str-end.c +../../../../../lib/cmn/str-dup.c 183 WString 4 @@ -828,7 +828,7 @@ WVList 186 MItem 33 -../../../../../lib/cmn/str-excl.c +../../../../../lib/cmn/str-dynm.c 187 WString 4 @@ -846,7 +846,7 @@ WVList 190 MItem 33 -../../../../../lib/cmn/str-fcpy.c +../../../../../lib/cmn/str-dynw.c 191 WString 4 @@ -863,8 +863,8 @@ WVList 0 194 MItem -33 -../../../../../lib/cmn/str-incl.c +32 +../../../../../lib/cmn/str-end.c 195 WString 4 @@ -881,8 +881,8 @@ WVList 0 198 MItem -32 -../../../../../lib/cmn/str-len.c +33 +../../../../../lib/cmn/str-excl.c 199 WString 4 @@ -899,8 +899,8 @@ WVList 0 202 MItem -32 -../../../../../lib/cmn/str-pac.c +33 +../../../../../lib/cmn/str-fcpy.c 203 WString 4 @@ -918,7 +918,7 @@ WVList 206 MItem 33 -../../../../../lib/cmn/str-pbrk.c +../../../../../lib/cmn/str-incl.c 207 WString 4 @@ -936,7 +936,7 @@ WVList 210 MItem 32 -../../../../../lib/cmn/str-put.c +../../../../../lib/cmn/str-len.c 211 WString 4 @@ -954,7 +954,7 @@ WVList 214 MItem 32 -../../../../../lib/cmn/str-rev.c +../../../../../lib/cmn/str-pac.c 215 WString 4 @@ -971,8 +971,8 @@ WVList 0 218 MItem -32 -../../../../../lib/cmn/str-rot.c +33 +../../../../../lib/cmn/str-pbrk.c 219 WString 4 @@ -990,7 +990,7 @@ WVList 222 MItem 32 -../../../../../lib/cmn/str-set.c +../../../../../lib/cmn/str-put.c 223 WString 4 @@ -1008,7 +1008,7 @@ WVList 226 MItem 32 -../../../../../lib/cmn/str-spl.c +../../../../../lib/cmn/str-rev.c 227 WString 4 @@ -1026,7 +1026,7 @@ WVList 230 MItem 32 -../../../../../lib/cmn/str-spn.c +../../../../../lib/cmn/str-rot.c 231 WString 4 @@ -1044,7 +1044,7 @@ WVList 234 MItem 32 -../../../../../lib/cmn/str-str.c +../../../../../lib/cmn/str-set.c 235 WString 4 @@ -1061,8 +1061,8 @@ WVList 0 238 MItem -34 -../../../../../lib/cmn/str-subst.c +32 +../../../../../lib/cmn/str-spl.c 239 WString 4 @@ -1080,7 +1080,7 @@ WVList 242 MItem 32 -../../../../../lib/cmn/str-tok.c +../../../../../lib/cmn/str-spn.c 243 WString 4 @@ -1098,7 +1098,7 @@ WVList 246 MItem 32 -../../../../../lib/cmn/str-trm.c +../../../../../lib/cmn/str-str.c 247 WString 4 @@ -1115,8 +1115,8 @@ WVList 0 250 MItem -33 -../../../../../lib/cmn/str-word.c +34 +../../../../../lib/cmn/str-subst.c 251 WString 4 @@ -1133,8 +1133,8 @@ WVList 0 254 MItem -29 -../../../../../lib/cmn/time.c +32 +../../../../../lib/cmn/str-tok.c 255 WString 4 @@ -1152,7 +1152,7 @@ WVList 258 MItem 32 -../../../../../lib/cmn/tio-get.c +../../../../../lib/cmn/str-trm.c 259 WString 4 @@ -1169,8 +1169,8 @@ WVList 0 262 MItem -32 -../../../../../lib/cmn/tio-put.c +33 +../../../../../lib/cmn/str-word.c 263 WString 4 @@ -1187,8 +1187,8 @@ WVList 0 266 MItem -28 -../../../../../lib/cmn/tio.c +29 +../../../../../lib/cmn/time.c 267 WString 4 @@ -1206,7 +1206,7 @@ WVList 270 MItem 32 -../../../../../lib/cmn/tre-ast.c +../../../../../lib/cmn/tio-get.c 271 WString 4 @@ -1223,8 +1223,8 @@ WVList 0 274 MItem -36 -../../../../../lib/cmn/tre-compile.c +32 +../../../../../lib/cmn/tio-put.c 275 WString 4 @@ -1241,8 +1241,8 @@ WVList 0 278 MItem -44 -../../../../../lib/cmn/tre-match-backtrack.c +28 +../../../../../lib/cmn/tio.c 279 WString 4 @@ -1259,8 +1259,8 @@ WVList 0 282 MItem -43 -../../../../../lib/cmn/tre-match-parallel.c +32 +../../../../../lib/cmn/tre-ast.c 283 WString 4 @@ -1277,8 +1277,8 @@ WVList 0 286 MItem -34 -../../../../../lib/cmn/tre-parse.c +36 +../../../../../lib/cmn/tre-compile.c 287 WString 4 @@ -1295,8 +1295,8 @@ WVList 0 290 MItem -34 -../../../../../lib/cmn/tre-stack.c +44 +../../../../../lib/cmn/tre-match-backtrack.c 291 WString 4 @@ -1313,8 +1313,8 @@ WVList 0 294 MItem -28 -../../../../../lib/cmn/tre.c +43 +../../../../../lib/cmn/tre-match-parallel.c 295 WString 4 @@ -1331,8 +1331,8 @@ WVList 0 298 MItem -29 -../../../../../lib/cmn/utf8.c +34 +../../../../../lib/cmn/tre-parse.c 299 WString 4 @@ -1349,8 +1349,8 @@ WVList 0 302 MItem -28 -../../../../../lib/cmn/xma.c +34 +../../../../../lib/cmn/tre-stack.c 303 WString 4 @@ -1367,55 +1367,109 @@ WVList 0 306 MItem -3 -*.h +28 +../../../../../lib/cmn/tre.c 307 WString -3 -NIL +4 +COBJ 308 WVList 0 309 WVList 0 --1 +11 1 1 0 310 MItem -28 -../../../../../lib/cmn/mem.h +29 +../../../../../lib/cmn/utf8.c 311 WString -3 -NIL +4 +COBJ 312 WVList 0 313 WVList 0 -306 +11 1 1 0 314 MItem -32 -../../../../../lib/cmn/syscall.h +28 +../../../../../lib/cmn/xma.c 315 WString -3 -NIL +4 +COBJ 316 WVList 0 317 WVList 0 -306 +11 +1 +1 +0 +318 +MItem +3 +*.h +319 +WString +3 +NIL +320 +WVList +0 +321 +WVList +0 +-1 +1 +1 +0 +322 +MItem +28 +../../../../../lib/cmn/mem.h +323 +WString +3 +NIL +324 +WVList +0 +325 +WVList +0 +318 +1 +1 +0 +326 +MItem +32 +../../../../../lib/cmn/syscall.h +327 +WString +3 +NIL +328 +WVList +0 +329 +WVList +0 +318 1 1 0 diff --git a/qse/watcom/qse.wpj b/qse/watcom/qse.wpj index b8e49594..f51533ce 100755 --- a/qse/watcom/qse.wpj +++ b/qse/watcom/qse.wpj @@ -4,8 +4,8 @@ projectIdent VpeMain 1 WRect -540 -0 +390 +40 9320 9680 2 @@ -148,14 +148,14 @@ WRect 1360 5700 4240 -1 +0 0 35 WFileName 28 debug/os2/lib/cmn/qsecmn.tgt -14 -22 +8 +12 36 VComponent 37 @@ -196,7 +196,7 @@ WRect 2440 5700 4240 -0 +1 0 44 WFileName @@ -228,7 +228,7 @@ WRect 360 5700 4240 -0 +1 0 50 WFileName @@ -244,7 +244,7 @@ WRect 1080 5700 4240 -1 +0 0 53 WFileName @@ -380,4 +380,4 @@ WFileName debug/win32/lib/sed/qsesed.tgt 0 0 -48 +51