Attachment 19619 Details for Bug 34834 – file.diff

[patch] file.diff

file.diff (text/plain), 3.35 KB, created by Tomas Svensson on 2002-02-11 15:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Svensson

Created: 2002-02-11 15:40:03 UTC

Size: 3.35 KB

patch

obsolete

>Index: du.c
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/du/du.c,v
>retrieving revision 1.23
>diff -u -r1.23 du.c
>--- du.c	8 Feb 2002 07:49:13 -0000	1.23
>+++ du.c	11 Feb 2002 13:18:33 -0000
>@@ -57,39 +57,12 @@
> #include <errno.h>
> #include <fnmatch.h>
> #include <fts.h>
>-#include <math.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> #include <sysexits.h>
> #include <unistd.h>
> 
>-#define	KILO_SZ(n) (n)
>-#define	MEGA_SZ(n) ((n) * (n))
>-#define	GIGA_SZ(n) ((n) * (n) * (n))
>-#define	TERA_SZ(n) ((n) * (n) * (n) * (n))
>-#define	PETA_SZ(n) ((n) * (n) * (n) * (n) * (n))
>-
>-#define	KILO_2_SZ (KILO_SZ(1024ULL))
>-#define	MEGA_2_SZ (MEGA_SZ(1024ULL))
>-#define	GIGA_2_SZ (GIGA_SZ(1024ULL))
>-#define	TERA_2_SZ (TERA_SZ(1024ULL))
>-#define	PETA_2_SZ (PETA_SZ(1024ULL))
>-
>-#define	KILO_SI_SZ (KILO_SZ(1000ULL))
>-#define	MEGA_SI_SZ (MEGA_SZ(1000ULL))
>-#define	GIGA_SI_SZ (GIGA_SZ(1000ULL))
>-#define	TERA_SI_SZ (TERA_SZ(1000ULL))
>-#define	PETA_SI_SZ (PETA_SZ(1000ULL))
>-
>-unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ};
>-unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ};
>-unsigned long long *valp;
>-
>-typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t;
>-
>-int unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };
>-
> SLIST_HEAD(ignhead, ignentry) ignores;
> struct ignentry {
> 	char			*mask;
>@@ -98,8 +71,7 @@
> 
> int		linkchk __P((FTSENT *));
> static void	usage __P((void));
>-void		prthumanval __P((double));
>-unit_t		unit_adjust __P((double *));
>+void		prthumanval __P((u_int64_t));
> void		ignoreadd __P((const char *));
> void		ignoreclean __P((void));
> int		ignorep __P((FTSENT *));
>@@ -165,7 +137,6 @@
> 			case 'h':
> 				putenv("BLOCKSIZE=512");
> 				hflag = 1;
>-				valp = vals_base2;
> 				break;
> 			case 'k':
> 				if (!hflag)
>@@ -349,43 +320,29 @@
>  * especially on huge disks.
>  *
>  */
>-unit_t
>-unit_adjust(val)
>-	double *val;
>-{
>-	double abval;
>-	unit_t unit;
>-	unsigned int unit_sz;
>-
>-	abval = fabs(*val);
>-
>-	unit_sz = abval ? ilogb(abval) / 10 : 0;
>-
>-	if (unit_sz >= UNIT_MAX) {
>-		unit = NONE;
>-	} else {
>-		unit = unitp[unit_sz];
>-		*val /= (double)valp[unit_sz];
>-	}
>-
>-	return (unit);
>-}
>-
> void
> prthumanval(bytes)
>-	double bytes;
>+	u_int64_t bytes;
> {
>-	unit_t unit;
>+	static const char prefixes[] = "BkMGTPE";
>+	
>+	int		i;
>+	u_int64_t	s1, s2;
> 
>-	bytes *= 512;
>-	unit = unit_adjust(&bytes);
>+	bytes *= 51200;
> 
>-	if (bytes == 0)
>-		(void)printf("  0B");
>-	else if (bytes > 10)
>-		(void)printf("%3.0f%c", bytes, "BKMGTPE"[unit]);
>-	else
>-		(void)printf("%3.1f%c", bytes, "BKMGTPE"[unit]);
>+	for (i = 0; bytes >= 100000 && i < sizeof(prefixes); i++)
>+		bytes /= 1024;
>+
>+	if (bytes < 1000 ) {
>+		s1 = bytes / 100;
>+		if (( s2 = (( (bytes % 100 ) + 5 ) /  10 ) ) == 10 ) {
>+			s1++;
>+			s2 = 0;
>+		}
>+		printf("%qd.%qd%c", s1, s2, prefixes[i]);
>+	} else
>+		printf("%3qd%c", (bytes + 50) / 100, prefixes[i]);
> }
> 
> static void
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/du/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	8 Feb 2002 22:31:38 -0000	1.7
>+++ Makefile	11 Feb 2002 13:18:33 -0000
>@@ -2,7 +2,5 @@
> # $FreeBSD: src/usr.bin/du/Makefile,v 1.7 2002/02/08 22:31:38 markm Exp $
> 
> PROG=	du
>-DPADD=	${LIBM}
>-LDADD=	-lm
> 
> .include <bsd.prog.mk>

Actions: View | Diff

Attachments on bug 34834: 19619