take the database name and port number as command line args

diff --git a/server/mr_main.c b/server/mr_main.c
index 86252a09a9bddfc49e752a5b368fe28d47d41a44..f9f539bd36223219484ba47aadf193d5c9408b5a 100644 (file)
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -72,8 +72,10 @@ main(argc, argv)
        int argc;
        char **argv;
 {
-       int status;
+       int status, i;
        time_t tardy;
+       char *port;
+       extern char *database;
        struct stat stbuf;
        
        whoami = argv[0];
@@ -86,10 +88,21 @@ main(argc, argv)
        set_com_err_hook(mr_com_err);
        setlinebuf(stderr);
        
-       if (argc != 1) {
-               com_err(whoami, 0, "Usage: moirad");
+       database = "moira";
+       port = index(MOIRA_SERVER, ':') + 1;
+
+       for (i = 1; i < argc; i++) {
+           if (!strcmp(argv[i], "-db") && i+1 < argc) {
+               database = argv[i+1];
+               i++;
+           } else if (!strcmp(argv[i], "-p") && i+1 < argc) {
+               port = argv[i+1];
+               i++;
+           } else {
+               com_err(whoami, 0, "Usage: moirad [-db database][-p port]");
                exit(1);
-       }               
+           }
+       }
 
        /* Profiling implies that getting rid of one level of call
         * indirection here wins us maybe 1% on the VAX.
@@ -143,7 +156,7 @@ main(argc, argv)
        /*
         * Establish template connection.
         */
-       if ((status = do_listen()) != 0) {
+       if ((status = do_listen(port)) != 0) {
                com_err(whoami, status,
                        " while trying to create listening connection");
                exit(1);
@@ -276,11 +289,10 @@ main(argc, argv)
  */
 
 int
-do_listen()
+do_listen(port)
+char *port;
 {
-       char *service = index(MOIRA_SERVER, ':') + 1;
-
-       listencon = create_listening_connection(service);
+       listencon = create_listening_connection(port);
 
        if (listencon == NULL)
                return errno;