gvfs-helper-client: clean up server process

gvfs-helper-client.c

@@ -38,6 +38,39 @@ static struct object_directory *gh_client__chosen_odb;
 #define CAP_OBJECTS__VERB_POST_NAME "post"
 #define CAP_OBJECTS__VERB_PREFETCH_NAME "prefetch"
 
+static void stop_gh_server_subprocesses(void)
+{
+	struct gh_server__process *entry, **entries;
+	struct hashmap_iter iter;
+	size_t i = 0, size;
+
+	if (!gh_server__subprocess_map_initialized)
+		return;
+
+	/*
+	 * Since `subprocess_stop()` modifies the hashmap by removing the
+	 * respective subprocess, we cannot use `hashmap_for_each_entry()`
+	 * directly, but have to copy the entries to an array first.
+	 */
+	size = hashmap_get_size(&gh_server__subprocess_map);
+	ALLOC_ARRAY(entries, size);
+	hashmap_for_each_entry(&gh_server__subprocess_map,
+			       &iter, entry, subprocess)
+		entries[i++] = entry;
+	if (i != size)
+		BUG("gh_server__subprocess_map: size mismatch: "
+		    "%"PRIuMAX" != %"PRIuMAX,
+		      (uintmax_t)i, (uintmax_t)size);
+	while(i--)
+		subprocess_stop(&gh_server__subprocess_map,
+				&entries[i]->subprocess);
+	FREE_AND_NULL(entries);
+
+	hashmap_clear_and_free(&gh_server__subprocess_map,
+			       struct gh_server__process, subprocess);
+	gh_server__subprocess_map_initialized = 0;
+}
+
 static int gh_client__start_fn(struct subprocess_entry *subprocess)
 {
 	static int versions[] = {1, 0};
@@ -48,6 +81,8 @@ static int gh_client__start_fn(struct subprocess_entry *subprocess)
 
 	struct gh_server__process *entry = (struct gh_server__process *)subprocess;
 
+	atexit(stop_gh_server_subprocesses);
+
 	return subprocess_handshake(subprocess, "gvfs-helper", versions,
 				    NULL, capabilities,
 				    &entry->supported_capabilities);