14 files changed, 192 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index 781203c..ed97650 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-Eclat NEWS -- history of user-visible changes. 2015-01-23
+Eclat NEWS -- history of user-visible changes. 2015-02-02
 Copyright (C) 2012-2015 Sergey Poznyakoff
@@ -14,2 +14,20 @@ Version 1.0.92, (Git)
 
+* New options:
+
+ -A, --add-parameter=NAME=VALUE
+
+Adds parameter NAME with the given VALUE to the generated AWS request.
+This option is intended for testing new AWS functionality for which
+eclat does not yet provide native support.
+
+  -p, --check-permissions
+  
+Checks if you have the required permissions for the action, without
+actually making the request.
+
+* forcibly stop the instance
+
+eclat stop now supports -f (--force) option, which stops the instance
+forcibly.
+
 * Implement signature version 4 signing
diff --git a/doc/eclat-stop.1 b/doc/eclat-stop.1
index 5adbe61..a8f61a8 100644
--- a/doc/eclat-stop.1
+++ b/doc/eclat-stop.1
@@ -15,3 +15,3 @@
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT-STOP 1 "January 26, 2015" "ECLAT" "Eclat User Reference"
+.TH ECLAT-STOP 1 "February 2, 2015" "ECLAT" "Eclat User Reference"
 .SH NAME
@@ -19,3 +19,3 @@ eclat-stop, eclat-stop-instances \- stop EC2 instances
 .SH SYNOPSIS
-\fBeclat stop\fR \fIID\fR [\fIID\fR...]
+\fBeclat stop\fR [\fB\-f\fR] [\fB\-\-force\fR] \fIID\fR [\fIID\fR...]
 .PP
@@ -26,2 +26,6 @@ The command
 stops running Amazon EBS-backed instances.
+.SH OPTIONS
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Forcibly stop the instance.
 .SH OUTPUT
diff --git a/doc/eclat.1man b/doc/eclat.1man
index 50cc3e2..829bec6 100644
--- a/doc/eclat.1man
+++ b/doc/eclat.1man
@@ -15,3 +15,3 @@
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT 1 "January 21, 2015" "ECLAT" "Eclat User Reference"
+.TH ECLAT 1 "February 2, 2015" "ECLAT" "Eclat User Reference"
 .SH NAME
@@ -468,2 +468,10 @@ Dump configuration grammar traces.
 Dump lexical analyzer traces.
+.TP
+\fB\-p\fR, \fB\-\-check\-permissions\fR
+Check if you have the required permissions for the action, without
+actually making the request.  This is equivalent to
+\fB\-\-add\-parameter=DryRun=true\fR.
+.TP
+\fB\-A\fR, \fB\-\-add\-parameter=\fINAME\fB=\fIVALUE\fR
+Add parameter to the AWS request.
 .SS Help and additional information
diff --git a/etc/default.fln b/etc/default.fln
index 178af18..d3da5eb 100644
--- a/etc/default.fln
+++ b/etc/default.fln
@@ -17,5 +17,12 @@
 if (.Response.Errors) {
-  error("Error: ",.Response.Errors.Error.Message,"\n");
+  if (.Response.Errors.Error.Code[DryRunOperation]) {
+    print(dequote(.Response.Errors.Error.Message),"\n");
+  } else if (.Response.Errors.Error.Code[UnauthorizedOperation]) {
+    error(dequote(.Response.Errors.Error.Message),"\n");
     exit(1);
   } else {
+    error("Error: ",dequote(.Response.Errors.Error.Message),"\n");
+    exit(1);
+  }
+} else {
   error("Unrecognized response:\n");
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5cfa67a..711bc98 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -55,2 +55,3 @@ libeclat_a_SOURCES=\
  map.c\
+ paramlist.c\
  path.c\
diff --git a/lib/forlan.c b/lib/forlan.c
index 2275bc7..977271d 100644
--- a/lib/forlan.c
+++ b/lib/forlan.c
@@ -1051,2 +1051,18 @@ func_decode(forlan_eval_env_t env, struct grecs_list *list)
 static void
+func_dequote(forlan_eval_env_t env, struct grecs_list *list)
+{
+        struct forlan_value *val = list->head->data;
+        char *s = val->v.string;
+        size_t l = strlen(s);
+        
+        if (l >= 2 && s[0] == '"' && s[l-1] == '"') {
+                s++;
+                l -= 2;
+        }
+        env->retval.v.string = grecs_malloc(l + 1);
+        memcpy(env->retval.v.string, s, l);
+        env->retval.v.string[l] = 0;
+}
+
+static void
 func_exit(forlan_eval_env_t env, struct grecs_list *list)
@@ -1129,2 +1145,3 @@ static struct forlan_function functab[] = {
         { "decode", forlan_value_literal, "s", 1, 1, func_decode },
+        { "dequote", forlan_value_literal, "s", 1, 1, func_dequote },
         { "exit",   forlan_value_void, "s", 1, 1, func_exit },
diff --git a/lib/libeclat.h b/lib/libeclat.h
index b33f0a2..770fb7d 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -107,2 +107,4 @@ struct ec2_request *eclat_request_create(int flags, const char *endpoint,
 void eclat_request_free(struct ec2_request *);
+void eclat_request_add_param0(struct ec2_request *req, const char *name,
+                              const char *value, int encoded);
 void eclat_request_add_param(struct ec2_request *req, const char *name,
@@ -121,2 +123,9 @@ void eclat_request_finalize(struct ec2_request *req);
 
+void ec2_param_free(void *ptr);
+
+struct grecs_list *ec2_param_list_create(void);
+void ec2_param_list_append(struct grecs_list **lp, char const *name,
+                           char const *val);
+void eclat_request_add_param_list(struct ec2_request *req,
+                                  struct grecs_list *lp);
 
diff --git a/lib/paramlist.c b/lib/paramlist.c
new file mode 100644
index 0000000..6d6c40a
--- /dev/null
+++ b/lib/paramlist.c
@@ -0,0 +1,57 @@
+/* This file is part of Eclat.
+   Copyright (C) 2012-2015 Sergey Poznyakoff.
+ 
+   Eclat is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+ 
+   Eclat is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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/>. */
+
+#include <config.h>
+#include <string.h>
+#include "libeclat.h"
+#include "grecs.h"
+
+struct grecs_list *
+ec2_param_list_create()
+{
+        struct grecs_list *lp = grecs_list_create();
+        lp->free_entry = ec2_param_free;
+        return lp;
+}
+
+void
+ec2_param_list_append(struct grecs_list **lpp, char const *name,
+                      char const *val)
+{
+        struct ec2_param *p;
+        if (!*lpp)
+                *lpp = ec2_param_list_create();
+        p = grecs_zalloc(sizeof(*p));
+        p->name = grecs_strdup(name);
+        p->value = grecs_strdup(val);
+        p->encoded = 0;
+        grecs_list_append(*lpp, p);
+}
+
+void
+eclat_request_add_param_list(struct ec2_request *req, struct grecs_list *lp)
+{
+        struct grecs_list_entry *ep;
+
+        if (!lp)
+                return;
+        for (ep = lp->head; ep; ep = ep->next) {
+                struct ec2_param *param = ep->data;
+                eclat_request_add_param0(req,
+                                         param->name, param->value, 
+                                         param->encoded);
+        }
+}
diff --git a/lib/reqcreat.c b/lib/reqcreat.c
index 65f7880..58d7829 100644
--- a/lib/reqcreat.c
+++ b/lib/reqcreat.c
@@ -20,3 +20,3 @@
 
-static void
+void
 ec2_param_free(void *ptr)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1aa8703..7ec7c66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,3 +104,4 @@ OPTFILES=\
  setiattr-cl.opt\
- setaattr-cl.opt
+ setaattr-cl.opt\
+ stop-cl.opt
 
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 6da23c2..8a707ec 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -261,2 +261,8 @@ END
 
+OPTION(check-permissions,p,,
+       [<check if the requested action is permitted for current account>])
+BEGIN       
+        ec2_param_list_append(&extra_param, "DryRun", "true");
+END
+
 OPTION(dump-grammar-trace,,,
@@ -281,2 +287,12 @@ END
 
+OPTION(add-parameter,A,NAME=VALUE,
+       [<pass additional parameter to the AWS request>])
+BEGIN
+        char *p = strchr(optarg, '=');
+        if (!p)
+                die(EX_USAGE, "malformed parameter: %s", optarg);
+        *p++ = 0;
+        ec2_param_list_append(&extra_param, optarg, p);
+END