diff --git a/src/conf.c b/src/conf.c
index 1f1f0bc39f0754b3cd847b2f327ffc6b04ab85db..81c280a405fcd85c7ac0062cc2923015887a9ae9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
/* ncmpc (Ncurses MPD Client)
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
#define CONF_CHAT_PREFIX "chat-prefix"
#define CONF_SECOND_COLUMN "second-column"
#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)
{
static bool
str2bool(char *str)
{
_("Error"), msg, input);
}
_("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)
{
static int
parse_key_value(char *str, char **end)
{
*value++ = 0;
g_strchomp(p);
*value++ = 0;
g_strchomp(p);
- return g_strchug(value);
+ return skip_spaces(value);
}
}
-static int
+static bool
parse_color(char *str)
{
char *value = separate_value(str);
if (value == NULL)
parse_color(char *str)
{
char *value = separate_value(str);
if (value == NULL)
- return -1;
+ return false;
return colors_assign(str, value);
}
return colors_assign(str, value);
}
if (comma != NULL) {
*comma++ = 0;
if (comma != NULL) {
*comma++ = 0;
- comma = g_strchug(comma);
+ comma = skip_spaces(comma);
} else
comma = p + strlen(p);
} else
comma = p + strlen(p);
return comma;
}
return comma;
}
-static int
+static bool
parse_color_definition(char *str)
{
char *value = separate_value(str);
if (value == NULL)
parse_color_definition(char *str)
{
char *value = separate_value(str);
if (value == NULL)
- return -1;
+ return false;
/* get the command name */
short color = colors_str2color(str);
if (color < 0) {
char buf[MAX_LINE_LENGTH];
print_error(_("Bad color name"), buf);
/* get the command name */
short color = colors_str2color(str);
if (color < 0) {
char buf[MAX_LINE_LENGTH];
print_error(_("Bad color name"), buf);
- return -1;
+ return false;
}
/* parse r,g,b values */
}
/* parse r,g,b values */
char *next = after_comma(value), *endptr;
if (*value == 0) {
print_error(_("Incomplete color definition"), str);
char *next = after_comma(value), *endptr;
if (*value == 0) {
print_error(_("Incomplete color definition"), str);
- return -1;
+ return false;
}
rgb[i] = strtol(value, &endptr, 0);
if (endptr == value || *endptr != 0) {
print_error(_("Invalid number"), value);
}
rgb[i] = strtol(value, &endptr, 0);
if (endptr == value || *endptr != 0) {
print_error(_("Invalid number"), value);
- return -1;
+ return false;
}
value = next;
}
value = next;
if (*value != 0) {
print_error(_("Malformed color definition"), str);
if (*value != 0) {
print_error(_("Malformed color definition"), str);
- return -1;
+ return false;
}
return colors_define(str, rgb[0], rgb[1], rgb[2]);
}
return colors_define(str, rgb[0], rgb[1], rgb[2]);
static bool
parse_line(char *line)
{
static bool
parse_line(char *line)
{
- size_t len = strlen(line), i = 0, j = 0;
-
/* get the name part */
/* 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 */
/* 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))
/* key definition */
if (!strcasecmp(CONF_KEY_DEFINITION, name))
g_free(options.scroll_sep);
options.scroll_sep = get_format(value);
} else if (!strcasecmp(CONF_DISPLAY_TIME, name))
g_free(options.scroll_sep);
options.scroll_sep = get_format(value);
} else if (!strcasecmp(CONF_DISPLAY_TIME, name))
-#ifdef NCMPC_MINI
+ /* obsolete, ignore */
{}
{}
-#else
- options.display_time = str2bool(value);
-#endif
else if (!strcasecmp(CONF_JUMP_PREFIX_ONLY, name))
#ifdef NCMPC_MINI
{}
else if (!strcasecmp(CONF_JUMP_PREFIX_ONLY, name))
#ifdef NCMPC_MINI
{}
char line[MAX_LINE_LENGTH];
while (fgets(line, sizeof(line), file) != NULL) {
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));
if (*p != 0 && *p != COMMENT_TOKEN)
parse_line(g_strchomp(p));
return 0;
}
return 0;
}
-int
+bool
check_user_conf_dir(void)
{
char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
g_free(directory);
check_user_conf_dir(void)
{
char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
g_free(directory);
- return 0;
+ return true;
}
}
- int retval = g_mkdir(directory, 0755);
+ bool success = g_mkdir(directory, 0755) == 0;
g_free(directory);
g_free(directory);
- return retval;
+ return success;
}
char *
}
char *