Date: Fri, 21 Mar 2003 18:06:38 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 27206 for review Message-ID: <200303220206.h2M26csQ039713@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=27206 Change 27206 by marcel@marcel_vaio on 2003/03/21 18:05:54 IFC @27188 Affected files ... .. //depot/projects/ia64/bin/dd/args.c#6 integrate .. //depot/projects/ia64/bin/sh/expand.c#9 integrate .. //depot/projects/ia64/bin/sh/jobs.c#17 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#7 integrate .. //depot/projects/ia64/contrib/gdtoa/README#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#4 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/README#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/ia64/contrib/one-true-awk/main.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/makefile#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#27 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#9 integrate .. //depot/projects/ia64/etc/rc.d/kldxref#1 branch .. //depot/projects/ia64/games/fortune/datfiles/fortunes#27 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#4 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getusershell.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/lnumeric.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#9 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#14 delete .. //depot/projects/ia64/lib/libdevstat/Makefile#3 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.c#4 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#16 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#11 integrate .. //depot/projects/ia64/lib/libgeom/geom_stats.c#3 integrate .. //depot/projects/ia64/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#3 integrate .. //depot/projects/ia64/lib/libutil/pw_util.c#5 integrate .. //depot/projects/ia64/libexec/rpc.rstatd/rstat_proc.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/ia64/libexec/tftpd/tftpd.c#7 integrate .. //depot/projects/ia64/release/Makefile#42 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#75 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#9 integrate .. //depot/projects/ia64/release/i386/drivers.conf#15 integrate .. //depot/projects/ia64/release/ia64/doFS.sh#2 integrate .. //depot/projects/ia64/release/pc98/drivers.conf#8 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#10 integrate .. //depot/projects/ia64/sbin/camcontrol/modeedit.c#5 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#14 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#24 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#5 integrate .. //depot/projects/ia64/sbin/vinum/list.c#5 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#29 integrate .. //depot/projects/ia64/share/man/man7/release.7#17 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#6 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#11 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#7 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/ia64/sys/conf/files#69 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#27 integrate .. //depot/projects/ia64/sys/contrib/dev/fla/fla.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#20 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/ia64/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#2 integrate .. //depot/projects/ia64/sys/dev/em/README#6 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#18 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#12 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#10 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#11 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#7 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/md/md.c#24 integrate .. //depot/projects/ia64/sys/dev/musycc/musycc.c#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#16 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard_cis.c#8 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#21 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#21 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_ifsubr.c#8 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#16 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#10 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#39 integrate .. //depot/projects/ia64/sys/dev/sio/sioreg.h#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#14 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#34 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#14 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#13 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#17 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/ia64/sys/geom/geom.h#23 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#31 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#14 integrate .. //depot/projects/ia64/sys/geom/geom_int.h#9 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_stats.c#6 delete .. //depot/projects/ia64/sys/geom/geom_stats.h#3 delete .. //depot/projects/ia64/sys/geom/geom_subr.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#4 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#10 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#14 integrate .. //depot/projects/ia64/sys/i386/isa/if_le.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#12 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/ia64/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/isa/fd.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#33 integrate .. //depot/projects/ia64/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#22 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/ia64/sys/modules/oltr/Makefile#4 integrate .. //depot/projects/ia64/sys/net/bpf.c#20 integrate .. //depot/projects/ia64/sys/net/if.c#22 integrate .. //depot/projects/ia64/sys/net/if_arp.h#2 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#11 integrate .. //depot/projects/ia64/sys/net/iso88025.h#5 integrate .. //depot/projects/ia64/sys/netatalk/aarp.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip.h#4 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.h#4 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#13 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#17 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#28 integrate .. //depot/projects/ia64/sys/pci/if_de.c#9 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#25 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#24 integrate .. //depot/projects/ia64/sys/pci/if_xlreg.h#10 integrate .. //depot/projects/ia64/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/genassym.c#10 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#22 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/ia64/sys/sparc64/include/cache.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#15 integrate .. //depot/projects/ia64/sys/sparc64/include/smp.h#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cache.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cheetah.c#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#30 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#32 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/spitfire.c#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/sys/devicestat.h#4 integrate .. //depot/projects/ia64/sys/sys/kse.h#8 integrate .. //depot/projects/ia64/sys/sys/param.h#28 integrate .. //depot/projects/ia64/sys/sys/proc.h#52 integrate .. //depot/projects/ia64/sys/sys/stat.h#12 integrate .. //depot/projects/ia64/sys/sys/systm.h#25 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#20 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#25 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#27 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_subr.c#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#32 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#15 integrate .. //depot/projects/ia64/sys/vm/pmap.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#46 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#40 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#28 integrate .. //depot/projects/ia64/tools/KSE/rr/rr.c#2 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/ia64/tools/tools/crypto/hifnstats.c#1 branch .. //depot/projects/ia64/tools/tools/crypto/ipsecstats.c#1 branch .. //depot/projects/ia64/usr.bin/awk/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.birthday#7 integrate .. //depot/projects/ia64/usr.bin/systat/iostat.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/vmstat.c#8 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#15 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.1#9 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#6 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#7 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#12 integrate .. //depot/projects/ia64/usr.sbin/Makefile#34 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#10 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/ia64/usr.sbin/gstat/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/gstat/gstat.c#1 branch .. //depot/projects/ia64/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/ia64/usr.sbin/mtree/mtree.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile.yp#3 integrate Differences ... ==== //depot/projects/ia64/bin/dd/args.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.34 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $"); #include <sys/types.h> @@ -189,7 +189,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %d", SSIZE_MAX); + errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -200,7 +200,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %d", SSIZE_MAX); + errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); cbsz = (size_t)res; } @@ -235,7 +235,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %zd", SSIZE_MAX); + errx(1, "ibs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -255,7 +256,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %zd", SSIZE_MAX); + errx(1, "obs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); out.dbsz = (size_t)res; } } ==== //depot/projects/ia64/bin/sh/expand.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.41 2003/01/08 10:50:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -531,7 +531,7 @@ outfmt(&errout, "%s\n", startp); error((char *)NULL); } - error("%.*s: parameter %snot set", p - str - 1, + error("%.*s: parameter %snot set", (int)(p - str - 1), str, (varflags & VSNUL) ? "null or " : nullstr); return 0; @@ -666,7 +666,8 @@ case VSTRIMRIGHT: case VSTRIMRIGHTMAX: case VSLENGTH: - error("%.*s: parameter not set", p - var - 1, var); + error("%.*s: parameter not set", (int)(p - var - 1), + var); } } if (set && subtype != VSPLUS) { ==== //depot/projects/ia64/bin/sh/jobs.c#17 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.62 2003/01/27 07:41:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.63 2003/03/17 11:28:56 tjr Exp $"); #include <fcntl.h> #include <signal.h> @@ -740,6 +740,7 @@ TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, mode)); INTOFF; + flushall(); pid = fork(); if (pid == -1) { TRACE(("Fork failed, errno=%d\n", errno)); ==== //depot/projects/ia64/contrib/cvs/src/parseinfo.c#4 (text+ko) ==== @@ -4,6 +4,8 @@ * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. + * + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.2 2003/03/20 11:05:48 des Exp $ */ #include "cvs.h" @@ -340,6 +342,25 @@ goto error_return; } } + else if (strcmp (line, "tag") == 0) { + RCS_setlocalid(p); + } + else if (strcmp (line, "umask") == 0) { + cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777); + } + else if (strcmp (line, "dlimit") == 0) { +#ifdef BSD +#include <sys/resource.h> + struct rlimit rl; + + if (getrlimit(RLIMIT_DATA, &rl) != -1) { + rl.rlim_cur = atoi(p); + rl.rlim_cur *= 1024; + + (void) setrlimit(RLIMIT_DATA, &rl); + } +#endif /* BSD */ + } else if (strcmp (line, "PreservePermissions") == 0) { if (strcmp (p, "no") == 0) ==== //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#7 (text+ko) ==== @@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/rs6000/sysv4.h,v 1.5 2003/02/10 06:05:38 kan Exp $ */ - /* Yes! We are ELF. */ #define TARGET_OBJECT_FORMAT OBJECT_ELF @@ -1209,7 +1207,7 @@ /* FreeBSD support. */ #define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ -D__ELF__ \ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ -Acpu=powerpc -Amachine=powerpc" #define STARTFILE_FREEBSD_SPEC FBSD_STARTFILE_SPEC ==== //depot/projects/ia64/contrib/gdtoa/README#2 (text+ko) ==== @@ -313,6 +313,10 @@ exponent = fpi->emin. Strtodg provides distinct return values for normals and denormals; see gdtoa.h. +Compiling g__fmt.c, strtod.c, and strtodg.c with -DUSE_LOCALE causes +the decimal-point character to be taken from the current locale; otherwise +it is '.'. + Please send comments to David M. Gay ==== //depot/projects/ia64/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -37,6 +37,10 @@ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + char * #ifdef KR_headers g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; @@ -46,13 +50,17 @@ { int i, j, k; char *s0 = s; - +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = '.'; + *b++ = decimalpoint; while((*b = *s++) !=0) b++; } @@ -76,7 +84,7 @@ *b = 0; } else if (decpt <= 0) { - *b++ = '.'; + *b++ = decimalpoint; for(; decpt < 0; decpt++) *b++ = '0'; while((*b = *s++) !=0) @@ -86,7 +94,7 @@ while((*b = *s++) !=0) { b++; if (--decpt == 0 && *s) - *b++ = '.'; + *b++ = decimalpoint; } for(; decpt > 0; decpt--) *b++ = '0'; ==== //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.2 2003/03/12 20:20:22 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.3 2003/03/19 20:25:45 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -203,6 +203,7 @@ #endif #define INFNAN_CHECK +#define USE_LOCALE #undef IEEE_Arith #undef Avoid_Underflow ==== //depot/projects/ia64/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -85,9 +85,6 @@ #ifdef Honor_FLT_ROUNDS int rounding; #endif -#ifdef USE_LOCALE - CONST char *s2; -#endif sign = nz0 = nz = 0; dval(rv) = 0.; @@ -150,25 +147,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/ia64/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -59,9 +59,6 @@ { ULong *x, *xe; Bigint *b1; -#ifdef USE_LOCALE - CONST char *s2; -#endif #ifdef Pack_16 ULong carry = 1, y; #endif @@ -399,25 +396,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/ia64/contrib/gdtoa/xsum0.out#2 (text+ko) ==== @@ -1,9 +1,9 @@ -README 10a65619 13093 +README 7150e50 13249 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c f2d66617 2355 +g__fmt.c e29d67f1 2534 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c f56c1968 5041 +gethex.c ff3c434d 4981 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1390a957 20277 +strtod.c 1ad667 20076 strtodI.c e58338e0 4062 -strtodg.c 1cba0060 19769 +strtodg.c 1caf3fa4 19553 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#4 (text+ko) ==== @@ -20,7 +20,7 @@ .\" .\" Portions copyright (c) 2000 David E. O'Brien. .\" All rights reserved. -.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.12 2003/01/16 07:28:12 obrien Exp $ +.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.13 2003/03/18 19:46:55 obrien Exp $ .\" .TH dhclient 8 .SH NAME @@ -41,6 +41,9 @@ .B -q ] [ +.B -v +] +[ .B -1 ] [ @@ -204,6 +207,10 @@ .B -q flag prevents any messages other than errors from being printed to the standard error descriptor. +.B -v +flag turns on all messages. +Opposite of +.B -q . .PP The client normally doesn't release the current lease as it is not required by the DHCP protocol. Some cable ISPs require their clients ==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright[] = "$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.23 2003/01/15 10:44:05 murray Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.24 2003/03/18 19:46:55 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -185,6 +185,9 @@ } else if (!strcmp (argv [i], "-q")) { quiet = 1; quiet_interface_discovery = 1; + } else if (!strcmp (argv [i], "-v")) { + quiet = 0; + quiet_interface_discovery = 0; } else if (!strcmp (argv [i], "-s")) { if (++i == argc) usage (); ==== //depot/projects/ia64/contrib/one-true-awk/FIXES#5 (text+ko) ==== @@ -25,6 +25,21 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Mar 14, 2003: + the internationalization changes, somewhat modified, are now + reinstated. in theory awk will now do character comparisons + and case conversions in national language, but "." will always + be the decimal point separator on input and output regardless + of national language. isblank(){} has an #ifndef. + + this no longer compiles on windows: LC_MESSAGES isn't defined + in vc6++. + + fixed subtle behavior in field and record splitting: if FS is + a single character and RS is not empty, \n is NOT a separator. + this tortuous reading is found in the awk book; behavior now + matches gawk and mawk. + Dec 13, 2002: for the moment, the internationalization changes of nov 29 are rolled back -- programs like x = 1.2 don't work in some locales, ==== //depot/projects/ia64/contrib/one-true-awk/README#5 (text+ko) ==== @@ -72,8 +72,14 @@ *if* you provide versions of popen and pclose. The file missing95.c contains versions that can be used to get started with, though the underlying support has mysterious properties, -the symptom of which can be truncated pipe output. Beware. -The file makefile.win gives hints on how to proceed. +the symptom of which can be truncated pipe output. Beware. The +file makefile.win gives hints on how to proceed; if you run +vcvars32.bat, it will set up necessary paths and parameters so +you can subsequently run nmake -f makefile.win. Beware also that +when running on Windows under command.com, various quoting +conventions are different from Unix systems: single quotes won't +work around arguments, and various characters like % are +interpreted within double quotes. This compiles without change on Macintosh OS X using gcc and the standard developer tools. ==== //depot/projects/ia64/contrib/one-true-awk/b.c#5 (text+ko) ==== @@ -282,9 +282,24 @@ return c; } +static int collate_range_cmp(int a, int b) +{ + int r; + static char s[2][2]; + + if ((uschar)a == (uschar)b) + return 0; + s[0][0] = a; + s[1][0] = b; + if ((r = strcoll(s[0], s[1])) == 0) + r = (uschar)a - (uschar)b; + return r; +} + char *cclenter(const char *argp) /* add a character class */ { int i, c, c2; + int j; uschar *p = (uschar *) argp; uschar *op, *bp; static uschar *buf = 0; @@ -303,15 +318,18 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { /* empty; ignore */ bp--; i--; continue; } - while (c < c2) { + for (j = 0; j < NCHARS; j++) { + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; } continue; @@ -695,23 +713,39 @@ * relex(), the expanded character class (prior to range expansion) * must be less than twice the size of their full name. */ + +/* Because isblank doesn't show up in any of the header files on any + * system i use, it's defined here. if some other locale has a richer + * definition of "blank", define HAS_ISBLANK and provide your own + * version. + */ + +#ifndef HAS_ISBLANK + +int isblank(int c) +{ + return c==' ' || c=='\t'; +} + +#endif + struct charclass { const char *cc_name; int cc_namelen; - const char *cc_expand; + int (*cc_func)(int); } charclasses[] = { - { "alnum", 5, "0-9A-Za-z" }, - { "alpha", 5, "A-Za-z" }, - { "blank", 5, " \t" }, - { "cntrl", 5, "\000-\037\177" }, - { "digit", 5, "0-9" }, - { "graph", 5, "\041-\176" }, - { "lower", 5, "a-z" }, - { "print", 5, " \041-\176" }, - { "punct", 5, "\041-\057\072-\100\133-\140\173-\176" }, - { "space", 5, " \f\n\r\t\v" }, - { "upper", 5, "A-Z" }, - { "xdigit", 6, "0-9A-Fa-f" }, + { "alnum", 5, isalnum }, + { "alpha", 5, isalpha }, + { "blank", 5, isblank }, + { "cntrl", 5, iscntrl }, + { "digit", 5, isdigit }, + { "graph", 5, isgraph }, + { "lower", 5, islower }, + { "print", 5, isprint }, + { "punct", 5, ispunct }, + { "space", 5, isspace }, + { "upper", 5, isupper }, + { "xdigit", 6, isxdigit }, { NULL, 0, NULL }, }; @@ -724,7 +758,7 @@ static int bufsz = 100; uschar *bp; struct charclass *cc; - const uschar *p; + int i; switch (c = *prestr++) { case '|': return OR; @@ -773,8 +807,14 @@ if (cc->cc_name != NULL && prestr[1 + cc->cc_namelen] == ':' && prestr[2 + cc->cc_namelen] == ']') { prestr += cc->cc_namelen + 3; - for (p = (const uschar *) cc->cc_expand; *p; p++) - *bp++ = *p; + for (i = 0; i < NCHARS; i++) { + if (!adjbuf((char **) &buf, &bufsz, bp-buf+1, 100, (char **) &bp, 0)) + FATAL("out of space for reg expr %.10s...", lastre); + if (cc->cc_func(i)) { + *bp++ = i; + n++; + } + } } else *bp++ = c; } else if (c == '\0') { ==== //depot/projects/ia64/contrib/one-true-awk/lib.c#3 (text+ko) ==== @@ -308,6 +308,13 @@ } *fr = 0; } else if (*r != 0) { /* if 0, it's a null field */ + /* subtlecase : if length(FS) == 1 && length(RS > 0) + * \n is NOT a field separator (cf awk book 61,84). + * this variable is tested in the inner while loop. + */ + int rtest = '\n'; /* normal case */ + if (strlen(*RS) > 0) + rtest = '\0'; for (;;) { i++; if (i > nfields) @@ -316,7 +323,7 @@ xfree(fldtab[i]->sval); fldtab[i]->sval = fr; fldtab[i]->tval = FLD | STR | DONTFREE; - while (*r != sep && *r != '\n' && *r != '\0') /* \n is always a separator */ + while (*r != sep && *r != rtest && *r != '\0') /* \n is always a separator */ *fr++ = *r++; *fr++ = 0; if (*r++ == 0) ==== //depot/projects/ia64/contrib/one-true-awk/main.c#6 (text+ko) ==== @@ -22,11 +22,12 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20021213"; +const char *version = "version 20030314"; #define DEBUG #include <stdio.h> #include <ctype.h> +#include <locale.h> #include <stdlib.h> #include <string.h> #include <signal.h> @@ -54,6 +55,10 @@ { const char *fs = NULL; + setlocale(LC_ALL, ""); + setlocale(LC_COLLATE, ""); + setlocale(LC_CTYPE, ""); + setlocale(LC_MESSAGES, ""); cmdname = argv[0]; if (argc == 1) { fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); ==== //depot/projects/ia64/contrib/one-true-awk/makefile#5 (text+ko) ==== @@ -45,7 +45,7 @@ lib.c run.c tran.c missing95.c SHIP = README FIXES $(SOURCE) ytab[ch].bak makefile makefile.win \ - buildwin.bat mac.code awk.1 + vcvars32.bat buildwin.bat mac.code awk.1 a.out: ytab.o $(OFILES) $(CC) $(CFLAGS) ytab.o $(OFILES) $(ALLOC) -lm ==== //depot/projects/ia64/contrib/one-true-awk/run.c#5 (text+ko) ==== @@ -1509,11 +1509,11 @@ if (t == FTOUPPER) { for (p = buf; *p; p++) if (islower((uschar) *p)) - *p = toupper(*p); + *p = toupper((uschar)*p); } else { for (p = buf; *p; p++) if (isupper((uschar) *p)) - *p = tolower(*p); + *p = tolower((uschar)*p); } tempfree(x); x = gettemp(); ==== //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#6 (text+ko) ==== @@ -195,6 +195,25 @@ return(r); } +static int rsa_eay_blinding(RSA *rsa, BN_CTX *ctx) + { + int ret = 1; + CRYPTO_w_lock(CRYPTO_LOCK_RSA); + /* Check again inside the lock - the macro's check is racey */ + if(rsa->blinding == NULL) + ret = RSA_blinding_on(rsa, ctx); + CRYPTO_w_unlock(CRYPTO_LOCK_RSA); + return ret; + } + +#define BLINDING_HELPER(rsa, ctx, err_instr) \ + do { \ + if(((rsa)->flags & RSA_FLAG_BLINDING) && \ + ((rsa)->blinding == NULL) && \ + !rsa_eay_blinding(rsa, ctx)) \ + err_instr \ + } while(0) + /* signing */ static int RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) @@ -239,8 +258,8 @@ goto err; } - if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL)) - RSA_blinding_on(rsa,ctx); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303220206.h2M26csQ039713>