svn commit: trunk/busybox/coreutils

[landley at busybox.net]

Author: landley
Date: 2006-05-09 16:14:39 -0700 (Tue, 09 May 2006)
New Revision: 15044

Log:
Replace isnan() and isinf() with inline tests so uClibc doesn't want us to
link sort against libm.  This adds 22 bytes for glibc but is a win for uClibc,
and since glibc is bigger than all of busybox it seems kind of silly to worry
about it.


Modified:
   trunk/busybox/coreutils/sort.c


Changeset:
Modified: trunk/busybox/coreutils/sort.c
===================================================================
--- trunk/busybox/coreutils/sort.c	2006-05-09 22:08:56 UTC (rev 15043)
+++ trunk/busybox/coreutils/sort.c	2006-05-09 23:14:39 UTC (rev 15044)
@@ -176,12 +176,14 @@
 				/* not numbers < NaN < -infinity < numbers < +infinity) */
 				if(x==xx) retval=(y==yy ? 0 : -1);
 				else if(y==yy) retval=1;
-				else if(isnan(dx)) retval=isnan(dy) ? 0 : -1;
-				else if(isnan(dy)) retval=1;
-				else if(isinf(dx)) {
-					if(dx<0) retval=((isinf(dy) && dy<0) ? 0 : -1);
-					else retval=((isinf(dy) && dy>0) ? 0 : 1);
-				} else if(isinf(dy)) retval=dy<0 ? 1 : -1;
+				/* Check for isnan */
+				else if(dx != dx) retval = (dy != dy) ? 0 : -1;
+				else if(dy != dy) retval = 1;
+				/* Check for infinity.  Could underflow, but it avoids libm. */
+				else if(1.0/dx == 0.0) {
+					if(dx<0) retval=((1.0/dy == 0.0 && dy<0) ? 0 : -1);
+					else retval=((1.0/dy == 0.0 && dy>0) ? 0 : 1);
+				} else if(1.0/dy == 0.0) retval=dy<0 ? 1 : -1;
 				else retval=dx>dy ? 1 : (dx<dy ? -1 : 0);
 				break;
 			}