nicer -h output

git-svn-id: file:///svn/unbound/trunk@1562 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/unbound.c b/daemon/unbound.c
index e82f1014a3a4afcb754a38a156891aff7e9e36e0..128ae839d3cf2671353a12bbbf3d6b2ef3cb62c9 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -101,10 +101,17 @@ static void usage()
        printf("        service - used to start from services control panel\n");
 #endif
        printf("Version %s\n", PACKAGE_VERSION);
-       printf("libevent %s, libldns %s, %s\n", 
-               event_get_version(), ldns_version(), 
+       printf("linked libs: event %s, ldns %s, %s\n", 
+#ifdef USE_WINSOCK
+               "winsock",
+#elif defined(USE_MINI_EVENT)
+               "internal",
+#else
+               event_get_version(), 
+#endif
+               ldns_version(), 
                SSLeay_version(SSLEAY_VERSION));
-       printf("modules:");
+       printf("linked modules:");
        for(m = module_list_avail(); *m; m++)
                printf(" %s", *m);
        printf("\n");

diff --git a/doc/Changelog b/doc/Changelog
index e283b42883f779d5dfc378e2340cee4399e7da59..8f690aac6b803944904d6c3bddb5a767634b37b0 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+27 March 2009: Wouter
+       - nicer -h output. report linked libraries and modules.
+       - prints modules in intuitive order (config file friendly).
+
 26 March 2009: Wouter
        - ignore swig varargs warnings with gcc.
        - remove duplicate example.conf text from python example configs.

diff --git a/services/modstack.c b/services/modstack.c
index fdadca9f9a0a0c92811a21da0dddd201903d07df..e57c0247abdf53f884766c821c76f8ba51118ca8 100644 (file)
--- a/services/modstack.c
+++ b/services/modstack.c
@@ -114,10 +114,12 @@ const char**
 module_list_avail(void)
 {
         /* these are the modules available */
-        static const char* names[] = {"iterator", "validator", 
+        static const char* names[] = {
 #ifdef WITH_PYTHONMODULE
                "python", 
 #endif
+               "validator", 
+               "iterator", 
                NULL};
        return names;
 }
@@ -129,11 +131,12 @@ typedef struct module_func_block* (*fbgetfunctype)(void);
 static fbgetfunctype*
 module_funcs_avail(void)
 {
-        static struct module_func_block* (*fb[])(void) = 
-                {&iter_get_funcblock, &val_get_funcblock, 
+        static struct module_func_block* (*fb[])(void) = {
 #ifdef WITH_PYTHONMODULE
                &pythonmod_get_funcblock, 
 #endif
+               &val_get_funcblock, 
+               &iter_get_funcblock, 
                NULL};
        return fb;
 }