Commit b74fd4c6 authored by Led's avatar Led

0.9.3-rc3

parent 0b3494b6
...@@ -495,11 +495,12 @@ int interfacePrintWithFD(int fd,char * buffer) { ...@@ -495,11 +495,12 @@ int interfacePrintWithFD(int fd,char * buffer) {
if(!(buflen = strlen(buffer))) return -1; if(!(buflen = strlen(buffer))) return -1;
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].fd==fd) break; if(interfaces[i].open && interfaces[i].fd==fd) break;
} }
/* if fd isn't found or interfaces is going to be closed, do nothing */ /* if fd isn't found or interfaces is going to be closed, do nothing */
if(i==interface_max_connections || interfaces[i].expired) return -1; if(i==interface_max_connections) return -1;
if(interfaces[i].expired) return 0;
interface = interfaces+i; interface = interfaces+i;
......
...@@ -119,6 +119,10 @@ void parseOptions(int argc, char ** argv, Options * options) { ...@@ -119,6 +119,10 @@ void parseOptions(int argc, char ** argv, Options * options) {
version(); version();
exit(0); exit(0);
} }
else {
myfprintf(stderr,"unknown command line option: %s\n",argv[i]);
exit(-1);
}
} }
else break; else break;
i++; i++;
......
...@@ -55,7 +55,7 @@ void myfprintf(FILE * fp, char * format, ... ) { ...@@ -55,7 +55,7 @@ void myfprintf(FILE * fp, char * format, ... ) {
fprintf(fp,"%s : ",str); fprintf(fp,"%s : ",str);
vfprintf(fp,format,arglist); vfprintf(fp,format,arglist);
} }
else if(fcntl) { else if(fcntlret & O_NONBLOCK) {
char buffer[BUFFER_LENGTH+1]; char buffer[BUFFER_LENGTH+1];
vsnprintf(buffer,BUFFER_LENGTH,format,arglist); vsnprintf(buffer,BUFFER_LENGTH,format,arglist);
if(interfacePrintWithFD(fd,buffer)<0) { if(interfacePrintWithFD(fd,buffer)<0) {
......
...@@ -93,8 +93,8 @@ int playerInit() { ...@@ -93,8 +93,8 @@ int playerInit() {
sigaction(SIGTERM,&sa,NULL); sigaction(SIGTERM,&sa,NULL);
close(listenSocket); close(listenSocket);
freeAllInterfaces();
finishPlaylist(); finishPlaylist();
freeAllInterfaces();
closeMp3Directory(); closeMp3Directory();
closeTables(); closeTables();
finishVolume(); finishVolume();
......
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