meson.build: fix build with meson > 0.38.1

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 0495353af7062d09762c925f886af4c7bd8cdc77..f6fa63f6573319e89ba424143890ab07d0a1fdab 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,5 +1,5 @@
 /* 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
@@ -53,6 +53,7 @@ options_t options = {
        .lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
        .lyrics_autosave = false,
        .lyrics_show_plugin = false,
+       .text_editor_ask = true,
 #endif
        .find_wrap = true,
        .scroll_offset = 0,
@@ -133,11 +134,9 @@ option_error(int error, const char *option, const char *arg)
 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)
@@ -214,9 +213,22 @@ handle_option(int c, const char *arg)
 #ifdef ENABLE_OUTPUTS_SCREEN
                     " outputs-screen"
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+                    " chat-screen"
+#endif
 
                     "\n");
 #ifndef NCMPC_MINI
+               {
+                       char *user_conf = build_user_conf_filename();
+                       char *system_conf = build_system_conf_filename();
+
+                       printf("configuration files:\n %s\n %s\n\n",
+                              user_conf, system_conf);
+
+                       g_free(user_conf);
+                       g_free(system_conf);
+               }
                if (strcmp("translator-credits", _("translator-credits")) != 0)
                        /* To translators: these credits are shown
                           when ncmpc is started with "--version" */
@@ -281,11 +293,10 @@ handle_option(int c, const char *arg)
 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);
 
@@ -367,11 +378,9 @@ options_init(void)
 {
        /* 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);
-#ifdef ENABLE_LYRICS_SCREEN
-       options.text_editor = g_strdup(DEFAULT_TEXT_EDITOR);
-#endif
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
@@ -389,6 +398,7 @@ options_deinit(void)
        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
@@ -398,4 +408,7 @@ options_deinit(void)
 #ifdef ENABLE_LYRICS_SCREEN
        g_free(options.text_editor);
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       g_free(options.chat_prefix);
+#endif
 }