From owner-p4-projects Wed Jul 31 7:15:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759AC37B401; Wed, 31 Jul 2002 07:14:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F122037B400 for ; Wed, 31 Jul 2002 07:14:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B38C43E70 for ; Wed, 31 Jul 2002 07:14:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VEE3JU059368 for ; Wed, 31 Jul 2002 07:14:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VEE2DC059361 for perforce@freebsd.org; Wed, 31 Jul 2002 07:14:02 -0700 (PDT) Date: Wed, 31 Jul 2002 07:14:02 -0700 (PDT) Message-Id: <200207311414.g6VEE2DC059361@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15302 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15302 Change 15302 by rwatson@rwatson_tislabs on 2002/07/31 07:13:40 IFC to begin another day of wild MAC merging Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#19 integrate .. //depot/projects/trustedbsd/base/etc/printcap#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snp.4#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#18 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.pl#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/ppp/README.devel#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.297 2002/07/24 23:08:57 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,8 +126,10 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +TARGET_CPUTYPE?= ${CPUTYPE} .else TARGET?= ${TARGET_ARCH} +TARGET_CPUTYPE?= .endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch @@ -184,13 +186,14 @@ INSTALL="sh ${.CURDIR}/tools/install.sh" BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR # build-tool stage TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ + -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB ==== //depot/projects/trustedbsd/base/etc/printcap#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.11 2000/11/01 13:30:24 andreas Exp $ +# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/handbook/printing.html +# http://www.freebsd.org/doc/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/trustedbsd/base/lib/libc/sys/fhopen.2#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: fhopen.2,v 1.1 1999/06/30 01:32:15 wrstuden Exp $ -.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.11 2001/10/01 16:09:01 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.12 2002/07/31 06:40:34 chris Exp $ .\" .\" Copyright (c) 1999 National Aeronautics & Space Administration .\" All rights reserved. @@ -130,7 +130,7 @@ .Fn fhstatfs functions first appeared in .Nx 1.5 -and was adapted to +and were adapted to .Fx 4.0 by Alfred Perlstein. .Sh AUTHORS ==== //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.10 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -78,11 +78,12 @@ u_int nodesize; /* like strings, arrays are really counted arrays */ - if (! xdr_u_int(xdrs, sizep)) { + if (!xdr_u_int(xdrs, sizep)) { return (FALSE); } c = *sizep; - if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { + if ((c > maxsize && UINT_MAX/elsize < c) && + (xdrs->x_op != XDR_FREE)) { return (FALSE); } nodesize = c * elsize; @@ -152,7 +153,7 @@ elptr = basep; for (i = 0; i < nelem; i++) { - if (! (*xdr_elem)(xdrs, elptr)) { + if (!(*xdr_elem)(xdrs, elptr)) { return(FALSE); } elptr += elemsize; ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#8 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.35 2002/07/25 17:41:47 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.36 2002/07/31 10:55:31 yar Exp $"; #endif /* not lint */ #include @@ -1068,6 +1068,8 @@ #define MAXGLOBARGS 1000 +#define MAXASIZE 10240 /* Deny ASCII SIZE on files larger than that */ + struct tab { char *name; short token; @@ -1589,6 +1591,10 @@ reply(550, "%s: not a plain file.", filename); (void) fclose(fin); return; + } else if (stbuf.st_size > MAXASIZE) { + reply(550, "%s: too large for type A SIZE.", filename); + (void) fclose(fin); + return; } count = 0; ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.396 2002/07/30 04:32:14 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.399 2002/07/31 04:01:12 bmah Exp $ 2000 @@ -122,12 +122,12 @@ can be disabled by the NODEVFS kernel option. - The DEVFS "rule" subsystem has been introduced. DEVFS rules - permit the administrator to define certain properties of new devfs - nodes before they become visible to the userland. Both static (e.g., - /dev/speaker) and dynamic (e.g., + The &man.devfs.5; rule subsystem has been introduced. DEVFS rules + permit the administrator to define certain properties of new device + nodes before they become visible to the userland. Both static (e.g. + /dev/speaker) and dynamic (e.g. /dev/bpf*, some removable devices) nodes are - supported. Each DEVFS mount may have a different ruleset assigned to + supported. Each &man.devfs.5; mount may have a different ruleset assigned to it, permitting different policies to be implemented for things like jails. Rules and rulesets are manipulated with the &man.devfs.8; utility. @@ -333,6 +333,9 @@ use an AT keyboard if you are not using a serial console. &merged; + The uaudio driver, for USB audio devices, has been + added. + The &man.umodem.4; driver for USB modems has been added. Support is provided for the 3Com 5605 and Metricom Ricochet GS wireless USB modems. &merged; @@ -361,6 +364,9 @@ The USER_LDT kernel option is now activated by default. + The uvisor driver for connecting Handspring Visors via USB + has been added. + A VESA S3 linear framebuffer driver has been added. The &man.viapm.4; driver for VIA SMBus @@ -1493,7 +1499,7 @@ (ACPI), a multi-vendor standard for configuration and power management, has been added. This functionality has been provided by the Intel ACPI Component - Architecture project, as of the ACPI CA 20020611 + Architecture project, as of the ACPI CA 20020725 snapshot. Some backward compatability for applications using the older APM standard has been provided. @@ -2309,6 +2315,9 @@ With this change, properly-compiled KLD modules are now able to be profiled. + The gpt tool for manipulating EFI GPT + partitions has been added. + &man.growfs.8;, a utility for growing FFS filesystems, has been added. &man.ffsinfo.8;, a utility for dump all the meta-information of an existing filesystem, has also been @@ -2623,6 +2632,9 @@ manpages) or if the running user is root. + The mca utility, for decoding machine check + records, has been added. + The &man.mdmfs.8; command has been added; it is a wrapper around &man.mdconfig.8;, &man.disklabel.8;, &man.newfs.8;, and &man.mount.8; that mimics the command line option set of the @@ -3207,7 +3219,7 @@ net/freebsd-uucp. &man.unexpand.1; now supports a to - specify tabstabs analogous to &man.expand.1;. &merged; + specify tabstops analogous to &man.expand.1;. &merged; &man.units.1; has received some updates and bugfixes. &merged; @@ -3763,7 +3775,7 @@ OpenSSL OpenSSL has been updated to - 0.9.6c. + 0.9.6e. &merged; OpenSSL now has support for machine-dependent ASM optimizations, activated by the new ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.15 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.16 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -360,11 +361,11 @@ if (read(fd, cp, (int)secsize) != secsize) { (void)lseek(fd, offset + i + secsize, 0); if (secsize != dev_bsize && dev_bsize != 1) - printf(" %lld (%lld),", - (long long)(blk * dev_bsize + i) / secsize, - (long long)blk + i / dev_bsize); + printf(" %jd (%jd),", + (intmax_t)(blk * dev_bsize + i) / secsize, + (intmax_t)blk + i / dev_bsize); else - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); errs++; } } @@ -399,7 +400,7 @@ for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize) if (write(fd, cp, (int)dev_bsize) != dev_bsize) { (void)lseek(fd, offset + i + dev_bsize, 0); - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); } printf("\n"); return; ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -562,7 +562,7 @@ printf("MODE=%o\n", DIP(dp, di_mode)); if (preen) printf("%s: ", cdevname); - printf("SIZE=%qu ", DIP(dp, di_size)); + printf("SIZE=%ju ", (uintmax_t)DIP(dp, di_size)); t = DIP(dp, di_mtime); p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); @@ -572,7 +572,7 @@ blkerror(ino_t ino, const char *type, ufs2_daddr_t blk) { - pfatal("%lld %s I=%lu", (intmax_t)blk, type, (u_long)ino); + pfatal("%jd %s I=%ju", (intmax_t)blk, type, (uintmax_t)ino); printf("\n"); switch (inoinfo(ino)->ino_state) { ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.34 2002/07/30 13:01:21 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.35 2002/07/31 12:01:14 mux Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -190,8 +191,9 @@ struct statfs *mntp; struct zlncnt *zlnp; ufs2_daddr_t blks; - int cylno, size, ret; + int cylno, ret; ino_t files; + size_t size; cdevname = filesys; if (debug && preen) @@ -372,11 +374,12 @@ pwarn("Reclaimed: %ld directories, %ld files, %lld fragments\n", countdirs, (long)files - countdirs, (long long)blks); } - pwarn("%ld files, %lld used, %llu free ", - (long)n_files, (long long)n_blks, - n_ffree + sblock.fs_frag * n_bfree); - printf("(%qu frags, %qu blocks, %.1f%% fragmentation)\n", - n_ffree, n_bfree, n_ffree * 100.0 / sblock.fs_dsize); + pwarn("%ld files, %jd used, %ju free ", + (long)n_files, (intmax_t)n_blks, + (uintmax_t)n_ffree + sblock.fs_frag * n_bfree); + printf("(%ju frags, %ju blocks, %.1f%% fragmentation)\n", + (uintmax_t)n_ffree, (uintmax_t)n_bfree, + n_ffree * 100.0 / sblock.fs_dsize); if (debug) { if (files < 0) printf("%d inodes missing\n", -files); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -48,6 +48,7 @@ #include #include +#include #include #include "fsck.h" @@ -228,7 +229,7 @@ DIP(dp, di_size) > sblock.fs_maxfilesize || (mode == IFDIR && DIP(dp, di_size) > MAXDIRSIZE)) { if (debug) - printf("bad size %qu:", DIP(dp, di_size)); + printf("bad size %ju:", (uintmax_t)DIP(dp, di_size)); goto unknown; } if (!preen && mode == IFMT && reply("HOLD BAD BLOCK") == 1) { @@ -240,7 +241,8 @@ if ((mode == IFBLK || mode == IFCHR || mode == IFIFO || mode == IFSOCK) && DIP(dp, di_size) != 0) { if (debug) - printf("bad special-file size %qu:", DIP(dp, di_size)); + printf("bad special-file size %ju:", + (uintmax_t)DIP(dp, di_size)); goto unknown; } if ((mode == IFBLK || mode == IFCHR) && @@ -252,8 +254,8 @@ ndb = howmany(DIP(dp, di_size), sblock.fs_bsize); if (ndb < 0) { if (debug) - printf("bad size %qu ndb %qu:", - DIP(dp, di_size), ndb); + printf("bad size %ju ndb %ju:", + (uintmax_t)DIP(dp, di_size), (uintmax_t)ndb); goto unknown; } if (mode == IFBLK || mode == IFCHR) @@ -281,8 +283,8 @@ for (j = ndb; ndb < NDADDR && j < NDADDR; j++) if (DIP(dp, di_db[j]) != 0) { if (debug) - printf("bad direct addr[%d]: %qu\n", j, - (ufs2_daddr_t)DIP(dp, di_db[j])); + printf("bad direct addr[%d]: %ju\n", j, + (uintmax_t)DIP(dp, di_db[j])); goto unknown; } for (j = 0, ndb -= NDADDR; ndb > 0; j++) @@ -290,8 +292,8 @@ for (; j < NIADDR; j++) if (DIP(dp, di_ib[j]) != 0) { if (debug) - printf("bad indirect addr: %qu\n", - DIP(dp, di_ib[j])); + printf("bad indirect addr: %ju\n", + (uintmax_t)DIP(dp, di_ib[j])); goto unknown; } if (ftypeok(dp) == 0) @@ -331,9 +333,9 @@ (void)ckinode(dp, idesc); idesc->id_entryno *= btodb(sblock.fs_fsize); if (DIP(dp, di_blocks) != idesc->id_entryno) { - pwarn("INCORRECT BLOCK COUNT I=%lu (%qu should be %qu)", - (u_long)inumber, DIP(dp, di_blocks), - idesc->id_entryno); + pwarn("INCORRECT BLOCK COUNT I=%lu (%ju should be %ju)", + (u_long)inumber, (uintmax_t)DIP(dp, di_blocks), + (uintmax_t)idesc->id_entryno); if (preen) printf(" (CORRECTED)\n"); else if (reply("CORRECT") == 0) @@ -346,8 +348,8 @@ cmd.value = idesc->id_number; cmd.size = idesc->id_entryno - DIP(dp, di_blocks); if (debug) - printf("adjblkcnt ino %qu amount %lld\n", - cmd.value, (long long)cmd.size); + printf("adjblkcnt ino %ju amount %lld\n", + (uintmax_t)cmd.value, (long long)cmd.size); if (sysctl(adjblkcnt, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) rwerror("ADJUST INODE BLOCK COUNT", cmd.value); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.19 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.20 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -46,6 +46,7 @@ #include #include +#include #include #include "fsck.h" @@ -134,7 +135,7 @@ inpend = &inpsort[inplast]; for (inpp = inpsort; inpp < inpend; inpp++) { if (got_siginfo) { - printf("%s: phase 2: dir %d of %d (%d%%)\n", cdevname, + printf("%s: phase 2: dir %td of %d (%d%%)\n", cdevname, inpp - inpsort, (int)inplast, (int)((inpp - inpsort) * 100 / inplast)); got_siginfo = 0; @@ -153,13 +154,13 @@ } else if ((inp->i_isize & (DIRBLKSIZ - 1)) != 0) { getpathname(pathbuf, inp->i_number, inp->i_number); if (usedsoftdep) - pfatal("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pfatal("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); else - pwarn("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pwarn("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); if (preen) printf(" (ADJUSTED)\n"); inp->i_isize = roundup(inp->i_isize, DIRBLKSIZ); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.34 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.35 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #define DKTYPENAMES @@ -52,6 +52,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -269,8 +270,8 @@ inphead = (struct inoinfo **)calloc((unsigned)numdirs, sizeof(struct inoinfo *)); if (inpsort == NULL || inphead == NULL) { - printf("cannot alloc %u bytes for inphead\n", - (unsigned)numdirs * sizeof(struct inoinfo *)); + printf("cannot alloc %ju bytes for inphead\n", + (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } bufinit(); ==== //depot/projects/trustedbsd/base/share/man/man4/snp.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/snp.4,v 1.22 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/snp.4,v 1.23 2002/07/31 09:32:22 schweikh Exp $ .\" .Dd February 24, 1995 .Dt SNP 4 @@ -16,7 +16,7 @@ .Ft int .Fn ioctl fd FIONREAD &result .Sh DESCRIPTION -/dev/snp? are snoop devices which allow user to attach to any tty +/dev/snp? are snoop devices which allow users to attach to any tty and watch activities on it. The kernel must be compiled with .Cd "device snp" , @@ -27,13 +27,12 @@ .Pp To associate a given .Nm -device with a tty to be observed, open the +device with a tty to be observed, open the .Nm device and then use the SNPSTTY ioctl. -The argument passed to the IOCTL is the address of a variable of type +The argument passed to the ioctl is the address of a variable of type dev_t. -By setting the value of the variable pointed to -1, the user may detach -the snp device from a tty. +To detach the snp device from a tty use a pointer to a value of (dev_t)-1. .Pp The SNPGTTY ioctl returns information about the current tty attached to the open ==== //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,10 +1,16 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.14 2002/07/27 22:15:42 jhb Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.15 2002/07/31 03:56:03 jhb Exp $ + +# Allow TARGET_CPUTYPE to override CPUTYPE to handle the cross-build case. + +.if defined(TARGET_CPUTYPE) +CPUTYPE = ${TARGET_CPUTYPE} +.endif # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but # may tune support for more advanced processors. -.if !defined(CPUTYPE) +.if !defined(CPUTYPE) || ${CPUTYPE} == "" . if ${MACHINE_ARCH} == "i386" _CPUCFLAGS = -mcpu=pentiumpro CPUTYPE = i386 @@ -43,11 +49,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" -. if defined(BOOTSTRAPPING) -_CPUCFLAGS = -march=k6 # gcc 2.95.x didn't support athlon -. else _CPUCFLAGS = -march=athlon -. endif . elif ${CPUTYPE} == "k6-2" _CPUCFLAGS = -march=k6 . elif ${CPUTYPE} == "k6" ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.2 2002/07/22 00:11:35 peter Exp $: */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.3 2002/07/31 13:33:55 joe Exp $: */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #include #endif #include +#include #if defined(__NetBSD__) || defined(__OpenBSD__) #include @@ -89,6 +90,8 @@ #define DPRINTF(x) if (uaudiodebug) logprintf x #define DPRINTFN(n,x) if (uaudiodebug>(n)) logprintf x int uaudiodebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uaudio, CTLFLAG_RW, + &uaudiodebug, 0, "uaudio debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ohci.c,v 1.125 2002/05/28 12:42:38 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.108 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.109 2002/07/31 13:33:54 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,6 +64,7 @@ #endif #include #include +#include #include #include @@ -93,6 +94,8 @@ #define DPRINTF(x) if (ohcidebug) logprintf x #define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x int ohcidebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ohci, CTLFLAG_RW, + &ohcidebug, 0, "ohci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.21 2002/07/15 11:22:37 ume Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.22 2002/07/31 13:33:54 joe Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -88,6 +88,7 @@ #include #include #include +#include #include #include @@ -100,14 +101,9 @@ #include #ifdef UCOM_DEBUG -#include - static int ucomdebug = 1; - -SYSCTL_NODE(_debug, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging"); SYSCTL_INT(_debug_usb, OID_AUTO, ucom, CTLFLAG_RW, &ucomdebug, 0, "ucom debug level"); - #define DPRINTF(x) do { \ if (ucomdebug) \ logprintf x; \ ==== //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.15 2002/06/01 07:18:32 alfred Exp $ + * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.16 2002/07/31 13:33:55 joe Exp $ */ /* Driver for arbitrary double bulk pipe devices. @@ -87,6 +87,7 @@ #include #include #include +#include #include #include @@ -107,6 +108,8 @@ #define DPRINTF(x) if (udbpdebug) logprintf x #define DPRINTFN(n,x) if (udbpdebug>(n)) logprintf x int udbpdebug = 9; +SYSCTL_INT(_debug_usb, OID_AUTO, udbp, CTLFLAG_RW, + &udbpdebug, 0, "udbp debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * its contributors. */ -/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.5 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.6 2002/07/31 13:33:55 joe Exp $ */ #include #include @@ -55,6 +55,7 @@ #endif #include #include +#include #include #include @@ -67,6 +68,8 @@ #define DPRINTF(x) if (ufmdebug) logprintf x #define DPRINTFN(n,x) if (ufmdebug>(n)) logprintf x int ufmdebug = 100; +SYSCTL_INT(_debug_usb, OID_AUTO, ufm, CTLFLAG_RW, + &ufmdebug, 0, "ufm debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.61 2002/07/09 01:01:25 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.62 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,6 +63,7 @@ #endif #include #include +#include #include #include @@ -72,6 +73,8 @@ #define DPRINTF(x) if (ugendebug) logprintf x #define DPRINTFN(n,x) if (ugendebug>(n)) logprintf x int ugendebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ugen, CTLFLAG_RW, + &ugendebug, 0, "ugen debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.124 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #endif #include #include +#include #include #include @@ -102,6 +103,8 @@ #define DPRINTFN(n,x) if (uhcidebug>(n)) printf x int uhcidebug = 0; int uhcinoloop = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhci, CTLFLAG_RW, + &uhcidebug, 0, "uhci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhid.c,v 1.45 2001/10/26 17:58:21 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.49 2002/04/07 17:13:00 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.50 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -86,6 +87,8 @@ #define DPRINTF(x) if (uhiddebug) logprintf x #define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x int uhiddebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhid, CTLFLAG_RW, + &uhiddebug, 0, "uhid debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhub.c,v 1.57 2001/11/20 16:08:37 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.43 2002/06/17 20:57:54 n_hibma Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.44 2002/07/31 13:58:15 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,9 @@ #ifdef UHUB_DEBUG #define DPRINTF(x) if (uhubdebug) logprintf x #define DPRINTFN(n,x) if (uhubdebug>(n)) logprintf x -int uhubdebug; +int uhubdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhub, CTLFLAG_RW, + &uhubdebug, 0, "uhub debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.37 2002/04/07 13:16:17 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.38 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,6 +57,7 @@ #include #endif #include +#include #include #include @@ -79,6 +80,8 @@ #define DPRINTF(x) if (ukbddebug) logprintf x #define DPRINTFN(n,x) if (ukbddebug>(n)) logprintf x int ukbddebug = 1; +SYSCTL_INT(_debug_usb, OID_AUTO, ukbd, CTLFLAG_RW, + &ukbddebug, 0, "ukbd debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ulpt.c,v 1.48 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.44 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.45 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -75,6 +76,8 @@ #define DPRINTF(x) if (ulptdebug) logprintf x #define DPRINTFN(n,x) if (ulptdebug>(n)) logprintf x int ulptdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ulpt, CTLFLAG_RW, + &ulptdebug, 0, "ulpt debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.62 2002/06/17 20:44:37 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.63 2002/07/31 13:33:55 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -104,6 +104,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,8 @@ #define UDMASS_WIRE (UDMASS_BBB|UDMASS_CBI) #define UDMASS_ALL 0xffff0000 /* all of the above */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message