summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-06 19:41:24 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-06 19:41:24 +0200
commitbcf3295d2b0d87caefad2e73d221aac080d0c11e (patch)
tree0a0af0e976f18a6d56058a02240dc4d0fd58c4ce /src/shared
parent827bf3c5dd88c51080de159e071fcbe7ada3477c (diff)
bus: add basic dbus1 policy parser
Enforcement is still missing, but at least we can parse it now.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/xml.c40
-rw-r--r--src/shared/xml.h2
2 files changed, 40 insertions, 2 deletions
diff --git a/src/shared/xml.c b/src/shared/xml.c
index be56b08ce9..15c629b188 100644
--- a/src/shared/xml.c
+++ b/src/shared/xml.c
@@ -25,17 +25,37 @@
#include "xml.h"
enum {
+ STATE_NULL,
STATE_TEXT,
STATE_TAG,
STATE_ATTRIBUTE,
};
+static void inc_lines(unsigned *line, const char *s, size_t n) {
+ const char *p = s;
+
+ if (!line)
+ return;
+
+ for (;;) {
+ const char *f;
+
+ f = memchr(p, '\n', n);
+ if (!f)
+ return;
+
+ n -= (f - p) + 1;
+ p = f + 1;
+ (*line)++;
+ }
+}
+
/* We don't actually do real XML here. We only read a simplistic
* subset, that is a bit less strict that XML and lacks all the more
* complex features, like entities, or namespaces. However, we do
* support some HTML5-like simplifications */
-int xml_tokenize(const char **p, char **name, void **state) {
+int xml_tokenize(const char **p, char **name, void **state, unsigned *line) {
const char *c, *e, *b;
char *ret;
int t;
@@ -48,6 +68,12 @@ int xml_tokenize(const char **p, char **name, void **state) {
t = PTR_TO_INT(*state);
c = *p;
+ if (t == STATE_NULL) {
+ if (line)
+ *line = 1;
+ t = STATE_TEXT;
+ }
+
for (;;) {
if (*c == 0)
return XML_END;
@@ -64,6 +90,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (!ret)
return -ENOMEM;
+ inc_lines(line, c, e - c);
+
*name = ret;
*p = e;
*state = INT_TO_PTR(STATE_TEXT);
@@ -80,6 +108,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (!e)
return -EINVAL;
+ inc_lines(line, b, e + 3 - b);
+
c = e + 3;
continue;
}
@@ -91,6 +121,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (!e)
return -EINVAL;
+ inc_lines(line, b, e + 2 - b);
+
c = e + 2;
continue;
}
@@ -102,6 +134,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (!e)
return -EINVAL;
+ inc_lines(line, b, e + 1 - b);
+
c = e + 1;
continue;
}
@@ -134,6 +168,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (*b == 0)
return -EINVAL;
+ inc_lines(line, c, b - c);
+
e = b + strcspn(b, WHITESPACE "=/>");
if (e > b) {
/* An attribute */
@@ -178,6 +214,8 @@ int xml_tokenize(const char **p, char **name, void **state) {
if (!e)
return -EINVAL;
+ inc_lines(line, c, e - c);
+
ret = strndup(c+1, e - c - 1);
if (!ret)
return -ENOMEM;
diff --git a/src/shared/xml.h b/src/shared/xml.h
index 18ebbd9e44..af71709c33 100644
--- a/src/shared/xml.h
+++ b/src/shared/xml.h
@@ -31,4 +31,4 @@ enum {
XML_ATTRIBUTE_VALUE
};
-int xml_tokenize(const char **p, char **name, void **state);
+int xml_tokenize(const char **p, char **name, void **state, unsigned *line);