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
@@ -70,7 +70,7 @@ OPTFILES=\
  asscaddr-cl.opt\
  cpimg-cl.opt\
  cpsnap-cl.opt\
- detvol-cl.opt\
+ devol-cl.opt\
  disasaddr-cl.opt\
  freeaddr-cl.opt\
  generic-cl.opt\
@@ -98,12 +98,13 @@ 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
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
@@ -14,12 +14,7 @@
    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>])
@@ -27,11 +22,10 @@ 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
@@ -23,7 +23,7 @@ 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;
 
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
@@ -14,12 +14,8 @@
    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>])
@@ -45,11 +41,11 @@ 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
@@ -26,7 +26,7 @@ eclat_associate_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;
 
diff --git a/src/cmdline.opt b/src/cmdline.opt
index cd8c280..561d7e2 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -155,7 +155,7 @@ BEGIN
 END     
 
 OPTION(sort,s,,
-       [<sort the returned XML teee prior to outputting it>])
+       [<sort the returned XML tree prior to outputting it>])
 BEGIN
         sort_option = 1;
 END     
diff --git a/src/cpimg-cl.opt b/src/cpimg-cl.opt
index 4a01386..991c8af 100644
--- a/src/cpimg-cl.opt
+++ b/src/cpimg-cl.opt
@@ -19,12 +19,8 @@ char *image;
 char *name;
 char *descr;
 
-OPTIONS_COMMAND_BEGIN("eclat",
-              [<cpimg, copy-image>],
-              [<copy an AMI from another region>],
-              [<REGION AMI-ID>],
-              [<gnu>],
-              [<noversion>])
+ECLAT_CL_BEGIN([<copy an AMI from another region>],
+               [<REGION AMI-ID>])
 
 OPTION(name,n,[<NAME>],
        [<assign name to the new image>])
@@ -40,10 +36,9 @@ END
 
 /* FIXME: The idempotency token */
 
-OPTIONS_END
+ECLAT_CL_END
 
-static void
-parse_options(int argc, char *argv[])
+ECLAT_CL_PARSER(parse_options, [<int argc, char *argv[]>],[<
 {
         int idx;
 
@@ -56,3 +51,4 @@ parse_options(int argc, char *argv[])
         region = argv[0];
         image = argv[1];
 }
+>])
diff --git a/src/cpimg.c b/src/cpimg.c
index 53e7d3f..6822ed6 100644
--- a/src/cpimg.c
+++ b/src/cpimg.c
@@ -21,7 +21,7 @@ int
 eclat_copy_image(eclat_command_env_t *env, int argc, char **argv)
 {
         struct ec2_query *q = env->query;