X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=d98c6327c9163d7018f0d94c1c612680205244d7;hp=2242d40e3589fd7211eae249e04b53869c102fd7;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd diff --git a/client.c b/client.c index 2242d40e..d98c6327 100644 --- a/client.c +++ b/client.c @@ -307,7 +307,7 @@ static void setatt_completer(struct i9e_completion_info *ci, free(orig); } sl[2 * num_atts] = NULL; - ret = i9e_extract_completions(ci->word, sl, &cr->matches); + i9e_extract_completions(ci->word, sl, &cr->matches); out: free(buf); free_argv(sl); @@ -459,11 +459,6 @@ static int client_i9e_line_handler(char *line) return 1; } -static void client_sighandler(int s) -{ - i9e_signal_dispatch(s); -} - static struct i9e_completer completers[] = { SERVER_COMPLETERS AFS_COMPLETERS @@ -494,7 +489,7 @@ __noreturn static void interactive_session(void) } ici.history_file = history_file; - act.sa_handler = client_sighandler; + act.sa_handler = i9e_signal_dispatch; sigemptyset(&act.sa_mask); act.sa_flags = 0; sigaction(SIGINT, &act, NULL); @@ -601,7 +596,7 @@ int main(int argc, char *argv[]) */ sit.btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.name = "stdin")); - ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL, &sched); + ret = client_connect(ct, &sched, sit.btrn, NULL); if (ret < 0) goto out; sot.btrn = btr_new_node(&(struct btr_node_description)