Index: ossp-pkg/lmtp2nntp/fixme.h
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/Attic/fixme.h,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/Attic/fixme.h,v' 2>/dev/null
--- fixme.h	2002/01/31 13:44:05	1.6
+++ fixme.h	2002/01/31 13:54:21	1.7
@@ -107,4 +107,10 @@
 #define ERR_EXECUTION 1
 #define ERR_DELIVERY -2
 
+enum {
+    GROUPMODE_ARG,
+    GROUPMODE_ENVELOPE,
+    GROUPMODE_HEADER
+};
+
 #endif /* __FIXME_H__ */
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_config.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v
rcsdiff -q -kk '-r1.23' '-r1.24' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v' 2>/dev/null
--- lmtp2nntp_config.c	2002/01/31 13:48:27	1.23
+++ lmtp2nntp_config.c	2002/01/31 13:54:21	1.24
@@ -404,6 +404,28 @@
     }
     catch (ex)
         rethrow;
+
+    /* --groupmode SINGLE */
+    try {
+        if (   (val_get(ctx->val, "option.groupmode", &ov) != VAL_OK)
+            || (ov->ndata != 1)
+            || (ov->data.s == NULL)
+              ) throw(0,0,0);
+        log1(ctx, TRACE, "--groupmode = \"%s\"", ov->data.s);
+
+        if      (strcasecmp(ov->data.s, "arg") == 0)
+            ctx->option_groupmode = GROUPMODE_ARG;
+        else if (strcasecmp(ov->data.s, "envelope") == 0)
+            ctx->option_groupmode = GROUPMODE_ENVELOPE;
+        else if (strcasecmp(ov->data.s, "header") == 0)
+            ctx->option_groupmode = GROUPMODE_HEADER;
+        else {
+            log1(ctx, ERROR, "option --groupmode, invalid mode (%s)", ov->data.s);
+            throw(0,0,0);
+        }
+    }
+    catch (ex)
+        rethrow;
 CUS:
     return;
 }
Index: ossp-pkg/lmtp2nntp/lmtp2nntp_main.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v
rcsdiff -q -kk '-r1.17' '-r1.18' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v' 2>/dev/null
--- lmtp2nntp_main.c	2002/01/31 13:44:05	1.17
+++ lmtp2nntp_main.c	2002/01/31 13:54:21	1.18
@@ -190,12 +190,6 @@
 static void lmtp_gfs_quit(lmtp2nntp_t *);
 
 enum {
-    GROUPMODE_ARG,
-    GROUPMODE_ENVELOPE,
-    GROUPMODE_HEADER
-};
-
-enum {
     OPERATIONMODE_FAKE,
     OPERATIONMODE_POST,
     OPERATIONMODE_FEED
@@ -464,18 +458,6 @@
     /* read in the arguments */
     while ((i = getopt(argc, argv, "C:DKP:Va:b:c:d:g:h:l:m:n:o:r:s:t:u:v")) != -1) {
         switch (i) {
-            case 'g': /*POD [B<-g> I<groupmode>] */
-                if      (strcasecmp(optarg, "arg") == 0)
-                    ctx->option_groupmode = GROUPMODE_ARG;
-                else if (strcasecmp(optarg, "envelope") == 0)
-                    ctx->option_groupmode = GROUPMODE_ENVELOPE;
-                else if (strcasecmp(optarg, "header") == 0)
-                    ctx->option_groupmode = GROUPMODE_HEADER;
-                else {
-                    fprintf(stderr, "%s:Error: Invalid mode \"%s\" to option -g\n", ctx->progname, optarg);
-                    CU(ERR_EXECUTION);
-                }
-                break;
             case 'h': /*POD [B<-h> I<header>:<value>] */
                 cpHeadername = strdup(optarg);
                 if ((cp = strchr(cpHeadername, ':')) == NULL) {