Commit 94790fef authored by Havoc Pennington's avatar Havoc Pennington

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
parent e55fd2c6
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
2003-04-02 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_transaction_send_error_reply): set sender
......
......@@ -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);
......
......@@ -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);
}
......@@ -759,6 +777,27 @@ all_whitespace (const DBusString *str)
return i == _dbus_string_get_length (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,
......@@ -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;
}
......
......@@ -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,
......
......@@ -1448,6 +1448,42 @@ _dbus_string_find_to (const DBusString *str,
return FALSE;
}
/**
* Find the given byte scanning backward from the given start.
* Sets *found to -1 if the byte is not found.
*
* @param str the string
* @param byte the byte to find
* @param found return location for where it was found
* @returns #TRUE if found
*/
dbus_bool_t
_dbus_string_find_byte_backward (const DBusString *str,
int start,
unsigned char byte,
int *found)
{
int i;
DBUS_CONST_STRING_PREAMBLE (str);
_dbus_assert (start <= real->len);
_dbus_assert (start >= 0);
_dbus_assert (found != NULL);
i = start - 1;
while (i >= 0)
{
if (real->str[i] == byte)
break;
--i;
}
if (found)
*found = i;
return i >= 0;
}
/**
* Finds a blank (space or tab) in the string. Returns #TRUE
* if found, #FALSE otherwise. If a blank is not found sets
......@@ -3145,6 +3181,26 @@ _dbus_string_test (void)
if (_dbus_string_find_to (&str, 0, 2, "Hello", NULL))
_dbus_assert_not_reached ("Did find 'Hello'");
if (!_dbus_string_find_byte_backward (&str, _dbus_string_get_length (&str), 'H', &i))
_dbus_assert_not_reached ("Did not find 'H'");
_dbus_assert (i == 0);
if (!_dbus_string_find_byte_backward (&str, _dbus_string_get_length (&str), 'o', &i))
_dbus_assert_not_reached ("Did not find 'o'");
_dbus_assert (i == _dbus_string_get_length (&str) - 1);
if (_dbus_string_find_byte_backward (&str, _dbus_string_get_length (&str) - 1, 'o', &i))
_dbus_assert_not_reached ("Did find 'o'");
_dbus_assert (i == -1);
if (_dbus_string_find_byte_backward (&str, 1, 'e', &i))
_dbus_assert_not_reached ("Did find 'e'");
_dbus_assert (i == -1);
if (!_dbus_string_find_byte_backward (&str, 2, 'e', &i))
_dbus_assert_not_reached ("Didn't find 'e'");
_dbus_assert (i == 1);
_dbus_string_free (&str);
......
This diff is collapsed.
......@@ -24,6 +24,7 @@
#include "dbus-internals.h"
#include "dbus-sysdeps.h"
#include "dbus-threads.h"
#include "dbus-test.h"
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
......@@ -1890,14 +1891,18 @@ _dbus_file_get_contents (DBusString *str,
if (fd < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"%s", _dbus_strerror (errno));
"Failed to open \"%s\": %s",
filename_c,
_dbus_strerror (errno));
return FALSE;
}
if (fstat (fd, &sb) < 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"%s", _dbus_strerror (errno));
"Failed to stat \"%s\": %s",
filename_c,
_dbus_strerror (errno));
_dbus_verbose ("fstat() failed: %s",
_dbus_strerror (errno));
......@@ -1910,8 +1915,8 @@ _dbus_file_get_contents (DBusString *str,
if (sb.st_size > _DBUS_ONE_MEGABYTE)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"File size %lu is too large.\n",
(unsigned long) sb.st_size);
"File size %lu of \"%s\" is too large.",
filename_c, (unsigned long) sb.st_size);
close (fd);
return FALSE;
}
......@@ -1929,7 +1934,9 @@ _dbus_file_get_contents (DBusString *str,
if (bytes_read <= 0)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"%s", _dbus_strerror (errno));
"Error reading \"%s\": %s",
filename_c,
_dbus_strerror (errno));
_dbus_verbose ("read() failed: %s",
_dbus_strerror (errno));
......@@ -1949,7 +1956,8 @@ _dbus_file_get_contents (DBusString *str,
{
_dbus_verbose ("Can only open regular files at the moment.\n");
dbus_set_error (error, DBUS_ERROR_FAILED,
"Not a regular file");
"\"%s\" is not a regular file",
filename_c);
close (fd);
return FALSE;
}
......@@ -2231,6 +2239,9 @@ _dbus_create_directory (const DBusString *filename,
/**
* Appends the given filename to the given directory.
*
* @todo it might be cute to collapse multiple '/' such as "foo//"
* concat "//bar"
*
* @param dir the directory name
* @param next_component the filename
* @returns #TRUE on success
......@@ -2265,6 +2276,69 @@ _dbus_concat_dir_and_file (DBusString *dir,
_dbus_string_get_length (dir));
}
/**
* Get the directory name from a complete filename
* @param filename the filename
* @param dirname string to append directory name to
* @returns #FALSE if no memory
*/
dbus_bool_t
_dbus_string_get_dirname (const DBusString *filename,
DBusString *dirname)
{
int sep;
_dbus_assert (filename != dirname);
_dbus_assert (filename != NULL);
_dbus_assert (dirname != NULL);
/* Ignore any separators on the end */
sep = _dbus_string_get_length (filename);
if (sep == 0)
return _dbus_string_append (dirname, "."); /* empty string passed in */
while (sep > 0 && _dbus_string_get_byte (filename, sep - 1) == '/')
--sep;
_dbus_assert (sep >= 0);
if (sep == 0)
return _dbus_string_append (dirname, "/");
/* Now find the previous separator */
_dbus_string_find_byte_backward (filename, sep, '/', &sep);
if (sep < 0)
return _dbus_string_append (dirname, ".");
/* skip multiple separators */
while (sep > 0 && _dbus_string_get_byte (filename, sep - 1) == '/')
--sep;
_dbus_assert (sep >= 0);
if (sep == 0 &&
_dbus_string_get_byte (filename, 0) == '/')
return _dbus_string_append (dirname, "/");
else
return _dbus_string_copy_len (filename, 0, sep - 0,
dirname, _dbus_string_get_length (dirname));
}
/**
* Checks whether the filename is an absolute path
*
* @param filename the filename
* @returns #TRUE if an absolute path
*/
dbus_bool_t
_dbus_path_is_absolute (const DBusString *filename)
{
if (_dbus_string_get_length (filename) > 0)
return _dbus_string_get_byte (filename, 0) == '/';
else
return FALSE;
}
struct DBusDirIter
{
DIR *d;
......@@ -2294,7 +2368,9 @@ _dbus_directory_open (const DBusString *filename,
if (d == NULL)
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"%s", _dbus_strerror (errno));
"Failed to read directory \"%s\": %s",
filename_c,
_dbus_strerror (errno));
return NULL;
}
iter = dbus_new0 (DBusDirIter, 1);
......@@ -3207,4 +3283,86 @@ _dbus_change_identity (unsigned long uid,
return TRUE;
}
#ifdef DBUS_BUILD_TESTS
#include <stdlib.h>
static void
check_dirname (const char *filename,
const char *dirname)
{
DBusString f, d;
_dbus_string_init_const (&f, filename);
if (!_dbus_string_init (&d))
_dbus_assert_not_reached ("no memory");
if (!_dbus_string_get_dirname (&f, &d))
_dbus_assert_not_reached ("no memory");
if (!_dbus_string_equal_c_str (&d, dirname))
{
_dbus_warn ("For filename \"%s\" got dirname \"%s\" and expected \"%s\"\n",
filename,
_dbus_string_get_const_data (&d),
dirname);
exit (1);
}
_dbus_string_free (&d);
}
static void
check_path_absolute (const char *path,
dbus_bool_t expected)
{
DBusString p;
_dbus_string_init_const (&p, path);
if (_dbus_path_is_absolute (&p) != expected)
{
_dbus_warn ("For path \"%s\" expected absolute = %d got %d\n",
path, expected, _dbus_path_is_absolute (&p));
exit (1);
}
}
/**
* Unit test for dbus-sysdeps.c.
*
* @returns #TRUE on success.
*/
dbus_bool_t
_dbus_sysdeps_test (void)
{
check_dirname ("foo", ".");
check_dirname ("foo/bar", "foo");
check_dirname ("foo//bar", "foo");
check_dirname ("foo///bar", "foo");
check_dirname ("foo/bar/", "foo");
check_dirname ("foo//bar/", "foo");
check_dirname ("foo///bar/", "foo");
check_dirname ("foo/bar//", "foo");
check_dirname ("foo//bar////", "foo");
check_dirname ("foo///bar///////", "foo");
check_dirname ("/foo", "/");
check_dirname ("////foo", "/");
check_dirname ("/foo/bar", "/foo");
check_dirname ("/foo//bar", "/foo");
check_dirname ("/foo///bar", "/foo");
check_dirname ("/", "/");
check_dirname ("///", "/");
check_dirname ("", ".");
check_path_absolute ("/", TRUE);
check_path_absolute ("/foo", TRUE);
check_path_absolute ("", FALSE);
check_path_absolute ("foo", FALSE);
check_path_absolute ("foo/bar", FALSE);
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
/** @} end of sysdeps */
......@@ -163,6 +163,9 @@ dbus_bool_t _dbus_create_directory (const DBusString *filename,
dbus_bool_t _dbus_concat_dir_and_file (DBusString *dir,
const DBusString *next_component);
dbus_bool_t _dbus_string_get_dirname (const DBusString *filename,
DBusString *dirname);
dbus_bool_t _dbus_path_is_absolute (const DBusString *filename);
typedef struct DBusDirIter DBusDirIter;
......
......@@ -78,6 +78,12 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir)
die ("strings");
check_memleaks ();
printf ("%s: running sysdeps tests\n", "dbus-test");
if (!_dbus_sysdeps_test ())