stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Andreas Öman 2008-03-25 17:52:49 +00:00
parent cc2c634b3d
commit 48a2cf5897
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
spawn.c
View file

@ -42,6 +42,22 @@ typedef struct spawn {
} spawn_t;
TAILQ_HEAD(spawn_output_buf_queue, spawn_output_buf);
#define MAX_SOB_SIZE 4000
typedef struct spawn_output_buf {
TAILQ_ENTRY(spawn_output_buf) sob_link;
int sob_size;
char sob_buf[MAX_SOB_SIZE];
} spawn_output_buf_t;
/**
* The reaper is called once a second to finish of any pending spawns
*/
static void
reaper(void *opaque, int64_t now)
{
@ -97,7 +113,9 @@ spawn_init(void)
}
/**
* Enqueue a spawn on the pending spawn list
*/
static spawn_t *
spawn_enq(const char *name, int pid)
{
@ -114,17 +132,6 @@ spawn_enq(const char *name, int pid)
TAILQ_HEAD(spawn_output_buf_queue, spawn_output_buf);
#define MAX_SOB_SIZE 4000
typedef struct spawn_output_buf {
TAILQ_ENTRY(spawn_output_buf) sob_link;
int sob_size;
char sob_buf[MAX_SOB_SIZE];
} spawn_output_buf_t;
int
spawn_and_store_stdout(const char *prog, char **outp)
@ -141,8 +148,11 @@ spawn_and_store_stdout(const char *prog, char **outp)
p = fork();
if(p == -1)
if(p == -1) {
syslog(LOG_ERR, "spawn: Unable to fork() for \"%s\" -- %s",
prog, strerror(errno));
return -1;
}
if(p == 0) {
close(0);
@ -159,7 +169,7 @@ spawn_and_store_stdout(const char *prog, char **outp)
}
spawn_enq(prog, p);
close(fd[1]);
TAILQ_INIT(&bufs);