clipctl: cache-dir/version support

These were supported by the end in 6.3.0, let's make sure we also
support them in v7.

Author: cdown

man/clipctl.1

@@ -22,6 +22,12 @@ Invert the current state of clipboard collection.
 .TP
 .B status
 Print the current state of clipboard collection.
+.TP
+.B version
+Print the major clipmenu version.
+.TP
+.B cache-dir
+Print the cache directory used by clipmenud.
 
 .TP
 clipctl also accepts one dash option:

src/clipctl.c

@@ -70,19 +70,31 @@ static bool _nonnull_ should_enable(struct config *cfg, const char *mode_str) {
 int main(int argc, char *argv[]) {
     _drop_(config_free) struct config cfg = setup("clipctl");
     exec_man_on_help(argc, argv);
-    die_on(argc != 2, "Usage: clipctl <enable|disable|toggle|status>\n");
+    die_on(argc != 2,
+           "Usage: clipctl <enable|disable|toggle|status|version|cache-dir>\n");
+
+    const char *cmd = argv[1];
+
+    if (streq(cmd, "cache-dir")) {
+        printf("%s\n", get_cache_dir(&cfg));
+        return 0;
+    }
+    if (streq(cmd, "version")) {
+        printf("%d\n", CLIPMENU_VERSION);
+        return 0;
+    }
 
     pid_t pid = get_clipmenud_pid();
     die_on(pid == -ENOENT, "clipmenud is not running\n");
     die_on(pid == -EEXIST, "Multiple instances of clipmenud are running\n");
     expect(pid > 0);
 
-    if (streq(argv[1], "status")) {
+    if (streq(cmd, "status")) {
         printf("%s\n", is_enabled(&cfg) ? "enabled" : "disabled");
         return 0;
     }
 
-    bool want_enable = should_enable(&cfg, argv[1]);
+    bool want_enable = should_enable(&cfg, cmd);
 
     expect(kill(pid, want_enable ? SIGUSR2 : SIGUSR1) == 0);
     dbg("Sent signal to pid %d\n", pid);

src/config.c

@@ -9,8 +9,6 @@
 #include "config.h"
 #include "x.h"
 
-#define CLIPMENU_VERSION 7
-
 /**
  * Determines the runtime directory for storing application data. This is _not_
  * the clip store, but the place to create the directory that will become it

src/config.h

@@ -9,6 +9,8 @@
 
 #include "util.h"
 
+#define CLIPMENU_VERSION 7
+
 struct selection {
     const char *name;
     bool active;

tests/x_integration_tests

@@ -39,6 +39,9 @@ export CM_DIR=$(mktemp -d)
 export CM_DEBUG=1
 export ASAN_OPTIONS='halt_on_error=1:abort_on_error=1'
 export UBSAN_OPTIONS='halt_on_error=1:abort_on_error=1'
+uid=$(id -u)
+[[ "$(clipctl version)" == 7 ]]
+[[ "$(clipctl cache-dir)" == "$CM_DIR/clipmenu.7.$uid" ]]
 
 launcher=$(mktemp)
 l_out=$(mktemp)
@@ -60,7 +63,6 @@ export CM_LAUNCHER="$launcher"
 tilde_home=$(mktemp -d)
 tilde_dir="$tilde_home/clipmenu_tilde"
 mkdir -p "$tilde_dir"
-uid=$(id -u)
 HOME="$tilde_home" CM_DIR="~/clipmenu_tilde" CM_CONFIG="$(mktemp)" \
     clipmenu || true
 [[ -d "$tilde_dir/clipmenu.7.$uid" ]]