2003-04-02 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-sysdeps.c (_dbus_file_get_contents): include filenames
	in error messages
	(_dbus_string_get_dirname): new
	(_dbus_sysdeps_test): new
	(_dbus_directory_open): include dirnames in error messages

	* bus/config-parser.c: interpret <include> and <includedir> and
	<servicedir> relative to config file location if the given
	filename is not absolute.

	* dbus/dbus-string.c (_dbus_string_find_byte_backward): new

3 files changed, 149 insertions, 30 deletions

diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
index 9e6de5e2..372a8867 100644
--- a/bus/config-loader-expat.c
+++ b/bus/config-loader-expat.c
@@ -170,7 +170,8 @@ bus_config_load (const DBusString *file,
   const char *filename;
   BusConfigParser *parser;
   ExpatParseContext context;
-
+  DBusString dirname;
+  
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
   parser = NULL;
@@ -186,6 +187,13 @@ bus_config_load (const DBusString *file,
       return NULL;
     }
 
+  if (!_dbus_string_init (&dirname))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      _dbus_string_free (&context.content);
+      return NULL;
+    }
+  
   expat = XML_ParserCreate_MM ("UTF-8", &memsuite, NULL);
   if (expat == NULL)
     {
@@ -193,7 +201,13 @@ bus_config_load (const DBusString *file,
       goto failed;
     }
 
-  parser = bus_config_parser_new ();
+  if (!_dbus_string_get_dirname (file, &dirname))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      goto failed;
+    }
+  
+  parser = bus_config_parser_new (&dirname);
   if (parser == NULL)
     {
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
@@ -258,6 +272,7 @@ bus_config_load (const DBusString *file,
   if (!bus_config_parser_finished (parser, error))
     goto failed;
 
+  _dbus_string_free (&dirname);
   _dbus_string_free (&context.content);
   XML_ParserFree (expat);
 
@@ -267,6 +282,7 @@ bus_config_load (const DBusString *file,
  failed:
   _DBUS_ASSERT_ERROR_IS_SET (error);
 
+  _dbus_string_free (&dirname);
   _dbus_string_free (&context.content);
   if (expat)
     XML_ParserFree (expat);
diff --git a/bus/config-parser.c b/bus/config-parser.c
index 77b68cae..9e16e4fc 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -22,6 +22,7 @@
  */
 #include "config-parser.h"
 #include "test.h"
+#include "utils.h"
 #include <dbus/dbus-list.h>
 #include <dbus/dbus-internals.h>
 #include <string.h>
@@ -82,6 +83,8 @@ struct BusConfigParser
 {
   int refcount;
 
+  DBusString basedir;  /**< Directory we resolve paths relative to */
+  
   DBusList *stack;     /**< stack of Element */
 
   char *user;          /**< user to run as */
@@ -226,7 +229,7 @@ merge_included (BusConfigParser *parser,
 }
 
 BusConfigParser*
-bus_config_parser_new (void)
+bus_config_parser_new (const DBusString *basedir)
 {
   BusConfigParser *parser;
 
@@ -234,6 +237,19 @@ bus_config_parser_new (void)
   if (parser == NULL)
     return NULL;
 
+  if (!_dbus_string_init (&parser->basedir))
+    {
+      dbus_free (parser);
+      return NULL;
+    }
+
+  if (!_dbus_string_copy (basedir, 0, &parser->basedir, 0))
+    {
+      _dbus_string_free (&parser->basedir);
+      dbus_free (parser);
+      return NULL;
+    }
+  
   parser->refcount = 1;
 
   return parser;
@@ -272,6 +288,8 @@ bus_config_parser_unref (BusConfigParser *parser)
                           NULL);
 
       _dbus_list_clear (&parser->service_dirs);
+
+      _dbus_string_free (&parser->basedir);
       
       dbus_free (parser);
     }
@@ -760,6 +778,27 @@ all_whitespace (const DBusString *str)
 }
 
 static dbus_bool_t
+make_full_path (const DBusString *basedir,
+                const DBusString *filename,
+                DBusString       *full_path)
+{
+  if (_dbus_path_is_absolute (filename))
+    {
+      return _dbus_string_copy (filename, 0, full_path, 0);
+    }
+  else
+    {
+      if (!_dbus_string_copy (basedir, 0, full_path, 0))
+        return FALSE;
+      
+      if (!_dbus_concat_dir_and_file (full_path, filename))
+        return FALSE;
+
+      return TRUE;
+    }
+}
+
+static dbus_bool_t
 include_file (BusConfigParser   *parser,
               const DBusString  *filename,
               dbus_bool_t        ignore_missing,
@@ -817,35 +856,52 @@ include_dir (BusConfigParser   *parser,
   
   if (!_dbus_string_init (&filename))
     {
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      BUS_SET_OOM (error);
       return FALSE;
     }
 
   retval = FALSE;
   
   dir = _dbus_directory_open (dirname, error);
-    
-  /* FIXME this is just so the tests pass for now, it needs to come out
-   * once I implement make-dirname-relative-to-currently-parsed-files-dir
-   */
-  if (dir == NULL)
-    {
-      if (error)
-        dbus_error_free (error);
-      _dbus_string_free (&filename);
-      return TRUE;
-    }
 
   if (dir == NULL)
     goto failed;
-  
+
+  dbus_error_init (&tmp_error);
   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
     {
-      if (_dbus_string_ends_with_c_str (&filename, ".conf"))
+      DBusString full_path;
+
+      if (!_dbus_string_init (&full_path))
+        {
+          BUS_SET_OOM (error);
+          goto failed;
+        }
+
+      if (!_dbus_string_copy (dirname, 0, &full_path, 0))
+        {
+          BUS_SET_OOM (error);
+          _dbus_string_free (&full_path);
+          goto failed;
+        }      
+
+      if (!_dbus_concat_dir_and_file (&full_path, &filename))
+        {
+          BUS_SET_OOM (error);
+          _dbus_string_free (&full_path);
+          goto failed;
+        }
+      
+      if (_dbus_string_ends_with_c_str (&full_path, ".conf"))
         {
-          if (!include_file (parser, &filename, TRUE, error))
-            goto failed;
+          if (!include_file (parser, &full_path, TRUE, error))
+            {
+              _dbus_string_free (&full_path);
+              goto failed;
+            }
         }
+
+      _dbus_string_free (&full_path);
     }
 
   if (dbus_error_is_set (&tmp_error))
@@ -921,20 +977,52 @@ bus_config_parser_content (BusConfigParser   *parser,
 
     case ELEMENT_INCLUDE:
       {
+        DBusString full_path;
+        
         e->had_content = TRUE;
 
-        if (!include_file (parser, content,
+        if (!_dbus_string_init (&full_path))
+          goto nomem;
+        
+        if (!make_full_path (&parser->basedir, content, &full_path))
+          {
+            _dbus_string_free (&full_path);
+            goto nomem;
+          }
+        
+        if (!include_file (parser, &full_path,
                            e->d.include.ignore_missing, error))
-          return FALSE;
+          {
+            _dbus_string_free (&full_path);
+            return FALSE;
+          }
+
+        _dbus_string_free (&full_path);
       }
       break;
 
     case ELEMENT_INCLUDEDIR:
       {
+        DBusString full_path;
+        
         e->had_content = TRUE;
+
+        if (!_dbus_string_init (&full_path))
+          goto nomem;
         
-        if (!include_dir (parser, content, error))
-          return FALSE;
+        if (!make_full_path (&parser->basedir, content, &full_path))
+          {
+            _dbus_string_free (&full_path);
+            goto nomem;
+          }
+        
+        if (!include_dir (parser, &full_path, error))
+          {
+            _dbus_string_free (&full_path);
+            return FALSE;
+          }
+
+        _dbus_string_free (&full_path);
       }
       break;
       
@@ -991,18 +1079,33 @@ bus_config_parser_content (BusConfigParser   *parser,
     case ELEMENT_SERVICEDIR:
       {
         char *s;
-
-        e->had_content = TRUE;
+        DBusString full_path;
         
-        if (!_dbus_string_copy_data (content, &s))
+        e->had_content = TRUE;
+
+        if (!_dbus_string_init (&full_path))
           goto nomem;
+        
+        if (!make_full_path (&parser->basedir, content, &full_path))
+          {
+            _dbus_string_free (&full_path);
+            goto nomem;
+          }
+        
+        if (!_dbus_string_copy_data (&full_path, &s))
+          {
+            _dbus_string_free (&full_path);
+            goto nomem;
+          }
 
-        if (!_dbus_list_append (&parser->service_dirs,
-                                s))
+        if (!_dbus_list_append (&parser->service_dirs, s))
           {
+            _dbus_string_free (&full_path);
             dbus_free (s);
             goto nomem;
           }
+
+        _dbus_string_free (&full_path);
       }
       break;
     }
@@ -1011,7 +1114,7 @@ bus_config_parser_content (BusConfigParser   *parser,
   return TRUE;
 
  nomem:
-  dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+  BUS_SET_OOM (error);
   return FALSE;
 }
 
diff --git a/bus/config-parser.h b/bus/config-parser.h
index d06cde08..9b433f04 100644
--- a/bus/config-parser.h
+++ b/bus/config-parser.h
@@ -34,7 +34,7 @@
 
 typedef struct BusConfigParser BusConfigParser;
 
-BusConfigParser* bus_config_parser_new           (void);
+BusConfigParser* bus_config_parser_new           (const DBusString  *basedir);
 void             bus_config_parser_ref           (BusConfigParser   *parser);
 void             bus_config_parser_unref         (BusConfigParser   *parser);
 dbus_bool_t      bus_config_parser_check_doctype (BusConfigParser   *parser,