options: don't leak options.text_editor

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index e2051c576fe578d527866dea9802fcaea18e0df8..0495353af7062d09762c925f886af4c7bd8cdc77 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "options.h"
 #include "config.h"
@@ -60,6 +60,7 @@ options_t options = {
        .audible_bell = true,
        .bell_on_wrap = true,
        .status_message_time = 3,
+       .timeout_ms = DEFAULT_MPD_TIMEOUT,
 #ifndef NCMPC_MINI
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
@@ -97,9 +98,9 @@ lookup_option(int s, char *l)
 
        for (i = 0; i < option_table_size; ++i) {
                if (l && strcmp(l, option_table[i].longopt) == 0)
-                       return &option_table[i];;
+                       return &option_table[i];
                if (s && s == option_table[i].shortopt)
-                       return &option_table[i];;
+                       return &option_table[i];
        }
 
        return NULL;
@@ -172,7 +173,7 @@ handle_option(int c, const char *arg)
 #ifdef ENABLE_MULTIBYTE
                     " multibyte"
 #endif
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
                     " wide"
 #endif
 #ifdef ENABLE_LOCALE
@@ -264,14 +265,12 @@ handle_option(int c, const char *arg)
                g_free(options.key_file);
                options.key_file = g_strdup(arg);
                break;
-#ifndef NDEBUG
-#ifndef NCMPC_MINI
+#if !defined(NDEBUG) && !defined(NCMPC_MINI)
        case 'K': /* --dump-keys */
                read_configuration();
                write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
                exit(EXIT_SUCCESS);
                break;
-#endif
 #endif
        default:
                fprintf(stderr,"Unknown Option %c = %s\n", c, arg);
@@ -370,9 +369,15 @@ options_init(void)
        options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
        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
+       if (getenv("MPD_TIMEOUT") != NULL)
+               /* let libmpdclient parse the environment variable */
+               options.timeout_ms = 0;
 }
 
 void
@@ -390,4 +395,7 @@ options_deinit(void)
        g_free(options.xterm_title_format);
        g_free(options.scroll_sep);
 #endif
+#ifdef ENABLE_LYRICS_SCREEN
+       g_free(options.text_editor);
+#endif
 }