From: short <>
Date: Tue, 28 Oct 2003 14:04:48 +0000 (+0000)
Subject: +Definition of CMDLINE_POPT for command arguments parsing support.
X-Git-Tag: captive-1_0_1~17
X-Git-Url: http://git.jankratochvil.net/?a=commitdiff_plain;h=bbd6c3d6f7d5e7ffdea9e1f758b3ae9a28aca62f;hp=748ef30f44c934e066a1feab7102c06c88b6515c;p=captive.git

+Definition of CMDLINE_POPT for command arguments parsing support.
Fixed 'command_name --help' to prevent exit of captive-cmdline(1).
---

diff --git a/src/client/cmdline/main.h b/src/client/cmdline/main.h
index 9d603b6..11c23a8 100644
--- a/src/client/cmdline/main.h
+++ b/src/client/cmdline/main.h
@@ -26,6 +26,21 @@
 #include <captive/client-vfs.h>
 
 
+#define CMDLINE_POPT(longname,shortname,argInfoP,argP,descripP,argDescripP) \
+		{ \
+			longName: (longname), \
+			shortName: (shortname), \
+			argInfo: (argInfoP), \
+			arg: (void *)argP, \
+			val: 0, \
+			descrip: (descripP), \
+			argDescrip: (argDescripP), \
+		}
+extern const struct poptOption cmdline_poptHelpOptions[];
+#define CMDLINE_POPT_AUTOHELP \
+		{ NULL,'\0',POPT_ARG_INCLUDE_TABLE,(struct poptOption *)cmdline_poptHelpOptions,0,"Help options:",NULL },
+
+
 #define CMDLINE_MAIN_ERROR (cmdline_main_error_quark())
 GQuark cmdline_main_error_quark(void);