From 2c50f0700ae9f5631b538f4dc2d0797e31985178 Mon Sep 17 00:00:00 2001
From: vxid <maxime.treca@gmail.com>
Date: Wed, 13 Mar 2019 15:47:22 +0100
Subject: Change -C and -D long option names

The config dir long option has been changed from --conf to --confdir.
The data dir long option has been changed from --directory to --datadir.

Both old options are kept for backward compatibility but are removed
from the manual.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
 src/args.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/args.c b/src/args.c
index 8443454..54eb52a 100644
--- a/src/args.c
+++ b/src/args.c
@@ -143,9 +143,9 @@ static void help_arg(void)
 	putchar('\n');
 	printf("%s\n", _("Miscellaneous:"));
 	printf("%s\n", _("  -c, --calendar <file>   The calendar data file to use"));
-	printf("%s\n", _("  -C, --conf <directory>  The configuration directory to use"));
+	printf("%s\n", _("  -C, --confdir <dir>     The configuration directory to use"));
 	printf("%s\n", _("  --daemon                Run notification daemon in the background"));
-	printf("%s\n", _("  -D, --directory <dir>   The data directory to use"));
+	printf("%s\n", _("  -D, --datadir <dir>     The data directory to use"));
 	printf("%s\n", _("  -g, --gc                Run the garbage collector"));
 	printf("%s\n", _("  -h, --help              Show this help text"));
 	printf("%s\n", _("  -i, --import <file>     Import iCal data from file"));
@@ -436,8 +436,12 @@ int parse_args(int argc, char **argv)
 	struct option longopts[] = {
 		{"appointment", no_argument, NULL, 'a'},
 		{"calendar", required_argument, NULL, 'c'},
+		/* Deprecated */
 		{"conf", required_argument, NULL, 'C'},
+		{"confdir", required_argument, NULL, 'C'},
 		{"day", required_argument, NULL, 'd'},
+		{"datadir", required_argument, NULL, 'D'},
+		/* Deprecated */
 		{"directory", required_argument, NULL, 'D'},
 		{"filter", no_argument, NULL, 'F'},
 		{"gc", no_argument, NULL, 'g'},
-- 
cgit v1.2.3-70-g09d2