/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2008 Richard Kettlewell
+ * Copyright (C) 2004-2009 Richard Kettlewell
*
* 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
char *v;
if(disorder_version(getclient(), &v)) exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(v)));
+ v = nullcheck(utf82mb_f(v));
+ xprintf("%s\n", v);
+ xfree(v);
}
static void print_queue_entry(const struct queue_entry *q) {
}
static void cf_play(char **argv) {
+ char *id;
while(*argv)
- if(disorder_play(getclient(), *argv++)) exit(EXIT_FAILURE);
+ if(disorder_play(getclient(), *argv++, &id)) exit(EXIT_FAILURE);
}
static void cf_remove(char **argv) {
static void cf_reconfigure(char attribute((unused)) **argv) {
/* Re-check configuration for server */
- if(config_read(1, NULL)) fatal(0, "cannot read configuration");
+ if(config_read(1, NULL))
+ disorder_fatal(0, "cannot read configuration");
if(disorder_reconfigure(getclient())) exit(EXIT_FAILURE);
}
static void cf_somequeue(int (*fn)(disorder_client *c,
struct queue_entry **qp)) {
- struct queue_entry *q;
+ struct queue_entry *q, *qbase;
- if(fn(getclient(), &q)) exit(EXIT_FAILURE);
- while(q) {
+ if(fn(getclient(), &qbase)) exit(EXIT_FAILURE);
+ for(q = qbase; q; q = q->next)
print_queue_entry(q);
- q = q->next;
- }
+ queue_free(qbase, 1);
}
static void cf_recent(char attribute((unused)) **argv) {
int (*fn)(disorder_client *c,
const char *arg, const char *re,
char ***vecp, int *nvecp)) {
- char **vec;
+ char **vec, **base;
const char *re;
if(argv[1])
re = xstrdup(argv[1] + 1);
else
re = 0;
- if(fn(getclient(), argv[0], re, &vec, 0)) exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ if(fn(getclient(), argv[0], re, &base, 0)) exit(EXIT_FAILURE);
+ for(vec = base; *vec; ++vec)
+ xprintf("%s\n", nullcheck(utf82mb_f(*vec)));
+ xfree(base);
}
static int isarg_regexp(const char *s) {
}
static void cf_dirs(char **argv) {
- cf_somelist(argv, disorder_directories);
+ cf_somelist(argv, disorder_dirs);
}
static void cf_files(char **argv) {
char *value;
if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(value)));
+ xprintf("%s\n", nullcheck(utf82mb_f(value)));
}
static void cf_length(char **argv) {
}
static void cf_prefs(char **argv) {
- struct kvp *k;
+ struct kvp *k, *base;
- if(disorder_prefs(getclient(), argv[0], &k)) exit(EXIT_FAILURE);
- for(; k; k = k->next)
+ if(disorder_prefs(getclient(), argv[0], &base)) exit(EXIT_FAILURE);
+ for(k = base; k; k = k->next)
xprintf("%s = %s\n",
nullcheck(utf82mb(k->name)), nullcheck(utf82mb(k->value)));
+ kvp_free(base);
}
static void cf_search(char **argv) {
if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE);
for(n = 0; n < nresults; ++n)
xprintf("%s\n", nullcheck(utf82mb(results[n])));
+ free_strings(nresults, results);
}
static void cf_random_disable(char attribute((unused)) **argv) {
static void cf_stats(char attribute((unused)) **argv) {
char **vec;
+ int nvec;
- if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE);
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_get_volume(char attribute((unused)) **argv) {
int e;
if((e = xstrtol(&n, argv[1], 0, 10)))
- fatal(e, "cannot convert '%s'", argv[1]);
+ disorder_fatal(e, "cannot convert '%s'", argv[1]);
if(n > INT_MAX || n < INT_MIN)
- fatal(e, "%ld out of range", n);
+ disorder_fatal(e, "%ld out of range", n);
if(disorder_move(getclient(), argv[0], (int)n)) exit(EXIT_FAILURE);
}
static void cf_part(char **argv) {
char *s;
- if(disorder_part(getclient(), &s, argv[0], argv[1], argv[2])) exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(s)));
+ if(disorder_part(getclient(), argv[0], argv[1], argv[2], &s)) exit(EXIT_FAILURE);
+ xprintf("%s\n", nullcheck(utf82mb_f(s)));
}
static int isarg_filename(const char *s) {
static void cf_resolve(char **argv) {
char *track;
- if(disorder_resolve(getclient(), &track, argv[0])) exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(track)));
+ if(disorder_resolve(getclient(), argv[0], &track)) exit(EXIT_FAILURE);
+ xprintf("%s\n", nullcheck(utf82mb_f(track)));
}
static void cf_pause(char attribute((unused)) **argv) {
char *value;
if(disorder_get_global(getclient(), argv[0], &value)) exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(value)));
+ xprintf("%s\n", nullcheck(utf82mb_f(value)));
}
static void cf_set_global(char **argv) {
if(disorder_userinfo(getclient(), argv[0], argv[1], &s))
exit(EXIT_FAILURE);
- xprintf("%s\n", nullcheck(utf82mb(s)));
+ xprintf("%s\n", nullcheck(utf82mb_f(s)));
}
static int isarg_option(const char *arg) {
case 'h': help_setup_guest();
case 'r': online_registration = 1; break;
case 'R': online_registration = 0; break;
- default: fatal(0, "invalid option");
+ default: disorder_fatal(0, "invalid option");
}
}
if(online_registration && !config->mail_sender)
- fatal(0, "you MUST set mail_sender if you want online registration");
+ disorder_fatal(0, "you MUST set mail_sender if you want online registration");
if(disorder_adduser(getclient(), "guest", "",
online_registration ? "read,register" : "read"))
exit(EXIT_FAILURE);
static void cf_playlists(char attribute((unused)) **argv) {
char **vec;
+ int nvec;
- if(disorder_playlists(getclient(), &vec, 0))
+ if(disorder_playlists(getclient(), &vec, &nvec))
exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_playlist_del(char **argv) {
static void cf_playlist_get(char **argv) {
char **vec;
+ int nvec;
- if(disorder_playlist_get(getclient(), argv[0], &vec, 0))
+ if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec))
exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_playlist_set(char **argv) {
if(argv[1]) {
// Read track list from file
if(!(input = fopen(argv[1], "r")))
- fatal(errno, "opening %s", argv[1]);
+ disorder_fatal(errno, "opening %s", argv[1]);
tag = argv[1];
} else {
// Read track list from standard input
vector_append(v, l);
}
if(ferror(input))
- fatal(errno, "reading %s", tag);
+ disorder_fatal(errno, "reading %s", tag);
if(input != stdin)
fclose(input);
if(disorder_playlist_lock(getclient(), argv[0])
const char *password;
while(!trackdb_readable()) {
- info("waiting for trackdb...");
+ disorder_info("waiting for trackdb...");
sleep(1);
}
trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
trackdb_close();
if(password)
break;
- info("waiting for root user to be created...");
+ disorder_info("waiting for root user to be created...");
sleep(1);
}
trackdb_deinit(NULL);
/* garbage-collect PCRE's memory */
pcre_malloc = xmalloc;
pcre_free = xfree;
- if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale");
+ if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
+ if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'u': user = optarg; break;
case 'p': password = optarg; break;
case 'W': wfr = 1; break;
- default: fatal(0, "invalid option");
+ default: disorder_fatal(0, "invalid option");
}
}
- if(config_read(0, NULL)) fatal(0, "cannot read configuration");
+ if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
if(user) {
- config->username = user;
+ xfree(config->username);
+ config->username = xstrdup(user);
config->password = 0;
}
- if(password)
- config->password = password;
+ if(password) {
+ xfree(config->password);
+ config->password = xstrdup(password);
+ }
if(local)
config->connect.af = -1;
if(wfr)
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)
- fatal(0, "unknown command '%s'", argv[n]);
+ disorder_fatal(0, "unknown command '%s'", argv[n]);
if(n + commands[i].min >= argc)
- fatal(0, "missing arguments to '%s'", argv[n]);
+ disorder_fatal(0, "missing arguments to '%s'", argv[n]);
vector_init(&args);
/* Include the command name in the args, but at element -1, for
* the benefit of subcommand getopt calls */
- vector_append(&args, argv[n]);
+ vector_append(&args, xstrdup(argv[n]));
n++;
for(j = 0; j < commands[i].min; ++j)
vector_append(&args, nullcheck(mb2utf8(argv[n + j])));
vector_append(&args, nullcheck(mb2utf8(argv[n + j])));
vector_terminate(&args);
commands[i].fn(args.vec + 1);
+ vector_clear(&args);
n += j;
}
if(client && disorder_close(client)) exit(EXIT_FAILURE);
- if(fclose(stdout) < 0) fatal(errno, "error closing stdout");
+ if(fclose(stdout) < 0) disorder_fatal(errno, "error closing stdout");
+ config_free(config);
+ xfree(client);
return status;
}