![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/conf.c b/src/conf.c
index 83c11c5f194b6359ffdd16a202355b64e98914e8..ae362f142d67f6363e3eceec352b6afde1f2e254 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
/* 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
#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 <unistd.h>
#include <string.h>
-#include <fcntl.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_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_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 int
+static bool
parse_key_definition(char *str)
{
/* get the command name */
/* the hotkey configuration contains an unknown
command */
print_error(_("Unknown command"), buf);
- return -1;
+ return false;
}
/* skip whitespace */
if (*buf == 0) {
/* the hotkey configuration line is incomplete */
print_error(_("Incomplete hotkey configuration"), str);
- return -1;
+ return false;
}
/* parse key values */
}
if (key < 0)
- return -1;
+ return false;
return assign_keys(cmd, keys);
}
*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)
- return -1;
+ return false;
return colors_assign(str, value);
}
if (comma != NULL) {
*comma++ = 0;
- comma = g_strchug(comma);
+ comma = skip_spaces(comma);
} else
comma = p + strlen(p);
return comma;
}
-static int
+static bool
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);
- return -1;
+ return false;
}
/* parse r,g,b values */
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);
- return -1;
+ return false;
}
value = next;
if (*value != 0) {
print_error(_("Malformed color definition"), str);
- return -1;
+ return false;
}
return colors_define(str, rgb[0], rgb[1], rgb[2]);
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);
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
{}
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));
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);
- return 0;
+ return true;
}
- int retval = g_mkdir(directory, 0755);
+ bool success = g_mkdir(directory, 0755) == 0;
g_free(directory);
- return retval;
+ return success;
}
char *
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))
{
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, "keys.conf", NULL);
if (g_file_test(pathname, G_FILE_TEST_EXISTS))
{