CLI: add --version long argument to return PROJ version

scripts/reference_exported_symbols.txt

@@ -813,6 +813,7 @@ pj_get_default_ctx()
 pj_get_default_searchpaths(pj_ctx*)
 pj_get_relative_share_proj(pj_ctx*)
 pj_get_release()
+pj_get_version()
 pj_inv(PJ_XY, PJconsts*)
 pj_mkparam(char const*)
 pj_param_exists(ARG_list*, char const*)

src/4D_api.cpp

@@ -2546,7 +2546,6 @@ static char *path_append(char *buf, const char *app, size_t *buf_size) {
 }
 
 static const char *empty = {""};
-static char version[64] = {""};
 static PJ_INFO info = {0, 0, 0, nullptr, nullptr, nullptr, nullptr, 0};
 
 /*****************************************************************************/
@@ -2565,12 +2564,7 @@ PJ_INFO proj_info(void) {
     info.minor = PROJ_VERSION_MINOR;
     info.patch = PROJ_VERSION_PATCH;
 
-    /* A normal version string is xx.yy.zz which is 8 characters
-    long and there is room for 64 bytes in the version string. */
-    snprintf(version, sizeof(version), "%d.%d.%d", info.major, info.minor,
-             info.patch);
-
-    info.version = version;
+    info.version = pj_get_version();
     info.release = pj_get_release();
 
     /* build search path string */

src/apps/bin_projinfo.cmake

@@ -1,4 +1,4 @@
-set(PROJINFO_SRC projinfo.cpp)
+set(PROJINFO_SRC projinfo.cpp emess.cpp)
 
 source_group("Source Files\\Bin" FILES ${PROJINFO_SRC})
 

src/apps/bin_projsync.cmake

@@ -1,4 +1,4 @@
-set(PROJSYNC_SRC projsync.cpp)
+set(PROJSYNC_SRC projsync.cpp emess.cpp)
 
 source_group("Source Files\\Bin" FILES ${PROJSYNC_SRC})
 

src/apps/cct.cpp

@@ -133,7 +133,7 @@ static const char usage[] = {
     "    --inverse         Alias for -I\n"
     "    --skip-lines      Alias for -s\n"
     "    --help            Alias for -h\n"
-    "    --version         Print version number\n"
+    "    --version         Print version\n"
     "--------------------------------------------------------------------------"
     "------\n"
     "Operator Specs:\n"
@@ -255,7 +255,8 @@ int main(int argc, char **argv) {
     proj_log_func(PJ_DEFAULT_CTX, (void *)fout, logger);
 
     if (opt_given(o, "version")) {
-        print(PJ_LOG_NONE, "%s: %s", o->progname, pj_get_release());
+        fprintf(stdout, "%s: %s\n", o->progname, pj_get_version());
+        free(o);
         return 0;
     }
 

src/apps/cs2cs.cpp

@@ -428,7 +428,10 @@ int main(int argc, char **argv) {
     /* process run line arguments */
     while (--argc > 0) { /* collect run line arguments */
         ++argv;
-        if (strcmp(*argv, "--area") == 0) {
+        if (strcmp(*argv, "--version") == 0) {
+            (void)fprintf(stdout, "%s: %s\n", emess_dat.Prog_name, pj_get_version());
+            exit(0);
+        } else if (strcmp(*argv, "--area") == 0) {
             ++argv;
             --argc;
             if (argc == 0) {

src/apps/geod.cpp

@@ -235,6 +235,15 @@ int main(int argc, char **argv) {
                 case 'p': /* output azimuths as positive */
                     pos_azi = 1;
                     continue;
+                case '-': /* long option */
+                    if (strcmp(*argv, "--version") == 0) {
+                        (void)fprintf(stdout, "%s: %s\n", emess_dat.Prog_name, pj_get_version());
+                        exit(0);
+                    }
+                    else {
+                      emess(1, "invalid option: %s", *argv);
+                      break;
+                    }
                 default:
                     emess(1, "invalid option: -%c", *arg);
                     break;

src/apps/gie.cpp

@@ -249,7 +249,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"
+    "    --version         Print version\n"
     "--------------------------------------------------------------------------"
     "------\n"
     "Examples:\n"
@@ -267,7 +267,8 @@ static const char usage[] = {
 int main(int argc, char **argv) {
     int i;
     const char *longflags[] = {"v=verbose", "q=quiet", "h=help",
-                               "l=list",    "version", nullptr};
+                               "l=list",    "version",
+                               nullptr};
     const char *longkeys[] = {"o=output", nullptr};
     OPTARGS *o;
 
@@ -290,7 +291,7 @@ int main(int argc, char **argv) {
     }
 
     if (opt_given(o, "version")) {
-        fprintf(stdout, "%s: %s\n", o->progname, pj_get_release());
+        fprintf(stdout, "%s: %s\n", o->progname, pj_get_version());
         free(o);
         return 0;
     }

src/apps/proj.cpp

@@ -496,6 +496,15 @@ int main(int argc, char **argv) {
                 case 's': /* reverse output */
                     reverseout = 1;
                     continue;
+                case '-': /* long option */
+                    if (strcmp(*argv, "--version") == 0) {
+                        (void)fprintf(stdout, "%s: %s\n", emess_dat.Prog_name, pj_get_version());
+                        exit(0);
+                    }
+                    else {
+                      emess(1, "invalid option: %s", *argv);
+                      break;
+                    }
                 default:
                     emess(1, "invalid option: -%c", *arg);
                     break;

src/apps/projinfo.cpp

@@ -38,6 +38,7 @@
 
 #include "proj.h"
 #include "proj_internal.h"
+#include "emess.h"
 
 #include <proj/common.hpp>
 #include <proj/coordinateoperation.hpp>
@@ -1016,6 +1017,11 @@ int main(int argc, char **argv) {
         std::cerr << pj_get_release() << std::endl;
         usage();
     }
+
+    if ((emess_dat.Prog_name = strrchr(*argv, '/')) != nullptr)
+        ++emess_dat.Prog_name;
+    else
+        emess_dat.Prog_name = *argv;
 
     std::string user_string;
     bool user_string_specified = false;
@@ -1058,7 +1064,12 @@ int main(int argc, char **argv) {
 
     for (int i = 1; i < argc; i++) {
         std::string arg(argv[i]);
-        if (arg == "-o" && i + 1 < argc) {
+        if (arg == "--version")
+        {
+          std::cout << emess_dat.Prog_name << ": " << pj_get_version() << std::endl;
+          std::exit(0);
+        }
+        else if (arg == "-o" && i + 1 < argc) {
             outputSwitchSpecified = true;
             i++;
             const auto formats(split(argv[i], ','));

src/apps/projsync.cpp

@@ -38,6 +38,7 @@
 #include "filemanager.hpp"
 #include "proj.h"
 #include "proj_internal.h"
+#include "emess.h"
 
 #include "proj/internal/include_nlohmann_json.hpp"
 #include "proj/internal/internal.hpp"
@@ -75,6 +76,9 @@ class ParsingException : public std::exception {
     std::cerr << "          [--quiet | --verbose] [--dry-run] [--list-files]"
               << std::endl;
     std::cerr << "          [--no-version-filtering]" << std::endl;
+    std::cerr << "          [--version]" << std::endl;
+    std::cerr << "          [--release]" << std::endl;
+    std::cerr << "          [--short-version]" << std::endl;
     std::exit(1);
 }
 
@@ -115,6 +119,11 @@ int main(int argc, char *argv[]) {
 
     auto ctx = pj_get_default_ctx();
 
+    if ((emess_dat.Prog_name = strrchr(*argv, '/')) != nullptr)
+        ++emess_dat.Prog_name;
+    else
+        emess_dat.Prog_name = *argv;
+
     std::string targetDir;
     std::string endpoint(proj_context_get_url_endpoint(ctx));
     const std::string geojsonFile("files.geojson");
@@ -138,7 +147,12 @@ int main(int argc, char *argv[]) {
 
     for (int i = 1; i < argc; i++) {
         std::string arg(argv[i]);
-        if (arg == "--endpoint" && i + 1 < argc) {
+        if (arg == "--version")
+        {
+          std::cout << emess_dat.Prog_name << ": " << pj_get_version() << std::endl;
+          std::exit(0);
+        }
+        else if (arg == "--endpoint" && i + 1 < argc) {
             i++;
             endpoint = argv[i];
         } else if (arg == "--user-writable-directory") {

src/proj_internal.h

@@ -1004,6 +1004,7 @@ int pj_has_inverse(PJ *);
 
 char *pj_strdup(const char *str);
 const char PROJ_DLL *pj_get_release(void);
+const char PROJ_DLL *pj_get_version(void);
 void pj_acquire_lock(void);
 void pj_release_lock(void);
 

src/release.cpp

@@ -6,6 +6,11 @@
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 
+char const pj_version[] = STR(PROJ_VERSION_MAJOR) "." STR(
+    PROJ_VERSION_MINOR) "." STR(PROJ_VERSION_PATCH);
+
+const char *pj_get_version() { return pj_version; }
+
 char const pj_release[] = "Rel. " STR(PROJ_VERSION_MAJOR) "." STR(
     PROJ_VERSION_MINOR) "." STR(PROJ_VERSION_PATCH) ", "
                                                     "September 1st, 2023";