diff --git a/src/options.c b/src/options.c
index 9746d3ab78c08b67052ba11076887499f0b138fa..e84b5013b1859d80b3d20eeec03a75f96e4baaf0 100644 (file)
--- a/src/options.c
+++ b/src/options.c
/* 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
#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
#ifdef ENABLE_LYRICS_SCREEN
.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
.lyrics_autosave = false,
+ .lyrics_show_plugin = false,
#endif
.find_wrap = true,
.scroll_offset = 0,
.scroll = DEFAULT_SCROLL,
.welcome_screen_list = true,
.jump_prefix_only = true,
+ .second_column = true,
#endif
};
{ '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
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;
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
#ifdef ENABLE_MULTIBYTE
" multibyte"
#endif
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
" wide"
#endif
#ifdef ENABLE_LOCALE
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 */
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);
} 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