changed pio for changes in mbwc conversion functions

This commit is contained in:
hyung-hwan 2011-12-21 02:02:05 +00:00
parent f4df349fc7
commit 42c44f9d3d
12 changed files with 218 additions and 334 deletions

View File

@ -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(" %s [options] [ -- ] sourcestring [datafile]*\n"), b);
qse_fprintf (out, QSE_T("Where options are:\n")); 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(" -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(" -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(" the pattern-action loop\n"));
qse_fprintf (out, QSE_T(" -f/--file sourcefile set the source script file\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(" -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(" -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")); 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(":call"), QSE_T('c') },
{ QSE_T(":file"), QSE_T('f') }, { QSE_T(":file"), QSE_T('f') },
{ QSE_T(":deparsed-file"), QSE_T('d') },
{ QSE_T(":field-separator"), QSE_T('F') }, { QSE_T(":field-separator"), QSE_T('F') },
{ QSE_T(":deparsed-file"), QSE_T('o') },
{ QSE_T(":assign"), QSE_T('v') }, { QSE_T(":assign"), QSE_T('v') },
{ QSE_T(":memory-limit"), QSE_T('m') }, { 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 = static qse_opt_t opt =
{ {
#if defined(QSE_BUILD_DEBUG) #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 #else
QSE_T("dc:f:F:o:v:m:h"), QSE_T("Dc:f:d:F:v:m:h"),
#endif #endif
lng 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); if (gvm != QSE_NULL) qse_htb_close (gvm);
return 0; return 0;
case QSE_T('d'): case QSE_T('D'):
{ {
app_debug = 1; app_debug = 1;
break; break;
@ -561,15 +561,15 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg)
break; break;
} }
case QSE_T('F'): case QSE_T('d'):
{ {
fs = opt.arg; osf = opt.arg;
break; break;
} }
case QSE_T('o'): case QSE_T('F'):
{ {
osf = opt.arg; fs = opt.arg;
break; break;
} }

View File

@ -36,125 +36,6 @@ static const qse_char_t* g_infile = QSE_NULL;
static const qse_char_t* g_outfile = QSE_NULL; static const qse_char_t* g_outfile = QSE_NULL;
static int g_option = 0; 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[]) static void print_usage (QSE_FILE* out, int argc, qse_char_t* argv[])
{ {
const qse_char_t* b = qse_basename (argv[0]); const qse_char_t* b = qse_basename (argv[0]);
@ -363,7 +244,7 @@ int cut_main (int argc, qse_char_t* argv[])
ret = -1; ret = -1;
cut = qse_cut_open (QSE_NULL, 0); cut = qse_cut_openstd (0);
if (cut == QSE_NULL) if (cut == QSE_NULL)
{ {
qse_fprintf (QSE_STDERR, QSE_T("cannot open cut\n")); 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); 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_fprintf (QSE_STDERR,
QSE_T("cannot compile - %s\n"), QSE_T("cannot compile - %s\n"),
@ -386,7 +267,8 @@ int cut_main (int argc, qse_char_t* argv[])
do do
{ {
g_infile = argv[g_infile_start]; 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_fprintf (QSE_STDERR,
QSE_T("cannot execute - %s\n"), QSE_T("cannot execute - %s\n"),
@ -401,7 +283,7 @@ int cut_main (int argc, qse_char_t* argv[])
} }
else else
{ {
if (qse_cut_exec (cut, in, out) == -1) if (qse_cut_execstd (cut, QSE_NULL, g_outfile) <= -1)
{ {
qse_fprintf (QSE_STDERR, qse_fprintf (QSE_STDERR,
QSE_T("cannot execute - %s\n"), QSE_T("cannot execute - %s\n"),

View File

@ -94,14 +94,6 @@ struct qse_sio_t
extern "C" { extern "C" {
#endif #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. * The qse_sio_open() fucntion creates a stream object.
*/ */

View File

@ -227,11 +227,13 @@ int qse_fio_init (
} }
/* some special check */ /* some special check */
#if 0
if (GetFileType(handle) == FILE_TYPE_UNKNOWN) if (GetFileType(handle) == FILE_TYPE_UNKNOWN)
{ {
CloseHandle (handle); CloseHandle (handle);
return -1; return -1;
} }
#endif
/* TODO: support more features on WIN32 - TEMPORARY, DELETE_ON_CLOSE */ /* TODO: support more features on WIN32 - TEMPORARY, DELETE_ON_CLOSE */

View File

@ -253,48 +253,19 @@ int qse_pio_init (
if (oflags & QSE_PIO_SHELL) if (oflags & QSE_PIO_SHELL)
{ {
qse_size_t reqlen;
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
if (oflags & QSE_PIO_MBSCMD) if (oflags & QSE_PIO_MBSCMD)
{ {
const qse_mchar_t* mbs = (const qse_mchar_t*)cmd; const qse_mchar_t* x[3];
qse_size_t ll = qse_mbstowcslen (mbs, &reqlen); x[0] = QSE_MT("cmd.exe /c ");
if (mbs[ll] != QSE_MT('\0')) x[1] = (const qse_mchar_t*)cmd;
{ x[2] = QSE_NULL;
pio->errnum = QSE_PIO_EINVAL; dupcmd = qse_mbsatowcsdup (x, mmgr);
goto oops; /* illegal sequence */
}
} }
else else
{ {
#endif #endif
reqlen = qse_strlen(cmd); dupcmd = qse_strdup2 (QSE_T("cmd.exe /c "), cmd, mmgr);
#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);
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
} }
#endif #endif
@ -314,12 +285,13 @@ int qse_pio_init (
#if defined(QSE_CHAR_IS_WCHAR) #if defined(QSE_CHAR_IS_WCHAR)
} }
#endif #endif
}
if (dupcmd == QSE_NULL) if (dupcmd == QSE_NULL)
{ {
pio->errnum = QSE_PIO_ENOMEM; pio->errnum = QSE_PIO_ENOMEM;
goto oops; goto oops;
} }
}
x = CreateProcess ( x = CreateProcess (
QSE_NULL, /* LPCTSTR lpApplicationName */ QSE_NULL, /* LPCTSTR lpApplicationName */
@ -532,8 +504,7 @@ int qse_pio_init (
} }
else else
{ {
n = qse_wcstombslen (cmd, &mn); if (qse_wcstombs (cmd, &n, QSE_NULL, &mn) <= -1)
if (cmd[n] != QSE_WT('\0'))
{ {
pio->errnum = QSE_PIO_EINVAL; pio->errnum = QSE_PIO_EINVAL;
goto oops; /* illegal sequence found */ goto oops; /* illegal sequence found */
@ -560,7 +531,7 @@ int qse_pio_init (
else else
{ {
mn = mn + 1; /* update the buffer size */ mn = mn + 1; /* update the buffer size */
n = qse_wcstombs (cmd, &cmd_line[11], &mn); qse_wcstombs (cmd, &n, &cmd_line[11], &mn);
} }
#endif #endif
cmd_line[11+mn+1] = QSE_MT('\0'); /* additional \0 after \0 */ cmd_line[11+mn+1] = QSE_MT('\0'); /* additional \0 after \0 */
@ -595,8 +566,7 @@ int qse_pio_init (
{ {
qse_size_t n; qse_size_t n;
n = qse_wcstombslen (cmd, &mn); if (qse_wcstombs (cmd, &n, QSE_NULL, &mn) <= -1)
if (cmd[n] != QSE_T('\0'))
{ {
pio->errnum = QSE_PIO_EINVAL; pio->errnum = QSE_PIO_EINVAL;
goto oops; /* illegal sequence in cmd */ goto oops; /* illegal sequence in cmd */
@ -610,7 +580,7 @@ int qse_pio_init (
goto oops; goto oops;
} }
qse_wcstombs (cmd, cmd_line, &mn); qse_wcstombs (cmd, &n, cmd_line, &mn);
} }
#endif #endif
@ -640,6 +610,9 @@ int qse_pio_init (
cmd_file cmd_file
); );
QSE_MMGR_FREE (mmgr, cmd_line);
cmd_line = QSE_NULL;
/* Once execution is completed regardless of success or failure, /* Once execution is completed regardless of success or failure,
* Restore stdin/out/err using handles duplicated into old_in/out/err */ * 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 */ 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 (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) if (qse_wcstombs (cmd, &wl, QSE_NULL, &mn) <= -1)
{ {
/* cmd has illegal sequence */ /* cmd has illegal sequence */

View File

@ -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) 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); xtn_t* xtn = (xtn_t*) QSE_XTN (cut);

View File

@ -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("Where options are:\n"));
qse_fprintf (out, QSE_T(" -h print this message\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(" -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")); 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* ins;
qse_char_t* inf; qse_char_t* inf;
qse_char_t* outf; qse_char_t* outf;
qse_char_t* outc;
qse_char_t* fs; qse_char_t* fs;
}; };
@ -279,7 +281,7 @@ static int handle_cmdline (
{ {
static qse_opt_t opt = static qse_opt_t opt =
{ {
QSE_T("hF:f:o:"), QSE_T("hF:f:d:o:"),
QSE_NULL QSE_NULL
}; };
qse_cint_t c; qse_cint_t c;
@ -301,10 +303,14 @@ static int handle_cmdline (
cmdline->inf = opt.arg; cmdline->inf = opt.arg;
break; break;
case QSE_T('o'): case QSE_T('d'):
cmdline->outf = opt.arg; cmdline->outf = opt.arg;
break; break;
case QSE_T('o'):
cmdline->outc = opt.arg;
break;
case QSE_T('?'): case QSE_T('?'):
print_error (QSE_T("illegal option - '%c'\n"), opt.opt); print_error (QSE_T("illegal option - '%c'\n"), opt.opt);
return -1; 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; MyAwk::Value ret;
if (awk.loop (&ret) <= -1) if (awk.loop (&ret) <= -1)
{ {

View File

@ -4,9 +4,9 @@
#define R(f) \ #define R(f) \
do { \ do { \
qse_sio_putstr (qse_sio_out,QSE_T("== ")); \ qse_printf (QSE_T("== ")); \
qse_sio_putstr (qse_sio_out,QSE_T(#f)); \ qse_printf (QSE_T(#f)); \
qse_sio_putstr (qse_sio_out,QSE_T(" ==\n")); \ qse_printf (QSE_T(" ==\n")); \
if (f() == -1) return -1; \ if (f() == -1) return -1; \
} while (0) } while (0)
@ -48,15 +48,15 @@ static int test1 (void)
if (sio == QSE_NULL) 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; return -1;
} }
for (i = 0; i < QSE_COUNTOF(x); i++) for (i = 0; i < QSE_COUNTOF(x); i++)
{ {
qse_sio_putstr (qse_sio_out, QSE_T("written: [")); qse_printf (QSE_T("written: ["));
qse_sio_putstr (qse_sio_out, x[i]); qse_printf (x[i]);
qse_sio_putstr (qse_sio_out, QSE_T("]\n")); qse_printf (QSE_T("]\n"));
qse_sio_putstr (sio, x[i]); qse_sio_putstr (sio, x[i]);
qse_sio_putc (sio, QSE_T('\n')); qse_sio_putc (sio, QSE_T('\n'));
@ -136,9 +136,9 @@ int main ()
{ {
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
qse_sio_putstr (qse_sio_out, QSE_T("--------------------------------------------------------------------------------\n")); qse_printf (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_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_sio_putstr (qse_sio_out, QSE_T("--------------------------------------------------------------------------------\n")); qse_printf (QSE_T("--------------------------------------------------------------------------------\n"));
R (test1); R (test1);
R (test2); R (test2);

View File

@ -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")), ((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); (int)wlen, (int)mlen, (int)wlen1, (int)mlen1, buf2);
qse_fflush (QSE_STDOUT); 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")); qse_printf (QSE_T("-----------------\n"));
@ -76,10 +71,6 @@ static int test1 (void)
(int)wlen, (int)mlen, (int)wlen, (int)wlen1, (int)mlen1, buf2); (int)wlen, (int)mlen, (int)wlen, (int)wlen1, (int)mlen1, buf2);
qse_fflush (QSE_STDOUT); 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; return 0;

View File

@ -42,7 +42,7 @@ WVList
0 0
10 10
WPickList WPickList
68 69
11 11
MItem MItem
3 3
@ -331,8 +331,8 @@ WVList
0 0
75 75
MItem MItem
29 28
../../../../../lib/cmn/misc.c ../../../../../lib/cmn/oht.c
76 76
WString WString
4 4
@ -350,7 +350,7 @@ WVList
79 79
MItem MItem
28 28
../../../../../lib/cmn/oht.c ../../../../../lib/cmn/opt.c
80 80
WString WString
4 4
@ -367,8 +367,8 @@ WVList
0 0
83 83
MItem MItem
28 38
../../../../../lib/cmn/opt.c ../../../../../lib/cmn/path-basename.c
84 84
WString WString
4 4
@ -385,8 +385,8 @@ WVList
0 0
87 87
MItem MItem
28 35
../../../../../lib/cmn/pio.c ../../../../../lib/cmn/path-canon.c
88 88
WString WString
4 4
@ -404,7 +404,7 @@ WVList
91 91
MItem MItem
28 28
../../../../../lib/cmn/pma.c ../../../../../lib/cmn/pio.c
92 92
WString WString
4 4
@ -422,7 +422,7 @@ WVList
95 95
MItem MItem
28 28
../../../../../lib/cmn/rbt.c ../../../../../lib/cmn/pma.c
96 96
WString WString
4 4
@ -440,7 +440,7 @@ WVList
99 99
MItem MItem
28 28
../../../../../lib/cmn/rex.c ../../../../../lib/cmn/rbt.c
100 100
WString WString
4 4
@ -458,7 +458,7 @@ WVList
103 103
MItem MItem
28 28
../../../../../lib/cmn/sio.c ../../../../../lib/cmn/rex.c
104 104
WString WString
4 4
@ -476,7 +476,7 @@ WVList
107 107
MItem MItem
28 28
../../../../../lib/cmn/sll.c ../../../../../lib/cmn/sio.c
108 108
WString WString
4 4
@ -493,8 +493,8 @@ WVList
0 0
111 111
MItem MItem
30 28
../../../../../lib/cmn/stdio.c ../../../../../lib/cmn/sll.c
112 112
WString WString
4 4
@ -511,8 +511,8 @@ WVList
0 0
115 115
MItem MItem
32 30
../../../../../lib/cmn/str-beg.c ../../../../../lib/cmn/stdio.c
116 116
WString WString
4 4
@ -530,7 +530,7 @@ WVList
119 119
MItem MItem
32 32
../../../../../lib/cmn/str-cat.c ../../../../../lib/cmn/str-beg.c
120 120
WString WString
4 4
@ -548,7 +548,7 @@ WVList
123 123
MItem MItem
32 32
../../../../../lib/cmn/str-chr.c ../../../../../lib/cmn/str-cat.c
124 124
WString WString
4 4
@ -566,7 +566,7 @@ WVList
127 127
MItem MItem
32 32
../../../../../lib/cmn/str-cmp.c ../../../../../lib/cmn/str-chr.c
128 128
WString WString
4 4
@ -584,7 +584,7 @@ WVList
131 131
MItem MItem
32 32
../../../../../lib/cmn/str-cnv.c ../../../../../lib/cmn/str-cmp.c
132 132
WString WString
4 4
@ -602,7 +602,7 @@ WVList
135 135
MItem MItem
32 32
../../../../../lib/cmn/str-cpy.c ../../../../../lib/cmn/str-cnv.c
136 136
WString WString
4 4
@ -620,7 +620,7 @@ WVList
139 139
MItem MItem
32 32
../../../../../lib/cmn/str-del.c ../../../../../lib/cmn/str-cpy.c
140 140
WString WString
4 4
@ -638,7 +638,7 @@ WVList
143 143
MItem MItem
32 32
../../../../../lib/cmn/str-dup.c ../../../../../lib/cmn/str-del.c
144 144
WString WString
4 4
@ -655,8 +655,8 @@ WVList
0 0
147 147
MItem MItem
33 32
../../../../../lib/cmn/str-dynm.c ../../../../../lib/cmn/str-dup.c
148 148
WString WString
4 4
@ -674,7 +674,7 @@ WVList
151 151
MItem MItem
33 33
../../../../../lib/cmn/str-dynw.c ../../../../../lib/cmn/str-dynm.c
152 152
WString WString
4 4
@ -691,8 +691,8 @@ WVList
0 0
155 155
MItem MItem
32 33
../../../../../lib/cmn/str-end.c ../../../../../lib/cmn/str-dynw.c
156 156
WString WString
4 4
@ -709,8 +709,8 @@ WVList
0 0
159 159
MItem MItem
33 32
../../../../../lib/cmn/str-excl.c ../../../../../lib/cmn/str-end.c
160 160
WString WString
4 4
@ -728,7 +728,7 @@ WVList
163 163
MItem MItem
33 33
../../../../../lib/cmn/str-fcpy.c ../../../../../lib/cmn/str-excl.c
164 164
WString WString
4 4
@ -746,7 +746,7 @@ WVList
167 167
MItem MItem
33 33
../../../../../lib/cmn/str-incl.c ../../../../../lib/cmn/str-fcpy.c
168 168
WString WString
4 4
@ -763,8 +763,8 @@ WVList
0 0
171 171
MItem MItem
32 33
../../../../../lib/cmn/str-len.c ../../../../../lib/cmn/str-incl.c
172 172
WString WString
4 4
@ -782,7 +782,7 @@ WVList
175 175
MItem MItem
32 32
../../../../../lib/cmn/str-pac.c ../../../../../lib/cmn/str-len.c
176 176
WString WString
4 4
@ -799,8 +799,8 @@ WVList
0 0
179 179
MItem MItem
33 32
../../../../../lib/cmn/str-pbrk.c ../../../../../lib/cmn/str-pac.c
180 180
WString WString
4 4
@ -817,8 +817,8 @@ WVList
0 0
183 183
MItem MItem
32 33
../../../../../lib/cmn/str-put.c ../../../../../lib/cmn/str-pbrk.c
184 184
WString WString
4 4
@ -836,7 +836,7 @@ WVList
187 187
MItem MItem
32 32
../../../../../lib/cmn/str-rev.c ../../../../../lib/cmn/str-put.c
188 188
WString WString
4 4
@ -854,7 +854,7 @@ WVList
191 191
MItem MItem
32 32
../../../../../lib/cmn/str-rot.c ../../../../../lib/cmn/str-rev.c
192 192
WString WString
4 4
@ -872,7 +872,7 @@ WVList
195 195
MItem MItem
32 32
../../../../../lib/cmn/str-set.c ../../../../../lib/cmn/str-rot.c
196 196
WString WString
4 4
@ -890,7 +890,7 @@ WVList
199 199
MItem MItem
32 32
../../../../../lib/cmn/str-spl.c ../../../../../lib/cmn/str-set.c
200 200
WString WString
4 4
@ -908,7 +908,7 @@ WVList
203 203
MItem MItem
32 32
../../../../../lib/cmn/str-spn.c ../../../../../lib/cmn/str-spl.c
204 204
WString WString
4 4
@ -926,7 +926,7 @@ WVList
207 207
MItem MItem
32 32
../../../../../lib/cmn/str-str.c ../../../../../lib/cmn/str-spn.c
208 208
WString WString
4 4
@ -943,8 +943,8 @@ WVList
0 0
211 211
MItem MItem
34 32
../../../../../lib/cmn/str-subst.c ../../../../../lib/cmn/str-str.c
212 212
WString WString
4 4
@ -961,8 +961,8 @@ WVList
0 0
215 215
MItem MItem
32 34
../../../../../lib/cmn/str-tok.c ../../../../../lib/cmn/str-subst.c
216 216
WString WString
4 4
@ -980,7 +980,7 @@ WVList
219 219
MItem MItem
32 32
../../../../../lib/cmn/str-trm.c ../../../../../lib/cmn/str-tok.c
220 220
WString WString
4 4
@ -997,8 +997,8 @@ WVList
0 0
223 223
MItem MItem
33 32
../../../../../lib/cmn/str-word.c ../../../../../lib/cmn/str-trm.c
224 224
WString WString
4 4
@ -1015,8 +1015,8 @@ WVList
0 0
227 227
MItem MItem
29 33
../../../../../lib/cmn/time.c ../../../../../lib/cmn/str-word.c
228 228
WString WString
4 4
@ -1033,8 +1033,8 @@ WVList
0 0
231 231
MItem MItem
32 29
../../../../../lib/cmn/tio-get.c ../../../../../lib/cmn/time.c
232 232
WString WString
4 4
@ -1052,7 +1052,7 @@ WVList
235 235
MItem MItem
32 32
../../../../../lib/cmn/tio-put.c ../../../../../lib/cmn/tio-get.c
236 236
WString WString
4 4
@ -1069,8 +1069,8 @@ WVList
0 0
239 239
MItem MItem
28 32
../../../../../lib/cmn/tio.c ../../../../../lib/cmn/tio-put.c
240 240
WString WString
4 4
@ -1087,8 +1087,8 @@ WVList
0 0
243 243
MItem MItem
32 28
../../../../../lib/cmn/tre-ast.c ../../../../../lib/cmn/tio.c
244 244
WString WString
4 4
@ -1105,8 +1105,8 @@ WVList
0 0
247 247
MItem MItem
36 32
../../../../../lib/cmn/tre-compile.c ../../../../../lib/cmn/tre-ast.c
248 248
WString WString
4 4
@ -1123,8 +1123,8 @@ WVList
0 0
251 251
MItem MItem
44 36
../../../../../lib/cmn/tre-match-backtrack.c ../../../../../lib/cmn/tre-compile.c
252 252
WString WString
4 4
@ -1141,8 +1141,8 @@ WVList
0 0
255 255
MItem MItem
43 44
../../../../../lib/cmn/tre-match-parallel.c ../../../../../lib/cmn/tre-match-backtrack.c
256 256
WString WString
4 4
@ -1159,8 +1159,8 @@ WVList
0 0
259 259
MItem MItem
34 43
../../../../../lib/cmn/tre-parse.c ../../../../../lib/cmn/tre-match-parallel.c
260 260
WString WString
4 4
@ -1178,7 +1178,7 @@ WVList
263 263
MItem MItem
34 34
../../../../../lib/cmn/tre-stack.c ../../../../../lib/cmn/tre-parse.c
264 264
WString WString
4 4
@ -1195,8 +1195,8 @@ WVList
0 0
267 267
MItem MItem
28 34
../../../../../lib/cmn/tre.c ../../../../../lib/cmn/tre-stack.c
268 268
WString WString
4 4
@ -1214,7 +1214,7 @@ WVList
271 271
MItem MItem
28 28
../../../../../lib/cmn/xma.c ../../../../../lib/cmn/tre.c
272 272
WString WString
4 4
@ -1231,26 +1231,26 @@ WVList
0 0
275 275
MItem MItem
3 28
*.h ../../../../../lib/cmn/xma.c
276 276
WString WString
3 4
NIL COBJ
277 277
WVList WVList
0 0
278 278
WVList WVList
0 0
-1 11
1 1
1 1
0 0
279 279
MItem MItem
28 3
../../../../../lib/cmn/mem.h *.h
280 280
WString WString
3 3
@ -1261,14 +1261,14 @@ WVList
282 282
WVList WVList
0 0
275 -1
1 1
1 1
0 0
283 283
MItem MItem
32 28
../../../../../lib/cmn/syscall.h ../../../../../lib/cmn/mem.h
284 284
WString WString
3 3
@ -1279,7 +1279,25 @@ WVList
286 286
WVList WVList
0 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
1 1
0 0

View File

@ -42,7 +42,7 @@ WVList
0 0
10 10
WPickList WPickList
68 69
11 11
MItem MItem
3 3
@ -331,8 +331,8 @@ WVList
0 0
75 75
MItem MItem
29 28
../../../../../lib/cmn/misc.c ../../../../../lib/cmn/oht.c
76 76
WString WString
4 4
@ -350,7 +350,7 @@ WVList
79 79
MItem MItem
28 28
../../../../../lib/cmn/oht.c ../../../../../lib/cmn/opt.c
80 80
WString WString
4 4
@ -367,8 +367,8 @@ WVList
0 0
83 83
MItem MItem
28 35
../../../../../lib/cmn/opt.c ../../../../../lib/cmn/path-canon.c
84 84
WString WString
4 4
@ -1231,26 +1231,26 @@ WVList
0 0
275 275
MItem MItem
3 37
*.h ../../../../..lib/cmn/path-basename.c
276 276
WString WString
3 4
NIL COBJ
277 277
WVList WVList
0 0
278 278
WVList WVList
0 0
-1 11
1 1
1 1
0 0
279 279
MItem MItem
28 3
../../../../../lib/cmn/mem.h *.h
280 280
WString WString
3 3
@ -1261,14 +1261,14 @@ WVList
282 282
WVList WVList
0 0
275 -1
1 1
1 1
0 0
283 283
MItem MItem
32 28
../../../../../lib/cmn/syscall.h ../../../../../lib/cmn/mem.h
284 284
WString WString
3 3
@ -1279,7 +1279,25 @@ WVList
286 286
WVList WVList
0 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
1 1
0 0

View File

@ -96,18 +96,18 @@ WVList
VComponent VComponent
25 25
WRect WRect
410 1080
1880 2533
5700 5700
4240 4240
0 1
0 0
26 26
WFileName WFileName
30 30
release/os2/lib/cmn/qsecmn.tgt release/os2/lib/cmn/qsecmn.tgt
0 13
0 21
27 27
VComponent VComponent
28 28
@ -148,14 +148,14 @@ WRect
80 80
5700 5700
4240 4240
0 1
0 0
35 35
WFileName WFileName
28 28
debug/os2/lib/cmn/qsecmn.tgt debug/os2/lib/cmn/qsecmn.tgt
0 21
0 21
36 36
VComponent VComponent
37 37
@ -176,8 +176,8 @@ debug/os2/lib/sed/qsesed.tgt
VComponent VComponent
40 40
WRect WRect
2420 30
440 146
5700 5700
4240 4240
1 1
@ -186,8 +186,8 @@ WRect
WFileName WFileName
30 30
debug/win32/lib/cmn/qsecmn.tgt debug/win32/lib/cmn/qsecmn.tgt
0 10
0 14
42 42
VComponent VComponent
43 43
@ -235,7 +235,7 @@ WFileName
28 28
debug/os2/cmd/awk/qseawk.tgt debug/os2/cmd/awk/qseawk.tgt
0 0
0 1
51 51
VComponent VComponent
52 52
@ -251,7 +251,7 @@ WFileName
30 30
debug/dos32/lib/cmn/qsecmn.tgt debug/dos32/lib/cmn/qsecmn.tgt
0 0
0 64
54 54
VComponent VComponent
55 55
@ -380,4 +380,4 @@ WFileName
debug/win32/lib/sed/qsesed.tgt debug/win32/lib/sed/qsesed.tgt
0 0
0 0
24 30