storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix a couple bugs in error handling when forking.

Browse Source
This commit is contained in:
Justin Maggard 2009-03-17 22:08:51 +00:00
parent 58862a115f
commit d484d5870c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
upnphttp.c
View File

@ -869,15 +869,16 @@ void
send_file(struct upnphttp * h, int sendfd, off_t offset, off_t end_offset) send_file(struct upnphttp * h, int sendfd, off_t offset, off_t end_offset)
{ {
off_t send_size; off_t send_size;
off_t ret;
while( offset < end_offset ) while( offset < end_offset )
{ {
send_size = ( ((end_offset - offset) < MAX_BUFFER_SIZE) ? (end_offset - offset + 1) : MAX_BUFFER_SIZE); send_size = ( ((end_offset - offset) < MAX_BUFFER_SIZE) ? (end_offset - offset + 1) : MAX_BUFFER_SIZE);
off_t ret = sendfile(h->socket, sendfd, &offset, send_size); ret = sendfile(h->socket, sendfd, &offset, send_size);
if( ret == -1 ) if( ret == -1 )
{ {
DPRINTF(E_WARN, L_HTTP, "sendfile error :: error no. %d [%s]\n", errno, strerror(errno)); DPRINTF(E_WARN, L_HTTP, "sendfile error :: error no. %d [%s]\n", errno, strerror(errno));
if( errno == 32 || errno == 9 || errno == 54 || errno == 104 ) if( errno != EAGAIN )
break; break;
} }
/*else /*else
@ -1170,7 +1171,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
{ {
DPRINTF(E_WARN, L_HTTP, "Client tried to specify transferMode as Streaming with a resized image!\n"); DPRINTF(E_WARN, L_HTTP, "Client tried to specify transferMode as Streaming with a resized image!\n");
Send406(h); Send406(h);
return; goto resized_error;
} }
sprintf(sql_buf, "SELECT PATH, RESOLUTION, THUMBNAIL from DETAILS where ID = '%s'", path); sprintf(sql_buf, "SELECT PATH, RESOLUTION, THUMBNAIL from DETAILS where ID = '%s'", path);
@ -1179,7 +1180,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
{ {
free(path); free(path);
DPRINTF(E_ERROR, L_HTTP, "Didn't find valid file for %s!\n", path); DPRINTF(E_ERROR, L_HTTP, "Didn't find valid file for %s!\n", path);
return; goto resized_error;
} }
file_path = result[3]; file_path = result[3];
resolution = result[4]; resolution = result[4];
@ -1201,7 +1202,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
exif_data_unref(ed); exif_data_unref(ed);
Send404(h); Send404(h);
sqlite3_free_table(result); sqlite3_free_table(result);
return; goto resized_error;
} }
imsrc = gdImageCreateFromJpegPtr(ed->size, ed->data); imsrc = gdImageCreateFromJpegPtr(ed->size, ed->data);
exif_data_unref(ed); exif_data_unref(ed);
@ -1213,7 +1214,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
{ {
Send404(h); Send404(h);
sqlite3_free_table(result); sqlite3_free_table(result);
return; goto resized_error;
} }
imsrc = gdImageCreateFromJpeg(imgfile); imsrc = gdImageCreateFromJpeg(imgfile);
fclose(imgfile); fclose(imgfile);
@ -1222,7 +1223,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
{ {
Send404(h); Send404(h);
sqlite3_free_table(result); sqlite3_free_table(result);
return; goto resized_error;
} }
/* Figure out the best destination resolution we can use */ /* Figure out the best destination resolution we can use */
dstw = width; dstw = width;
@ -1274,6 +1275,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
gdImageDestroy(imdst); gdImageDestroy(imdst);
DPRINTF(E_INFO, L_HTTP, "Done serving %s\n", file_path); DPRINTF(E_INFO, L_HTTP, "Done serving %s\n", file_path);
sqlite3_free_table(result); sqlite3_free_table(result);
resized_error:
#if USE_FORK #if USE_FORK
_exit(0); _exit(0);
#endif #endif
@ -1309,7 +1311,7 @@ SendResp_dlnafile(struct upnphttp * h, char * object)
DPRINTF(E_WARN, L_HTTP, "%s not found, responding ERROR 404\n", object); DPRINTF(E_WARN, L_HTTP, "%s not found, responding ERROR 404\n", object);
Send404(h); Send404(h);
sqlite3_free_table(result); sqlite3_free_table(result);
return; goto done_dlna;
} }
path = result[3]; path = result[3];
mime = result[4]; mime = result[4];
@ -1436,6 +1438,7 @@ SendResp_dlnafile(struct upnphttp * h, char * object)
error: error:
sqlite3_free_table(result); sqlite3_free_table(result);
done_dlna:
#if USE_FORK #if USE_FORK
_exit(0); _exit(0);
#endif #endif