[svn-upgrade] Integrating new upstream version, ion3 (20080103)

[ion3.git] / utils / ion-statusd / ion-statusd.c

diff --git a/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c
index da9e432cd2d9b2970f0f05c31c1d6a45557627c1..640274629ac778e5395043b07bafe27f0b5c4302 100644 (file)
--- a/utils/ion-statusd/ion-statusd.c
+++ b/utils/ion-statusd/ion-statusd.c
@@ -1,7 +1,7 @@
 /*
  * ion/utils/ion-statusd/ion-statusd.c
  *
- * Copyright (c) Tuomo Valkonen 2004-2006.
+ * Copyright (c) Tuomo Valkonen 2004-2008.
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -19,6 +19,7 @@
 #include <libtu/errorlog.h>
 #include <libtu/locale.h>
 #include <libtu/misc.h>
+#include <libtu/prefix.h>
 #include <libextl/readconfig.h>
 #include <libmainloop/select.h>
 #include <libmainloop/signal.h>
@@ -64,7 +65,7 @@ static OptParserOpt ion_opts[]={
 
 
 static const char statusd_copy[]=
-    "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2005.";
+    "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2008.";
 
 
 static const char statusd_license[]=DUMMY_TR(
@@ -159,16 +160,21 @@ int main(int argc, char*argv[])
     configtab=extl_table_none();
     
     libtu_init(argv[0]);
-    extl_init();
 
+#ifdef STATUSD_LOCATION
+    prefix_set(argv[0], STATUSD_LOCATION);
+#endif
+
+    extl_init();
+    
     if(!statusd_register_exports())
         return EXIT_FAILURE;
 
-    extl_add_searchdir(EXTRABINDIR);
-    extl_add_searchdir(MODULEDIR);
-    extl_add_searchdir(ETCDIR);
-    extl_add_searchdir(SHAREDIR);
-    extl_add_searchdir(LCDIR);
+    prefix_wrap_simple(extl_add_searchdir, EXTRABINDIR);
+    prefix_wrap_simple(extl_add_searchdir, MODULEDIR);
+    prefix_wrap_simple(extl_add_searchdir, ETCDIR);
+    prefix_wrap_simple(extl_add_searchdir, SHAREDIR);
+    prefix_wrap_simple(extl_add_searchdir, LCDIR);
     extl_set_userdirs("ion3");
 
     optparser_init(argc, argv, OPTP_MIDLONG, ion_opts);