From aaa1097128fa025b0811af8f3708423929cd49e9 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 23 Dec 2009 06:56:01 +0000 Subject: [PATCH] simplified qse_cut_comp() and related functions --- qse/cmd/cut/cut.c | 105 ++++--- qse/configure | 11 +- qse/configure.ac | 9 +- qse/include/qse/cut/Cut.hpp | 15 - qse/include/qse/cut/cut.h | 4 +- qse/include/qse/cut/std.h | 11 +- qse/include/qse/sed/std.h | 3 +- qse/lib/cut/Cut.cpp | 4 +- qse/lib/cut/cut.c | 150 ++++++---- qse/lib/cut/cut.h | 4 +- qse/lib/cut/std.c | 6 +- qse/samples/Makefile.am | 2 +- qse/samples/Makefile.in | 2 +- qse/samples/cut/Makefile.am | 20 ++ qse/samples/cut/Makefile.in | 550 ++++++++++++++++++++++++++++++++++++ qse/samples/cut/cut01.c | 79 ++++++ qse/samples/sed/Makefile.am | 10 +- qse/samples/sed/Makefile.in | 11 +- 18 files changed, 850 insertions(+), 146 deletions(-) create mode 100644 qse/samples/cut/Makefile.am create mode 100644 qse/samples/cut/Makefile.in create mode 100644 qse/samples/cut/cut01.c diff --git a/qse/cmd/cut/cut.c b/qse/cmd/cut/cut.c index 19ede836..d5d67e8a 100644 --- a/qse/cmd/cut/cut.c +++ b/qse/cmd/cut/cut.c @@ -18,7 +18,7 @@ License along with QSE. If not, see . */ -#include +#include #include #include #include @@ -36,9 +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_cint_t g_din = QSE_CHAR_EOF; -static qse_cint_t g_dout = QSE_CHAR_EOF; - 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) @@ -62,7 +59,14 @@ static qse_ssize_t in ( QSE_SIO_READ ); - if (arg->handle == QSE_NULL) return -1; + 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; @@ -75,24 +79,13 @@ static qse_ssize_t in ( case QSE_CUT_IO_READ: { qse_ssize_t n = qse_sio_getsn (arg->handle, buf, size); -#if 0 - if (n == 0) + if (n <= -1) { - if (no more file) return 0; - - tmp = qse_sio_open ( - qse_cut_getmmgr(cut), - 0, - g_infile[++g_infile], - QSE_SIO_READ - ); - if (tmp == QSE_NULL) return -1; - - qse_sio_close (arg->handle); - arg->handle = tmp; - goto retry; + qse_cstr_t ea; + ea.ptr = g_infile; + ea.len = qse_strlen (g_infile); + qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); } -#endif return n; } @@ -126,7 +119,17 @@ static qse_ssize_t out ( QSE_SIO_TRUNCATE ); - if (arg->handle == QSE_NULL) return -1; + 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; @@ -135,7 +138,17 @@ static qse_ssize_t out ( return 0; case QSE_CUT_IO_WRITE: - return qse_sio_putsn (arg->handle, data, len); + { + qse_ssize_t n = qse_sio_putsn (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; @@ -172,6 +185,8 @@ static int handle_args (int argc, qse_char_t* argv[]) QSE_NULL }; qse_cint_t c; + qse_cint_t din = QSE_CHAR_EOF; + qse_cint_t dout = QSE_CHAR_EOF; while ((c = qse_getopt (argc, argv, &opt)) != QSE_CHAR_EOF) { @@ -204,8 +219,14 @@ static int handle_args (int argc, qse_char_t* argv[]) case QSE_T('c'): case QSE_T('f'): { - qse_char_t x[2] = QSE_T(" "); - + /* + * 1 character for c or f. + * 4 characters to hold Dxx, in case + * a delimiter is specified + * 1 character for the terminating '\0'; + */ + qse_char_t x[6] = QSE_T(" "); + if (g_selector != QSE_NULL) { qse_fprintf (QSE_STDERR, @@ -214,7 +235,7 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - x[0] = c; + x[4] = c; g_selector = qse_strdup2 (x, opt.arg, QSE_MMGR_GETDFL()); if (g_selector == QSE_NULL) { @@ -231,7 +252,7 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - g_din = opt.arg[0]; + din = opt.arg[0]; break; case QSE_T('D'): @@ -241,7 +262,7 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - g_dout = opt.arg[0]; + dout = opt.arg[0]; break; case QSE_T('s'): @@ -290,8 +311,20 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - if (g_selector[0] == QSE_T('c') && - (g_din != QSE_CHAR_EOF || g_dout != QSE_CHAR_EOF || + if (din == QSE_CHAR_EOF) din = QSE_T('\t'); + if (dout == QSE_CHAR_EOF) dout = din; + + if (din != QSE_CHAR_EOF) + { + QSE_ASSERT (dout != QSE_CHAR_EOF); + g_selector[0] = QSE_T('D'), + g_selector[1] = din; + g_selector[2] = dout; + g_selector[3] = QSE_T(','); + } + + if (g_selector[4] == QSE_T('c') && + (din != QSE_CHAR_EOF || dout != QSE_CHAR_EOF || (g_option & QSE_CUT_WHITESPACE) || (g_option & QSE_CUT_FOLDDELIMS))) { qse_fprintf (QSE_STDERR, @@ -300,7 +333,7 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - if (g_din != QSE_CHAR_EOF && (g_option & QSE_CUT_WHITESPACE)) + if (din != QSE_CHAR_EOF && (g_option & QSE_CUT_WHITESPACE)) { qse_fprintf (QSE_STDERR, QSE_T("ERROR: both -d and -w specified\n")); @@ -308,7 +341,7 @@ static int handle_args (int argc, qse_char_t* argv[]) return -1; } - if (g_selector[0] == QSE_T('f') && + if (g_selector[4] == QSE_T('c') && (g_option & QSE_CUT_DELIMONLY)) { qse_fprintf (QSE_STDERR, @@ -326,8 +359,7 @@ int cut_main (int argc, qse_char_t* argv[]) int ret = -1; ret = handle_args (argc, argv); - if (ret <= -1) return -1; - if (ret == 0) return 0; + if (ret <= 0) goto oops; ret = -1; @@ -340,10 +372,7 @@ int cut_main (int argc, qse_char_t* argv[]) qse_cut_setoption (cut, g_option); - if (g_din == QSE_CHAR_EOF) g_din = QSE_T('\t'); - if (g_dout == QSE_CHAR_EOF) g_dout = g_din; - - if (qse_cut_comp (cut, g_selector, qse_strlen(g_selector), g_din, g_dout) == -1) + if (qse_cut_comp (cut, g_selector, qse_strlen(g_selector)) == -1) { qse_fprintf (QSE_STDERR, QSE_T("cannot compile - %s\n"), diff --git a/qse/configure b/qse/configure index 68342dda..6c80ac24 100755 --- a/qse/configure +++ b/qse/configure @@ -17458,7 +17458,7 @@ QSE_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}" QSE_PROJECT_URL="${PACKAGE_URL}" -ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/sed/Makefile include/qse/awk/Makefile include/qse/cut/Makefile include/qse/lsp/Makefile include/qse/utl/Makefile lib/Makefile lib/cmn/Makefile lib/sed/Makefile lib/awk/Makefile lib/cut/Makefile lib/lsp/Makefile lib/utl/Makefile cmd/Makefile cmd/sed/Makefile cmd/awk/Makefile cmd/cut/Makefile cmd/lsp/Makefile samples/Makefile samples/cmn/Makefile samples/sed/Makefile samples/awk/Makefile regress/Makefile regress/sed/Makefile regress/awk/Makefile doc/Makefile doc/page/Makefile doc/Doxyfile" +ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/cut/Makefile include/qse/sed/Makefile include/qse/lsp/Makefile include/qse/utl/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/cut/Makefile lib/sed/Makefile lib/lsp/Makefile lib/utl/Makefile cmd/Makefile cmd/sed/Makefile cmd/awk/Makefile cmd/cut/Makefile cmd/lsp/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/cut/Makefile samples/sed/Makefile regress/Makefile regress/awk/Makefile regress/sed/Makefile doc/Makefile doc/page/Makefile doc/Doxyfile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18551,16 +18551,16 @@ do "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/qse/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/Makefile" ;; "include/qse/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/cmn/Makefile" ;; - "include/qse/sed/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/sed/Makefile" ;; "include/qse/awk/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/awk/Makefile" ;; "include/qse/cut/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/cut/Makefile" ;; + "include/qse/sed/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/sed/Makefile" ;; "include/qse/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/lsp/Makefile" ;; "include/qse/utl/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/utl/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cmn/Makefile" ;; - "lib/sed/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sed/Makefile" ;; "lib/awk/Makefile") CONFIG_FILES="$CONFIG_FILES lib/awk/Makefile" ;; "lib/cut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cut/Makefile" ;; + "lib/sed/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sed/Makefile" ;; "lib/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lsp/Makefile" ;; "lib/utl/Makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/Makefile" ;; "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;; @@ -18570,11 +18570,12 @@ do "cmd/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lsp/Makefile" ;; "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;; "samples/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES samples/cmn/Makefile" ;; - "samples/sed/Makefile") CONFIG_FILES="$CONFIG_FILES samples/sed/Makefile" ;; "samples/awk/Makefile") CONFIG_FILES="$CONFIG_FILES samples/awk/Makefile" ;; + "samples/cut/Makefile") CONFIG_FILES="$CONFIG_FILES samples/cut/Makefile" ;; + "samples/sed/Makefile") CONFIG_FILES="$CONFIG_FILES samples/sed/Makefile" ;; "regress/Makefile") CONFIG_FILES="$CONFIG_FILES regress/Makefile" ;; - "regress/sed/Makefile") CONFIG_FILES="$CONFIG_FILES regress/sed/Makefile" ;; "regress/awk/Makefile") CONFIG_FILES="$CONFIG_FILES regress/awk/Makefile" ;; + "regress/sed/Makefile") CONFIG_FILES="$CONFIG_FILES regress/sed/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/page/Makefile") CONFIG_FILES="$CONFIG_FILES doc/page/Makefile" ;; "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; diff --git a/qse/configure.ac b/qse/configure.ac index affef0eb..e6dbafd6 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -255,16 +255,16 @@ AC_CONFIG_FILES([ include/Makefile include/qse/Makefile include/qse/cmn/Makefile - include/qse/sed/Makefile include/qse/awk/Makefile include/qse/cut/Makefile + include/qse/sed/Makefile include/qse/lsp/Makefile include/qse/utl/Makefile lib/Makefile lib/cmn/Makefile - lib/sed/Makefile lib/awk/Makefile lib/cut/Makefile + lib/sed/Makefile lib/lsp/Makefile lib/utl/Makefile cmd/Makefile @@ -274,11 +274,12 @@ AC_CONFIG_FILES([ cmd/lsp/Makefile samples/Makefile samples/cmn/Makefile - samples/sed/Makefile samples/awk/Makefile + samples/cut/Makefile + samples/sed/Makefile regress/Makefile - regress/sed/Makefile regress/awk/Makefile + regress/sed/Makefile doc/Makefile doc/page/Makefile doc/Doxyfile diff --git a/qse/include/qse/cut/Cut.hpp b/qse/include/qse/cut/Cut.hpp index 72e64931..9aa4f69e 100644 --- a/qse/include/qse/cut/Cut.hpp +++ b/qse/include/qse/cut/Cut.hpp @@ -105,8 +105,6 @@ public: /// Cut (Mmgr* mmgr): Mmged (mmgr), cut (QSE_NULL), dflerrstr (QSE_NULL) { - delim.in = QSE_T(' '); - delim.out = delim.in; } /// @@ -130,12 +128,6 @@ public: /// void close (); - char_t getInputDelimiter () const { return delim.in; } - void setInputDelimiter (char_t delimc) { delim.in = delimc; } - - char_t getOutputDelimiter () const { return delim.out; } - void setOutputDelimiter (char_t delimc) { delim.out = delimc; } - /// /// The compile() function compiles a null-terminated string pointed /// to by @a sptr. @@ -217,13 +209,6 @@ protected: /// I/O stream to read data from and write output to. Stream* iostream; - struct - { - char_t in; - char_t out; - } delim; - - private: static ssize_t xin ( cut_t* s, io_cmd_t cmd, io_arg_t* arg, char_t* buf, size_t len); diff --git a/qse/include/qse/cut/cut.h b/qse/include/qse/cut/cut.h index 4a55e158..ed3b3552 100644 --- a/qse/include/qse/cut/cut.h +++ b/qse/include/qse/cut/cut.h @@ -254,9 +254,7 @@ void qse_cut_clear ( int qse_cut_comp ( qse_cut_t* cut, /**< text cutter */ const qse_char_t* str, /**< selector pointer */ - qse_size_t len, /**< selector length */ - qse_char_t din, /**< input field delimiter */ - qse_char_t dout /**< output field delimiter */ + qse_size_t len /**< selector length */ ); /** diff --git a/qse/include/qse/cut/std.h b/qse/include/qse/cut/std.h index 5e0c2524..57dbb5e5 100644 --- a/qse/include/qse/cut/std.h +++ b/qse/include/qse/cut/std.h @@ -24,7 +24,12 @@ #include /** @file - * This file defines a simple text cutter. + * This file provides easier-to-use versions of selected API functions + * by implementing default handlers for I/O and memory management. + * + * @example cut01.c + * This example shows how to write a simple text cutter using easy API + * functions. */ #ifdef __cplusplus @@ -53,9 +58,7 @@ void* qse_cut_getxtnstd ( */ int qse_cut_compstd ( qse_cut_t* cut, - const qse_char_t* str, - qse_char_t din, - qse_char_t dout + const qse_char_t* str ); /** diff --git a/qse/include/qse/sed/std.h b/qse/include/qse/sed/std.h index 42332c29..ca531077 100644 --- a/qse/include/qse/sed/std.h +++ b/qse/include/qse/sed/std.h @@ -24,7 +24,8 @@ #include /** @file - * This file defines a simple stream editor. + * This file provides easier-to-use versions of selected API functions + * by implementing default handlers for I/O and memory management. * * @example sed01.c * This example shows how to write a simple stream editor using easy API diff --git a/qse/lib/cut/Cut.cpp b/qse/lib/cut/Cut.cpp index 6e4c5be2..923dcd2a 100644 --- a/qse/lib/cut/Cut.cpp +++ b/qse/lib/cut/Cut.cpp @@ -51,13 +51,13 @@ void Cut::close () int Cut::compile (const char_t* sptr) { QSE_ASSERT (cut != QSE_NULL); - return qse_cut_comp (cut, sptr, qse_strlen(sptr), delim.in, delim.out); + return qse_cut_comp (cut, sptr, qse_strlen(sptr)); } int Cut::compile (const char_t* sptr, size_t slen) { QSE_ASSERT (cut != QSE_NULL); - return qse_cut_comp (cut, sptr, slen, delim.in, delim.out); + return qse_cut_comp (cut, sptr, slen); } int Cut::execute (Stream& iostream) diff --git a/qse/lib/cut/cut.c b/qse/lib/cut/cut.c index 5eef1ffc..8abdc32a 100644 --- a/qse/lib/cut/cut.c +++ b/qse/lib/cut/cut.c @@ -162,9 +162,7 @@ void qse_cut_clear (qse_cut_t* cut) qse_str_setcapa (&cut->e.in.line, DFL_LINE_CAPA); } -int qse_cut_comp ( - qse_cut_t* cut, const qse_char_t* str, qse_size_t len, - qse_char_t din, qse_char_t dout) +int qse_cut_comp (qse_cut_t* cut, const qse_char_t* str, qse_size_t len) { const qse_char_t* p = str; const qse_char_t* xnd = str + len; @@ -178,10 +176,17 @@ int qse_cut_comp ( #define MASK_END (1 << 2) #define MAX QSE_TYPE_MAX(qse_size_t) + /* free selector blocks compiled previously */ free_all_selector_blocks (cut); + /* set the default delimiters */ + cut->sel.din = QSE_T(' '); + cut->sel.dout = QSE_T(' '); + + /* if the selector string is empty, don't need to proceed */ if (len <= 0) return 0; + /* compile the selector string */ xnd--; c = CC (p, xnd); while (1) { @@ -200,82 +205,115 @@ int qse_cut_comp ( break; } - if (c == QSE_T('c')) + if (c == QSE_T('d')) { - sel = QSE_SED_SEL_CHAR; + /* the next character is the input delimiter. + * the output delimiter defaults to the input + * delimiter. */ c = NC (p, xnd); - while (QSE_ISSPACE(c)) c = NC (p, xnd); - } - else if (c == QSE_T('f')) - { - sel = QSE_SED_SEL_FIELD; - c = NC (p, xnd); - while (QSE_ISSPACE(c)) c = NC (p, xnd); - } + if (EOF(c)) + { + SETERR0 (cut, QSE_CUT_ESELNV); + return -1; + } + cut->sel.din = c; + cut->sel.dout = c; - if (QSE_ISDIGIT(c)) + c = NC (p, xnd); + } + else if (c == QSE_T('D')) { - do - { - start = start * 10 + (c - QSE_T('0')); + /* the next two characters are the input and + * the output delimiter each. */ + c = NC (p, xnd); + if (EOF(c)) + { + SETERR0 (cut, QSE_CUT_ESELNV); + return -1; + } + cut->sel.din = c; + + c = NC (p, xnd); + if (EOF(c)) + { + SETERR0 (cut, QSE_CUT_ESELNV); + return -1; + } + cut->sel.dout = c; + + c = NC (p, xnd); + } + else + { + if (c == QSE_T('c') || c == QSE_T('f')) + { + sel = c; c = NC (p, xnd); - } - while (QSE_ISDIGIT(c)); - - while (QSE_ISSPACE(c)) c = NC (p, xnd); - mask |= MASK_START; - } - else start++; - - if (c == QSE_T('-')) - { - c = NC (p, xnd); - while (QSE_ISSPACE(c)) c = NC (p, xnd); - + while (QSE_ISSPACE(c)) c = NC (p, xnd); + } + if (QSE_ISDIGIT(c)) { do { - end = end * 10 + (c - QSE_T('0')); + start = start * 10 + (c - QSE_T('0')); c = NC (p, xnd); } while (QSE_ISDIGIT(c)); - mask |= MASK_END; + + while (QSE_ISSPACE(c)) c = NC (p, xnd); + mask |= MASK_START; } - else end = MAX; + else start++; - while (QSE_ISSPACE(c)) c = NC (p, xnd); - } - else end = start; - - if (!(mask & (MASK_START | MASK_END))) - { - SETERR0 (cut, QSE_CUT_ESELNV); - return -1; - } - - if (cut->sel.lb->len >= QSE_COUNTOF(cut->sel.lb->range)) - { - if (add_selector_block (cut) <= -1) + if (c == QSE_T('-')) { + c = NC (p, xnd); + while (QSE_ISSPACE(c)) c = NC (p, xnd); + + if (QSE_ISDIGIT(c)) + { + do + { + end = end * 10 + (c - QSE_T('0')); + c = NC (p, xnd); + } + while (QSE_ISDIGIT(c)); + mask |= MASK_END; + } + else end = MAX; + + while (QSE_ISSPACE(c)) c = NC (p, xnd); + } + else end = start; + + if (!(mask & (MASK_START | MASK_END))) + { + SETERR0 (cut, QSE_CUT_ESELNV); return -1; } - } - cut->sel.lb->range[cut->sel.lb->len].id = sel; - cut->sel.lb->range[cut->sel.lb->len].start = start; - cut->sel.lb->range[cut->sel.lb->len].end = end; - cut->sel.lb->len++; - cut->sel.count++; - if (sel == QSE_SED_SEL_FIELD) cut->sel.fcount++; - else cut->sel.ccount++; + if (cut->sel.lb->len >= QSE_COUNTOF(cut->sel.lb->range)) + { + if (add_selector_block (cut) <= -1) + { + return -1; + } + } + + cut->sel.lb->range[cut->sel.lb->len].id = sel; + cut->sel.lb->range[cut->sel.lb->len].start = start; + cut->sel.lb->range[cut->sel.lb->len].end = end; + cut->sel.lb->len++; + cut->sel.count++; + if (sel == QSE_SED_SEL_FIELD) cut->sel.fcount++; + else cut->sel.ccount++; + } if (EOF(c)) break; if (c == QSE_T(',')) c = NC (p, xnd); } - cut->sel.din = din; - cut->sel.dout = dout; return 0; } diff --git a/qse/lib/cut/cut.h b/qse/lib/cut/cut.h index 96c37625..66185ece 100644 --- a/qse/lib/cut/cut.h +++ b/qse/lib/cut/cut.h @@ -33,8 +33,8 @@ struct qse_cut_sel_blk_t { enum { - QSE_SED_SEL_CHAR, - QSE_SED_SEL_FIELD + QSE_SED_SEL_CHAR = QSE_T('c'), + QSE_SED_SEL_FIELD = QSE_T('f') } id; qse_size_t start; qse_size_t end; diff --git a/qse/lib/cut/std.c b/qse/lib/cut/std.c index 7729f1cd..c83b1f94 100644 --- a/qse/lib/cut/std.c +++ b/qse/lib/cut/std.c @@ -54,9 +54,9 @@ void* qse_cut_getxtnstd (qse_cut_t* cut) return (void*)((xtn_t*)QSE_XTN(cut) + 1); } -int qse_cut_compstd (qse_cut_t* cut, const qse_char_t* sptr, qse_char_t din, qse_char_t dout) +int qse_cut_compstd (qse_cut_t* cut, const qse_char_t* sptr) { - return qse_cut_comp (cut, sptr, qse_strlen(sptr), din, dout); + return qse_cut_comp (cut, sptr, qse_strlen(sptr)); } static qse_ssize_t xin ( @@ -88,7 +88,7 @@ static qse_ssize_t xin ( qse_cstr_t ea; ea.ptr = xtn->infile; ea.len = qse_strlen (xtn->infile); - qse_cut_seterrnum (cut,QSE_CUT_EIOFIL, &ea); + qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea); return -1; } } diff --git a/qse/samples/Makefile.am b/qse/samples/Makefile.am index e1904a41..7e04d351 100644 --- a/qse/samples/Makefile.am +++ b/qse/samples/Makefile.am @@ -1 +1 @@ -SUBDIRS = cmn sed awk +SUBDIRS = cmn awk cut sed diff --git a/qse/samples/Makefile.in b/qse/samples/Makefile.in index 64533063..c40a3670 100644 --- a/qse/samples/Makefile.in +++ b/qse/samples/Makefile.in @@ -229,7 +229,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = cmn sed awk +SUBDIRS = cmn awk cut sed all: all-recursive .SUFFIXES: diff --git a/qse/samples/cut/Makefile.am b/qse/samples/cut/Makefile.am new file mode 100644 index 00000000..37fb0db0 --- /dev/null +++ b/qse/samples/cut/Makefile.am @@ -0,0 +1,20 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include + +LDFLAGS = -L../../lib/cmn -L../../lib/cut +LDADD = -lqsecut -lqsecmn $(LIBM) + +bin_PROGRAMS = cut01 + +cut01_SOURCES = cut01.c +cut01_LDADD = $(LDADD) + +#if ENABLE_CXX +# +#CXXLIB = -lqsecutxx -lqsecmnxx +#bin_PROGRAMS += cut02 cut03 +# +#cut02_SOURCES = cut02.cpp +#cut02_LDADD = $(CXXLIB) $(LDADD) +# +# +#endif diff --git a/qse/samples/cut/Makefile.in b/qse/samples/cut/Makefile.in new file mode 100644 index 00000000..74f25638 --- /dev/null +++ b/qse/samples/cut/Makefile.in @@ -0,0 +1,550 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = cut01$(EXEEXT) +subdir = samples/cut +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/ac/m4/libtool.m4 \ + $(top_srcdir)/ac/m4/ltoptions.m4 \ + $(top_srcdir)/ac/m4/ltsugar.m4 \ + $(top_srcdir)/ac/m4/ltversion.m4 \ + $(top_srcdir)/ac/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/include/qse/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am_cut01_OBJECTS = cut01.$(OBJEXT) +cut01_OBJECTS = $(am_cut01_OBJECTS) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +cut01_DEPENDENCIES = $(am__DEPENDENCIES_2) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse +depcomp = $(SHELL) $(top_srcdir)/ac/au/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(cut01_SOURCES) +DIST_SOURCES = $(cut01_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_MODE = @BUILD_MODE@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHAR_MODE = @CHAR_MODE@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = -L../../lib/cmn -L../../lib/cut +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +QSE_PROJECT_AUTHOR = @QSE_PROJECT_AUTHOR@ +QSE_PROJECT_URL = @QSE_PROJECT_URL@ +QSE_SIZEOF_CHAR = @QSE_SIZEOF_CHAR@ +QSE_SIZEOF_DOUBLE = @QSE_SIZEOF_DOUBLE@ +QSE_SIZEOF_FLOAT = @QSE_SIZEOF_FLOAT@ +QSE_SIZEOF_INT = @QSE_SIZEOF_INT@ +QSE_SIZEOF_LONG = @QSE_SIZEOF_LONG@ +QSE_SIZEOF_LONG_DOUBLE = @QSE_SIZEOF_LONG_DOUBLE@ +QSE_SIZEOF_LONG_LONG = @QSE_SIZEOF_LONG_LONG@ +QSE_SIZEOF_SHORT = @QSE_SIZEOF_SHORT@ +QSE_SIZEOF_VOID_P = @QSE_SIZEOF_VOID_P@ +QSE_SIZEOF_WCHAR_T = @QSE_SIZEOF_WCHAR_T@ +RANLIB = @RANLIB@ +RM = @RM@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_OBJC = @ac_ct_OBJC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -I$(top_srcdir)/include +LDADD = -lqsecut -lqsecmn $(LIBM) +cut01_SOURCES = cut01.c +cut01_LDADD = $(LDADD) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign samples/cut/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign samples/cut/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +cut01$(EXEEXT): $(cut01_OBJECTS) $(cut01_DEPENDENCIES) + @rm -f cut01$(EXEEXT) + $(LINK) $(cut01_OBJECTS) $(cut01_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cut01.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS + + +#if ENABLE_CXX +# +#CXXLIB = -lqsecutxx -lqsecmnxx +#bin_PROGRAMS += cut02 cut03 +# +#cut02_SOURCES = cut02.cpp +#cut02_LDADD = $(CXXLIB) $(LDADD) +# +# +#endif + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/qse/samples/cut/cut01.c b/qse/samples/cut/cut01.c new file mode 100644 index 00000000..39a7fead --- /dev/null +++ b/qse/samples/cut/cut01.c @@ -0,0 +1,79 @@ +/* + * $Id$ + * + Copyright 2006-2009 Chung, Hyung-Hwan. + This file is part of QSE. + + QSE is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of + the License, or (at your option) any later version. + + QSE is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with QSE. If not, see . + */ + +#include +#include +#include + +void print_usage (QSE_FILE* s, const qse_char_t* argv0) +{ + qse_fprintf (s, QSE_T("USAGE: %s selector [input-file [output-file]]\n"), argv0); + qse_fprintf (s, QSE_T("Sample selectors:\n")); + qse_fprintf (s, QSE_T("f1-3,5,D:, - select 1st to 3rd fields and 5th field delimited by :\n")); + qse_fprintf (s, QSE_T(" delimit output with ,\n")); + qse_fprintf (s, QSE_T("c7,10 - select 7th and 10th characters\n")); +} + +int cut_main (int argc, qse_char_t* argv[]) +{ + qse_cut_t* cut = QSE_NULL; + qse_char_t* infile; + qse_char_t* outfile; + int ret = -1; + + if (argc < 2 || argc > 4) + { + print_usage (QSE_STDERR, argv[0]); + return -1; + } + + cut = qse_cut_openstd (0); + if (cut == QSE_NULL) + { + qse_fprintf (QSE_STDERR, QSE_T("ERROR: cannot open cut\n")); + goto oops; + } + + if (qse_cut_compstd (cut, argv[1]) <= -1) + { + qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s\n"), qse_cut_geterrmsg(cut)); + goto oops; + } + + infile = (argc >= 3)? argv[2]: QSE_NULL; + outfile = (argc >= 4)? argv[3]: QSE_NULL; + + if (qse_cut_execstd (cut, infile, outfile) <= -1) + { + qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s\n"), qse_cut_geterrmsg(cut)); + goto oops; + } + +oops: + if (cut != QSE_NULL) qse_cut_close (cut); + return ret; +} + + +int qse_main (int argc, qse_achar_t* argv[]) +{ + return qse_runmain (argc, argv, cut_main); +} + diff --git a/qse/samples/sed/Makefile.am b/qse/samples/sed/Makefile.am index 525eeb73..39b8c821 100644 --- a/qse/samples/sed/Makefile.am +++ b/qse/samples/sed/Makefile.am @@ -1,17 +1,16 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -bin_PROGRAMS = sed01 - LDFLAGS = -L../../lib/cmn -L../../lib/sed LDADD = -lqsesed -lqsecmn $(LIBM) -if ENABLE_CXX - -CXXLIB = -lqsesedxx -lqsecmnxx +bin_PROGRAMS = sed01 sed01_SOURCES = sed01.c sed01_LDADD = $(LDADD) +if ENABLE_CXX + +CXXLIB = -lqsesedxx -lqsecmnxx bin_PROGRAMS += sed02 sed03 sed02_SOURCES = sed02.cpp @@ -19,4 +18,5 @@ sed02_LDADD = $(CXXLIB) $(LDADD) sed03_SOURCES = sed03.cpp sed03_LDADD = $(CXXLIB) $(LDADD) + endif diff --git a/qse/samples/sed/Makefile.in b/qse/samples/sed/Makefile.in index 8d57cc48..987a5764 100644 --- a/qse/samples/sed/Makefile.in +++ b/qse/samples/sed/Makefile.in @@ -53,12 +53,11 @@ CONFIG_CLEAN_VPATH_FILES = @ENABLE_CXX_TRUE@am__EXEEXT_1 = sed02$(EXEEXT) sed03$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am__sed01_SOURCES_DIST = sed01.c -@ENABLE_CXX_TRUE@am_sed01_OBJECTS = sed01.$(OBJEXT) +am_sed01_OBJECTS = sed01.$(OBJEXT) sed01_OBJECTS = $(am_sed01_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@ENABLE_CXX_TRUE@sed01_DEPENDENCIES = $(am__DEPENDENCIES_2) +sed01_DEPENDENCIES = $(am__DEPENDENCIES_2) am__sed02_SOURCES_DIST = sed02.cpp @ENABLE_CXX_TRUE@am_sed02_OBJECTS = sed02.$(OBJEXT) sed02_OBJECTS = $(am_sed02_OBJECTS) @@ -92,7 +91,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(sed01_SOURCES) $(sed02_SOURCES) $(sed03_SOURCES) -DIST_SOURCES = $(am__sed01_SOURCES_DIST) $(am__sed02_SOURCES_DIST) \ +DIST_SOURCES = $(sed01_SOURCES) $(am__sed02_SOURCES_DIST) \ $(am__sed03_SOURCES_DIST) ETAGS = etags CTAGS = ctags @@ -238,9 +237,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include LDADD = -lqsesed -lqsecmn $(LIBM) +sed01_SOURCES = sed01.c +sed01_LDADD = $(LDADD) @ENABLE_CXX_TRUE@CXXLIB = -lqsesedxx -lqsecmnxx -@ENABLE_CXX_TRUE@sed01_SOURCES = sed01.c -@ENABLE_CXX_TRUE@sed01_LDADD = $(LDADD) @ENABLE_CXX_TRUE@sed02_SOURCES = sed02.cpp @ENABLE_CXX_TRUE@sed02_LDADD = $(CXXLIB) $(LDADD) @ENABLE_CXX_TRUE@sed03_SOURCES = sed03.cpp