ctpvclear: add option to pass id as argument

clear.sh

@@ -1,3 +1,3 @@
-setup_fifo "" 1
+setup_fifo "$1" 1
 
 printf '{"action": "remove", "identifier": "preview"}\n' > "$fifo"

ctpv.c

@@ -136,9 +136,9 @@ static int server(char const *id_s)
     return server_listen(id_s);
 }
 
-static int clear(void)
+static int clear(char const *id_s)
 {
-    return server_clear();
+    return server_clear(id_s);
 }
 
 static int end(char const *id_s)
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
     program = ctpv.ctpv_path ? ctpv.ctpv_path : "ctpv";
 
     int c;
-    while ((c = getopt(argc, argv, "s:ce:lmC:")) != -1) {
+    while ((c = getopt(argc, argv, "s:c:e:lmC:")) != -1) {
         switch (c) {
         case 's':
             ctpv.mode = MODE_SERVER;
@@ -272,6 +272,7 @@ int main(int argc, char *argv[])
             break;
         case 'c':
             ctpv.mode = MODE_CLEAR;
+            ctpv.server_id_s = optarg;
             break;
         case 'e':
             ctpv.mode = MODE_END;
@@ -304,7 +305,7 @@ int main(int argc, char *argv[])
             ret = server(ctpv.server_id_s);
             break;
         case MODE_CLEAR:
-            ret = clear();
+            ret = clear(ctpv.server_id_s);
             break;
         case MODE_END:
             ret = end(ctpv.server_id_s);

ctpvclear

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-exec ctpv -c
+[ -z "$id" ] && id="$1"
+
+exec ctpv -c "$id"

helpers.sh

@@ -5,8 +5,8 @@ fifo_open() {
 }
 
 setup_fifo() {
-	exit_code="${2:-127}"
 	fifo="$(printf '/tmp/ctpvfifo.%s' "${1:-$id}")"
+	exit_code="${2:-127}"
 	[ -e "$fifo" ] || exit "$exit_code"
 	fifo_open "$fifo" || exit "$exit_code"
 }

server.c

@@ -148,9 +148,9 @@ cleanup:
     return ret;
 }
 
-int server_clear(void)
+int server_clear(const char *id_s)
 {
-    return run_script(scr_clear_sh, LEN(scr_clear_sh)-1, "");
+    return run_script(scr_clear_sh, LEN(scr_clear_sh)-1, (char *)id_s);
 }
 
 int server_end(const char *id_s)

server.h

@@ -2,7 +2,7 @@
 #define SERVER_H
 
 int server_listen(char const *id_s);
-int server_clear(void);
+int server_clear(const char *id_s);
 int server_end(const char *id_s);
 
 #endif