Skip to content

M
mpd
Commit 09056300 authored by Avuton Olrich's avatar Avuton Olrich
Browse files
Options

Fix whitespace->tabs in main.c, it was afu

git-svn-id: https://svn.musicpd.org/mpd/trunk@4405 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 3187eb30
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 164 deletions
src/main.c
View file @ 09056300
...@@ -78,17 +78,20 @@ static int setenv(const char *name, const char *value, int replace) ...@@ -78,17 +78,20 @@ static int setenv(const char *name, const char *value, int replace)
size_t namelen, valuelen; size_t namelen, valuelen;
char *envstr; char *envstr;
if (!name || !value) return -1; if (!name || !value)
return -1;
if (!replace) { if (!replace) {
char *oldval = NULL; char *oldval = NULL;
oldval = getenv(name); oldval = getenv(name);
if (oldval) return 0; if (oldval)
return 0;
} }
namelen = strlen(name); namelen = strlen(name);
valuelen = strlen(value); valuelen = strlen(value);
envstr = malloc((namelen + valuelen + 2)); envstr = malloc((namelen + valuelen + 2));
if (!envstr) return -1; if (!envstr)
return -1;
memcpy(envstr, name, namelen); memcpy(envstr, name, namelen);
envstr[namelen] = '='; envstr[namelen] = '=';
...@@ -106,27 +109,30 @@ static int setenv(const char *name, const char *value, int replace) ...@@ -106,27 +109,30 @@ static int setenv(const char *name, const char *value, int replace)
} }
#endif /* HAVE_SETENV */ #endif /* HAVE_SETENV */
static void usage(char * argv[]) { static void usage(char *argv[])
{
ERROR("usage:\n"); ERROR("usage:\n");
ERROR(" %s [options] <conf file>\n",argv[0]); ERROR(" %s [options] <conf file>\n", argv[0]);
ERROR(" %s [options] (searches for ~%s then %s)\n", ERROR(" %s [options] (searches for ~%s then %s)\n",
argv[0],USER_CONFIG_FILE_LOCATION, argv[0], USER_CONFIG_FILE_LOCATION, SYSTEM_CONFIG_FILE_LOCATION);
SYSTEM_CONFIG_FILE_LOCATION);
ERROR("\n"); ERROR("\n");
ERROR("options:\n"); ERROR("options:\n");
ERROR(" --help this usage statement\n"); ERROR(" --help this usage statement\n");
ERROR(" --kill kill the currently running mpd session\n"); ERROR(" --kill kill the currently running mpd session\n");
ERROR(" --create-db force (re)creation of database and exit\n"); ERROR
ERROR(" --no-create-db don't create database, even if it doesn't exist\n"); (" --create-db force (re)creation of database and exit\n");
ERROR
(" --no-create-db don't create database, even if it doesn't exist\n");
ERROR(" --no-daemon don't detach from console\n"); ERROR(" --no-daemon don't detach from console\n");
ERROR(" --stdout print messages to stdout and stderr\n"); ERROR(" --stdout print messages to stdout and stderr\n");
/*ERROR(" --update-db create database and exit\n");*/ /*ERROR(" --update-db create database and exit\n"); */
ERROR(" --verbose verbose logging\n"); ERROR(" --verbose verbose logging\n");
ERROR(" --version prints version information\n"); ERROR(" --version prints version information\n");
} }
static void version(void) { static void version(void)
LOG("mpd (MPD: Music Player Daemon) %s\n",VERSION); {
LOG("mpd (MPD: Music Player Daemon) %s\n", VERSION);
LOG("\n"); LOG("\n");
LOG("Copyright (C) 2003-2006 Warren Dukes <warren.dukes@gmail.com>\n"); LOG("Copyright (C) 2003-2006 Warren Dukes <warren.dukes@gmail.com>\n");
LOG("This is free software; see the source for copying conditions. There is NO\n"); LOG("This is free software; see the source for copying conditions. There is NO\n");
...@@ -143,7 +149,8 @@ static void version(void) { ...@@ -143,7 +149,8 @@ static void version(void) {
printAllOutputPluginTypes(stdout); printAllOutputPluginTypes(stdout);
} }
static void parseOptions(int argc, char ** argv, Options * options) { static void parseOptions(int argc, char **argv, Options * options)
{
int argcLeft = argc; int argcLeft = argc;
options->daemon = 1; options->daemon = 1;
...@@ -152,78 +159,66 @@ static void parseOptions(int argc, char ** argv, Options * options) { ...@@ -152,78 +159,66 @@ static void parseOptions(int argc, char ** argv, Options * options) {
options->updateDB = 0; options->updateDB = 0;
options->kill = 0; options->kill = 0;
if(argc>1) { if (argc > 1) {
int i = 1; int i = 1;
while(i<argc) { while (i < argc) {
if(strncmp(argv[i],"--",2)==0) { if (strncmp(argv[i], "--", 2) == 0) {
if(strcmp(argv[i],"--help")==0) { if (strcmp(argv[i], "--help") == 0) {
usage(argv); usage(argv);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} } else if (strcmp(argv[i], "--kill") == 0) {
else if(strcmp(argv[i],"--kill")==0) {
options->kill++; options->kill++;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--no-daemon") == 0) {
else if(strcmp(argv[i],"--no-daemon")==0) {
options->daemon = 0; options->daemon = 0;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--stdout") == 0) {
else if(strcmp(argv[i],"--stdout")==0) {
options->stdOutput = 1; options->stdOutput = 1;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--create-db") == 0) {
else if(strcmp(argv[i],"--create-db")==0) {
options->stdOutput = 1; options->stdOutput = 1;
options->createDB = 1; options->createDB = 1;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--no-create-db") ==
/*else if(strcmp(argv[i],"--update-db")==0) { 0) {
options->stdOutput = 1;
options->updateDB = 1;
argcLeft--;
}*/
else if(strcmp(argv[i],"--no-create-db")==0) {
options->createDB = -1; options->createDB = -1;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--verbose") == 0) {
else if(strcmp(argv[i],"--verbose")==0) {
logLevel = LOG_LEVEL_DEBUG; logLevel = LOG_LEVEL_DEBUG;
argcLeft--; argcLeft--;
} } else if (strcmp(argv[i], "--version") == 0) {
else if(strcmp(argv[i],"--version")==0) {
version(); version();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} } else {
else { myfprintf(stderr,
myfprintf(stderr,"unknown command line option: %s\n",argv[i]); "unknown command line option: %s\n",
argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} } else
else break; break;
i++; i++;
} }
} }
if(argcLeft<=2) { if (argcLeft <= 2) {
if(argcLeft==2) { if (argcLeft == 2) {
readConf(argv[argc-1]); readConf(argv[argc - 1]);
return; return;
} } else if (argcLeft == 1) {
else if(argcLeft==1) {
struct stat st; struct stat st;
char * homedir = getenv("HOME"); char *homedir = getenv("HOME");
char userfile[MAXPATHLEN+1] = ""; char userfile[MAXPATHLEN + 1] = "";
if(homedir && (strlen(homedir)+ if (homedir && (strlen(homedir) +
strlen(USER_CONFIG_FILE_LOCATION)) < strlen(USER_CONFIG_FILE_LOCATION)) <
MAXPATHLEN) { MAXPATHLEN) {
strcpy(userfile,homedir); strcpy(userfile, homedir);
strcat(userfile,USER_CONFIG_FILE_LOCATION); strcat(userfile, USER_CONFIG_FILE_LOCATION);
} }
if(strlen(userfile) && (0 == stat(userfile,&st))) { if (strlen(userfile) && (0 == stat(userfile, &st))) {
readConf(userfile); readConf(userfile);
return; return;
} } else if (0 == stat(SYSTEM_CONFIG_FILE_LOCATION, &st)) {
else if(0 == stat(SYSTEM_CONFIG_FILE_LOCATION,&st)) {
readConf(SYSTEM_CONFIG_FILE_LOCATION); readConf(SYSTEM_CONFIG_FILE_LOCATION);
return; return;
} }
...@@ -234,31 +229,33 @@ static void parseOptions(int argc, char ** argv, Options * options) { ...@@ -234,31 +229,33 @@ static void parseOptions(int argc, char ** argv, Options * options) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static void closeAllFDs(void) { static void closeAllFDs(void)
{
int i; int i;
int fds = getdtablesize(); int fds = getdtablesize();
for(i = 3; i < fds; i++) close(i); for (i = 3; i < fds; i++)
close(i);
} }
static void changeToUser(void) { static void changeToUser(void)
ConfigParam * param = getConfigParam(CONF_USER); {
ConfigParam *param = getConfigParam(CONF_USER);
if (param && strlen(param->value)) { if (param && strlen(param->value)) {
/* get uid */ /* get uid */
struct passwd * userpwd; struct passwd *userpwd;
if ((userpwd = getpwnam(param->value)) == NULL) { if ((userpwd = getpwnam(param->value)) == NULL) {
ERROR("no such user \"%s\" at line %i\n", param->value, ERROR("no such user \"%s\" at line %i\n", param->value,
param->line); param->line);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(setgid(userpwd->pw_gid) == -1) { if (setgid(userpwd->pw_gid) == -1) {
ERROR("cannot setgid for user \"%s\" at line %i: %s\n", param->value, param->line, ERROR("cannot setgid for user \"%s\" at line %i: %s\n",
strerror(errno)); param->value, param->line, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef _BSD_SOURCE #ifdef _BSD_SOURCE
/* init suplementary groups /* init suplementary groups
* (must be done before we change our uid) * (must be done before we change our uid)
...@@ -266,8 +263,7 @@ static void changeToUser(void) { ...@@ -266,8 +263,7 @@ static void changeToUser(void) {
if (initgroups(param->value, userpwd->pw_gid) == -1) { if (initgroups(param->value, userpwd->pw_gid) == -1) {
WARNING("cannot init supplementary groups " WARNING("cannot init supplementary groups "
"of user \"%s\" at line %i: %s\n", "of user \"%s\" at line %i: %s\n",
param->value, param->line, param->value, param->line, strerror(errno));
strerror(errno));
} }
#endif #endif
...@@ -275,74 +271,78 @@ static void changeToUser(void) { ...@@ -275,74 +271,78 @@ static void changeToUser(void) {
if (setuid(userpwd->pw_uid) == -1) { if (setuid(userpwd->pw_uid) == -1) {
ERROR("cannot change to uid of user " ERROR("cannot change to uid of user "
"\"%s\" at line %i: %s\n", "\"%s\" at line %i: %s\n",
param->value, param->line, param->value, param->line, strerror(errno));
strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* this is needed by libs such as arts */ /* this is needed by libs such as arts */
if(userpwd->pw_dir) { if (userpwd->pw_dir) {
setenv("HOME", userpwd->pw_dir, 1); setenv("HOME", userpwd->pw_dir, 1);
} }
} }
} }
static void openLogFiles(Options * options, FILE ** out, FILE ** err) { static void openLogFiles(Options * options, FILE ** out, FILE ** err)
ConfigParam * logParam = parseConfigFilePath(CONF_LOG_FILE, 1); {
ConfigParam * errorParam = parseConfigFilePath(CONF_ERROR_FILE, 1); ConfigParam *logParam = parseConfigFilePath(CONF_LOG_FILE, 1);
ConfigParam *errorParam = parseConfigFilePath(CONF_ERROR_FILE, 1);
mode_t prev; mode_t prev;
if(options->stdOutput) { if (options->stdOutput) {
flushWarningLog(); flushWarningLog();
return; return;
} }
/* be sure to create log files w/ rw permissions*/ /* be sure to create log files w/ rw permissions */
prev = umask(0066); prev = umask(0066);
if(NULL==(*out=fopen(logParam->value,"a"))) { if (NULL == (*out = fopen(logParam->value, "a"))) {
ERROR("problem opening log file \"%s\" (config line %i) for " ERROR("problem opening log file \"%s\" (config line %i) for "
"writing\n", logParam->value, logParam->line); "writing\n", logParam->value, logParam->line);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(NULL==(*err=fopen(errorParam->value,"a"))) { if (NULL == (*err = fopen(errorParam->value, "a"))) {
ERROR("problem opening error file \"%s\" (config line %i) for " ERROR("problem opening error file \"%s\" (config line %i) for "
"writing\n", errorParam->value, "writing\n", errorParam->value, errorParam->line);
errorParam->line);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
umask(prev); umask(prev);
} }
static void openDB(Options * options, char * argv0) { static void openDB(Options * options, char *argv0)
if(options->createDB>0 || readDirectoryDB()<0) { {
if(options->createDB<0) { if (options->createDB > 0 || readDirectoryDB() < 0) {
if (options->createDB < 0) {
ERROR("can't open db file and using \"--no-create-db\"" ERROR("can't open db file and using \"--no-create-db\""
" command line option\n"); " command line option\n");
ERROR("try running \"%s --create-db\"\n", argv0); ERROR("try running \"%s --create-db\"\n", argv0);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
flushWarningLog(); flushWarningLog();
if(checkDirectoryDB()<0) exit(EXIT_FAILURE); if (checkDirectoryDB() < 0)
exit(EXIT_FAILURE);
initMp3Directory(); initMp3Directory();
if(writeDirectoryDB()<0) exit(EXIT_FAILURE); if (writeDirectoryDB() < 0)
if(options->createDB) exit(EXIT_SUCCESS); exit(EXIT_FAILURE);
if (options->createDB)
exit(EXIT_SUCCESS);
} }
if(options->updateDB) { if (options->updateDB) {
flushWarningLog(); flushWarningLog();
updateMp3Directory(); updateMp3Directory();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
} }
static void startMainProcess(void) { static void startMainProcess(void)
{
int pid; int pid;
fflush(0); fflush(0);
pid = fork(); pid = fork();
if(pid>0) { if (pid > 0) {
initInputStream(); initInputStream();
initReplayGainState(); initReplayGainState();
readAudioDevicesState(); readAudioDevicesState();
...@@ -353,7 +353,7 @@ static void startMainProcess(void) { ...@@ -353,7 +353,7 @@ static void startMainProcess(void) {
mainPid = pid; mainPid = pid;
masterInitSigHandlers(); masterInitSigHandlers();
kill(mainPid, SIGUSR1); kill(mainPid, SIGUSR1);
while (masterHandlePendingSignals()!=COMMAND_RETURN_KILL) while (masterHandlePendingSignals() != COMMAND_RETURN_KILL)
waitOnSignals(); waitOnSignals();
/* we're killed */ /* we're killed */
playerKill(); playerKill();
...@@ -364,12 +364,12 @@ static void startMainProcess(void) { ...@@ -364,12 +364,12 @@ static void startMainProcess(void) {
finishPaths(); finishPaths();
kill(mainPid, SIGTERM); kill(mainPid, SIGTERM);
waitpid(mainPid,NULL,0); waitpid(mainPid, NULL, 0);
finishConf(); finishConf();
myfprintfCloseLogFile(); myfprintfCloseLogFile();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if(pid<0) { } else if (pid < 0) {
ERROR("problems fork'ing main process!\n"); ERROR("problems fork'ing main process!\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -377,48 +377,52 @@ static void startMainProcess(void) { ...@@ -377,48 +377,52 @@ static void startMainProcess(void) {
DEBUG("main process started!\n"); DEBUG("main process started!\n");
} }
static void daemonize(Options * options) { static void daemonize(Options * options)
FILE * fp = NULL; {
ConfigParam * pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); FILE *fp = NULL;
ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0);
if (pidFileParam) { if (pidFileParam) {
/* do this before daemon'izing so we can fail gracefully if we can't /* do this before daemon'izing so we can fail gracefully if we can't
* write to the pid file */ * write to the pid file */
DEBUG("opening pid file\n"); DEBUG("opening pid file\n");
fp = fopen(pidFileParam->value, "w+"); fp = fopen(pidFileParam->value, "w+");
if(!fp) { if (!fp) {
ERROR("could not open %s \"%s\" (at line %i) for writing: %s\n", ERROR
("could not open %s \"%s\" (at line %i) for writing: %s\n",
CONF_PID_FILE, pidFileParam->value, CONF_PID_FILE, pidFileParam->value,
pidFileParam->line, strerror(errno)); pidFileParam->line, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
if(options->daemon) { if (options->daemon) {
int pid; int pid;
fflush(NULL); fflush(NULL);
pid = fork(); pid = fork();
if(pid>0) _exit(EXIT_SUCCESS); if (pid > 0)
else if(pid<0) { _exit(EXIT_SUCCESS);
else if (pid < 0) {
ERROR("problems fork'ing for daemon!\n"); ERROR("problems fork'ing for daemon!\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(chdir("/")<0) { if (chdir("/") < 0) {
ERROR("problems changing to root directory\n"); ERROR("problems changing to root directory\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(setsid()<0) { if (setsid() < 0) {
ERROR("problems setsid'ing\n"); ERROR("problems setsid'ing\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
fflush(NULL); fflush(NULL);
pid = fork(); pid = fork();
if(pid>0) _exit(EXIT_SUCCESS); if (pid > 0)
else if(pid<0) { _exit(EXIT_SUCCESS);
else if (pid < 0) {
ERROR("problems fork'ing for daemon!\n"); ERROR("problems fork'ing for daemon!\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -434,18 +438,19 @@ static void daemonize(Options * options) { ...@@ -434,18 +438,19 @@ static void daemonize(Options * options) {
} }
} }
static void setupLogOutput(Options * options, FILE * out, FILE * err) { static void setupLogOutput(Options * options, FILE * out, FILE * err)
if(!options->stdOutput) { {
if (!options->stdOutput) {
fflush(NULL); fflush(NULL);
if(dup2(fileno(out),STDOUT_FILENO)<0) { if (dup2(fileno(out), STDOUT_FILENO) < 0) {
myfprintf(err,"problems dup2 stdout : %s\n", myfprintf(err, "problems dup2 stdout : %s\n",
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(dup2(fileno(err),STDERR_FILENO)<0) { if (dup2(fileno(err), STDERR_FILENO) < 0) {
myfprintf(err,"problems dup2 stderr : %s\n", myfprintf(err, "problems dup2 stderr : %s\n",
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -456,36 +461,36 @@ static void setupLogOutput(Options * options, FILE * out, FILE * err) { ...@@ -456,36 +461,36 @@ static void setupLogOutput(Options * options, FILE * out, FILE * err) {
/* lets redirect stdin to dev null as a work around for libao bug */ /* lets redirect stdin to dev null as a work around for libao bug */
{ {
int fd = open("/dev/null",O_RDONLY); int fd = open("/dev/null", O_RDONLY);
if(fd<0) { if (fd < 0) {
ERROR("not able to open /dev/null to redirect stdin: " ERROR("not able to open /dev/null to redirect stdin: "
"%s\n",strerror(errno)); "%s\n", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(dup2(fd,STDIN_FILENO)<0) { if (dup2(fd, STDIN_FILENO) < 0) {
ERROR("problems dup2's stdin for redirection: " ERROR("problems dup2's stdin for redirection: "
"%s\n",strerror(errno)); "%s\n", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
} }
static void cleanUpPidFile(void) { static void cleanUpPidFile(void)
ConfigParam * pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); {
ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0);
if (!pidFileParam) return; if (!pidFileParam)
return;
DEBUG("cleaning up pid file\n"); DEBUG("cleaning up pid file\n");
unlink(pidFileParam->value); unlink(pidFileParam->value);
} }
static void killFromPidFile(char * cmd, int killOption) { static void killFromPidFile(char *cmd, int killOption)
/*char buf[32]; {
struct stat st_cmd; FILE *fp;
struct stat st_exe;*/ ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0);
FILE * fp;
ConfigParam * pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0);
int pid; int pid;
if (!pidFileParam) { if (!pidFileParam) {
...@@ -493,57 +498,30 @@ static void killFromPidFile(char * cmd, int killOption) { ...@@ -493,57 +498,30 @@ static void killFromPidFile(char * cmd, int killOption) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
fp = fopen(pidFileParam->value,"r"); fp = fopen(pidFileParam->value, "r");
if(!fp) { if (!fp) {
ERROR("unable to open %s \"%s\": %s\n", ERROR("unable to open %s \"%s\": %s\n",
CONF_PID_FILE, pidFileParam->value, CONF_PID_FILE, pidFileParam->value, strerror(errno));
strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if(fscanf(fp, "%i", &pid) != 1) { if (fscanf(fp, "%i", &pid) != 1) {
ERROR("unable to read the pid from file \"%s\"\n", ERROR("unable to read the pid from file \"%s\"\n",
pidFileParam->value); pidFileParam->value);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
fclose(fp); fclose(fp);
/*memset(buf, 0, 32); if (kill(pid, SIGTERM)) {
snprintf(buf, 31, "/proc/%i/exe", pid);
if(killOption == 1) {
if(stat(cmd, &st_cmd)) {
ERROR("unable to stat file \"%s\"\n", cmd);
ERROR("execute \"%s --kill -kill\" to kill pid %i\n",
cmd, pid);
exit(EXIT_FAILURE);
}
if(stat(buf, &st_exe)) {
ERROR("unable to kill proccess %i (%s: %s)\n", pid, buf,
strerror(errno));
ERROR("execute \"%s --kill -kill\" to kill pid %i\n",
cmd, pid);
exit(EXIT_FAILURE);
}
if(st_exe.st_dev != st_cmd.st_dev || st_exe.st_ino != st_cmd.st_ino) {
ERROR("%s doesn't appear to be running as pid %i\n",
cmd, pid);
ERROR("execute \"%s --kill -kill\" to kill pid %i\n",
cmd, pid);
exit(EXIT_FAILURE);
}
}*/
if(kill(pid, SIGTERM)) {
ERROR("unable to kill proccess %i: %s\n", pid, strerror(errno)); ERROR("unable to kill proccess %i: %s\n", pid, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
int main(int argc, char * argv[]) { int main(int argc, char *argv[])
FILE * out = NULL; {
FILE * err = NULL; FILE *out = NULL;
FILE *err = NULL;
Options options; Options options;
closeAllFDs(); closeAllFDs();
...@@ -552,14 +530,15 @@ int main(int argc, char * argv[]) { ...@@ -552,14 +530,15 @@ int main(int argc, char * argv[]) {
parseOptions(argc, argv, &options); parseOptions(argc, argv, &options);
if(options.kill) killFromPidFile(argv[0], options.kill); if (options.kill)
killFromPidFile(argv[0], options.kill);
initStats(); initStats();
initTagConfig(); initTagConfig();
initLog(); initLog();
if(options.createDB <= 0 && !options.updateDB) listenOnPort(); if (options.createDB <= 0 && !options.updateDB)
listenOnPort();
changeToUser(); changeToUser();
...@@ -602,9 +581,9 @@ int main(int argc, char * argv[]) { ...@@ -602,9 +581,9 @@ int main(int argc, char * argv[]) {
openVolumeDevice(); openVolumeDevice();
readPlaylistState(); readPlaylistState();
while (COMMAND_RETURN_KILL != doIOForInterfaces()) {
while(COMMAND_RETURN_KILL!=doIOForInterfaces()) { if (COMMAND_RETURN_KILL == handlePendingSignals())
if(COMMAND_RETURN_KILL==handlePendingSignals()) break; break;
syncPlayerAndPlaylist(); syncPlayerAndPlaylist();
closeOldInterfaces(); closeOldInterfaces();
readDirectoryDBIfUpdateIsFinished(); readDirectoryDBIfUpdateIsFinished();
...@@ -618,7 +597,7 @@ int main(int argc, char * argv[]) { ...@@ -618,7 +597,7 @@ int main(int argc, char * argv[]) {
/* This slows shutdown immensely, and doesn't really accomplish /* This slows shutdown immensely, and doesn't really accomplish
* anything. Uncomment when we rewrite tagTracker to use a tree. */ * anything. Uncomment when we rewrite tagTracker to use a tree. */
/*closeMp3Directory();*/ /*closeMp3Directory(); */
finishPlaylist(); finishPlaylist();
freePlayerData(); freePlayerData();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment