#include <unistd.h>
static void
-errmsg (const char *filename, const char* msg, ...)
+errmsg (conf_error_func error_func, const char* msg, ...)
{
#define MAX_MSGLEN 1024
char buf[MAX_MSGLEN];
va_list ap;
+ if (!error_func)
+ return;
+
va_start (ap, msg);
vsnprintf (buf, MAX_MSGLEN, msg, ap);
buf[MAX_MSGLEN - 1] = 0;
- conf_error (filename, buf);
+ error_func (buf);
va_end (ap);
}
*/
static char*
-read_config_file (const char* filename, int flags)
+read_config_file (const char* filename, int flags,
+ conf_error_func error_func)
{
char* config = NULL;
FILE* f = NULL;
errno = ENOMEM;
return config;
}
- errmsg (filename, "couldn't open config file: %s", filename);
+ errmsg (error_func, "couldn't open config file: %s", filename);
return NULL;
}
if (fseek (f, 0, SEEK_END) == -1 ||
(len = ftell (f)) == -1 ||
fseek (f, 0, SEEK_SET) == -1) {
- errmsg (filename, "couldn't seek config file: %s", filename);
+ errmsg (error_func, "couldn't seek config file: %s", filename);
return NULL;
}
if ((config = (char*)malloc (len + 2)) == NULL) {
- errmsg (filename, "out of memory");
+ errmsg (error_func, "out of memory");
errno = ENOMEM;
return NULL;
}
/* And read in one block */
if (fread (config, 1, len, f) != len) {
- errmsg (filename, "couldn't read config file: %s", filename);
+ errmsg (error_func, "couldn't read config file: %s", filename);
return NULL;
}
}
hash_t*
-conf_parse_file (const char* filename, int flags)
+conf_parse_file (const char* filename, int flags,
+ conf_error_func error_func)
{
char *name;
char *value;
assert (filename);
/* Adds an extra newline to end of file */
- config = read_config_file (filename, flags);
+ config = read_config_file (filename, flags, error_func);
if (!config)
return NULL;
/* Look for the break between name = value on the same line */
value = name + strcspn (name, ":=");
if (!*value) {
- errmsg (filename, "%s: invalid config line: %s", filename, name);
+ errmsg (error_func, "%s: invalid config line: %s", filename, name);
errno = EINVAL;
break;
}
--- /dev/null
+/*
+ * Copyright (c) 2011, Collabora Ltd.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the
+ * following disclaimer.
+ * * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ * * The names of contributors to this software may not be
+ * used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@collabora.co.uk>
+ */
+
+#include "config.h"
+#include "CuTest.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "conf.h"
+
+static int n_errors = 0;
+
+static void
+error_func (const char *buffer)
+{
+ ++n_errors;
+}
+
+static void
+test_parse_conf_1 (CuTest *tc)
+{
+ hash_t *ht;
+ const char *value;
+
+ ht = conf_parse_file (SRCDIR "/files/test-1.conf", 0, error_func);
+ CuAssertPtrNotNull (tc, ht);
+
+ value = hash_get (ht, "key1");
+ CuAssertStrEquals (tc, "value1", value);
+
+ value = hash_get (ht, "with-colon");
+ CuAssertStrEquals (tc, "value-of-colon", value);
+
+ value = hash_get (ht, "with-whitespace");
+ CuAssertStrEquals (tc, "value-with-whitespace", value);
+
+ value = hash_get (ht, "embedded-comment");
+ CuAssertStrEquals (tc, "this is # not a comment", value);
+
+ hash_free (ht);
+}
+
+static void
+test_parse_ignore_missing (CuTest *tc)
+{
+ hash_t *ht;
+
+ n_errors = 0;
+ ht = conf_parse_file (SRCDIR "/files/non-existant.conf", CONF_IGNORE_MISSING, error_func);
+ CuAssertPtrNotNull (tc, ht);
+
+ CuAssertIntEquals (tc, 0, hash_count (ht));
+ CuAssertIntEquals (tc, 0, n_errors);
+ hash_free (ht);
+}
+
+static void
+test_parse_fail_missing (CuTest *tc)
+{
+ hash_t *ht;
+
+ n_errors = 0;
+ ht = conf_parse_file (SRCDIR "/files/non-existant.conf", 0, error_func);
+ CuAssertPtrEquals (tc, ht, NULL);
+ CuAssertIntEquals (tc, 1, n_errors);
+}
+
+int
+main (void)
+{
+ CuString *output = CuStringNew ();
+ CuSuite* suite = CuSuiteNew ();
+ int ret;
+
+ SUITE_ADD_TEST (suite, test_parse_conf_1);
+ SUITE_ADD_TEST (suite, test_parse_ignore_missing);
+ SUITE_ADD_TEST (suite, test_parse_fail_missing);
+
+ CuSuiteRun (suite);
+ CuSuiteSummary (suite, output);
+ CuSuiteDetails (suite, output);
+ printf ("%s\n", output->buffer);
+ ret = suite->failCount;
+ CuSuiteDelete (suite);
+ return ret;
+}
+
+#include "CuTest.c"
projects / p11-kit / commitdiff