aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

updates for #599 (dropping of stdin,out,err when using -b) and #630 (pidfile

Browse Source 
created before changeowner/chroot)

svn path=/icecast/trunk/icecast/; revision=9759
This commit is contained in:
Karl Heyes 2005-08-16 21:14:43 +00:00
parent 092c73b4a5
commit 77ad26f39b
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main.c
View File

@ -63,6 +63,9 @@
#undef CATMODULE #undef CATMODULE
#define CATMODULE "main" #define CATMODULE "main"
static int background;
static char *pidfile = NULL;
static void _fatal_error(char *perr) static void _fatal_error(char *perr)
{ {
#ifdef WIN32 #ifdef WIN32
@ -132,7 +135,7 @@ static int _parse_config_opts(int argc, char **argv, char *filename, int size)
int i = 1; int i = 1;
int config_ok = 0; int config_ok = 0;
background = 0;
if (argc < 2) return -1; if (argc < 2) return -1;
while (i < argc) { while (i < argc) {
@ -151,6 +154,7 @@ static int _parse_config_opts(int argc, char **argv, char *filename, int size)
fprintf(stderr, "FATAL: Unable to fork child!"); fprintf(stderr, "FATAL: Unable to fork child!");
exit(1); exit(1);
} }
background = 1;
#endif #endif
} }
if (strcmp(argv[i], "-v") == 0) { if (strcmp(argv[i], "-v") == 0) {
@ -300,6 +304,8 @@ static int _start_listening(void)
/* bind the socket and start listening */ /* bind the socket and start listening */
static int _server_proc_init(void) static int _server_proc_init(void)
{ {
ice_config_t *config;
if (!_setup_sockets()) if (!_setup_sockets())
return 0; return 0;
@ -308,6 +314,19 @@ static int _server_proc_init(void)
return 0; return 0;
} }
config = config_get_config_unlocked();
/* recreate the pid file */
if (config->pidfile)
{
FILE *f;
pidfile = strdup (config->pidfile);
if (pidfile && (f = fopen (config->pidfile, "w")) != NULL)
{
fprintf (f, "%d\n", (int)getpid());
fclose (f);
}
}
return 1; return 1;
} }
@ -316,6 +335,12 @@ static void _server_proc(void)
{ {
int i; int i;
if (background)
{
fclose (stdin);
fclose (stdout);
fclose (stderr);
}
connection_accept_loop(); connection_accept_loop();
for(i=0; i < MAX_LISTEN_SOCKETS; i++) for(i=0; i < MAX_LISTEN_SOCKETS; i++)
@ -402,8 +427,6 @@ static void _ch_root_uid_setup(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int res, ret; int res, ret;
ice_config_t *config;
char *pidfile = NULL;
char filename[512]; char filename[512];
char pbuf[1024]; char pbuf[1024];
@ -482,19 +505,6 @@ int main(int argc, char **argv)
return 1; return 1;
} }
config = config_get_config_unlocked();
/* recreate the pid file */
if (config->pidfile)
{
FILE *f;
pidfile = strdup (config->pidfile);
if (pidfile && (f = fopen (config->pidfile, "w")) != NULL)
{
fprintf (f, "%d\n", (int)getpid());
fclose (f);
}
}
INFO0 (ICECAST_VERSION_STRING " server started"); INFO0 (ICECAST_VERSION_STRING " server started");
/* REM 3D Graphics */ /* REM 3D Graphics */