Merge branch 'refs/heads/t/command_handler_cleanups'

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index c378563379777fe3c7af5f1bc352871f9b6dbd55..e8f6948437aac8c0f03b538381afc5ea20b55fe4 100644 (file)
--- a/command.c
+++ b/command.c
@@ -425,9 +425,10 @@ static int com_version(struct command_context *cc)
        char *msg;
        size_t len;
 
-       if (cc->argc != 1)
-               return -E_COMMAND_SYNTAX;
-       len = xasprintf(&msg, "%s", version_text("server"));
+       if (cc->argc > 1 && strcmp(cc->argv[1], "-v") == 0)
+               len = xasprintf(&msg, "%s", version_text("server"));
+       else
+               len = xasprintf(&msg, "%s\n", version_single_line("server"));
        return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 }