/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2010 Richard Kettlewell
+ * Copyright (C) 2004-2011, 2013 Richard Kettlewell
* Portions copyright (C) 2007 Mark Wooding
*
* This program is free software: you can redistribute it and/or modify
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <ctype.h>
#include <stddef.h>
-#include <pwd.h>
-#include <langinfo.h>
-#include <pcre.h>
+#if HAVE_PWD_H
+# include <pwd.h>
+#endif
+#if HAVE_LANGINFO_H
+# include <langinfo.h>
+#endif
+#if HAVE_PCRE_H
+# include <pcre.h>
+#endif
#include <signal.h>
#include "rights.h"
#include "charset.h"
#include "defs.h"
#include "printf.h"
-#include "regsub.h"
+#if HAVE_PCRE_H
+# include "regsub.h"
+#endif
#include "signame.h"
#include "authhash.h"
#include "vector.h"
/* Defaults */
if(!module)
module = "fs";
+#if HAVE_LANGINFO_H
if(!encoding)
encoding = nl_langinfo(CODESET);
+#else
+ if(!encoding)
+ encoding = "ascii";
+#endif
cl = ADDRESS(cs->config, struct collectionlist);
++cl->n;
cl->s = xrealloc(cl->s, cl->n * sizeof (struct collection));
nvec, vec);
}
+#if HAVE_PCRE_H
static int set_namepart(const struct config_state *cs,
const struct conf *whoami,
int nvec, char **vec) {
++tl->n;
return 0;
}
+#endif
static int set_rights(const struct config_state *cs,
const struct conf *whoami,
xfree(cll->s);
}
+#if HAVE_PCRE_H
static void free_namepartlist(struct config *c,
const struct conf *whoami) {
struct namepartlist *npl = ADDRESS(c, struct namepartlist);
}
xfree(tl->t);
}
+#endif
static void free_netaddress(struct config *c,
const struct conf *whoami) {
static int validate_player(const struct config_state *cs,
int nvec,
char attribute((unused)) **vec) {
- if(nvec < 2) {
+ if(nvec && nvec < 2) {
disorder_error(0, "%s:%d: should be at least 'player PATTERN MODULE'",
cs->path, cs->line);
return -1;
static int validate_tracklength(const struct config_state *cs,
int nvec,
char attribute((unused)) **vec) {
- if(nvec < 2) {
+ if(nvec && nvec < 2) {
disorder_error(0, "%s:%d: should be at least 'tracklength PATTERN MODULE'",
cs->path, cs->line);
return -1;
{ C(mount_rescan), &type_boolean, validate_any },
{ C(multicast_loop), &type_boolean, validate_any },
{ C(multicast_ttl), &type_integer, validate_non_negative },
+#if HAVE_PCRE_H
{ C(namepart), &type_namepart, validate_any },
+#endif
{ C(new_bias), &type_integer, validate_positive },
{ C(new_bias_age), &type_integer, validate_positive },
{ C(new_max), &type_integer, validate_positive },
{ C(remote_userman), &type_boolean, validate_any },
{ C(replay_min), &type_integer, validate_non_negative },
{ C(rtp_delay_threshold), &type_integer, validate_positive },
+ { C(rtp_mode), &type_string, validate_any },
{ C(rtp_verbose), &type_boolean, validate_any },
{ C(sample_format), &type_sample_format, validate_sample_format },
{ C(scratch), &type_string_accum, validate_isreg },
{ C(stopword), &type_string_accum, validate_any },
{ C(templates), &type_string_accum, validate_isdir },
{ C(tracklength), &type_stringlist_accum, validate_tracklength },
+#if HAVE_PCRE_H
{ C(transform), &type_transform, validate_any },
+#endif
{ C(url), &type_string, validate_url },
{ C(user), &type_string, validate_isauser },
{ C(username), &type_string, validate_any },
va_list ap;
struct vector v[1];
char *s;
+ int rc;
vector_init(v);
vector_append(v, (char *)which);
vector_append(v, s);
va_end(ap);
vector_terminate(v);
- int rc = config_set(cs, v->nvec, v->vec);
+ rc = config_set(cs, v->nvec, v->vec);
xfree(v->vec);
return rc;
}
c->broadcast_from.af = -1;
c->listen.af = -1;
c->connect.af = -1;
+ c->rtp_mode = xstrdup("auto");
return c;
}
static void config_postdefaults(struct config *c,
int server) {
struct config_state cs;
+#if HAVE_PCRE_H
const struct conf *whoami;
int n;
+#endif
+#if HAVE_PCRE_H
static const char *namepart[][4] = {
{ "title", "/([0-9]+ *[-:]? *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },
{ "title", "/([^/]+)\\.[a-zA-Z0-9]+$", "$1", "sort" },
{ "dir", "[[:punct:]]", "", "sort", "g", }
};
#define NTRANSFORM (int)(sizeof transform / sizeof *transform)
+#endif
cs.path = "<internal>";
cs.line = 0;
cs.config = c;
+#if HAVE_PCRE_H
if(!c->namepart.n) {
whoami = find("namepart");
for(n = 0; n < NNAMEPART; ++n)
for(n = 0; n < NTRANSFORM; ++n)
set_transform(&cs, whoami, 5, (char **)transform[n]);
}
+#endif
if(!c->api) {
if(c->speaker_command)
c->api = xstrdup("command");
else if(c->broadcast.af != -1)
c->api = xstrdup("rtp");
else if(config_uaudio_apis)
- c->api = xstrdup(config_uaudio_apis[0]->name);
+ c->api = xstrdup(uaudio_default(config_uaudio_apis,
+ UAUDIO_API_SERVER)->name);
else
c->api = xstrdup("<none>");
}
disorder_error(0, "'nice_server' cannot be changed without a restart");
/* ...but we accept the new config anyway */
}
+#if HAVE_PCRE_H
if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) {
disorder_error(0, "'namepart' settings cannot be changed without a restart");
failed = 1;
}
+#endif
if(stringlist_compare(&c->stopword, &oldconfig->stopword)) {
disorder_error(0, "'stopword' settings cannot be changed without a restart");
failed = 1;
return 0;
}
+#if HAVE_PCRE_H
/** @brief Order two namepart definitions
* @param a First namepart definition
* @param b Second namepart definition
else
return 0;
}
+#endif
/** @brief Verify configuration table.
* @return The number of problems found
*/
int config_verify(void) {
int fails = 0;
- for(size_t n = 1; n < sizeof conf / sizeof *conf; ++n)
+ size_t n;
+ for(n = 1; n < sizeof conf / sizeof *conf; ++n)
if(strcmp(conf[n-1].name, conf[n].name) >= 0) {
fprintf(stderr, "%s >= %s\n", conf[n-1].name, conf[n].name);
++fails;
~mdw / disorder / blobdiff