Provide additional m4 magic for creating cl interfaces.

* src/Makefile.am (EXTRA_DIST): Add eclatcl.m4
* src/eclatcl.m4: New file.
* src/detvol-cl.opt: Rename to src/devol-cl.opt
* src/cmdline.opt: Fix a typo

* src/allocaddr-cl.opt: Rewrite usning new m4 macros.
* src/asscaddr-cl.opt: Likewise.
* src/cpimg-cl.opt: Likewise.
* src/cpsnap-cl.opt: Likewise.
* src/disasaddr-cl.opt: Likewise.
* src/freeaddr-cl.opt: Likewise.
* src/lsaddr-cl.opt: Likewise.
* src/lsattr-cl.opt: Likewise.
* src/lsimg-cl.opt: Likewise.
* src/lsistat-cl.opt: Likewise.
* src/lssg-cl.opt: Likewise.
* src/lssnap-cl.opt: Likewise.
* src/lstag-cl.opt: Likewise.
* src/mkimg-cl.opt: Likewise.
* src/mkinst-cl.opt: Likewise.
* src/mktags-cl.opt: Likewise.
* src/mkvol-cl.opt: Likewise.

* src/allocaddr.c: Update calls to parse_options.
* src/asscaddr.c: Likewise.
* src/cpimg.c: Likewise.
* src/cpsnap.c: Likewise.
* src/devol.c: Likewise.
* src/disasaddr.c: Likewise.
* src/freeaddr.c: Likewise.
* src/lsaddr.c: Likewise.
* src/lsattr.c: Likewise.
* src/lsimg.c: Likewise.
* src/lsistat.c: Likewise.
* src/lssg.c: Likewise.
* src/lssnap.c: Likewise.
* src/lstag.c: Likewise.
* src/mkimg.c: Likewise.
* src/mkinst.c: Likewise.
* src/mktags.c: Likewise.
* src/mkvol.c: Likewise.

40 files changed, 159 insertions, 192 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ee9eece..d97110a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,13 +67,13 @@ AM_CPPFLAGS = \
 
 OPTFILES=\
  allocaddr-cl.opt\
  asscaddr-cl.opt\
  cpimg-cl.opt\
  cpsnap-cl.opt\
- detvol-cl.opt\
+ devol-cl.opt\
  disasaddr-cl.opt\
  freeaddr-cl.opt\
  generic-cl.opt\
  lsaddr-cl.opt\
  lsattr-cl.opt\
  lsimg-cl.opt\
@@ -95,18 +95,19 @@ BUILT_SOURCES=\
  xref.man
 
 EXTRA_DIST=\
  cmdline.opt\
  $(OPTFILES)\
  comtab.man\
- xref.man
+ xref.man\
+ eclatcl.m4
 
 SUFFIXES=.opt .c .h
 
 .opt.h:
-        $(AM_V_GEN)m4 -s $(top_srcdir)/grecs/build-aux/getopt.m4 $< | sed '1d' > $@
+        $(AM_V_GEN)m4 -s $(top_srcdir)/grecs/build-aux/getopt.m4 eclatcl.m4 $< | sed '1d' > $@
 
 comtab.man: eclat.c
         $(AM_V_GEN)$(top_srcdir)/src/eclat -l '\t\\fB%n\\fR\t\\fB%i\\fR\n' > comtab.man
 
 xref.man: eclat.c
         $(AM_V_GEN)$(top_srcdir)/src/eclat -l '%.BR eclat-: (1)n,\n' > xref.man
diff --git a/src/allocaddr-cl.opt b/src/allocaddr-cl.opt
index c618375..c29b4f3 100644
--- a/src/allocaddr-cl.opt
+++ b/src/allocaddr-cl.opt
@@ -11,27 +11,21 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
  
    You should have received a copy of the GNU General Public License
    along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
 
-OPTIONS_COMMAND_BEGIN("eclat",
-              [<allocaddr, allocate-address>],
-              [<allocate Elastic IP address>],
-              [<>],
-              [<gnu>],
-              [<noversion>])
+ECLAT_CL_BEGIN([<allocate Elastic IP address>])
 
 OPTION(vpc,v,,
        [<assign VPC addresses>])
 BEGIN
         vpc = 1;
 END
 
-OPTIONS_END
+ECLAT_CL_END
 
-static void
-parse_options(int argc, char *argv[], int *index)
+ECLAT_CL_PARSER(parse_options, [<int argc, char *argv[], int *index>],[<
 {
         GETOPT(argc, argv, *index, exit(EX_USAGE))
 }
-        
+>])
diff --git a/src/allocaddr.c b/src/allocaddr.c
index 61736cd..51e58c3 100644
--- a/src/allocaddr.c
+++ b/src/allocaddr.c
@@ -20,13 +20,13 @@ static int vpc;
 
 int
 eclat_allocate_address(eclat_command_env_t *env, int argc, char **argv)
 {
         int i;
 
-        parse_options(argc, argv, &i);
+        parse_options(env, argc, argv, &i);
         argc -= i;
         argv += i;
 
         if (argc != 0)
                 die(EX_USAGE, "wrong number of arguments to allocate-address");
 
diff --git a/src/asscaddr-cl.opt b/src/asscaddr-cl.opt
index 87846e3..321f7c4 100644
--- a/src/asscaddr-cl.opt
+++ b/src/asscaddr-cl.opt
@@ -11,18 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
  
    You should have received a copy of the GNU General Public License
    along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
 
-OPTIONS_COMMAND_BEGIN("eclat",
-              [<asscaddr, associate-address>],
-              [<associate IP address with an instance>],
-              [<INSTANCE IP-OR-ALLOC-ID>],
-              [<gnu>],
-              [<noversion>])
+ECLAT_CL_BEGIN([<associate IP address with an instance>],
+               [<INSTANCE IP-OR-ALLOC-ID>]);
 
 OPTION(vpc,v,,
        [<assign VPC addresses>])
 BEGIN
         vpc = 1;
 END
@@ -42,14 +38,14 @@ END
 OPTION(allow-reassociation,A,,
        [<allow to reassociate an already associated address (vpc only)>])
 BEGIN
         reassoc = 1;
 END     
 
-OPTIONS_END
+ECLAT_CL_END
 
-static void
-parse_options(int argc, char *argv[], int *index)
+ECLAT_CL_PARSER(parse_options, [<int argc, char *argv[], int *index>],[<
 {
         GETOPT(argc, argv, *index, exit(EX_USAGE))
 }
+>])
         
diff --git a/src/asscaddr.c b/src/asscaddr.c
index 859675b..8ec3998 100644
--- a/src/asscaddr.c
+++ b/src/asscaddr.c
@@ -23,13 +23,13 @@ static int reassoc;
 
 int
 eclat_associate_address(eclat_command_env_t *env, int argc, char **argv)
 {
         int i;