README: Explain the building process slightly better

[xsv.git] / xsv.c

diff --git a/xsv.c b/xsv.c
index 971ae58f3ba971ca566130e35d8be0572971c3e8..0d2d972b055544ddab45ad06132ed09ea4e2b8c6 100644 (file)
--- a/xsv.c
+++ b/xsv.c
@@ -1,11 +1,9 @@
 /*
- *     A Swiss-Army Knife for CSV-like Files
+ *     The Swiss-Army Knife for CSV-like Files
  *
  *     (c) 2012 Martin Mares <mj@ucw.cz>
  */
 
-#define _GNU_SOURCE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -416,6 +414,12 @@ static int regex_read(struct format *fmt)
                        }
                        return 1;
                }
+               if (ovec[0] == ovec[1]) {
+                       warn(fmt, "Regular expression matched an empty separator.");
+                       new_field(i);
+                       in_field->len = n - i;
+                       return 1;
+               }
                if (!fmt->sloppy || ovec[0]) {
                        new_field(i);
                        in_field->len = ovec[0] - i;
@@ -446,7 +450,7 @@ static void table_write(struct format *fmt)
                                cw = fw;
                        }
                        while (len--)
-                               putchar(*p++);
+                               putchar_unlocked(*p++);
                }
                while (fw < cw) {
                        putchar_unlocked(' ');
@@ -471,7 +475,7 @@ static void table_write_grid(struct format *fmt, int pos UNUSED)
                putchar_unlocked('+');
                int w = fmt->table_sep + *intarray_nth(&column_widths, i);
                while (w--)
-                       putchar('-');
+                       putchar_unlocked('-');
        }
        putchar_unlocked('+');
        putchar_unlocked('\n');
@@ -639,6 +643,7 @@ static void write_header(void)
                }
        }
 
+       fields_reset(&out_fields);
        if (want_select_fields)
                select_fields();
        else
@@ -706,7 +711,7 @@ static int parse_field(char *str)
        if (in_format->field_names && (f = find_field_by_name(in_format->field_names, str)) > 0)
                return f;
 
-       die("Unknown field %s", str);
+       die("Unknown field `%s'", str);
 }
 
 static char *parse_selector(char *str)
@@ -823,7 +828,7 @@ static void NONRET usage(void)
 Usage: xsv <in-format> [<out-format>] <options> [<fields>]\n\
 \n\
 Formats:\n\
--t, --tsv              TAB-separated values (default)\n\
+-t, --tsv              Tab-separated values (default)\n\
 -c, --csv              Comma-separated values\n\
 -w, --ws               Values separated by arbitrary whitespace\n\
 -r, --regex=<rx>       Separator given by Perl regular expression (input only)\n\
@@ -864,6 +869,7 @@ static const char short_options[] = "cd:f:hqr:twW";
 
 enum long_options {
        OPT_HELP = 256,
+       OPT_VERSION,
        OPT_TRIM,
        OPT_ALWAYS_QUOTE,
        OPT_TABLE,
@@ -880,6 +886,7 @@ static const struct option long_options[] = {
        { "fs",                 1,      NULL,   'd' },
        { "grid",               0,      NULL,   OPT_GRID },
        { "header",             0,      NULL,   'h' },
+       { "help",               0,      NULL,   OPT_HELP },
        { "quiet",              0,      NULL,   'q' },
        { "regex",              1,      NULL,   'r' },
        { "sloppy",             0,      NULL,   's' },
@@ -887,8 +894,8 @@ static const struct option long_options[] = {
        { "table-sep",          1,      NULL,   OPT_TABLE_SEP },
        { "trim",               0,      NULL,   OPT_TRIM },
        { "tsv",                0,      NULL,   't' },
+       { "version",            0,      NULL,   OPT_VERSION },
        { "ws",                 0,      NULL,   'w' },
-       { "help",               0,      NULL,   OPT_HELP },
        { NULL,                 0,      NULL,   0 },
 };
 
@@ -994,6 +1001,9 @@ int main(int argc, char **argv)
                                break;
                        case OPT_HELP:
                                usage();
+                       case OPT_VERSION:
+                               puts("This is xsv version " VERSION ".");
+                               exit(0);
                        case OPT_TRIM:
                                want_trim = 1;
                                break;