From: Dick Porter <dick@acm.org> --

Here is a patch for popt to implement selective argument stripping from argv.
With this patch I can use popt in ORBit (the CORBA spec requires ORBs to
remove all ORB options from argv), which allows me to export a popt option
table to the rest of Gnome.

There is also a bug fix included where a string was realloc()d into a space
too small to hold the trailing NULL.

1 files changed, 3 insertions, 0 deletions

diff --git a/popt.h b/popt.h
index 5046fad..e6fa8bd 100644
--- a/popt.h
+++ b/popt.h
@@ -30,6 +30,7 @@ extern "C" {
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
+#define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv (only applies to long args) */
 #define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
 #define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
 #define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
@@ -119,6 +120,8 @@ void poptPrintHelp(poptContext con, FILE * f, int flags);
 void poptPrintUsage(poptContext con, FILE * f, int flags);
 void poptSetOtherOptionHelp(poptContext con, const char * text);
 /*@observer@*/ const char * poptGetInvocationName(poptContext con);
+/* shuffles argv pointers to remove stripped args, returns new argc */
+int poptStrippedArgv(poptContext con, int argc, char **argv);
 
 #ifdef  __cplusplus
 }