X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Finput.c;h=2a2d1707101404169febb67d0ac643aaa98ec649;hb=HEAD;hp=b6603c08ed86aef9aa7aa5ac956634f4aafd888f;hpb=13fe0f9ec3d161fab7a015054649910541d75f5e;p=sysdb.git diff --git a/src/tools/sysdb/input.c b/src/tools/sysdb/input.c index b6603c0..2a2d170 100644 --- a/src/tools/sysdb/input.c +++ b/src/tools/sysdb/input.c @@ -160,7 +160,7 @@ input_readline(void) } if (sysdb_input->have_input) - prompt = "sysdb-> "; + prompt = " -> "; if (sdb_client_eof(sysdb_input->client)) prompt = "!-> "; @@ -203,7 +203,7 @@ input_readline(void) /* some response / error message from the server pending */ /* XXX: clear current line */ printf("\n"); - sdb_command_print_reply(sysdb_input->client); + sdb_command_print_reply(sysdb_input); if (sdb_client_eof(sysdb_input->client)) { rl_callback_handler_remove(); @@ -237,6 +237,24 @@ sdb_input_init(sdb_input_t *input) return 0; } /* sdb_input_init */ +void +sdb_input_reset(sdb_input_t *input) +{ + sdb_input_t reset = SDB_INPUT_INIT; + + if (! input) + return; + + if (input->client) + sdb_client_destroy(input->client); + if (input->user) + free(input->user); + if (input->input) + sdb_strbuf_destroy(input->input); + + *input = reset; +} /* sdb_input_reset */ + int sdb_input_mainloop(void) { @@ -311,6 +329,7 @@ sdb_input_reconnect(void) return -1; } sdb_log(SDB_LOG_INFO, "Successfully reconnected to SysDBd"); + sdb_command_print_server_version(sysdb_input); return 0; } /* sdb_input_reconnect */