rework option parsing to have a group structure

Add also a new 'commit' group that is the common options
for all applets that can commit package changes.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/apk_applet.h b/src/apk_applet.h
index d11c259be2..e4594355ba 100644
--- a/src/apk_applet.h
+++ b/src/apk_applet.h
@@ -12,6 +12,7 @@
 #ifndef APK_APPLET_H
 #define APK_APPLET_H
 
+#include <errno.h>
 #include <getopt.h>
 #include "apk_defines.h"
 #include "apk_database.h"
@@ -24,23 +25,31 @@ struct apk_option {
 	const char *arg_name;
 };
 
+struct apk_option_group {
+	const char *name;
+	int num_options;
+	const struct apk_option *options;
+
+	int (*parse)(void *ctx, struct apk_db_options *dbopts,
+		     int optch, const char *optarg);
+};
+
 struct apk_applet {
 	struct list_head node;
 
 	const char *name;
 	const char *arguments;
 	const char *help;
+	const struct apk_option_group *optgroups[4];
 
 	unsigned int open_flags, forced_flags;
 	int context_size;
-	int num_options;
-	struct apk_option *options;
 
-	int (*parse)(void *ctx, struct apk_db_options *dbopts,
-		     int optch, int optindex, const char *optarg);
 	int (*main)(void *ctx, struct apk_database *db, struct apk_string_array *args);
 };
 
+extern const struct apk_option_group optgroup_global, optgroup_commit;
+
 void apk_applet_register(struct apk_applet *);
 typedef void (*apk_init_func_t)(void);