command.c: put curly braces around a single large statement

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index c9eb5e8a954c3fcbb812caa4651e36b1f5888548..e84b5013b1859d80b3d20eeec03a75f96e4baaf0 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <glib.h>
 
-#define MAX_LONGOPT_LENGTH 32
-
 #define ERROR_UNKNOWN_OPTION    0x01
 #define ERROR_BAD_ARGUMENT      0x02
 #define ERROR_GOT_ARGUMENT      0x03
@@ -54,6 +52,7 @@ options_t options = {
 #ifdef ENABLE_LYRICS_SCREEN
        .lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
        .lyrics_autosave = false,
+       .lyrics_show_plugin = false,
 #endif
        .find_wrap = true,
        .scroll_offset = 0,
@@ -65,6 +64,7 @@ options_t options = {
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
        .jump_prefix_only = true,
+       .second_column = true,
 #endif
 };
 
@@ -82,8 +82,7 @@ static const arg_opt_t option_table[] = {
        { 'h', "host", "HOST", "Connect to server on host" },
        { 'P', "password","PASSWORD", "Connect with password" },
        { 'f', "config", "FILE", "Read configuration from file" },
-       { 'k', "key-file","FILE", "Read configuration from file" },
-       { 'S', "no-splash", NULL, "Don't show the splash screen" },
+       { 'k', "key-file","FILE", "Read key bindings from file" },
 #ifndef NDEBUG
        { 'K', "dump-keys", NULL, "Dump key bindings to stdout" },
 #endif
@@ -98,9 +97,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;
@@ -138,10 +137,10 @@ display_help(void)
        printf("Usage: %s [OPTION]...\n", PACKAGE);
 
        for (i = 0; i < option_table_size; ++i) {
-               char tmp[MAX_LONGOPT_LENGTH];
+               char tmp[32];
 
                if (option_table[i].argument)
-                       g_snprintf(tmp, MAX_LONGOPT_LENGTH, "%s=%s",
+                       g_snprintf(tmp, sizeof(tmp), "%s=%s",
                                   option_table[i].longopt,
                                   option_table[i].argument);
                else
@@ -173,7 +172,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
@@ -265,9 +264,6 @@ handle_option(int c, const char *arg)
                g_free(options.key_file);
                options.key_file = g_strdup(arg);
                break;
-       case 'S': /* --key-file */
-               /* the splash screen was removed */
-               break;
 #ifndef NDEBUG
 #ifndef NCMPC_MINI
        case 'K': /* --dump-keys */
@@ -290,8 +286,7 @@ options_parse(int argc, const char *argv[])
        const arg_opt_t *opt = NULL;
        option_callback_fn_t option_cb = handle_option;
 
-       i=1;
-       while (i < argc) {
+       for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                size_t len = strlen(arg);
 
@@ -355,28 +350,22 @@ options_parse(int argc, const char *argv[])
                        } else
                                option_error(ERROR_BAD_ARGUMENT, arg, NULL);
                }
-               i++;
        }
 
        if (opt && opt->argument == NULL)
                option_cb (opt->shortopt, NULL);
        else if (opt && opt->argument)
                option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
+
+       if (!options.host && getenv("MPD_HOST")) {
+               g_free(options.host);
+               options.host = g_strdup(getenv("MPD_HOST"));
+       }
 }
 
 void
 options_init(void)
 {
-       /* XXX
-       if ((tmp = g_strstr_len(options.host, strlen(options.host), "@"))) {
-               char *oldhost = options.host;
-               *tmp  = '\0';
-               options.password = locale_to_utf8(oldhost);
-               options.host = g_strdup(tmp+1);
-               g_free(oldhost);
-       }
-       */
-
        /* default option values */
        options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
        options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);