[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [bug-recutils] rec2csv options broken/mixed up
From: |
Jose E. Marchesi |
Subject: |
Re: [bug-recutils] rec2csv options broken/mixed up |
Date: |
Mon, 04 Feb 2019 09:34:05 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hi Brandon.
Many thanks for the fix. Committed as follows.
commit f984cb1305fd05bee78db168badc530167276825
Author: Jose E. Marchesi <address@hidden>
Date: Mon Feb 4 09:32:53 2019 +0100
rec2csv: fix handling of the --delim command line option
2019-02-04 Brandon Invergo <address@hidden>
* utils/rec2csv.c (DELIM_ARG): New long option.
(rec2csv_parse_args): Use DELIM_ARG and put RECORD_TYPE_ARG in the
right place.
diff --git a/ChangeLog b/ChangeLog
index a7e348a..cd89a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-04 Brandon Invergo <address@hidden>
+
+ * utils/rec2csv.c (DELIM_ARG): New long option.
+ (rec2csv_parse_args): Use DELIM_ARG and put RECORD_TYPE_ARG in the
+ right place.
+
2019-01-07 Jose E. Marchesi <address@hidden>
* doc/recutils.texi (Top): Spurious menu header "Remote
diff --git a/utils/rec2csv.c b/utils/rec2csv.c
index 37cfae8..575c903 100644
--- a/utils/rec2csv.c
+++ b/utils/rec2csv.c
@@ -61,6 +61,7 @@ char rec2csv_delim = ',';
enum
{
COMMON_ARGS,
+ DELIM_ARG,
RECORD_TYPE_ARG,
SORT_ARG
};
@@ -68,6 +69,7 @@ enum
static const struct option GNU_longOptions[] =
{
COMMON_LONG_ARGS,
+ {"delim", required_argument, NULL, DELIM_ARG},
{"type", required_argument, NULL, RECORD_TYPE_ARG},
{"sort", required_argument, NULL, SORT_ARG},
{NULL, 0, NULL, 0}
@@ -123,12 +125,13 @@ rec2csv_parse_args (int argc,
switch (c)
{
COMMON_ARGS_CASES
- case RECORD_TYPE_ARG:
+ case DELIM_ARG:
case 'd':
{
rec2csv_delim = optarg[0];
break;
}
+ case RECORD_TYPE_ARG:
case 't':
{
rec2csv_record_type = xstrdup (optarg);