X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=share%2Fbase_config.c;h=6df2faea4aac9c45801c9f79621d1f0fd37a10be;hb=5591d1ae2e911ce8264f7a7a45cbae0bedab821d;hp=721a2d55ec548b293c54d3b8874dfad0c54a45ee;hpb=3df276a67dda0ffea52990e5c152f2118444119d;p=neverball

diff --git a/share/base_config.c b/share/base_config.c
index 721a2d5..6df2fae 100644
--- a/share/base_config.c
+++ b/share/base_config.c
@@ -12,7 +12,6 @@
  * General Public License for more details.
  */
 
-#include <SDL.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -46,11 +45,11 @@ static const char *config_file(const char *path, const char *file)
 {
     static char absolute[MAXSTR];
 
-    size_t d = strlen(path);
+    size_t d = path ? strlen(path) : 0;
 
-    strncpy(absolute, path, MAXSTR - 1);
+    strncpy(absolute, path ? path : "", MAXSTR - 1);
     strncat(absolute, "/",  MAXSTR - d - 1);
-    strncat(absolute, file, MAXSTR - d - 2);
+    strncat(absolute, file ? file : "", MAXSTR - d - 2);
 
     return absolute;
 }
@@ -104,7 +103,7 @@ int config_data_path(const char *path, const char *file)
         return 1;
     }
 
-    if (CONFIG_DATA && config_test(CONFIG_DATA, file))
+    if (config_test(CONFIG_DATA, file))
     {
         strncpy(data_path, CONFIG_DATA, MAXSTR);
         return 1;