diff --git a/src/conf.c b/src/conf.c
index 496dcab6dc974cc429247fd0ee9fb54a1e9a92a2..81c280a405fcd85c7ac0062cc2923015887a9ae9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
#define CONF_CHAT_PREFIX "chat-prefix"
#define CONF_SECOND_COLUMN "second-column"
+gcc_const
+static bool
+is_space_not_null(char ch)
+{
+ unsigned char uch = (unsigned char)ch;
+ return uch <= 0x20 && uch > 0;
+}
+
+/**
+ * Returns the first non-space character (or a pointer to the null
+ * terminator). Similar to g_strchug(), but just moves the pointer
+ * forward without modifying the string contents.
+ */
+gcc_pure
+static char *
+skip_spaces(char *p)
+{
+ while (is_space_not_null(*p))
+ ++p;
+ return p;
+}
+
static bool
str2bool(char *str)
{
_("Error"), msg, input);
}
+gcc_const
+static bool
+is_word_char(char ch)
+{
+ return g_ascii_isalnum(ch) || ch == '-' || ch == '_';
+}
+
+static char *
+after_unquoted_word(char *p)
+{
+ if (!is_word_char(*p)) {
+ print_error(_("Word expected"), p);
+ return NULL;
+ }
+
+ ++p;
+
+ while (is_word_char(*p))
+ ++p;
+
+ return p;
+}
+
static int
parse_key_value(char *str, char **end)
{
*value++ = 0;
g_strchomp(p);
- return g_strchug(value);
+ return skip_spaces(value);
}
static bool
if (comma != NULL) {
*comma++ = 0;
- comma = g_strchug(comma);
+ comma = skip_spaces(comma);
} else
comma = p + strlen(p);
static bool
parse_line(char *line)
{
- size_t len = strlen(line), i = 0, j = 0;
-
/* get the name part */
- char name[MAX_LINE_LENGTH];
- while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
- name[j++] = line[i++];
+ char *const name = line;
+ char *const name_end = after_unquoted_word(line);
+ if (name_end == NULL)
+ return false;
- name[j] = '\0';
+ line = skip_spaces(name_end);
+ if (*line == '=') {
+ ++line;
+ line = skip_spaces(line);
+ } else if (line == name_end) {
+ print_error(_("Missing '='"), name_end);
+ return false;
+ }
- /* skip '=' and whitespace */
- while (i < len && (line[i] == '=' || g_ascii_isspace(line[i])))
- i++;
+ *name_end = 0;
/* get the value part */
- char value[MAX_LINE_LENGTH];
- j = 0;
- while (i < len)
- value[j++] = line[i++];
- value[j] = '\0';
+ char *const value = line;
/* key definition */
if (!strcasecmp(CONF_KEY_DEFINITION, name))
char line[MAX_LINE_LENGTH];
while (fgets(line, sizeof(line), file) != NULL) {
- char *p = g_strchug(line);
+ char *p = skip_spaces(line);
if (*p != 0 && *p != COMMENT_TOKEN)
parse_line(g_strchomp(p));