svn commit: trunk/busybox: coreutils findutils miscutils networking etc...

vda at busybox.net vda at busybox.net
Mon Aug 13 11:09:31 UTC 2007


Author: vda
Date: 2007-08-13 04:09:30 -0700 (Mon, 13 Aug 2007)
New Revision: 19486

Log:
httpd: round down sendfile byte count to 64k
*: style fixes



Modified:
   trunk/busybox/coreutils/cal.c
   trunk/busybox/findutils/find.c
   trunk/busybox/miscutils/ttysize.c
   trunk/busybox/networking/httpd.c
   trunk/busybox/selinux/runcon.c


Changeset:
Modified: trunk/busybox/coreutils/cal.c
===================================================================
--- trunk/busybox/coreutils/cal.c	2007-08-13 10:48:33 UTC (rev 19485)
+++ trunk/busybox/coreutils/cal.c	2007-08-13 11:09:30 UTC (rev 19486)
@@ -45,7 +45,7 @@
 /* leap year -- account for Gregorian reformation in 1752 */
 static int leap_year(unsigned yr)
 {
-	if (yr <= 1752) 
+	if (yr <= 1752)
 		return !(yr % 4);
 	return (!(yr % 4) && (yr % 100)) || !(yr % 400);
 }

Modified: trunk/busybox/findutils/find.c
===================================================================
--- trunk/busybox/findutils/find.c	2007-08-13 10:48:33 UTC (rev 19485)
+++ trunk/busybox/findutils/find.c	2007-08-13 11:09:30 UTC (rev 19486)
@@ -475,8 +475,8 @@
 	                         "-o\0"
 	USE_FEATURE_FIND_NOT(    "!\0"       )
 #if ENABLE_DESKTOP
-	                         "-and\0"  
-	                         "-or\0"   
+	                         "-and\0"
+	                         "-or\0"
 	USE_FEATURE_FIND_NOT(	 "-not\0"    )
 #endif
 	                         "-print\0"
@@ -487,7 +487,7 @@
 	USE_FEATURE_FIND_EXEC(   "-exec\0"   )
 	USE_FEATURE_FIND_PAREN(  "(\0"       )
 	/* All options starting from here require argument */
-	                         "-name\0" 
+	                         "-name\0"
 	USE_FEATURE_FIND_PATH(   "-path\0"   )
 	USE_FEATURE_FIND_REGEX(  "-regex\0"  )
 	USE_FEATURE_FIND_TYPE(   "-type\0"   )

Modified: trunk/busybox/miscutils/ttysize.c
===================================================================
--- trunk/busybox/miscutils/ttysize.c	2007-08-13 10:48:33 UTC (rev 19485)
+++ trunk/busybox/miscutils/ttysize.c	2007-08-13 11:09:30 UTC (rev 19486)
@@ -16,7 +16,7 @@
 {
 	unsigned w,h;
 	struct winsize wsz;
-    
+
 	w = 80;
 	h = 24;
 	if (!ioctl(0, TIOCGWINSZ, &wsz)) {

Modified: trunk/busybox/networking/httpd.c
===================================================================
--- trunk/busybox/networking/httpd.c	2007-08-13 10:48:33 UTC (rev 19485)
+++ trunk/busybox/networking/httpd.c	2007-08-13 11:09:30 UTC (rev 19486)
@@ -1395,7 +1395,8 @@
 		fd++; /* write to fd #1 in inetd mode */
 #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
 	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 (offset == 0)
 				goto fallback;

Modified: trunk/busybox/selinux/runcon.c
===================================================================
--- trunk/busybox/selinux/runcon.c	2007-08-13 10:48:33 UTC (rev 19485)
+++ trunk/busybox/selinux/runcon.c	2007-08-13 11:09:30 UTC (rev 19486)
@@ -75,7 +75,7 @@
 	"type\0"    Required_argument "t"
 	"range\0"   Required_argument "l"
 	"compute\0" No_argument "c"
-	"help\0"    No_argument "h"      
+	"help\0"    No_argument "h"
 	;
 #endif
 




More information about the busybox-cvs mailing list