diff --git a/src/conf.c b/src/conf.c
index 9ac3a5623d8d5d22acc4f5da3da883d6137111a9..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
#include "command.h"
#include "colors.h"
#include "screen_list.h"
#include "command.h"
#include "colors.h"
#include "screen_list.h"
+#include "options.h"
+#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <string.h>
-#include <fcntl.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <glib.h>
#include <glib/gstdio.h>
#define CONF_COLOR "color"
#define CONF_COLOR_DEFINITION "colordef"
#define CONF_LIST_FORMAT "list-format"
#define CONF_COLOR "color"
#define CONF_COLOR_DEFINITION "colordef"
#define CONF_LIST_FORMAT "list-format"
+#define CONF_SEARCH_FORMAT "search-format"
#define CONF_STATUS_FORMAT "status-format"
#define CONF_XTERM_TITLE_FORMAT "xterm-title-format"
#define CONF_LIST_WRAP "wrap-around"
#define CONF_STATUS_FORMAT "status-format"
#define CONF_XTERM_TITLE_FORMAT "xterm-title-format"
#define CONF_LIST_WRAP "wrap-around"
#define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
#define CONF_TEXT_EDITOR "text-editor"
#define CONF_TEXT_EDITOR_ASK "text-editor-ask"
#define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
#define CONF_TEXT_EDITOR "text-editor"
#define CONF_TEXT_EDITOR_ASK "text-editor-ask"
+#define CONF_CHAT_PREFIX "chat-prefix"
#define CONF_SECOND_COLUMN "second-column"
#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)
{
}
}
}
}
-static int
+static bool
parse_key_definition(char *str)
{
parse_key_definition(char *str)
{
- char buf[MAX_LINE_LENGTH];
- char *p;
- size_t len = strlen(str), i;
- int j,key;
- int keys[MAX_COMMAND_KEYS];
- command_t cmd;
-
/* get the command name */
/* get the command name */
- i=0;
- j=0;
+ const size_t len = strlen(str);
+ size_t i = 0;
+ int j = 0;
+ char buf[MAX_LINE_LENGTH];
memset(buf, 0, MAX_LINE_LENGTH);
while (i < len && str[i] != '=' && !g_ascii_isspace(str[i]))
buf[j++] = str[i++];
memset(buf, 0, MAX_LINE_LENGTH);
while (i < len && str[i] != '=' && !g_ascii_isspace(str[i]))
buf[j++] = str[i++];
- if( (cmd=get_key_command_from_name(buf)) == CMD_NONE ) {
+
+ command_t cmd = get_key_command_from_name(buf);
+ if(cmd == CMD_NONE) {
/* the hotkey configuration contains an unknown
command */
print_error(_("Unknown command"), buf);
/* the hotkey configuration contains an unknown
command */
print_error(_("Unknown command"), buf);
- return -1;
+ return false;
}
/* skip whitespace */
}
/* skip whitespace */
if (*buf == 0) {
/* the hotkey configuration line is incomplete */
print_error(_("Incomplete hotkey configuration"), str);
if (*buf == 0) {
/* the hotkey configuration line is incomplete */
print_error(_("Incomplete hotkey configuration"), str);
- return -1;
+ return false;
}
/* parse key values */
i = 0;
}
/* parse key values */
i = 0;
- key = 0;
- p = buf;
+ int key = 0;
+ char *p = buf;
+
+ int keys[MAX_COMMAND_KEYS];
memset(keys, 0, sizeof(int)*MAX_COMMAND_KEYS);
while (i < MAX_COMMAND_KEYS && *p != 0 &&
(key = parse_key_value(p, &p)) >= 0) {
memset(keys, 0, sizeof(int)*MAX_COMMAND_KEYS);
while (i < MAX_COMMAND_KEYS && *p != 0 &&
(key = parse_key_value(p, &p)) >= 0) {
}
if (key < 0)
}
if (key < 0)
- return -1;
+ return false;
return assign_keys(cmd, keys);
}
return assign_keys(cmd, keys);
}
static char *
separate_value(char *p)
{
static char *
separate_value(char *p)
{
- char *value;
-
- value = strchr(p, '=');
+ char *value = strchr(p, '=');
if (value == NULL) {
/* an equals sign '=' was expected while parsing a
configuration file line */
if (value == NULL) {
/* an equals sign '=' was expected while parsing a
configuration file line */
*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)
{
parse_color(char *str)
{
- char *value;
-
- value = separate_value(str);
+ char *value = separate_value(str);
if (value == NULL)
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)
{
parse_color_definition(char *str)
{
- char buf[MAX_LINE_LENGTH];
- char *value;
- short color, rgb[3];
-
- value = separate_value(str);
+ char *value = separate_value(str);
if (value == NULL)
if (value == NULL)
- return -1;
+ return false;
/* get the command name */
/* get the command name */
- color = colors_str2color(str);
+ short color = colors_str2color(str);
if (color < 0) {
if (color < 0) {
+ char buf[MAX_LINE_LENGTH];
print_error(_("Bad color name"), buf);
print_error(_("Bad color name"), buf);
- return -1;
+ return false;
}
/* parse r,g,b values */
}
/* parse r,g,b values */
+ short rgb[3];
for (unsigned i = 0; i < 3; ++i) {
char *next = after_comma(value), *endptr;
if (*value == 0) {
print_error(_("Incomplete color definition"), str);
for (unsigned i = 0; i < 3; ++i) {
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]);
get_search_mode(char *value)
{
char * test;
get_search_mode(char *value)
{
char * test;
- int mode;
- mode= strtol(value, &test, 10);
+ const int mode = strtol(value, &test, 10);
if (*test == '\0')
{
if (0 <= mode && mode <= 4)
if (*test == '\0')
{
if (0 <= mode && mode <= 4)
static bool
parse_line(char *line)
{
static bool
parse_line(char *line)
{
- size_t len = strlen(line), i = 0, j = 0;
- char name[MAX_LINE_LENGTH];
- char value[MAX_LINE_LENGTH];
- bool match_found;
-
/* get the name part */
/* get the name part */
- 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 */
- j = 0;
- while (i < len)
- value[j++] = line[i++];
- value[j] = '\0';
-
- match_found = true;
+ char *const value = line;
/* key definition */
if (!strcasecmp(CONF_KEY_DEFINITION, name))
/* key definition */
if (!strcasecmp(CONF_KEY_DEFINITION, name))
else if (!strcasecmp(CONF_LIST_FORMAT, name)) {
g_free(options.list_format);
options.list_format = get_format(value);
else if (!strcasecmp(CONF_LIST_FORMAT, name)) {
g_free(options.list_format);
options.list_format = get_format(value);
+ /* search format string */
+ } else if (!strcasecmp(CONF_SEARCH_FORMAT, name)) {
+ g_free(options.search_format);
+ options.search_format = get_format(value);
/* status format string */
} else if (!strcasecmp(CONF_STATUS_FORMAT, name)) {
g_free(options.status_format);
/* status format string */
} else if (!strcasecmp(CONF_STATUS_FORMAT, name)) {
g_free(options.status_format);
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
{}
options.text_editor_ask = str2bool(value);
#else
{}
options.text_editor_ask = str2bool(value);
#else
{}
+#endif
+ else if (!strcasecmp(name, CONF_CHAT_PREFIX))
+#ifdef ENABLE_CHAT_SCREEN
+ options.chat_prefix = get_format(value);
+#else
+ {}
#endif
else if (!strcasecmp(CONF_SECOND_COLUMN, name))
#ifdef NCMPC_MINI
#endif
else if (!strcasecmp(CONF_SECOND_COLUMN, name))
#ifdef NCMPC_MINI
#else
options.second_column = str2bool(value);
#endif
#else
options.second_column = str2bool(value);
#endif
- else
- match_found = false;
-
- if (!match_found)
+ else {
print_error(_("Unknown configuration parameter"), name);
print_error(_("Unknown configuration parameter"), name);
+ return false;
+ }
- return match_found;
+ return true;
}
static int
read_rc_file(char *filename)
{
}
static int
read_rc_file(char *filename)
{
- FILE *file;
- char line[MAX_LINE_LENGTH];
+ assert(filename != NULL);
- if (filename == NULL)
- return -1;
-
- file = fopen(filename, "r");
+ FILE *file = fopen(filename, "r");
if (file == NULL) {
if (file == NULL) {
- perror(filename);
- return -1;
- }
+ perror(filename);
+ return -1;
+ }
+ char line[MAX_LINE_LENGTH];
while (fgets(line, sizeof(line), file) != NULL) {
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)
{
check_user_conf_dir(void)
{
- int retval;
char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
g_free(directory);
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;
}
}
- retval = g_mkdir(directory, 0755);
+ bool success = g_mkdir(directory, 0755) == 0;
g_free(directory);
g_free(directory);
- return retval;
+ return success;
}
char *
}
char *
for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
{
for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
{
- g_message (*system_data_dirs);
pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
if (g_file_test(pathname, G_FILE_TEST_EXISTS))
{
pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
if (g_file_test(pathname, G_FILE_TEST_EXISTS))
{
static char *
g_build_system_key_binding_filename(void)
{
static char *
g_build_system_key_binding_filename(void)
{
+#ifdef WIN32
+ const gchar* const *system_data_dirs;
+ gchar *pathname = NULL;
+
+ for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
+ {
+ pathname = g_build_filename(*system_data_dirs, PACKAGE, "keys.conf", NULL);
+ if (g_file_test(pathname, G_FILE_TEST_EXISTS))
+ {
+ break;
+ }
+ else
+ {
+ g_free (pathname);
+ pathname = NULL;
+ }
+ }
+ return pathname;
+#else
return g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
return g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
+#endif
}
}
-void
-read_configuration(void)
+static char *
+find_config_file(void)
{
{
- char *filename = NULL;
-
/* check for command line configuration file */
/* check for command line configuration file */
- if (options.config_file)
- filename = g_strdup(options.config_file);
+ if (options.config_file != NULL)
+ return g_strdup(options.config_file);
/* check for user configuration ~/.ncmpc/config */
/* check for user configuration ~/.ncmpc/config */
- if (filename == NULL) {
- filename = build_user_conf_filename();
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ char *filename = build_user_conf_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
/* check for global configuration SYSCONFDIR/ncmpc/config */
/* check for global configuration SYSCONFDIR/ncmpc/config */
- if (filename == NULL) {
- filename = build_system_conf_filename();
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ filename = build_system_conf_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
- /* load configuration */
- if (filename) {
- read_rc_file(filename);
- g_free(filename);
- filename = NULL;
- }
+ g_free(filename);
+ return NULL;
+}
+static char *
+find_keys_file(void)
+{
/* check for command line key binding file */
/* check for command line key binding file */
- if (options.key_file)
- filename = g_strdup(options.key_file);
+ if (options.key_file != NULL)
+ return g_strdup(options.key_file);
/* check for user key bindings ~/.ncmpc/keys */
/* check for user key bindings ~/.ncmpc/keys */
- if (filename == NULL) {
- filename = build_user_key_binding_filename();
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ char *filename = build_user_key_binding_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
/* check for global key bindings SYSCONFDIR/ncmpc/keys */
/* check for global key bindings SYSCONFDIR/ncmpc/keys */
- if (filename == NULL) {
- filename = g_build_system_key_binding_filename();
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
+ filename = g_build_system_key_binding_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
+ return NULL;
+}
+
+void
+read_configuration(void)
+{
+ /* load configuration */
+ char *filename = find_config_file();
+ if (filename != NULL) {
+ read_rc_file(filename);
+ g_free(filename);
}
/* load key bindings */
}
/* load key bindings */
- if (filename) {
+ filename = find_keys_file();
+ if (filename != NULL) {
read_rc_file(filename);
g_free(filename);
read_rc_file(filename);
g_free(filename);
- filename = NULL;
}
}
}
}