From d87a68a8d3cbda69f8244830601096bcd64fa3ba Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 27 Mar 2018 12:31:38 +0200
Subject: Document --version option in cct and gie

---
 docs/source/apps/cct.rst | 4 ++++
 docs/source/apps/gie.rst | 4 ++++
 src/cct.c                | 1 +
 src/gie.c                | 1 +
 4 files changed, 10 insertions(+)

diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst
index 9153e29b..dc2944f2 100644
--- a/docs/source/apps/cct.rst
+++ b/docs/source/apps/cct.rst
@@ -49,6 +49,10 @@ The following control parameters can  appear  in any order:
     Write non-essential, but potentially useful, information to stderr.
     Repeat for additional information (``-vv``, ``-vvv``, etc.)
 
+.. option:: --version
+
+    Print version number.
+
 The *+args* arguments are associated with coordinate operation parameters.
 Usage varies with operation.
 
diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst
index f94c1171..41664660 100644
--- a/docs/source/apps/gie.rst
+++ b/docs/source/apps/gie.rst
@@ -47,6 +47,10 @@ already employed for compiling the library.
 
     List the PROJ internal system error codes
 
+.. option:: --version
+
+    Print version number
+
 Tests for :program:`gie` are defined in simple text files. Usually having the
 extension ``.gie``. Test for :program:`gie` are written in the purpose-build command language for gie.
 The basic functionality of the gie command language is implemented through just
diff --git a/src/cct.c b/src/cct.c
index 8096986d..476ff174 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -117,6 +117,7 @@ static const char usage[] = {
     "    --verbose         Alias for -v\n"
     "    --inverse         Alias for -I\n"
     "    --help            Alias for -h\n"
+    "    --version         Print version number\n"
     "--------------------------------------------------------------------------------\n"
     "Operator Specs:\n"
     "--------------------------------------------------------------------------------\n"
diff --git a/src/gie.c b/src/gie.c
index 5685a6c2..68bb4a43 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -221,6 +221,7 @@ static const char usage[] = {
     "    --verbose         Alias for -v\n"
     "    --help            Alias for -h\n"
     "    --list            Alias for -l\n"
+    "    --version         Print version number\n"
     "--------------------------------------------------------------------------------\n"
     "Examples:\n"
     "--------------------------------------------------------------------------------\n"
-- 
cgit v1.2.3


From 976dac03398addda1c3cf7fc9825959aac06eb0b Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 27 Mar 2018 12:24:48 +0200
Subject: Print help when calling cct without arguments

Previously when calling cct without any arguments the following
message would be presented to the user:

    cct: Bad transformation arguments - ((null))
        'cct -h' for help

With this change the help instructions are returned instead.
---
 src/cct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cct.c b/src/cct.c
index 476ff174..6b8f35f3 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -166,7 +166,7 @@ int main(int argc, char **argv) {
     if (0==o)
         return 0;
 
-    if (opt_given (o, "h")) {
+    if (opt_given (o, "h") || argc==1) {
         printf (usage, o->progname);
         return 0;
     }
-- 
cgit v1.2.3


From 43a37f0b37b346290d876254ea20c0aec9e23787 Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 27 Mar 2018 13:30:12 +0200
Subject: Free memory on exit

---
 src/gie.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gie.c b/src/gie.c
index 68bb4a43..1d30c81e 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -250,19 +250,22 @@ int main (int argc, char **argv) {
 
     if (opt_given (o, "h")) {
         printf (usage, o->progname);
+        free (o);
         return 0;
     }
 
 
     if (opt_given (o, "version")) {
         fprintf (stdout, "%s: %s\n", o->progname, pj_get_release ());
+        free (o);
         return 0;
     }
 
 
-    if (opt_given (o, "l"))
+    if (opt_given (o, "l")) {
+        free (o);
         return list_err_codes ();
-
+    }
 
     T.verbosity = opt_given (o, "q");
     if (T.verbosity)
-- 
cgit v1.2.3


From 9b27bd8a4e33dfd3994340af7aab334c262ce27e Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 27 Mar 2018 13:31:01 +0200
Subject: Print help text when callin gie without arguments

Previously gie would return "Nothing to do" when called without
arguments. With this change the help text is returned instead.
---
 src/gie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gie.c b/src/gie.c
index 1d30c81e..3dd1ad2d 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -248,7 +248,7 @@ int main (int argc, char **argv) {
     if (0==o)
         return 0;
 
-    if (opt_given (o, "h")) {
+    if (opt_given (o, "h") || argc==1) {
         printf (usage, o->progname);
         free (o);
         return 0;
-- 
cgit v1.2.3