Updated copyright information.

[sysdb.git] / src / tools / sysdb / main.c

diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index d895de7184cb9bdb7cea1bf8b98db2939151e272..33f96c4461c24cbea9dd17b5b8c0c611fc428fa9 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
@@ -78,8 +78,6 @@
 #      define DEFAULT_SOCKET "unix:"LOCALSTATEDIR"/run/sysdbd.sock"
 #endif
 
-extern int yylex(void);
-
 static void
 exit_usage(char *name, int status)
 {
@@ -101,7 +99,7 @@ exit_version(void)
        printf("SysDB version "SDB_CLIENT_VERSION_STRING
                        SDB_CLIENT_VERSION_EXTRA", built "BUILD_DATE"\n"
                        "using libsysdbclient version %s%s\n"
-                       "Copyright (C) 2012-2013 "PACKAGE_MAINTAINER"\n"
+                       "Copyright (C) 2012-2014 "PACKAGE_MAINTAINER"\n"
 
                        "\nThis is free software under the terms of the BSD license, see "
                        "the source for\ncopying conditions. There is NO WARRANTY; not "
@@ -167,8 +165,6 @@ get_homedir(const char *username)
 int
 main(int argc, char **argv)
 {
-       sdb_client_t *client;
-
        const char *host = NULL;
        const char *user = NULL;
 
@@ -213,14 +209,14 @@ main(int argc, char **argv)
                        exit(1);
        }
 
-       client = sdb_client_create(host);
-       if (! client) {
+       input.client = sdb_client_create(host);
+       if (! input.client) {
                sdb_log(SDB_LOG_ERR, "Failed to create client object");
                exit(1);
        }
-       if (sdb_client_connect(client, user)) {
+       if (sdb_client_connect(input.client, user)) {
                sdb_log(SDB_LOG_ERR, "Failed to connect to SysDBd");
-               sdb_client_destroy(client);
+               sdb_client_destroy(input.client);
                exit(1);
        }
 
@@ -242,9 +238,9 @@ main(int argc, char **argv)
                }
        }
 
-       input.buf = sdb_strbuf_create(2048);
-       sdb_input_set(&input);
-       yylex();
+       input.input = sdb_strbuf_create(2048);
+       sdb_input_init(&input);
+       sdb_input_mainloop();
 
        if (hist_file[0] != '\0') {
                errno = 0;
@@ -255,7 +251,8 @@ main(int argc, char **argv)
                }
        }
 
-       sdb_client_destroy(client);
+       sdb_client_destroy(input.client);
+       sdb_strbuf_destroy(input.input);
        return 0;
 } /* main */