*
* 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
*
* 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
{ "help-commands", no_argument, 0, 'H' },
{ "user", required_argument, 0, 'u' },
{ "password", required_argument, 0, 'p' },
{ "help-commands", no_argument, 0, 'H' },
{ "user", required_argument, 0, 'u' },
{ "password", required_argument, 0, 'p' },
static void cf_reconfigure(char attribute((unused)) **argv) {
/* Re-check configuration for server */
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");
static void cf_somequeue(int (*fn)(disorder_client *c,
struct queue_entry **qp)) {
static void cf_somequeue(int (*fn)(disorder_client *c,
struct queue_entry **qp)) {
int (*fn)(disorder_client *c,
const char *arg, const char *re,
char ***vecp, int *nvecp)) {
int (*fn)(disorder_client *c,
const char *arg, const char *re,
char ***vecp, int *nvecp)) {
- 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);
char *value;
if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE);
char *value;
if(disorder_get(getclient(), argv[0], argv[1], &value)) exit(EXIT_FAILURE);
- 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)
if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE);
for(n = 0; n < nresults; ++n)
xprintf("%s\n", nullcheck(utf82mb(results[n])));
if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE);
for(n = 0; n < nresults; ++n)
xprintf("%s\n", nullcheck(utf82mb(results[n])));
- 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(n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
int e;
if((e = xstrtol(&n, argv[1], 0, 10)))
int e;
if((e = xstrtol(&n, argv[1], 0, 10)))
if(disorder_move(getclient(), argv[0], (int)n)) exit(EXIT_FAILURE);
}
static void cf_part(char **argv) {
char *s;
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)));
- 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)));
- if(disorder_new_tracks(getclient(), &vec, 0, argv[0] ? atoi(argv[0]) : 0))
+ if(disorder_new_tracks(getclient(), argv[0] ? atol(argv[0]) : 0, &vec, 0))
if(disorder_userinfo(getclient(), argv[0], argv[1], &s))
exit(EXIT_FAILURE);
if(disorder_userinfo(getclient(), argv[0], argv[1], &s))
exit(EXIT_FAILURE);
case 'h': help_setup_guest();
case 'r': online_registration = 1; break;
case 'R': online_registration = 0; break;
case 'h': help_setup_guest();
case 'r': online_registration = 1; break;
case 'R': online_registration = 0; break;
if(disorder_adduser(getclient(), "guest", "",
online_registration ? "read,register" : "read"))
exit(EXIT_FAILURE);
}
if(disorder_adduser(getclient(), "guest", "",
online_registration ? "read,register" : "read"))
exit(EXIT_FAILURE);
}
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
- if(disorder_playlist_get(getclient(), argv[0], &vec, 0))
+ if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec))
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
if(argv[1]) {
// Read track list from file
if(!(input = fopen(argv[1], "r")))
if(argv[1]) {
// Read track list from file
if(!(input = fopen(argv[1], "r")))
} commands[] = {
{ "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]",
"Create a new user" },
} commands[] = {
{ "adduser", 2, 3, cf_adduser, isarg_rights, "USERNAME PASSWORD [RIGHTS]",
"Create a new user" },
-static void wait_for_root(void) {
- const char *password;
-
- while(!trackdb_readable()) {
- info("waiting for trackdb...");
- sleep(1);
- }
- trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
- for(;;) {
- trackdb_open(TRACKDB_READ_ONLY);
- password = trackdb_get_password("root");
- trackdb_close();
- if(password)
- break;
- info("waiting for root user to be created...");
- sleep(1);
- }
- trackdb_deinit();
-}
-
- int n, i, j, local = 0, wfr = 0;
+ int n, i, j, local = 0;
- if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) {
+#endif
+ 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:", options, 0)) >= 0) {
case 'N': config_per_user = 0; break;
case 'u': user = optarg; break;
case 'p': password = optarg; break;
case 'N': config_per_user = 0; break;
case 'u': user = optarg; break;
case 'p': password = optarg; break;
/* gcrypt initialization */
if(!gcry_check_version(NULL))
disorder_fatal(0, "gcry_check_version failed");
gcry_control(GCRYCTL_INIT_SECMEM, 0);
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
/* gcrypt initialization */
if(!gcry_check_version(NULL))
disorder_fatal(0, "gcry_check_version failed");
gcry_control(GCRYCTL_INIT_SECMEM, 0);
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)
vector_init(&args);
/* Include the command name in the args, but at element -1, for
* the benefit of subcommand getopt calls */
vector_init(&args);
/* Include the command name in the args, but at element -1, for
* the benefit of subcommand getopt calls */
n++;
for(j = 0; j < commands[i].min; ++j)
vector_append(&args, nullcheck(mb2utf8(argv[n + j])));
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_append(&args, nullcheck(mb2utf8(argv[n + j])));
vector_terminate(&args);
commands[i].fn(args.vec + 1);