+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 (file)
--- 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);