Commit Diff


commit - 71ddfd2023f7358314ee13427919803c5917c6ab
commit + c5b4db930eb7d4546b7591bc719ce22abf83beb6
blob - ec351845b67a362462cb86460ed2403664fff75c
blob + 91b6646cccf967ea82f0fd9f573e8b73c9bf9f7c
--- ge.c
+++ ge.c
@@ -184,7 +184,7 @@ static __dead void
 usage(void)
 {
 	fprintf(stderr,
-	    "Version: " GMID_STRING "\n"
+	    "Version: " GE_STRING "\n"
 	    "Usage: %s [-hVv] [-d certs-dir] [-H hostname] [-p port] [dir]\n",
 	    getprogname());
 	exit(1);
@@ -221,7 +221,7 @@ main(int argc, char **argv)
 				fatal("port number is %s: %s", errstr, optarg);
 			break;
 		case 'V':
-			puts("Version: " GMID_STRING);
+			puts("Version: " GE_STRING);
 			return 0;
 		default:
 			usage();
blob - 8765b1117bafe89450fa8b19d889240db66aaecc
blob + da76e1d04b3453d7190bfc80c48757a5209dc044
--- gg.c
+++ gg.c
@@ -304,6 +304,7 @@ close:
 static void __attribute__((noreturn))
 usage(void)
 {
+	fprintf(stderr, "version: " GG_STRING "\n");
 	fprintf(stderr, "usage: %s [-23Nnv] [-C cert] [-d mode] [-H sni] "
 	    "[-K key] [-P host[:port]]\n",
 	    getprogname());
blob - 7595d3f13e263ae022d1bc7732c9823cc373bc1e
blob + 402bf1be057146040b30189e66f110c423e49547
--- gmid.h
+++ gmid.h
@@ -50,7 +50,11 @@
 # include <event.h>
 #endif
 
-#define GMID_STRING	"gmid " VERSION
+#define VERSION_STR(n)	n " " VERSION
+#define GE_STRING	VERSION_STR("ge")
+#define GG_STRING	VERSION_STR("gg")
+#define GMID_STRING	VERSION_STR("gmid")
+
 #define GMID_VERSION	"gmid/" VERSION
 
 #define GEMINI_URL_LEN (1024+3)	/* URL max len + \r\n + \0 */