X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ec554a3df7afe6a7b890983e75e81bc3aa17cb55..cca89d7ce589d10a226c6dfa212e36cbcad25fd2:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index 351b151..c2c9a9f 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -1,6 +1,6 @@ /* * 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 @@ -25,12 +25,20 @@ #include #include #include -#include +#if HAVE_UNISTD_H +# include +#endif #include #include -#include -#include -#include +#if HAVE_PWD_H +# include +#endif +#if HAVE_LANGINFO_H +# include +#endif +#if HAVE_PCRE_H +# include +#endif #include #include "rights.h" @@ -44,7 +52,9 @@ #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" @@ -200,8 +210,13 @@ static int set_collections(const struct config_state *cs, /* 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)); @@ -395,6 +410,7 @@ static int set_sample_format(const struct config_state *cs, nvec, vec); } +#if HAVE_PCRE_H static int set_namepart(const struct config_state *cs, const struct conf *whoami, int nvec, char **vec) { @@ -480,6 +496,7 @@ static int set_transform(const struct config_state *cs, ++tl->n; return 0; } +#endif static int set_rights(const struct config_state *cs, const struct conf *whoami, @@ -561,6 +578,7 @@ static void free_collectionlist(struct config *c, 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); @@ -593,6 +611,7 @@ static void free_transformlist(struct config *c, } xfree(tl->t); } +#endif static void free_netaddress(struct config *c, const struct conf *whoami) { @@ -1033,7 +1052,9 @@ static const struct conf conf[] = { { 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 }, @@ -1055,6 +1076,7 @@ static const struct conf conf[] = { { 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 }, @@ -1068,7 +1090,9 @@ static const struct conf conf[] = { { 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 }, @@ -1338,6 +1362,7 @@ static struct config *config_default(void) { c->broadcast_from.af = -1; c->listen.af = -1; c->connect.af = -1; + c->rtp_mode = xstrdup("auto"); return c; } @@ -1389,9 +1414,12 @@ void config_free(struct config *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" }, @@ -1409,10 +1437,12 @@ static void config_postdefaults(struct config *c, { "dir", "[[:punct:]]", "", "sort", "g", } }; #define NTRANSFORM (int)(sizeof transform / sizeof *transform) +#endif cs.path = ""; cs.line = 0; cs.config = c; +#if HAVE_PCRE_H if(!c->namepart.n) { whoami = find("namepart"); for(n = 0; n < NNAMEPART; ++n) @@ -1423,13 +1453,15 @@ static void config_postdefaults(struct config *c, 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(""); } @@ -1530,10 +1562,12 @@ int config_read(int server, 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; @@ -1611,6 +1645,7 @@ static int stringlist_compare(const struct stringlist *a, return 0; } +#if HAVE_PCRE_H /** @brief Order two namepart definitions * @param a First namepart definition * @param b Second namepart definition @@ -1656,6 +1691,7 @@ static int namepartlist_compare(const struct namepartlist *a, else return 0; } +#endif /** @brief Verify configuration table. * @return The number of problems found