emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: round down sendfile byte count to 64k

Browse Source 
*: style fixes
This commit is contained in:
Denis Vlasenko 2007-08-13 11:09:30 +00:00
parent f5635f4d32
commit 319f8ebef8
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/cal.c
View File

@ -45,7 +45,7 @@ static unsigned julian;
/* leap year -- account for Gregorian reformation in 1752 */ /* leap year -- account for Gregorian reformation in 1752 */
static int leap_year(unsigned yr) static int leap_year(unsigned yr)
{ {
if (yr <= 1752) if (yr <= 1752)
return !(yr % 4); return !(yr % 4);
return (!(yr % 4) && (yr % 100)) || !(yr % 400); return (!(yr % 4) && (yr % 100)) || !(yr % 400);
} }

6
findutils/find.c
View File

@ -475,8 +475,8 @@ static action*** parse_params(char **argv)
"-o\0" "-o\0"
USE_FEATURE_FIND_NOT( "!\0" ) USE_FEATURE_FIND_NOT( "!\0" )
#if ENABLE_DESKTOP #if ENABLE_DESKTOP
"-and\0" "-and\0"
"-or\0" "-or\0"
USE_FEATURE_FIND_NOT( "-not\0" ) USE_FEATURE_FIND_NOT( "-not\0" )
#endif #endif
"-print\0" "-print\0"
@ -487,7 +487,7 @@ static action*** parse_params(char **argv)
USE_FEATURE_FIND_EXEC( "-exec\0" ) USE_FEATURE_FIND_EXEC( "-exec\0" )
USE_FEATURE_FIND_PAREN( "(\0" ) USE_FEATURE_FIND_PAREN( "(\0" )
/* All options starting from here require argument */ /* All options starting from here require argument */
"-name\0" "-name\0"
USE_FEATURE_FIND_PATH( "-path\0" ) USE_FEATURE_FIND_PATH( "-path\0" )
USE_FEATURE_FIND_REGEX( "-regex\0" ) USE_FEATURE_FIND_REGEX( "-regex\0" )
USE_FEATURE_FIND_TYPE( "-type\0" ) USE_FEATURE_FIND_TYPE( "-type\0" )

2
miscutils/ttysize.c
View File

@ -16,7 +16,7 @@ int ttysize_main(int argc, char **argv)
{ {
unsigned w,h; unsigned w,h;
struct winsize wsz; struct winsize wsz;
w = 80; w = 80;
h = 24; h = 24;
if (!ioctl(0, TIOCGWINSZ, &wsz)) { if (!ioctl(0, TIOCGWINSZ, &wsz)) {

3
networking/httpd.c
View File

@ -1395,7 +1395,8 @@ static int sendFile(const char *url)
fd++; /* write to fd #1 in inetd mode */ fd++; /* write to fd #1 in inetd mode */
#if ENABLE_FEATURE_HTTPD_USE_SENDFILE #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
do { do {
count = sendfile(fd, f, &offset, MAXINT(ssize_t)); /* byte count is rounded down to 64k */
count = sendfile(fd, f, &offset, MAXINT(ssize_t) - 0xffff);
if (count < 0) { if (count < 0) {
if (offset == 0) if (offset == 0)
goto fallback; goto fallback;

2
selinux/runcon.c
View File

@ -75,7 +75,7 @@ static const char runcon_longopts[] ALIGN1 =
"type\0" Required_argument "t" "type\0" Required_argument "t"
"range\0" Required_argument "l" "range\0" Required_argument "l"
"compute\0" No_argument "c" "compute\0" No_argument "c"
"help\0" No_argument "h" "help\0" No_argument "h"
; ;
#endif #endif