nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for conditional compilation of support for command-line args and-or configuration files

Browse Source
This commit is contained in:
Mike Brady
2015-04-29 15:22:47 +01:00
parent 33d5215d73
commit e73657d6ed
4 changed files with 96 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+2
View File
@@ -40,8 +40,10 @@ endif
if INSTALL_INITSCRIPT
install-exec-hook:
if INSTALL_CONFIG_FILES
cp scripts/shairport-sync.conf /etc/shairport-sync.conf.sample
[ -f /etc/shairport-sync.conf ] || cp scripts/shairport-sync.conf /etc/shairport-sync.conf
endif
[ -f /etc/init.d/shairport-sync ] || cp scripts/shairport-sync /etc/init.d/
update-rc.d shairport-sync defaults 90 10
endif
common.h
+3 -1
View File
@@ -3,6 +3,8 @@
#include <stdint.h>
#include <sys/socket.h>
#include <libconfig.h>
#include "config.h"
#include "audio.h"
#include "mdns.h"
@@ -39,7 +41,7 @@ enum stuffing_type {
typedef struct {
char *configuration_file; // if used, all other command-line arguments are ignored
config_t cfg; // if used, all other command-line arguments are ignored
char *password;
char *apname;
#ifdef CONFIG_METADATA
configure.ac
+26 -6
View File
@@ -31,21 +31,41 @@ fi
AC_CHECK_LIB([daemon],[daemon_log], , AC_MSG_ERROR(libdaemon needed))
AC_CHECK_LIB([pthread],[pthread_create], , AC_MSG_ERROR(pthread library needed))
AC_CHECK_LIB([m],[exp], , AC_MSG_ERROR(maths library needed))
AC_MSG_RESULT(>>Including libpopt)
PKG_CHECK_MODULES(
[POPT], [popt],
[LIBS="${POPT_LIBS} ${LIBS}"
AC_DEFINE([HAVE_LIBPOPT],[1],[Define to 1 if you have popt])])
PKG_CHECK_MODULES(
[LIBCONFIG], [libconfig],
[LIBS="${LIBCONFIG_LIBS} ${LIBS}"
AC_DEFINE([HAVE_LIBCONFIG],[1],[Define to 1 if you have libconfig])])
# Check to see if we should include the initscript
AC_ARG_WITH([initscript],
[ --with-initscript = include a startup script], ,[with_initscript=1])
AM_CONDITIONAL([INSTALL_INITSCRIPT], [test "x$with_initscript" = "x1"])
# Check if we want to support reading arguments from the command line
AC_ARG_WITH([command_line_argument_support],
[ --with-command-line-argument-support = read configuration from command line arguments], ,[with_command_line_argument_support=1])
if test "x${with_command_line_argument_support}" = x1 ; then
AC_MSG_RESULT(>>Including command line argument support)
AC_DEFINE([COMMAND_LINE_ARGUMENT_SUPPORT],[1],[Define to 1 if you want to support command line arguments])
fi
# Check if we want to support reading from a configuration file chosen -- i.e. take parameters from /etc/shairport-sync.conf
AC_ARG_WITH([configfile_support],
[ --with-configfile-support = read configuration from a configuration file], ,[with_configfile_support=1])
if test "x${with_configfile_support}" = x1 ; then
AC_MSG_RESULT(>>Including configuration file support)
PKG_CHECK_MODULES(
[LIBCONFIG], [libconfig],
[LIBS="${LIBCONFIG_LIBS} ${LIBS}"])
AC_DEFINE([SUPPORT_CONFIG_FILES],[1],[Define to 1 if you want to support configuration files])
fi
AM_CONDITIONAL([INSTALL_CONFIG_FILES], [test "x${with_configfile_support}" = "x1"])
# Check to see if we should include the initscript
# Look for piddir flag
AC_ARG_WITH(piddir, [ --with-piddir=<pathname> Specify a pathname to a directory in which to write the PID file.], [
AC_MSG_CHECKING(--with-piddir argument)
shairport.c
+65 -26
View File
@@ -137,6 +137,9 @@ void print_version(void) {
#endif
#ifdef CONFIG_METADATA
strcat(version_string,"-metadata");
#endif
#ifdef SUPPORT_CONFIG_FILES
strcat(version_string,"-configfile");
#endif
printf("%s\n",version_string);
}
@@ -144,14 +147,15 @@ void print_version(void) {
void usage(char *progname) {
printf("Usage: %s [options...]\n", progname);
printf(" or: %s [options...] -- [audio output-specific options]\n", progname);
printf("\n");
printf("Mandatory arguments to long options are mandatory for short options too.\n");
printf("\n");
printf("Options:\n");
printf(" -h, --help show this help\n");
printf(" -V, --version show version information\n");
printf(" -k, --kill kill the existing shairport daemon.\n");
printf(" -D, --disconnectFromOutput disconnect immediately from the output device.\n");
printf(" -R, --reconnectToOutput reconnect to the output device.\n");
#ifdef COMMAND_LINE_ARGUMENT_SUPPORT
printf(" -v, --verbose -v print debug information; -vv more; -vvv lots\n");
printf(" -p, --port=PORT set RTSP listening port\n");
printf(" -a, --name=NAME set advertised name\n");
@@ -167,9 +171,6 @@ void usage(char *progname) {
printf(" \"soxr\" uses libsoxr to minimally resample packet frames -- moderate processor overhead.\n");
printf(" \"soxr\" option only available if built with soxr support.\n");
printf(" -d, --daemon daemonise.\n");
printf(" -k, --kill kill the existing shairport daemon.\n");
printf(" -D, --disconnectFromOutput disconnect immediately from the output device.\n");
printf(" -R, --reconnectToOutput reconnect to the output device.\n");
printf(" -B, --on-start=PROGRAM run PROGRAM when playback is about to begin.\n");
printf(" -E, --on-stop=PROGRAM run PROGRAM when playback has ended.\n");
printf(" For -B and -E options, specify the full path to the program, e.g. /usr/bin/logger.\n");
@@ -187,6 +188,10 @@ void usage(char *progname) {
#ifdef CONFIG_METADATA
printf(" --meta-dir=DIR get metadata from the source and pipe it to DIR/shairport-sync-metadata, e.g. --meta-dir=/tmp.\n");
printf(" --get-coverart get cover art from the source and pipe it to DIR/shairport-sync-metadata, e.g. --meta-dir=/tmp.\n");
#endif
#endif
#ifdef SUPPORT_CONFIG_FILES
printf("All other settings are in the configuration file at /etc/%s.conf\n",progname);
#endif
printf("\n");
mdns_ls_backends();
@@ -195,12 +200,13 @@ void usage(char *progname) {
}
int parse_options(int argc, char **argv) {
char *stuffing = NULL; /* used for picking up the stuffing option */
#ifdef COMMAND_LINE_ARGUMENT_SUPPORT
signed char c; /* used for argument parsing */
int i = 0; /* used for tracking options */
char *stuffing = NULL; /* used for picking up the stuffing option */
poptContext optCon; /* context for parsing command-line options */
struct poptOption optionsTable[] = {
{ "config-file", 0, POPT_ARG_STRING, &config.configuration_file, 0, NULL } ,
{ "statistics", 0, POPT_ARG_NONE, &config.statistics_requested, 0, NULL},
{ "version", 'V', POPT_ARG_NONE, NULL, 0, NULL},
{ "verbose", 'v', POPT_ARG_NONE, NULL, 'v', NULL },
@@ -270,32 +276,65 @@ int parse_options(int argc, char **argv) {
if (c < -1) {
die("%s: %s",poptBadOption(optCon, POPT_BADOPTION_NOALIAS),poptStrerror(c));
}
// now, die if the -c option was chosen and there were more than two arguments, which should be the app name and the single -c option.
if (config.configuration_file!=NULL) {
if ((argc!=2) && !((argc==3) && (debuglev!=0)))
die("If you choose the -c or --config-file option, no other command-line arguments are permitted -- %d arguments seen",argc);
// parse the arguments
#endif
#ifdef SUPPORT_CONFIG_FILES
char configuration_file_path[4096];
strcpy(configuration_file_path,"/etc/");
strcat(configuration_file_path,argv[0]);
strcat(configuration_file_path,".conf");
debug(1,"Looking for file \"%s\"",configuration_file_path);
config_t cfg;
config_setting_t *setting;
const char *str;
int value;
config_init(&cfg);
debug(1,"config stuff initialised");
/* Read the file. If there is an error, report it and exit. */
if(config_read_file(&cfg, config.configuration_file)) {
/* Get the store name. */
if(config_lookup_string(&cfg, "name", &str))
debug(1,"Store name: %s", str);
else
debug(1, "No 'name' setting in configuration file.");
if(config_read_file(&cfg,configuration_file_path)) {
debug(1,"Configuration file opened.");
debug(1,"name");
/* Get the Service Name. */
if(config_lookup_string(&cfg, "general.name", &str))
config.apname=strdup(str);
debug(1,"daemonize");
/* Get the Daemonize setting. */
if(config_lookup_string(&cfg, "general.daemonize", &str)) {
if (strcasecmp(str,"no")==0)
config.daemonise=0;
else if (strcasecmp(str,"yes")==0)
config.daemonise=1;
else
die("Invalid daemonize option choice \"%\". It should be \"yes\" or \"no\"");
}
debug(1,"mdns_backend");
/* Get the mdns_backend setting. */
if(config_lookup_string(&cfg, "general.mdns_backend", &str))
config.mdns_name=strdup(str);
debug(1,"output_backend");
/* Get the output_backend setting. */
if(config_lookup_string(&cfg, "general.output_backend", &str))
config.output_name=strdup(str);
debug(1,"port");
/* Get the port setting. */
if(config_lookup_int(&cfg, "general.port", &value))
config.port=value;
debug(1,"done");
} else {
debug(1,"Couldn't open configuration file.");
debug(1,"Line %d of the configuration file \"%s\":\n%s",config_error_line(&cfg),config_error_file(&cfg),config_error_text(&cfg));
}
config_destroy(&cfg);
}
// config_destroy(&cfg);
#endif
/* Print out options */
debug(2,"statistics_requester status is %d.",config.statistics_requested);