Date: Fri, 11 Apr 2003 22:28:14 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28787 for review Message-ID: <200304120528.h3C5SEj0043085@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28787 Change 28787 by marcel@marcel_pluto1 on 2003/04/11 22:27:28 IFC @28784 Affected files ... .. //depot/projects/ia64/Makefile.inc1#54 integrate .. //depot/projects/ia64/bin/echo/echo.1#2 integrate .. //depot/projects/ia64/bin/pwd/pwd.1#6 integrate .. //depot/projects/ia64/bin/sh/sh.1#20 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#20 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/addr2line/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile.inc0#8 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/nm/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/objcopy/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/objdump/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/readelf/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/size/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/strings/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/strip/Makefile#5 integrate .. //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/getbootfile.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.c#4 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#12 integrate .. //depot/projects/ia64/lib/libc/sys/jail.2#4 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.c#5 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#16 integrate .. //depot/projects/ia64/lib/libusbhid/Makefile#3 integrate .. //depot/projects/ia64/lib/libusbhid/data.c#2 integrate .. //depot/projects/ia64/lib/libusbhid/descr.c#2 integrate .. //depot/projects/ia64/lib/libusbhid/libusbhid.h#3 delete .. //depot/projects/ia64/lib/libusbhid/parse.c#3 integrate .. //depot/projects/ia64/lib/libusbhid/usage.c#3 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.3#3 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.h#2 integrate .. //depot/projects/ia64/lib/libutil/pw_util.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#40 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#77 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#10 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.isdn#3 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.sample#5 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.span-isp#2 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.span-isp.working#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/pae.4#1 branch .. //depot/projects/ia64/share/man/man4/wi.4#19 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#9 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#28 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#8 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#9 integrate .. //depot/projects/ia64/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#46 integrate .. //depot/projects/ia64/sys/conf/options.i386#15 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#30 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#7 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/ia64/sys/dev/aic/aic_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#2 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#21 integrate .. //depot/projects/ia64/sys/dev/an/if_an_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#7 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#12 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#25 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#9 integrate .. //depot/projects/ia64/sys/dev/iir/iir.c#5 integrate .. //depot/projects/ia64/sys/dev/md/md.c#26 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#6 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#19 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#22 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#22 integrate .. //depot/projects/ia64/sys/dev/pccard/pccardvar.h#9 integrate .. //depot/projects/ia64/sys/dev/sn/if_sn_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/stg/tmc18c30_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#30 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#30 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#36 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#17 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe_pccard.c#7 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#4 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#25 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#19 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#16 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#37 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#2 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#22 integrate .. //depot/projects/ia64/sys/i386/include/bus_dma.h#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#9 integrate .. //depot/projects/ia64/sys/kern/init_main.c#29 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#36 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#13 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#33 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#27 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#28 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#39 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#30 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#17 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#28 integrate .. //depot/projects/ia64/sys/powerpc/include/bus.h#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#11 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#12 integrate .. //depot/projects/ia64/sys/sparc64/include/iommuvar.h#9 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#20 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#34 integrate .. //depot/projects/ia64/sys/sys/jail.h#6 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#20 integrate .. //depot/projects/ia64/sys/sys/mdioctl.h#5 integrate .. //depot/projects/ia64/sys/sys/param.h#30 integrate .. //depot/projects/ia64/sys/sys/proc.h#54 integrate .. //depot/projects/ia64/sys/sys/sched.h#3 integrate .. //depot/projects/ia64/sys/sys/syscall.h#26 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#26 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#29 integrate .. //depot/projects/ia64/sys/sys/timetc.h#9 integrate .. //depot/projects/ia64/sys/sys/vnode.h#28 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#26 integrate .. //depot/projects/ia64/sys/vm/pmap.h#16 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#42 integrate .. //depot/projects/ia64/tools/build/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/geom/MdLoad/Makefile#1 branch .. //depot/projects/ia64/tools/regression/geom/MdLoad/MdLoad.c#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.alpha.da0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.alpha2.da0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.apple.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.beast.da0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.critter.ad0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.empty.flp.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.far.ad0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.flat.da1.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.kern.flp.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.msdos.ext.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.msdos.flp.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.pc98.wdc0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.sun.da0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.sun.da1.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/Ref/disk.typo.ad0.xml#1 branch .. //depot/projects/ia64/tools/regression/geom/RunTest.sh#1 branch .. //depot/projects/ia64/usr.bin/Makefile#42 integrate .. //depot/projects/ia64/usr.bin/chpass/edit.c#5 integrate .. //depot/projects/ia64/usr.bin/killall/killall.1#7 integrate .. //depot/projects/ia64/usr.bin/killall/killall.c#7 integrate .. //depot/projects/ia64/usr.bin/systat/vmstat.c#9 integrate .. //depot/projects/ia64/usr.bin/uniq/uniq.1#7 integrate .. //depot/projects/ia64/usr.bin/usbhidaction/Makefile#1 branch .. //depot/projects/ia64/usr.bin/usbhidaction/usbhidaction.1#1 branch .. //depot/projects/ia64/usr.bin/usbhidaction/usbhidaction.c#1 branch .. //depot/projects/ia64/usr.bin/usbhidctl/usbhid.c#5 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#13 integrate .. //depot/projects/ia64/usr.sbin/Makefile#35 integrate .. //depot/projects/ia64/usr.sbin/diskinfo/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/diskinfo/diskinfo.8#1 branch .. //depot/projects/ia64/usr.sbin/diskinfo/diskinfo.c#1 branch .. //depot/projects/ia64/usr.sbin/jail/jail.8#10 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.c#5 integrate .. //depot/projects/ia64/usr.sbin/jexec/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/jexec/jexec.8#1 branch .. //depot/projects/ia64/usr.sbin/jexec/jexec.c#1 branch .. //depot/projects/ia64/usr.sbin/jls/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/jls/jls.8#1 branch .. //depot/projects/ia64/usr.sbin/jls/jls.c#1 branch .. //depot/projects/ia64/usr.sbin/mixer/mixer.8#3 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#7 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#54 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.339 2003/04/07 00:01:33 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.340 2003/04/11 17:58:17 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -625,6 +625,7 @@ @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install ==== //depot/projects/ia64/bin/echo/echo.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $FreeBSD: src/bin/echo/echo.1,v 1.13 2001/08/15 09:09:35 ru Exp $ +.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $ .\" -.Dd July 22, 1993 +.Dd April 12, 2003 .Dt ECHO 1 .Os .Sh NAME @@ -81,6 +81,6 @@ .Sh STANDARDS The .Nm -utility is expected to be -.St -p1003.2 -compatible. +utility conforms to +.St -p1003.1-2001 +as amended by Cor. 1-2002. ==== //depot/projects/ia64/bin/pwd/pwd.1#6 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.20 2002/05/18 13:52:07 tjr Exp $ +.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.21 2003/04/12 03:22:54 tjr Exp $ .\" -.Dd February 4, 2002 +.Dd April 12, 2003 .Dt PWD 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd return working directory name .Sh SYNOPSIS .Nm -.Op Fl LP +.Oo Fl L | Fl P Oc .Sh DESCRIPTION The .Nm ==== //depot/projects/ia64/bin/sh/sh.1#20 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.84 2003/02/03 23:03:05 fanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ .\" -.Dd May 5, 1995 +.Dd April 12, 2003 .Dt SH 1 .Os .Sh NAME @@ -1296,7 +1296,7 @@ List or alter key bindings for the line editor. This command is documented in .Xr editrc 5 . -.It Ic cd Oo Fl LP Oc Op Ar directory +.It Ic cd Oo Fl L | Fl P Oc Op Ar directory Switch to the specified .Ar directory , or to the directory specified in the @@ -1627,7 +1627,7 @@ If the .Fl s option is specified, only the PIDs of the jobs are printed, one per line. -.It Ic pwd Op Fl LP +.It Ic pwd Oo Fl L | Fl P Oc Print the path of the current directory. The built-in command may differ from the program of the same name because the built-in command remembers what the current directory ==== //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.4 2003/04/05 22:09:26 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.5 2003/04/09 06:04:35 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -600,6 +600,7 @@ extern Bigint *diff ANSI((Bigint*, Bigint*)); extern char *dtoa ANSI((double d, int mode, int ndigits, int *decpt, int *sign, char **rve)); + extern void freedtoa ANSI((char*)); extern char *gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp, int mode, int ndigits, int *decpt, char **rve)); extern char *g__fmt ANSI((char*, char*, char*, int, ULong)); @@ -623,8 +624,28 @@ extern Bigint *s2b ANSI((CONST char*, int, int, ULong)); extern Bigint *set_ones ANSI((Bigint*, int)); extern char *strcp ANSI((char*, const char*)); + extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*)); + + extern int strtoId ANSI((CONST char *, char **, double *, double *)); + extern int strtoIdd ANSI((CONST char *, char **, double *, double *)); + extern int strtoIf ANSI((CONST char *, char **, float *, float *)); extern int strtoIg ANSI((CONST char*, char**, FPI*, Long*, Bigint**, int*)); + extern int strtoIQ ANSI((CONST char *, char **, void *, void *)); + extern int strtoIx ANSI((CONST char *, char **, void *, void *)); + extern int strtoIxL ANSI((CONST char *, char **, void *, void *)); extern double strtod ANSI((const char *s00, char **se)); + extern int strtopQ ANSI((CONST char *, char **, Void *)); + extern int strtopf ANSI((CONST char *, char **, float *)); + extern int strtopd ANSI((CONST char *, char **, double *)); + extern int strtopdd ANSI((CONST char *, char **, double *)); + extern int strtopx ANSI((CONST char *, char **, Void *)); + extern int strtopxL ANSI((CONST char *, char **, Void *)); + extern int strtord ANSI((CONST char *, char **, int, double *)); + extern int strtordd ANSI((CONST char *, char **, int, double *)); + extern int strtorf ANSI((CONST char *, char **, int, float *)); + extern int strtorQ ANSI((CONST char *, char **, int, void *)); + extern int strtorx ANSI((CONST char *, char **, int, void *)); + extern int strtorxL ANSI((CONST char *, char **, int, void *)); extern Bigint *sum ANSI((Bigint*, Bigint*)); extern int trailz ANSI((Bigint*)); extern double ulp ANSI((double)); ==== //depot/projects/ia64/etc/defaults/pccard.conf#20 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.259 2003/03/28 11:12:52 sobomax Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.260 2003/04/10 17:16:01 shiba Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2081,6 +2081,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# NTT-ME SS-LAN CARD MN128 +card "NTT-ME" "11Mbps Wireless LAN PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Generic PRISM2.5 card card "PCMCIA" "11M WLAN Card v2.5" config auto "wi" ? ==== //depot/projects/ia64/gnu/usr.bin/binutils/addr2line/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.7 2002/03/20 23:05:09 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.8 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -9,9 +9,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.9 2002/03/20 23:05:09 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.10 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -10,9 +10,10 @@ CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd NOSHARED?= yes -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile.inc0#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc0,v 1.21 2002/12/02 09:41:35 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc0,v 1.22 2003/04/11 18:02:09 ru Exp $ .include "${.CURDIR}/../../Makefile.inc0" @@ -20,9 +20,10 @@ CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" NOSHARED?= yes -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD:= ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${RELTOP}/libopcodes/libopcodes.a \ + ${DPADD} LDADD= ${DPADD} # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU ==== //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.24 2003/04/05 20:30:29 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.25 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -15,8 +15,9 @@ CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd NOSHARED?= yes -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} CLEANDIRS+= ldscripts CLEANFILES+= ldemul-list.h stringify.sed ==== //depot/projects/ia64/gnu/usr.bin/binutils/nm/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/nm/Makefile,v 1.9 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/nm/Makefile,v 1.10 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -10,9 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/objcopy/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/objcopy/Makefile,v 1.8 2002/03/20 23:05:18 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/objcopy/Makefile,v 1.9 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -9,9 +9,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/objdump/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.10 2002/03/20 23:05:18 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.11 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -10,10 +10,11 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libopcodes/libopcodes.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.9 2002/03/20 23:05:18 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.10 2003/04/11 18:02:09 ru Exp $ .include "../Makefile.inc0" @@ -10,9 +10,10 @@ CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd NOSHARED?= yes -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/readelf/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/readelf/Makefile,v 1.5 2002/03/20 23:05:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/readelf/Makefile,v 1.6 2003/04/11 18:02:10 ru Exp $ .include "../Makefile.inc0" @@ -12,9 +12,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/size/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/size/Makefile,v 1.8 2002/03/20 23:05:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/size/Makefile,v 1.9 2003/04/11 18:02:10 ru Exp $ .include "../Makefile.inc0" @@ -9,9 +9,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/strings/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/strings/Makefile,v 1.8 2002/03/20 23:05:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/strings/Makefile,v 1.9 2003/04/11 18:02:10 ru Exp $ .include "../Makefile.inc0" @@ -9,9 +9,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/binutils/strip/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.11 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.12 2003/04/11 18:02:10 ru Exp $ .include "../Makefile.inc0" @@ -9,9 +9,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} CLEANFILES+= maybe_stripped ==== //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisQ.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.1 2003/03/12 20:29:58 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $"); #include "gdtoaimp.h" @@ -40,6 +40,6 @@ { long double result; - strtopQ(s, sp, result); + strtopQ(s, sp, &result); return result; } ==== //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisx.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.1 2003/03/12 20:29:58 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $"); #include "gdtoaimp.h" @@ -40,6 +40,6 @@ { long double result; - strtopx(s, sp, result); + strtopx(s, sp, &result); return result; } ==== //depot/projects/ia64/lib/libc/gen/getbootfile.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "From: @(#)gethostname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.6 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.7 2003/04/11 13:54:28 tjr Exp $"); #include <sys/param.h> #include <sys/sysctl.h> @@ -50,6 +50,6 @@ mib[0] = CTL_KERN; mib[1] = KERN_BOOTFILE; if (sysctl(mib, 2, name, &size, NULL, 0) == -1) - return ("/kernel"); + return ("/boot/kernel/kernel"); return (name); } ==== //depot/projects/ia64/lib/libc/locale/wcrtomb.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.3 2002/10/25 13:24:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.4 2003/04/10 09:20:38 tjr Exp $"); #include <errno.h> #include <limits.h> @@ -39,8 +39,10 @@ char *e; char buf[MB_LEN_MAX]; - if (s == NULL) + if (s == NULL) { s = buf; + wc = L'\0'; + } sputrune(wc, s, MB_CUR_MAX, &e); if (e == NULL) { errno = EILSEQ; ==== //depot/projects/ia64/lib/libc/sys/Makefile.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.100 2003/01/12 09:28:16 tjr Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.101 2003/04/09 02:55:17 mike Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -115,6 +115,7 @@ MLINKS+=gettimeofday.2 settimeofday.2 MLINKS+=getuid.2 geteuid.2 MLINKS+=intro.2 errno.2 +MLINKS+=jail.2 jail_attach.2 MLINKS+=kqueue.2 kevent.2 MLINKS+=kse.2 kse_create.2 kse.2 kse_exit.2 kse.2 kse_release.2 \ kse.2 kse_wakeup.2 kse.2 kse_thr_interrupt.2 ==== //depot/projects/ia64/lib/libc/sys/jail.2#4 (text+ko) ==== @@ -6,9 +6,9 @@ .\"this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\"---------------------------------------------------------------------------- .\" -.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.22 2002/12/18 09:22:30 ru Exp $ +.\"$FreeBSD: src/lib/libc/sys/jail.2,v 1.23 2003/04/09 02:55:17 mike Exp $ .\" -.Dd April 28, 1999 +.Dd April 8, 2003 .Dt JAIL 2 .Os .Sh NAME @@ -17,10 +17,12 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h +.In sys/param.h .In sys/jail.h .Ft int .Fn jail "struct jail *jail" +.Ft int +.Fn jail_attach "int jid" .Sh DESCRIPTION The .Fn jail @@ -52,9 +54,29 @@ The .Dq Li ip_number can be set to the IP number assigned to the prison. +.Pp +The +.Fn jail_attach +system call attaches the current process to an existing jail, +identified by +.Va jid . +.Sh RETURN VALUES +If successful, +.Fn jail +returns a non-negative integer, termed the jail identifier (JID). +It returns -1 on failure, and sets +.Va errno +to indicate the error. +.Pp +If successful, +.Fn jail_attach +returns 0. +It returns -1 on failure, and sets +.Va errno +to indicate the error. .Sh PRISON? Once a process has been put in a prison, it and its decendants cannot escape -the prison. It is not possible to add a process to a preexisting prison. +the prison. .Pp Inside the prison, the concept of "superuser" is very diluted. In general, it can be assumed that nothing can be mangled from inside a prison which @@ -100,6 +122,10 @@ .Fn jail system call appeared in .Fx 4.0 . +The +.Fn jail_attach +system call appeared in +.Fx 5.1 . .Sh AUTHORS The jail feature was written by .An Poul-Henning Kamp ==== //depot/projects/ia64/lib/libdevstat/devstat.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.21 2003/03/19 14:15:32 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.22 2003/04/09 07:49:15 phk Exp $"); #include <sys/types.h> #include <sys/sysctl.h> @@ -1512,6 +1512,8 @@ *destld = 0; *destld /= etime; *destld *= 100; + if (*destld < 0) + *destld = 0; break; case DSM_QUEUE_LENGTH: *destu64 = current->start_count - current->end_count; ==== //depot/projects/ia64/lib/libkvm/kvm_proc.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.65 2003/04/01 04:49:12 jeff Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.66 2003/04/10 17:41:40 julian Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -364,6 +364,7 @@ kp->ki_pri.pri_native = mtd.td_base_pri; kp->ki_lastcpu = mtd.td_lastcpu; kp->ki_wchan = mtd.td_wchan; + kp->ki_oncpu = mtd.td_oncpu; if (!(proc.p_flag & P_THREADED)) { /* stuff from the ksegrp */ @@ -376,10 +377,7 @@ /* Stuff from the kse */ kp->ki_pctcpu = mke.ke_pctcpu; kp->ki_rqindex = mke.ke_rqindex; - kp->ki_oncpu = mke.ke_oncpu; } else { - kp->ki_oncpu = -1; - kp->ki_lastcpu = -1; kp->ki_tdflags = -1; /* All the rest are 0 for now */ } ==== //depot/projects/ia64/lib/libusbhid/Makefile#3 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $ -# $FreeBSD: src/lib/libusbhid/Makefile,v 1.7 2002/09/28 00:25:31 peter Exp $ +# $FreeBSD: src/lib/libusbhid/Makefile,v 1.8 2003/04/09 01:52:48 mdodd Exp $ MAINTAINER= n_hibma@FreeBSD.ORG LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 0 +SHLIB_MAJOR= 1 MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \ usbhid.3 hid_dispose_report_desc.3 \ @@ -19,7 +19,6 @@ SRCS= descr.c parse.c usage.c data.c -INCS= libusbhid.h +INCS= usbhid.h .include <bsd.lib.mk> - ==== //depot/projects/ia64/lib/libusbhid/data.c#2 (text+ko) ==== @@ -27,11 +27,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.5 2002/03/28 11:42:45 joe Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $"); #include <assert.h> #include <stdlib.h> -#include "libusbhid.h" +#include "usbhid.h" int hid_get_data(const void *p, const hid_item_t *h) ==== //depot/projects/ia64/lib/libusbhid/descr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.7 2002/03/28 11:42:45 joe Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $"); #include <sys/types.h> @@ -37,13 +37,11 @@ #include <string.h> #include <unistd.h> #include <sys/time.h> -#if defined(__FreeBSD__) #include <sys/ioctl.h> -#endif #include <dev/usb/usb.h> -#include "libusbhid.h" +#include "usbhid.h" #include "usbvar.h" report_desc_t ==== //depot/projects/ia64/lib/libusbhid/parse.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $ */ /* - * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> + * Copyright (c) 1999, 2001 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.7 2003/04/07 00:49:53 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $"); #include <assert.h> #include <stdlib.h> @@ -37,7 +37,7 @@ #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> -#include "libusbhid.h" +#include "usbhid.h" #include "usbvar.h" #define MAXUSAGE 100 @@ -49,18 +49,30 @@ unsigned int usages[MAXUSAGE]; int nusage; int minset; + int logminsize; int multi; int multimax; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304120528.h3C5SEj0043085>