diff --git a/src/options.c b/src/options.c
index c331fa54c897a109b69a77e59c848c0216c1c1e1..f6fa63f6573319e89ba424143890ab07d0a1fdab 100644 (file)
--- a/src/options.c
+++ b/src/options.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
static void
display_help(void)
{
- unsigned i;
-
printf("Usage: %s [OPTION]...\n", PACKAGE);
- for (i = 0; i < option_table_size; ++i) {
+ for (unsigned i = 0; i < option_table_size; ++i) {
char tmp[32];
if (option_table[i].argument)
#ifdef ENABLE_OUTPUTS_SCREEN
" outputs-screen"
#endif
+#ifdef ENABLE_CHAT_SCREEN
+ " chat-screen"
+#endif
"\n");
#ifndef NCMPC_MINI
void
options_parse(int argc, const char *argv[])
{
- int i;
const arg_opt_t *opt = NULL;
option_callback_fn_t option_cb = handle_option;
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
const char *arg = argv[i];
size_t len = strlen(arg);
{
/* default option values */
options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
+ options.search_format = NULL;
options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
#ifndef NCMPC_MINI
g_free(options.config_file);
g_free(options.key_file);
g_free(options.list_format);
+ g_free(options.search_format);
g_free(options.status_format);
g_strfreev(options.screen_list);
#ifndef NCMPC_MINI
#ifdef ENABLE_LYRICS_SCREEN
g_free(options.text_editor);
#endif
+#ifdef ENABLE_CHAT_SCREEN
+ g_free(options.chat_prefix);
+#endif
}