options: don't override the libmpdclient default timeout

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 35de128e1e602a4b7aed0d5008120471d10ac1ca..ca6d415e41e5da28f0c08376f3039e0af189cd80 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
@@ -61,7 +61,7 @@ options_t options = {
        .audible_bell = true,
        .bell_on_wrap = true,
        .status_message_time = 3,
-       .timeout_ms = DEFAULT_MPD_TIMEOUT,
+       .timeout_ms = 0,
 #ifndef NCMPC_MINI
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
@@ -134,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)
@@ -215,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" */
@@ -282,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);
 
@@ -368,14 +378,12 @@ 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);
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
-       if (getenv("MPD_TIMEOUT") != NULL)
-               /* let libmpdclient parse the environment variable */
-               options.timeout_ms = 0;
 }
 
 void
@@ -387,6 +395,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
@@ -396,4 +405,7 @@ options_deinit(void)
 #ifdef ENABLE_LYRICS_SCREEN
        g_free(options.text_editor);
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       g_free(options.chat_prefix);
+#endif
 }