aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

STDERR_FILENO -> fileno(stderr), and fix a brain'o: Systems with limited or

Browse Source 
no signals support obviously don't have SIG_HUP/SIG_USR1 defined.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12614 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2007-03-03 12:42:50 +00:00
parent 539bb39322
commit 1be748b206
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ezstream.c
View File

@ -122,7 +122,6 @@ typedef struct tag_ID3Tag {
char genre; char genre;
} ID3Tag; } ID3Tag;
void sig_handler(int);
#ifdef WIN32 #ifdef WIN32
char * basename(const char *); char * basename(const char *);
#endif #endif
@ -141,6 +140,9 @@ char * getProgname(const char *);
void usage(void); void usage(void);
void usageHelp(void); void usageHelp(void);
#ifdef HAVE_SIGNALS
void sig_handler(int);
void void
sig_handler(int sig) sig_handler(int sig)
{ {
@ -156,6 +158,7 @@ sig_handler(int sig)
break; break;
} }
} }
#endif /* HAVE_SIGNALS */
#ifdef WIN32 #ifdef WIN32
char * char *
@ -528,7 +531,7 @@ openResource(shout_t *shout, const char *fileName, int *popenFlag,
*popenFlag = 0; *popenFlag = 0;
if (pezConfig->reencode) { if (pezConfig->reencode) {
if (strlen(extension) > 0) { if (strlen(extension) > 0) {
int stderr_fd = dup(STDERR_FILENO); int stderr_fd = dup(fileno(stderr));
pCommandString = buildCommandString(extension, fileName, pMetadata); pCommandString = buildCommandString(extension, fileName, pMetadata);
if (vFlag > 1) if (vFlag > 1)
@ -544,7 +547,7 @@ openResource(shout_t *shout, const char *fileName, int *popenFlag,
exit(1); exit(1);
} }
dup2(fd, STDERR_FILENO); dup2(fd, fileno(stderr));
if (fd > 2) if (fd > 2)
close(fd); close(fd);
} }
@ -568,7 +571,7 @@ openResource(shout_t *shout, const char *fileName, int *popenFlag,
xfree(pCommandString); xfree(pCommandString);
if (qFlag) if (qFlag)
dup2(stderr_fd, STDERR_FILENO); dup2(stderr_fd, fileno(stderr));
} else } else
printf("%s: Error: Cannot determine file type of '%s'\n", printf("%s: Error: Cannot determine file type of '%s'\n",
__progname, fileName); __progname, fileName);