From dac1cf97dc6ca358a4f2e9b7e270929b33dff6e6 Mon Sep 17 00:00:00 2001
From: Karl Heyes <karl@xiph.org>
Date: Tue, 24 Feb 2004 21:02:44 +0000
Subject: [PATCH] small cleanup and don't shutdown curl too early

svn path=/trunk/icecast/; revision=5860
---
 src/main.c | 45 +++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/main.c b/src/main.c
index 3eff6886..28f76031 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,12 +76,13 @@ static void _fatal_error(char *perr)
 
 static void _print_usage()
 {
+    printf(ICECAST_VERSION_STRING "\n\n");
     printf("usage: icecast [-h -b -v] -c <file>\n");
     printf("options:\n");
-	printf("\t-c <file>\tSpecify configuration file\n");
-	printf("\t-h\t\tDisplay usage\n");
-	printf("\t-v\t\tDisplay version info\n");
-	printf("\t-b\t\tRun icecast in the background\n");
+    printf("\t-c <file>\tSpecify configuration file\n");
+    printf("\t-h\t\tDisplay usage\n");
+    printf("\t-v\t\tDisplay version info\n");
+    printf("\t-b\t\tRun icecast in the background\n");
     printf("\n");
 }
 
@@ -109,14 +110,14 @@ static void _initialize_subsystems(void)
 
 static void _shutdown_subsystems(void)
 {
-#ifdef USE_YP
-    curl_shutdown();
-#endif
     fserve_shutdown();
     xslt_shutdown();
     refbuf_shutdown();
     slave_shutdown();
     stats_shutdown();
+#ifdef USE_YP
+    curl_shutdown();
+#endif
 
     /* Now that these are done, we can stop the loggers. */
     _stop_logging();
@@ -142,17 +143,18 @@ static int _parse_config_file(int argc, char **argv, char *filename, int size)
     while (i < argc) {
         if (strcmp(argv[i], "-b") == 0) {
 #ifndef WIN32
-                fprintf(stdout, "Starting icecast2\nDetaching from the console\n");
-                if ((processID = (int)fork()) > 0) {
-                        /* exit the parent */
-                        _exit(0);
-                }
+            fprintf(stdout, "Starting icecast2\nDetaching from the console\n");
+            if ((processID = (int)fork()) > 0) {
+                /* exit the parent */
+                _exit(0);
+            }
 #endif
         }
         if (strcmp(argv[i], "-v") == 0) {
             fprintf(stdout, "%s\n", ICECAST_VERSION_STRING);
-			exit(0);
-		}
+            exit(0);
+        }
+
         if (strcmp(argv[i], "-c") == 0) {
             if (i + 1 < argc) {
                 strncpy(filename, argv[i + 1], size-1);
@@ -452,7 +454,7 @@ int main(int argc, char **argv)
         }
     }
 
-    INFO0("icecast server started");
+    INFO0 (ICECAST_VERSION_STRING " server started");
 
     /* REM 3D Graphics */
 
@@ -483,16 +485,3 @@ int main(int argc, char **argv)
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-