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

Simplify playlist_program()

Browse Source
This commit is contained in:
Moritz Grimm 2015-05-30 21:48:46 +02:00
parent cf141edd52
commit 8d9f475e38
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/playlist.c
View File

@ -111,10 +111,7 @@ static const char *
_playlist_run_program(struct playlist *pl) _playlist_run_program(struct playlist *pl)
{ {
FILE *filep; FILE *filep;
char buf[PATH_MAX]; char buf[PATH_MAX + 1];
if (!pl->program)
return (NULL);
fflush(NULL); fflush(NULL);
errno = 0; errno = 0;
@ -129,21 +126,13 @@ _playlist_run_program(struct playlist *pl)
return (NULL); return (NULL);
} }
if (fgets(buf, (int)sizeof(buf), filep) == NULL) { fgets(buf, (int)sizeof(buf), filep);
int errnum = errno;
if (ferror(filep)) { if (ferror(filep)) {
log_alert("%s: output read error: %s", pl->filename, log_error("%s: output read error: %s", pl->filename,
strerror(errnum)); strerror(ferror(filep)));
pclose(filep); pclose(filep);
exit(1);
}
pclose(filep);
/* No output (end of playlist.) */
return (NULL); return (NULL);
} }
pclose(filep); pclose(filep);
if (strlen(buf) == sizeof(buf) - 1) { if (strlen(buf) == sizeof(buf) - 1) {
@ -157,7 +146,6 @@ _playlist_run_program(struct playlist *pl)
/* Empty line (end of playlist.) */ /* Empty line (end of playlist.) */
return (NULL); return (NULL);
if (pl->prog_track != NULL)
xfree(pl->prog_track); xfree(pl->prog_track);
pl->prog_track = xstrdup(buf); pl->prog_track = xstrdup(buf);
@ -265,25 +253,22 @@ playlist_program(const char *filename)
struct playlist *pl; struct playlist *pl;
struct stat st; struct stat st;
pl = _playlist_create(filename);
pl->program = 1;
if (stat(filename, &st) == -1) { if (stat(filename, &st) == -1) {
log_error("%s: %s", filename, strerror(errno)); log_error("%s: %s", filename, strerror(errno));
playlist_free(&pl);
return (NULL); return (NULL);
} }
if (st.st_mode & S_IWOTH) { if (st.st_mode & S_IWOTH) {
log_error("%s: world writeable", filename); log_error("%s: world writeable", filename);
playlist_free(&pl);
return (NULL); return (NULL);
} }
if (!(st.st_mode & (S_IEXEC | S_IXGRP | S_IXOTH))) { if (!(st.st_mode & (S_IEXEC | S_IXGRP | S_IXOTH))) {
log_error("%s: not an executable program", filename); log_error("%s: not an executable program", filename);
playlist_free(&pl);
return (NULL); return (NULL);
} }
pl = _playlist_create(filename);
pl->program = 1;
return (pl); return (pl);
} }
@ -321,6 +306,7 @@ playlist_free(struct playlist **pl_p)
} }
xfree(*pl_p); xfree(*pl_p);
*pl_p = NULL;
} }
const char * const char *