[Glibc-bsd-commits] r1351 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2006-03-18 15:04:42 +0000 (Sat, 18 Mar 2006)
New Revision: 1351

Added:
   trunk/freebsd-utils/debian/dirs
   trunk/freebsd-utils/debian/patches/009_sysctl_clocktime.diff
   trunk/freebsd-utils/debian/patches/010_sysctl_other.diff
Log:
Two more patches, and debian/dirs file.

Added: trunk/freebsd-utils/debian/dirs
===================================================================
--- trunk/freebsd-utils/debian/dirs	2006-03-18 14:59:08 UTC (rev 1350)
+++ trunk/freebsd-utils/debian/dirs	2006-03-18 15:04:42 UTC (rev 1351)
@@ -0,0 +1 @@
+usr/share/man/man8

Added: trunk/freebsd-utils/debian/patches/009_sysctl_clocktime.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/009_sysctl_clocktime.diff	2006-03-18 14:59:08 UTC (rev 1350)
+++ trunk/freebsd-utils/debian/patches/009_sysctl_clocktime.diff	2006-03-18 15:04:42 UTC (rev 1351)
@@ -0,0 +1,10 @@
+--- src/sbin/sysctl/sysctl.c~	2006-03-18 15:59:26.000000000 +0100
++++ src/sbin/sysctl/sysctl.c	2006-03-18 16:00:12.000000000 +0100
+@@ -59,6 +59,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <time.h>
+ 
+ static int	aflag, bflag, dflag, eflag, hflag, Nflag, nflag, oflag, xflag;
+ 

Added: trunk/freebsd-utils/debian/patches/010_sysctl_other.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/010_sysctl_other.diff	2006-03-18 14:59:08 UTC (rev 1350)
+++ trunk/freebsd-utils/debian/patches/010_sysctl_other.diff	2006-03-18 15:04:42 UTC (rev 1351)
@@ -0,0 +1,20 @@
+--- src/sbin/sysctl/sysctl.c~	2006-03-18 16:00:32.000000000 +0100
++++ src/sbin/sysctl/sysctl.c	2006-03-18 16:02:57.000000000 +0100
+@@ -319,16 +319,7 @@
+ static int
+ S_loadavg(int l2, void *p)
+ {
+-	struct loadavg *tv = (struct loadavg*)p;
+-
+-	if (l2 != sizeof(*tv)) {
+-		warnx("S_loadavg %d != %d", l2, sizeof(*tv));
+-		return (0);
+-	}
+-	printf(hflag ? "{ %'.2f %'.2f %'.2f }" : "{ %.2f %.2f %.2f }",
+-		(double)tv->ldavg[0]/(double)tv->fscale,
+-		(double)tv->ldavg[1]/(double)tv->fscale,
+-		(double)tv->ldavg[2]/(double)tv->fscale);
++/* bah.. */
+ 	return (0);
+ }
+