diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 29485281..af37ebe9 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -420,11 +420,11 @@ static void print_usage (QSE_FILE* out, const qse_char_t* argv0) qse_fprintf (out, QSE_T(" %s [options] [ -- ] sourcestring [datafile]*\n"), b); qse_fprintf (out, QSE_T("Where options are:\n")); qse_fprintf (out, QSE_T(" -h/--help print this message\n")); - qse_fprintf (out, QSE_T(" -d show extra information\n")); + qse_fprintf (out, QSE_T(" -D show extra information\n")); qse_fprintf (out, QSE_T(" -c/--call name call a function instead of entering\n")); qse_fprintf (out, QSE_T(" the pattern-action loop\n")); qse_fprintf (out, QSE_T(" -f/--file sourcefile set the source script file\n")); - qse_fprintf (out, QSE_T(" -o/--deparsed-file deparsedfile set the deparsing output file\n")); + qse_fprintf (out, QSE_T(" -d/--deparsed-file deparsedfile set the deparsing output file\n")); qse_fprintf (out, QSE_T(" -F/--field-separator string set a field separator(FS)\n")); qse_fprintf (out, QSE_T(" -v/--assign var=value add a global variable with a value\n")); qse_fprintf (out, QSE_T(" -m/--memory-limit number limit the memory usage (bytes)\n")); @@ -462,8 +462,8 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) { QSE_T(":call"), QSE_T('c') }, { QSE_T(":file"), QSE_T('f') }, + { QSE_T(":deparsed-file"), QSE_T('d') }, { QSE_T(":field-separator"), QSE_T('F') }, - { QSE_T(":deparsed-file"), QSE_T('o') }, { QSE_T(":assign"), QSE_T('v') }, { QSE_T(":memory-limit"), QSE_T('m') }, @@ -474,9 +474,9 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) static qse_opt_t opt = { #if defined(QSE_BUILD_DEBUG) - QSE_T("dc:f:F:o:v:m:X:h"), + QSE_T("Dc:f:d:F:v:m:X:h"), #else - QSE_T("dc:f:F:o:v:m:h"), + QSE_T("Dc:f:d:F:v:m:h"), #endif lng }; @@ -529,7 +529,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) if (gvm != QSE_NULL) qse_htb_close (gvm); return 0; - case QSE_T('d'): + case QSE_T('D'): { app_debug = 1; break; @@ -561,15 +561,15 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) break; } - case QSE_T('F'): + case QSE_T('d'): { - fs = opt.arg; + osf = opt.arg; break; } - case QSE_T('o'): + case QSE_T('F'): { - osf = opt.arg; + fs = opt.arg; break; } diff --git a/qse/cmd/cut/cut.c b/qse/cmd/cut/cut.c index 018ecc91..86a53a8d 100644 --- a/qse/cmd/cut/cut.c +++ b/qse/cmd/cut/cut.c @@ -36,125 +36,6 @@ static const qse_char_t* g_infile = QSE_NULL; static const qse_char_t* g_outfile = QSE_NULL; static int g_option = 0; -static qse_ssize_t in ( - qse_cut_t* cut, qse_cut_io_cmd_t cmd, - qse_cut_io_arg_t* arg, qse_char_t* buf, qse_size_t size) -{ - switch (cmd) - { - case QSE_CUT_IO_OPEN: - { - if (g_infile == QSE_NULL || - (g_infile[0] == QSE_T('-') && - g_infile[1] == QSE_T('\0'))) - { - arg->handle = qse_sio_in; - } - else - { - arg->handle = qse_sio_open ( - qse_cut_getmmgr(cut), - 0, - g_infile, - QSE_SIO_READ - ); - - if (arg->handle == QSE_NULL) - { - qse_cstr_t ea; - ea.ptr = g_infile; - ea.len = qse_strlen (g_infile); - qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); - return -1; - } - } - - return 1; - } - - case QSE_CUT_IO_CLOSE: - if (arg->handle != qse_sio_in) qse_sio_close (arg->handle); - return 0; - - case QSE_CUT_IO_READ: - { - qse_ssize_t n = qse_sio_getstrn (arg->handle, buf, size); - if (n <= -1) - { - qse_cstr_t ea; - ea.ptr = g_infile; - ea.len = qse_strlen (g_infile); - qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); - } - - return n; - } - - default: - return -1; - } -} - -static qse_ssize_t out ( - qse_cut_t* cut, qse_cut_io_cmd_t cmd, - qse_cut_io_arg_t* arg, qse_char_t* data, qse_size_t len) -{ - switch (cmd) - { - case QSE_CUT_IO_OPEN: - if (g_outfile == QSE_NULL || - (g_outfile[0] == QSE_T('-') && - g_outfile[1] == QSE_T('\0'))) - { - arg->handle = qse_sio_out; - } - else - { - arg->handle = qse_sio_open ( - qse_cut_getmmgr(cut), - 0, - g_outfile, - QSE_SIO_WRITE | - QSE_SIO_CREATE | - QSE_SIO_TRUNCATE - ); - - if (arg->handle == QSE_NULL) - { - /* set the error message explicitly - * as the file name is different from - * the standard console name (NULL) */ - qse_cstr_t ea; - ea.ptr = g_outfile; - ea.len = qse_strlen (g_outfile); - qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); - return -1; - } - } - return 1; - - case QSE_CUT_IO_CLOSE: - if (arg->handle != qse_sio_out) qse_sio_close (arg->handle); - return 0; - - case QSE_CUT_IO_WRITE: - { - qse_ssize_t n = qse_sio_putstrn (arg->handle, data, len); - if (n <= -1) - { - qse_cstr_t ea; - ea.ptr = g_outfile; - ea.len = qse_strlen (g_outfile); - qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); - } - return n; - } - - default: - return -1; - } -} - static void print_usage (QSE_FILE* out, int argc, qse_char_t* argv[]) { const qse_char_t* b = qse_basename (argv[0]); @@ -363,7 +244,7 @@ int cut_main (int argc, qse_char_t* argv[]) ret = -1; - cut = qse_cut_open (QSE_NULL, 0); + cut = qse_cut_openstd (0); if (cut == QSE_NULL) { qse_fprintf (QSE_STDERR, QSE_T("cannot open cut\n")); @@ -372,7 +253,7 @@ int cut_main (int argc, qse_char_t* argv[]) qse_cut_setoption (cut, g_option); - if (qse_cut_comp (cut, g_selector, qse_strlen(g_selector)) == -1) + if (qse_cut_compstd (cut, g_selector) <= -1) { qse_fprintf (QSE_STDERR, QSE_T("cannot compile - %s\n"), @@ -386,7 +267,8 @@ int cut_main (int argc, qse_char_t* argv[]) do { g_infile = argv[g_infile_start]; - if (qse_cut_exec (cut, in, out) == -1) + if (g_infile && g_infile[0] == QSE_T('-') && g_infile[1] == QSE_T('\0')) g_infile = QSE_NULL; + if (qse_cut_execstd (cut, g_infile, g_outfile) <= -1) { qse_fprintf (QSE_STDERR, QSE_T("cannot execute - %s\n"), @@ -401,7 +283,7 @@ int cut_main (int argc, qse_char_t* argv[]) } else { - if (qse_cut_exec (cut, in, out) == -1) + if (qse_cut_execstd (cut, QSE_NULL, g_outfile) <= -1) { qse_fprintf (QSE_STDERR, QSE_T("cannot execute - %s\n"), diff --git a/qse/include/qse/cmn/sio.h b/qse/include/qse/cmn/sio.h index 0c946c00..5ffba447 100644 --- a/qse/include/qse/cmn/sio.h +++ b/qse/include/qse/cmn/sio.h @@ -94,14 +94,6 @@ struct qse_sio_t extern "C" { #endif -extern qse_sio_t* qse_sio_in; -extern qse_sio_t* qse_sio_out; -extern qse_sio_t* qse_sio_err; - -#define QSE_SIO_IN qse_sio_in -#define QSE_SIO_OUT qse_sio_out -#define QSE_SIO_ERR qse_sio_err - /** * The qse_sio_open() fucntion creates a stream object. */ diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index f358e704..31cbd4b0 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -227,11 +227,13 @@ int qse_fio_init ( } /* some special check */ +#if 0 if (GetFileType(handle) == FILE_TYPE_UNKNOWN) { CloseHandle (handle); return -1; } +#endif /* TODO: support more features on WIN32 - TEMPORARY, DELETE_ON_CLOSE */ diff --git a/qse/lib/cmn/pio.c b/qse/lib/cmn/pio.c index 5e356664..6abb48a2 100644 --- a/qse/lib/cmn/pio.c +++ b/qse/lib/cmn/pio.c @@ -253,48 +253,19 @@ int qse_pio_init ( if (oflags & QSE_PIO_SHELL) { - qse_size_t reqlen; #if defined(QSE_CHAR_IS_WCHAR) if (oflags & QSE_PIO_MBSCMD) { - const qse_mchar_t* mbs = (const qse_mchar_t*)cmd; - qse_size_t ll = qse_mbstowcslen (mbs, &reqlen); - if (mbs[ll] != QSE_MT('\0')) - { - pio->errnum = QSE_PIO_EINVAL; - goto oops; /* illegal sequence */ - } + const qse_mchar_t* x[3]; + x[0] = QSE_MT("cmd.exe /c "); + x[1] = (const qse_mchar_t*)cmd; + x[2] = QSE_NULL; + dupcmd = qse_mbsatowcsdup (x, mmgr); } else { #endif - reqlen = qse_strlen(cmd); - #if defined(QSE_CHAR_IS_WCHAR) - } - #endif - - reqlen++; /* increment for a terminating null */ - - dupcmd = QSE_MMGR_ALLOC ( - mmgr, (11 + reqlen) * QSE_SIZEOF(*dupcmd) - ); - if (dupcmd == QSE_NULL) - { - pio->errnum = QSE_PIO_ENOMEM; - goto oops; - } - - qse_strcpy (dupcmd, QSE_T("cmd.exe /c ")); - - #if defined(QSE_CHAR_IS_WCHAR) - if (oflags & QSE_PIO_MBSCMD) - { - qse_mbstowcs ((const qse_mchar_t*)cmd, &dupcmd[11], &reqlen); - } - else - { - #endif - qse_strcpy (&dupcmd[11], cmd); + dupcmd = qse_strdup2 (QSE_T("cmd.exe /c "), cmd, mmgr); #if defined(QSE_CHAR_IS_WCHAR) } #endif @@ -314,11 +285,12 @@ int qse_pio_init ( #if defined(QSE_CHAR_IS_WCHAR) } #endif - if (dupcmd == QSE_NULL) - { - pio->errnum = QSE_PIO_ENOMEM; - goto oops; - } + } + + if (dupcmd == QSE_NULL) + { + pio->errnum = QSE_PIO_ENOMEM; + goto oops; } x = CreateProcess ( @@ -532,8 +504,7 @@ int qse_pio_init ( } else { - n = qse_wcstombslen (cmd, &mn); - if (cmd[n] != QSE_WT('\0')) + if (qse_wcstombs (cmd, &n, QSE_NULL, &mn) <= -1) { pio->errnum = QSE_PIO_EINVAL; goto oops; /* illegal sequence found */ @@ -560,7 +531,7 @@ int qse_pio_init ( else { mn = mn + 1; /* update the buffer size */ - n = qse_wcstombs (cmd, &cmd_line[11], &mn); + qse_wcstombs (cmd, &n, &cmd_line[11], &mn); } #endif cmd_line[11+mn+1] = QSE_MT('\0'); /* additional \0 after \0 */ @@ -595,8 +566,7 @@ int qse_pio_init ( { qse_size_t n; - n = qse_wcstombslen (cmd, &mn); - if (cmd[n] != QSE_T('\0')) + if (qse_wcstombs (cmd, &n, QSE_NULL, &mn) <= -1) { pio->errnum = QSE_PIO_EINVAL; goto oops; /* illegal sequence in cmd */ @@ -610,7 +580,7 @@ int qse_pio_init ( goto oops; } - qse_wcstombs (cmd, cmd_line, &mn); + qse_wcstombs (cmd, &n, cmd_line, &mn); } #endif @@ -640,6 +610,9 @@ int qse_pio_init ( cmd_file ); + QSE_MMGR_FREE (mmgr, cmd_line); + cmd_line = QSE_NULL; + /* Once execution is completed regardless of success or failure, * Restore stdin/out/err using handles duplicated into old_in/out/err */ DosDupHandle (old_in, &std_in); /* I can't do much if this fails */ @@ -838,14 +811,6 @@ int qse_pio_init ( if (oflags & QSE_PIO_SHELL) { -#if 0 - n = qse_wcstombslen (cmd, &mn); - if (cmd[n] != QSE_WT('\0')) - { - /* cmd has illegal sequence */ - goto child_oops; - } -#endif if (qse_wcstombs (cmd, &wl, QSE_NULL, &mn) <= -1) { /* cmd has illegal sequence */ diff --git a/qse/lib/cut/std.c b/qse/lib/cut/std.c index ae6a6862..b5de799d 100644 --- a/qse/lib/cut/std.c +++ b/qse/lib/cut/std.c @@ -201,6 +201,7 @@ static qse_ssize_t xout ( } } +/* TODO: refer to sed/std.c and make similar enhancements */ int qse_cut_execstd (qse_cut_t* cut, const qse_char_t* infile, const qse_char_t* outfile) { xtn_t* xtn = (xtn_t*) QSE_XTN (cut); diff --git a/qse/samples/awk/awk08.cpp b/qse/samples/awk/awk08.cpp index c8632aac..60e190c1 100644 --- a/qse/samples/awk/awk08.cpp +++ b/qse/samples/awk/awk08.cpp @@ -262,7 +262,8 @@ static void print_usage (QSE_FILE* out, const qse_char_t* argv0) qse_fprintf (out, QSE_T("Where options are:\n")); qse_fprintf (out, QSE_T(" -h print this message\n")); qse_fprintf (out, QSE_T(" -f sourcefile set the source script file\n")); - qse_fprintf (out, QSE_T(" -o deparsedfile set the deparsing output file\n")); + qse_fprintf (out, QSE_T(" -d deparsedfile set the deparsing output file\n")); + qse_fprintf (out, QSE_T(" -o outputfile set the console output file\n")); qse_fprintf (out, QSE_T(" -F string set a field separator(FS)\n")); } @@ -271,6 +272,7 @@ struct cmdline_t qse_char_t* ins; qse_char_t* inf; qse_char_t* outf; + qse_char_t* outc; qse_char_t* fs; }; @@ -279,7 +281,7 @@ static int handle_cmdline ( { static qse_opt_t opt = { - QSE_T("hF:f:o:"), + QSE_T("hF:f:d:o:"), QSE_NULL }; qse_cint_t c; @@ -301,10 +303,14 @@ static int handle_cmdline ( cmdline->inf = opt.arg; break; - case QSE_T('o'): + case QSE_T('d'): cmdline->outf = opt.arg; break; + case QSE_T('o'): + cmdline->outc = opt.arg; + break; + case QSE_T('?'): print_error (QSE_T("illegal option - '%c'\n"), opt.opt); return -1; @@ -388,6 +394,15 @@ static int awk_main_2 (MyAwk& awk, int argc, qse_char_t* argv[]) } } + if (cmdline.outc) + { + if (awk.addConsoleOutput (cmdline.outc) <= -1) + { + print_error (awk); + return -1; + } + } + MyAwk::Value ret; if (awk.loop (&ret) <= -1) { diff --git a/qse/samples/cmn/sio01.c b/qse/samples/cmn/sio01.c index 4e01aeb6..6182b3d0 100644 --- a/qse/samples/cmn/sio01.c +++ b/qse/samples/cmn/sio01.c @@ -4,9 +4,9 @@ #define R(f) \ do { \ - qse_sio_putstr (qse_sio_out,QSE_T("== ")); \ - qse_sio_putstr (qse_sio_out,QSE_T(#f)); \ - qse_sio_putstr (qse_sio_out,QSE_T(" ==\n")); \ + qse_printf (QSE_T("== ")); \ + qse_printf (QSE_T(#f)); \ + qse_printf (QSE_T(" ==\n")); \ if (f() == -1) return -1; \ } while (0) @@ -48,15 +48,15 @@ static int test1 (void) if (sio == QSE_NULL) { - qse_sio_putstr (qse_sio_err, QSE_T("cannot open file\n")); + qse_printf (QSE_T("cannot open file\n")); return -1; } for (i = 0; i < QSE_COUNTOF(x); i++) { - qse_sio_putstr (qse_sio_out, QSE_T("written: [")); - qse_sio_putstr (qse_sio_out, x[i]); - qse_sio_putstr (qse_sio_out, QSE_T("]\n")); + qse_printf (QSE_T("written: [")); + qse_printf (x[i]); + qse_printf (QSE_T("]\n")); qse_sio_putstr (sio, x[i]); qse_sio_putc (sio, QSE_T('\n')); @@ -136,9 +136,9 @@ int main () { setlocale (LC_ALL, ""); - qse_sio_putstr (qse_sio_out, QSE_T("--------------------------------------------------------------------------------\n")); - qse_sio_putstr (qse_sio_out, QSE_T("Set the environment LANG to a Unicode locale such as UTF-8 if you see the illegal XXXXX errors. If you see such errors in Unicode locales, this program might be buggy. It is normal to see such messages in non-Unicode locales as it uses Unicode data\n")); - qse_sio_putstr (qse_sio_out, QSE_T("--------------------------------------------------------------------------------\n")); + qse_printf (QSE_T("--------------------------------------------------------------------------------\n")); + qse_printf (QSE_T("Set the environment LANG to a Unicode locale such as UTF-8 if you see the illegal XXXXX errors. If you see such errors in Unicode locales, this program might be buggy. It is normal to see such messages in non-Unicode locales as it uses Unicode data\n")); + qse_printf (QSE_T("--------------------------------------------------------------------------------\n")); R (test1); R (test2); diff --git a/qse/samples/cmn/str02.c b/qse/samples/cmn/str02.c index dfe6866d..ae0f86f0 100644 --- a/qse/samples/cmn/str02.c +++ b/qse/samples/cmn/str02.c @@ -53,11 +53,6 @@ static int test1 (void) ((n == -3)? QSE_T("INCOMPLETE-SEQ"): (n == -2)? QSE_T("BUFFER-SMALL"): (n == -1)? QSE_T("ILLEGAL-CHAR"): QSE_T("FULL")), (int)wlen, (int)mlen, (int)wlen1, (int)mlen1, buf2); qse_fflush (QSE_STDOUT); - - qse_sio_putwcs (QSE_SIO_OUT, QSE_T("<<")); - qse_sio_putwcs (QSE_SIO_OUT, buf2); - qse_sio_putwcs (QSE_SIO_OUT, QSE_T(">>\n")); - qse_sio_flush (QSE_SIO_OUT); } qse_printf (QSE_T("-----------------\n")); @@ -76,10 +71,6 @@ static int test1 (void) (int)wlen, (int)mlen, (int)wlen, (int)wlen1, (int)mlen1, buf2); qse_fflush (QSE_STDOUT); - qse_sio_putwcs (QSE_SIO_OUT, QSE_T("<<")); - qse_sio_putwcs (QSE_SIO_OUT, buf2); - qse_sio_putwcs (QSE_SIO_OUT, QSE_T(">>\n")); - qse_sio_flush (QSE_SIO_OUT); } return 0; diff --git a/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt b/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt index 3244322c..78008d2e 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 -68 +69 11 MItem 3 @@ -331,8 +331,8 @@ WVList 0 75 MItem -29 -../../../../../lib/cmn/misc.c +28 +../../../../../lib/cmn/oht.c 76 WString 4 @@ -350,7 +350,7 @@ WVList 79 MItem 28 -../../../../../lib/cmn/oht.c +../../../../../lib/cmn/opt.c 80 WString 4 @@ -367,8 +367,8 @@ WVList 0 83 MItem -28 -../../../../../lib/cmn/opt.c +38 +../../../../../lib/cmn/path-basename.c 84 WString 4 @@ -385,8 +385,8 @@ WVList 0 87 MItem -28 -../../../../../lib/cmn/pio.c +35 +../../../../../lib/cmn/path-canon.c 88 WString 4 @@ -404,7 +404,7 @@ WVList 91 MItem 28 -../../../../../lib/cmn/pma.c +../../../../../lib/cmn/pio.c 92 WString 4 @@ -422,7 +422,7 @@ WVList 95 MItem 28 -../../../../../lib/cmn/rbt.c +../../../../../lib/cmn/pma.c 96 WString 4 @@ -440,7 +440,7 @@ WVList 99 MItem 28 -../../../../../lib/cmn/rex.c +../../../../../lib/cmn/rbt.c 100 WString 4 @@ -458,7 +458,7 @@ WVList 103 MItem 28 -../../../../../lib/cmn/sio.c +../../../../../lib/cmn/rex.c 104 WString 4 @@ -476,7 +476,7 @@ WVList 107 MItem 28 -../../../../../lib/cmn/sll.c +../../../../../lib/cmn/sio.c 108 WString 4 @@ -493,8 +493,8 @@ WVList 0 111 MItem -30 -../../../../../lib/cmn/stdio.c +28 +../../../../../lib/cmn/sll.c 112 WString 4 @@ -511,8 +511,8 @@ WVList 0 115 MItem -32 -../../../../../lib/cmn/str-beg.c +30 +../../../../../lib/cmn/stdio.c 116 WString 4 @@ -530,7 +530,7 @@ WVList 119 MItem 32 -../../../../../lib/cmn/str-cat.c +../../../../../lib/cmn/str-beg.c 120 WString 4 @@ -548,7 +548,7 @@ WVList 123 MItem 32 -../../../../../lib/cmn/str-chr.c +../../../../../lib/cmn/str-cat.c 124 WString 4 @@ -566,7 +566,7 @@ WVList 127 MItem 32 -../../../../../lib/cmn/str-cmp.c +../../../../../lib/cmn/str-chr.c 128 WString 4 @@ -584,7 +584,7 @@ WVList 131 MItem 32 -../../../../../lib/cmn/str-cnv.c +../../../../../lib/cmn/str-cmp.c 132 WString 4 @@ -602,7 +602,7 @@ WVList 135 MItem 32 -../../../../../lib/cmn/str-cpy.c +../../../../../lib/cmn/str-cnv.c 136 WString 4 @@ -620,7 +620,7 @@ WVList 139 MItem 32 -../../../../../lib/cmn/str-del.c +../../../../../lib/cmn/str-cpy.c 140 WString 4 @@ -638,7 +638,7 @@ WVList 143 MItem 32 -../../../../../lib/cmn/str-dup.c +../../../../../lib/cmn/str-del.c 144 WString 4 @@ -655,8 +655,8 @@ WVList 0 147 MItem -33 -../../../../../lib/cmn/str-dynm.c +32 +../../../../../lib/cmn/str-dup.c 148 WString 4 @@ -674,7 +674,7 @@ WVList 151 MItem 33 -../../../../../lib/cmn/str-dynw.c +../../../../../lib/cmn/str-dynm.c 152 WString 4 @@ -691,8 +691,8 @@ WVList 0 155 MItem -32 -../../../../../lib/cmn/str-end.c +33 +../../../../../lib/cmn/str-dynw.c 156 WString 4 @@ -709,8 +709,8 @@ WVList 0 159 MItem -33 -../../../../../lib/cmn/str-excl.c +32 +../../../../../lib/cmn/str-end.c 160 WString 4 @@ -728,7 +728,7 @@ WVList 163 MItem 33 -../../../../../lib/cmn/str-fcpy.c +../../../../../lib/cmn/str-excl.c 164 WString 4 @@ -746,7 +746,7 @@ WVList 167 MItem 33 -../../../../../lib/cmn/str-incl.c +../../../../../lib/cmn/str-fcpy.c 168 WString 4 @@ -763,8 +763,8 @@ WVList 0 171 MItem -32 -../../../../../lib/cmn/str-len.c +33 +../../../../../lib/cmn/str-incl.c 172 WString 4 @@ -782,7 +782,7 @@ WVList 175 MItem 32 -../../../../../lib/cmn/str-pac.c +../../../../../lib/cmn/str-len.c 176 WString 4 @@ -799,8 +799,8 @@ WVList 0 179 MItem -33 -../../../../../lib/cmn/str-pbrk.c +32 +../../../../../lib/cmn/str-pac.c 180 WString 4 @@ -817,8 +817,8 @@ WVList 0 183 MItem -32 -../../../../../lib/cmn/str-put.c +33 +../../../../../lib/cmn/str-pbrk.c 184 WString 4 @@ -836,7 +836,7 @@ WVList 187 MItem 32 -../../../../../lib/cmn/str-rev.c +../../../../../lib/cmn/str-put.c 188 WString 4 @@ -854,7 +854,7 @@ WVList 191 MItem 32 -../../../../../lib/cmn/str-rot.c +../../../../../lib/cmn/str-rev.c 192 WString 4 @@ -872,7 +872,7 @@ WVList 195 MItem 32 -../../../../../lib/cmn/str-set.c +../../../../../lib/cmn/str-rot.c 196 WString 4 @@ -890,7 +890,7 @@ WVList 199 MItem 32 -../../../../../lib/cmn/str-spl.c +../../../../../lib/cmn/str-set.c 200 WString 4 @@ -908,7 +908,7 @@ WVList 203 MItem 32 -../../../../../lib/cmn/str-spn.c +../../../../../lib/cmn/str-spl.c 204 WString 4 @@ -926,7 +926,7 @@ WVList 207 MItem 32 -../../../../../lib/cmn/str-str.c +../../../../../lib/cmn/str-spn.c 208 WString 4 @@ -943,8 +943,8 @@ WVList 0 211 MItem -34 -../../../../../lib/cmn/str-subst.c +32 +../../../../../lib/cmn/str-str.c 212 WString 4 @@ -961,8 +961,8 @@ WVList 0 215 MItem -32 -../../../../../lib/cmn/str-tok.c +34 +../../../../../lib/cmn/str-subst.c 216 WString 4 @@ -980,7 +980,7 @@ WVList 219 MItem 32 -../../../../../lib/cmn/str-trm.c +../../../../../lib/cmn/str-tok.c 220 WString 4 @@ -997,8 +997,8 @@ WVList 0 223 MItem -33 -../../../../../lib/cmn/str-word.c +32 +../../../../../lib/cmn/str-trm.c 224 WString 4 @@ -1015,8 +1015,8 @@ WVList 0 227 MItem -29 -../../../../../lib/cmn/time.c +33 +../../../../../lib/cmn/str-word.c 228 WString 4 @@ -1033,8 +1033,8 @@ WVList 0 231 MItem -32 -../../../../../lib/cmn/tio-get.c +29 +../../../../../lib/cmn/time.c 232 WString 4 @@ -1052,7 +1052,7 @@ WVList 235 MItem 32 -../../../../../lib/cmn/tio-put.c +../../../../../lib/cmn/tio-get.c 236 WString 4 @@ -1069,8 +1069,8 @@ WVList 0 239 MItem -28 -../../../../../lib/cmn/tio.c +32 +../../../../../lib/cmn/tio-put.c 240 WString 4 @@ -1087,8 +1087,8 @@ WVList 0 243 MItem -32 -../../../../../lib/cmn/tre-ast.c +28 +../../../../../lib/cmn/tio.c 244 WString 4 @@ -1105,8 +1105,8 @@ WVList 0 247 MItem -36 -../../../../../lib/cmn/tre-compile.c +32 +../../../../../lib/cmn/tre-ast.c 248 WString 4 @@ -1123,8 +1123,8 @@ WVList 0 251 MItem -44 -../../../../../lib/cmn/tre-match-backtrack.c +36 +../../../../../lib/cmn/tre-compile.c 252 WString 4 @@ -1141,8 +1141,8 @@ WVList 0 255 MItem -43 -../../../../../lib/cmn/tre-match-parallel.c +44 +../../../../../lib/cmn/tre-match-backtrack.c 256 WString 4 @@ -1159,8 +1159,8 @@ WVList 0 259 MItem -34 -../../../../../lib/cmn/tre-parse.c +43 +../../../../../lib/cmn/tre-match-parallel.c 260 WString 4 @@ -1178,7 +1178,7 @@ WVList 263 MItem 34 -../../../../../lib/cmn/tre-stack.c +../../../../../lib/cmn/tre-parse.c 264 WString 4 @@ -1195,8 +1195,8 @@ WVList 0 267 MItem -28 -../../../../../lib/cmn/tre.c +34 +../../../../../lib/cmn/tre-stack.c 268 WString 4 @@ -1214,7 +1214,7 @@ WVList 271 MItem 28 -../../../../../lib/cmn/xma.c +../../../../../lib/cmn/tre.c 272 WString 4 @@ -1231,26 +1231,26 @@ WVList 0 275 MItem -3 -*.h +28 +../../../../../lib/cmn/xma.c 276 WString -3 -NIL +4 +COBJ 277 WVList 0 278 WVList 0 --1 +11 1 1 0 279 MItem -28 -../../../../../lib/cmn/mem.h +3 +*.h 280 WString 3 @@ -1261,14 +1261,14 @@ WVList 282 WVList 0 -275 +-1 1 1 0 283 MItem -32 -../../../../../lib/cmn/syscall.h +28 +../../../../../lib/cmn/mem.h 284 WString 3 @@ -1279,7 +1279,25 @@ WVList 286 WVList 0 -275 +279 +1 +1 +0 +287 +MItem +32 +../../../../../lib/cmn/syscall.h +288 +WString +3 +NIL +289 +WVList +0 +290 +WVList +0 +279 1 1 0 diff --git a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt index 7384fa3e..cef0f739 100755 --- a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt +++ b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -68 +69 11 MItem 3 @@ -331,8 +331,8 @@ WVList 0 75 MItem -29 -../../../../../lib/cmn/misc.c +28 +../../../../../lib/cmn/oht.c 76 WString 4 @@ -350,7 +350,7 @@ WVList 79 MItem 28 -../../../../../lib/cmn/oht.c +../../../../../lib/cmn/opt.c 80 WString 4 @@ -367,8 +367,8 @@ WVList 0 83 MItem -28 -../../../../../lib/cmn/opt.c +35 +../../../../../lib/cmn/path-canon.c 84 WString 4 @@ -1231,26 +1231,26 @@ WVList 0 275 MItem -3 -*.h +37 +../../../../..lib/cmn/path-basename.c 276 WString -3 -NIL +4 +COBJ 277 WVList 0 278 WVList 0 --1 +11 1 1 0 279 MItem -28 -../../../../../lib/cmn/mem.h +3 +*.h 280 WString 3 @@ -1261,14 +1261,14 @@ WVList 282 WVList 0 -275 +-1 1 1 0 283 MItem -32 -../../../../../lib/cmn/syscall.h +28 +../../../../../lib/cmn/mem.h 284 WString 3 @@ -1279,7 +1279,25 @@ WVList 286 WVList 0 -275 +279 +1 +1 +0 +287 +MItem +32 +../../../../../lib/cmn/syscall.h +288 +WString +3 +NIL +289 +WVList +0 +290 +WVList +0 +279 1 1 0 diff --git a/qse/watcom/qse.wpj b/qse/watcom/qse.wpj index 6dc17b68..2ec0ffd0 100755 --- a/qse/watcom/qse.wpj +++ b/qse/watcom/qse.wpj @@ -96,18 +96,18 @@ WVList VComponent 25 WRect -410 -1880 +1080 +2533 5700 4240 -0 +1 0 26 WFileName 30 release/os2/lib/cmn/qsecmn.tgt -0 -0 +13 +21 27 VComponent 28 @@ -148,14 +148,14 @@ WRect 80 5700 4240 -0 +1 0 35 WFileName 28 debug/os2/lib/cmn/qsecmn.tgt -0 -0 +21 +21 36 VComponent 37 @@ -176,8 +176,8 @@ debug/os2/lib/sed/qsesed.tgt VComponent 40 WRect -2420 -440 +30 +146 5700 4240 1 @@ -186,8 +186,8 @@ WRect WFileName 30 debug/win32/lib/cmn/qsecmn.tgt -0 -0 +10 +14 42 VComponent 43 @@ -235,7 +235,7 @@ WFileName 28 debug/os2/cmd/awk/qseawk.tgt 0 -0 +1 51 VComponent 52 @@ -251,7 +251,7 @@ WFileName 30 debug/dos32/lib/cmn/qsecmn.tgt 0 -0 +64 54 VComponent 55 @@ -380,4 +380,4 @@ WFileName debug/win32/lib/sed/qsesed.tgt 0 0 -24 +30