#define CAP_CLEAN (1u<<0)
#define CAP_SMUDGE (1u<<1)
-struct cmd2process {
+struct subprocess_entry {
struct hashmap_entry ent; /* must be the first member! */
- unsigned int supported_capabilities;
const char *cmd;
struct child_process process;
};
+struct cmd2process {
+ struct subprocess_entry subprocess; /* must be the first member! */
+ unsigned int supported_capabilities;
+};
+
static int cmd_process_map_initialized;
static struct hashmap cmd_process_map;
-static int cmd2process_cmp(const struct cmd2process *e1,
- const struct cmd2process *e2,
+static int cmd2process_cmp(const struct subprocess_entry *e1,
+ const struct subprocess_entry *e2,
const void *unused)
{
return strcmp(e1->cmd, e2->cmd);
}
-static struct cmd2process *find_multi_file_filter_entry(struct hashmap *hashmap, const char *cmd)
+static struct subprocess_entry *find_multi_file_filter_entry(struct hashmap *hashmap, const char *cmd)
{
- struct cmd2process key;
+ struct subprocess_entry key;
+
hashmap_entry_init(&key, strhash(cmd));
key.cmd = cmd;
return hashmap_get(hashmap, &key, NULL);
}
}
-static void kill_multi_file_filter(struct hashmap *hashmap, struct cmd2process *entry)
+static void kill_multi_file_filter(struct hashmap *hashmap, struct subprocess_entry *entry)
{
if (!entry)
return;
struct string_list cap_list = STRING_LIST_INIT_NODUP;
char *cap_buf;
const char *cap_name;
- struct child_process *process = &entry->process;
- const char *cmd = entry->cmd;
+ struct child_process *process = &entry->subprocess.process;
+ const char *cmd = entry->subprocess.cmd;
sigchain_push(SIGPIPE, SIG_IGN);
const char *argv[] = { cmd, NULL };
entry = xmalloc(sizeof(*entry));
- entry->cmd = cmd;
+ entry->subprocess.cmd = cmd;
entry->supported_capabilities = 0;
- process = &entry->process;
+ process = &entry->subprocess.process;
child_process_init(process);
process->argv = argv;
err = start_multi_file_filter_fn(entry);
if (err) {
error("initialization for external filter '%s' failed", cmd);
- kill_multi_file_filter(hashmap, entry);
+ kill_multi_file_filter(hashmap, &entry->subprocess);
return NULL;
}
hashmap_init(&cmd_process_map, (hashmap_cmp_fn) cmd2process_cmp, 0);
entry = NULL;
} else {
- entry = find_multi_file_filter_entry(&cmd_process_map, cmd);
+ entry = (struct cmd2process *)find_multi_file_filter_entry(&cmd_process_map, cmd);
}
fflush(NULL);
if (!entry)
return 0;
}
- process = &entry->process;
+ process = &entry->subprocess.process;
if (!(wanted_capability & entry->supported_capabilities))
return 0;
* Force shutdown and restart if another blob requires filtering.
*/
error("external filter '%s' failed", cmd);
- kill_multi_file_filter(&cmd_process_map, entry);
+ kill_multi_file_filter(&cmd_process_map, &entry->subprocess);
}
} else {
strbuf_swap(dst, &nbuf);