Date: Sat, 11 Nov 2006 18:51:51 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109750 for review Message-ID: <200611111851.kABIppGb023876@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109750 Change 109750 by marcel@marcel_cluster on 2006/11/11 18:51:35 IFC @109749 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#12 integrate .. //depot/projects/ia64/bin/sh/expand.c#17 integrate .. //depot/projects/ia64/bin/sh/parser.c#17 integrate .. //depot/projects/ia64/bin/sh/parser.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ChangeLog#13 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#12 integrate .. //depot/projects/ia64/crypto/openssh/README#12 integrate .. //depot/projects/ia64/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth-rsa.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth.c#13 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.h#8 delete .. //depot/projects/ia64/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/ia64/crypto/openssh/buildpkg.sh.in#5 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#14 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#13 integrate .. //depot/projects/ia64/crypto/openssh/dh.c#10 integrate .. //depot/projects/ia64/crypto/openssh/entropy.c#7 integrate .. //depot/projects/ia64/crypto/openssh/kexdhc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexgexc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/ia64/crypto/openssh/key.c#14 integrate .. //depot/projects/ia64/crypto/openssh/moduli.c#7 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#15 integrate .. //depot/projects/ia64/crypto/openssh/monitor_fdpass.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-solaris.c#2 integrate .. //depot/projects/ia64/crypto/openssh/rsa.c#5 integrate .. //depot/projects/ia64/crypto/openssh/scard.c#7 integrate .. //depot/projects/ia64/crypto/openssh/scard/Makefile.in#2 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#14 integrate .. //depot/projects/ia64/crypto/openssh/session.c#26 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#15 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#17 integrate .. //depot/projects/ia64/crypto/openssh/ssh-dss.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.1#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#16 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#21 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#17 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#15 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect1.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#19 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#23 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#19 integrate .. //depot/projects/ia64/crypto/openssh/version.h#22 integrate .. //depot/projects/ia64/etc/amd.map#4 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#74 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#30 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#42 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libiberty/config.h#6 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#22 integrate .. //depot/projects/ia64/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_buffer.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#16 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/ia64/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/ia64/lib/libc/arm/arith.h#2 integrate .. //depot/projects/ia64/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/ia64/lib/libc/arm/sys/cerror.S#3 integrate .. //depot/projects/ia64/lib/libc/arm/sys/ptrace.S#3 integrate .. //depot/projects/ia64/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/i386/net/htonl.S#6 delete .. //depot/projects/ia64/lib/libc/i386/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/i386/net/ntohl.S#6 delete .. //depot/projects/ia64/lib/libc/i386/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_2.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_4.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/htonl.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/ntohl.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/net/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/libc/net/ntoh.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/ia64/lib/libc/sparc64/net/Makefile.inc#3 delete .. //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#5 delete .. //depot/projects/ia64/lib/libc/sparc64/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#5 delete .. //depot/projects/ia64/lib/libc/sparc64/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/sys/extattr_get_file.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.c#5 integrate .. //depot/projects/ia64/lib/libstand/Makefile#24 integrate .. //depot/projects/ia64/lib/libutil/login_ok.3#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#165 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#13 integrate .. //depot/projects/ia64/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#42 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.8#8 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#15 integrate .. //depot/projects/ia64/sbin/routed/main.c#6 integrate .. //depot/projects/ia64/share/colldef/Makefile#26 integrate .. //depot/projects/ia64/share/man/man4/ips.4#4 integrate .. //depot/projects/ia64/share/man/man4/le.4#3 integrate .. //depot/projects/ia64/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#62 integrate .. //depot/projects/ia64/share/man/man9/priv.9#1 branch .. //depot/projects/ia64/share/man/man9/suser.9#11 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#34 integrate .. //depot/projects/ia64/share/mk/bsd.endian.mk#3 integrate .. //depot/projects/ia64/share/mklocale/Makefile#23 integrate .. //depot/projects/ia64/share/monetdef/Makefile#22 integrate .. //depot/projects/ia64/share/msgdef/Makefile#23 integrate .. //depot/projects/ia64/share/numericdef/Makefile#22 integrate .. //depot/projects/ia64/share/timedef/Makefile#22 integrate .. //depot/projects/ia64/share/timedef/nn_NO.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/nn_NO.UTF-8.src#1 branch .. //depot/projects/ia64/sys/Makefile#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#42 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/ia64/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/ia64/sys/arm/arm/intr.c#11 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/ia64/sys/arm/include/armreg.h#5 integrate .. //depot/projects/ia64/sys/arm/include/atomic.h#13 integrate .. //depot/projects/ia64/sys/arm/include/cpuconf.h#7 integrate .. //depot/projects/ia64/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#16 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/main.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.h#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btx/btx.S#6 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/ia64/sys/cam/cam_xpt.c#34 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#49 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#16 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#39 integrate .. //depot/projects/ia64/sys/conf/NOTES#110 integrate .. //depot/projects/ia64/sys/conf/files#150 integrate .. //depot/projects/ia64/sys/conf/files.arm#8 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#3 integrate .. //depot/projects/ia64/sys/conf/options#101 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#15 integrate .. //depot/projects/ia64/sys/ddb/db_main.c#3 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#29 integrate .. //depot/projects/ia64/sys/dev/aha/ahareg.h#5 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#39 integrate .. //depot/projects/ia64/sys/dev/arl/if_arl.c#8 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#52 integrate .. //depot/projects/ia64/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#18 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#15 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#16 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#15 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#56 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#36 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#68 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/ia64/sys/dev/kbd/kbd.c#17 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.c#15 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/ia64/sys/dev/nmdm/nmdm.c#23 integrate .. //depot/projects/ia64/sys/dev/null/null.c#20 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#20 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#61 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#32 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#15 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/ia64/sys/dev/random/randomdev.c#19 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni.c#20 integrate .. //depot/projects/ia64/sys/dev/sbsh/if_sbsh.c#12 integrate .. //depot/projects/ia64/sys/dev/si/si.c#17 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#43 integrate .. //depot/projects/ia64/sys/dev/syscons/sysmouse.c#11 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#66 integrate .. //depot/projects/ia64/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#23 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#17 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#42 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#36 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#28 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#21 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/ia64/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/ia64/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/ia64/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#45 integrate .. //depot/projects/ia64/sys/i386/i386/io.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#74 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#15 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#25 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_proto.h#12 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.h#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#24 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/ia64/sys/i386/pci/pci_pir.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#19 integrate .. //depot/projects/ia64/sys/ia64/ia64/ssc.c#16 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#36 integrate .. //depot/projects/ia64/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#87 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#85 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#68 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_ntptime.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_priv.c#1 branch .. //depot/projects/ia64/sys/kern/kern_prot.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#96 integrate .. //depot/projects/ia64/sys/kern/kern_sx.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/ia64/sys/kern/ksched.c#1 branch .. //depot/projects/ia64/sys/kern/makesyscalls.sh#12 integrate .. //depot/projects/ia64/sys/kern/p1003_1b.c#1 branch .. //depot/projects/ia64/sys/kern/posix4_mib.c#1 branch .. //depot/projects/ia64/sys/kern/sched_4bsd.c#37 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#51 integrate .. //depot/projects/ia64/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_lock.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#40 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#60 integrate .. //depot/projects/ia64/sys/kern/sysv_ipc.c#10 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#23 integrate .. //depot/projects/ia64/sys/kern/tty.c#50 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#29 integrate .. //depot/projects/ia64/sys/kern/tty_pts.c#6 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#32 integrate .. //depot/projects/ia64/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#66 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#58 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#53 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#94 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#77 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#57 integrate .. //depot/projects/ia64/sys/modules/Makefile#99 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#28 integrate .. //depot/projects/ia64/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/ia64/sys/net/bpf.c#47 integrate .. //depot/projects/ia64/sys/net/bridgestp.c#10 integrate .. //depot/projects/ia64/sys/net/bridgestp.h#3 integrate .. //depot/projects/ia64/sys/net/if.c#54 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#13 integrate .. //depot/projects/ia64/sys/net/if_bridgevar.h#8 integrate .. //depot/projects/ia64/sys/net/if_gre.c#25 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#29 integrate .. //depot/projects/ia64/sys/net/if_pppvar.h#9 integrate .. //depot/projects/ia64/sys/net/if_sl.c#20 integrate .. //depot/projects/ia64/sys/net/if_tap.c#38 integrate .. //depot/projects/ia64/sys/net/if_tun.c#37 integrate .. //depot/projects/ia64/sys/net/ppp_tty.c#17 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#21 integrate .. //depot/projects/ia64/sys/net/rtsock.c#38 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#21 integrate .. //depot/projects/ia64/sys/netatalk/at_control.c#11 integrate .. //depot/projects/ia64/sys/netatalk/ddp_pcb.c#8 integrate .. //depot/projects/ia64/sys/netatm/atm_usrreq.c#15 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#13 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#22 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#18 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#32 integrate .. //depot/projects/ia64/sys/netgraph/ng_tty.c#15 integrate .. //depot/projects/ia64/sys/netinet/in.c#24 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#49 integrate .. //depot/projects/ia64/sys/netinet/ip_carp.c#11 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#37 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#40 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#58 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#50 integrate .. //depot/projects/ia64/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctputil.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctputil.h#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#60 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#49 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#27 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#33 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#20 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#25 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#16 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.c#14 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#21 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#13 integrate .. //depot/projects/ia64/sys/netncp/ncp_mod.c#12 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.h#6 integrate .. //depot/projects/ia64/sys/netsmb/smb_conn.c#17 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.h#12 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#26 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#28 integrate .. //depot/projects/ia64/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#34 integrate .. //depot/projects/ia64/sys/pci/if_pcnreg.h#7 integrate .. //depot/projects/ia64/sys/posix4/_semaphore.h#5 delete .. //depot/projects/ia64/sys/posix4/ksched.c#16 delete .. //depot/projects/ia64/sys/posix4/ksem.h#2 delete .. //depot/projects/ia64/sys/posix4/p1003_1b.c#12 delete .. //depot/projects/ia64/sys/posix4/posix4.h#9 delete .. //depot/projects/ia64/sys/posix4/posix4_mib.c#7 delete .. //depot/projects/ia64/sys/posix4/sched.h#4 delete .. //depot/projects/ia64/sys/posix4/semaphore.h#6 delete .. //depot/projects/ia64/sys/security/audit/audit.c#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_net.c#11 integrate .. //depot/projects/ia64/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/ia64/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#36 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#21 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#27 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#34 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#10 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#30 integrate .. //depot/projects/ia64/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/ia64/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/ia64/sys/sys/_lock.h#6 integrate .. //depot/projects/ia64/sys/sys/_mutex.h#9 integrate .. //depot/projects/ia64/sys/sys/_semaphore.h#1 branch .. //depot/projects/ia64/sys/sys/jail.h#13 integrate .. //depot/projects/ia64/sys/sys/ksem.h#1 branch .. //depot/projects/ia64/sys/sys/lock.h#15 integrate .. //depot/projects/ia64/sys/sys/lock_profile.h#1 branch .. //depot/projects/ia64/sys/sys/lockmgr.h#18 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#35 integrate .. //depot/projects/ia64/sys/sys/mutex.h#30 integrate .. //depot/projects/ia64/sys/sys/param.h#78 integrate .. //depot/projects/ia64/sys/sys/posix4.h#1 branch .. //depot/projects/ia64/sys/sys/priv.h#1 branch .. //depot/projects/ia64/sys/sys/sched.h#15 integrate .. //depot/projects/ia64/sys/sys/sem.h#7 integrate .. //depot/projects/ia64/sys/sys/semaphore.h#1 branch .. //depot/projects/ia64/sys/sys/sysproto.h#60 integrate .. //depot/projects/ia64/sys/sys/systm.h#51 integrate .. //depot/projects/ia64/sys/sys/thr.h#9 integrate .. //depot/projects/ia64/sys/sys/umtx.h#13 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#38 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#66 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#51 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#29 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#27 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#58 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#63 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#34 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#80 integrate .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp1.0#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp2.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp3.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp4.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp5.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/fifo/fifo_io/fifo_io.c#2 integrate .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ascii.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.block.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dddh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhdd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhdh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ed.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.grep.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.n21.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.out#2 delete .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.sh#5 integrate .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.stutter.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.tabs.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.x.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.xaa.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.yes.out#1 branch .. //depot/projects/ia64/tools/tools/pirtool/pirtable.h#3 integrate .. //depot/projects/ia64/tools/tools/pirtool/pirtool.c#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#63 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#24 integrate .. //depot/projects/ia64/usr.bin/jot/jot.1#7 integrate .. //depot/projects/ia64/usr.bin/jot/jot.c#8 integrate .. //depot/projects/ia64/usr.bin/ktrace/ktrace.1#5 integrate .. //depot/projects/ia64/usr.bin/netstat/if.c#13 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#13 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/bsnmpd/Makefile#12 integrate .. //depot/projects/ia64/usr.sbin/portsnap/phttpget/phttpget.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#38 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#12 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.59 2006/11/08 03:23:49 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +.if ${TARGET_ARCH} == "ia64" +# 20061104: skiload.help removed +OLD_FILES+=boot/skiload.help +.endif # 20061018: pccardc removed OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ ==== //depot/projects/ia64/bin/sh/expand.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.51 2006/11/07 22:46:13 stefanf Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -98,7 +98,7 @@ STATIC int subevalvar(char *, char *, int, int, int, int); STATIC char *evalvar(char *, int); STATIC int varisset(char *, int); -STATIC void varvalue(char *, int, int); +STATIC void varvalue(char *, int, int, int); STATIC void recordregion(int, int, int); STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); @@ -633,7 +633,7 @@ int easy; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - varflags = *p++; + varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; var = p; special = 0; @@ -669,7 +669,7 @@ if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - varvalue(var, varflags & VSQUOTE, flag & EXP_FULL); + varvalue(var, varflags & VSQUOTE, subtype, flag); if (subtype == VSLENGTH) { varlen = expdest - stackblock() - startloc; STADJUST(-varlen, expdest); @@ -763,6 +763,11 @@ goto record; break; + case VSERROR: + c = p - var - 1; + error("${%.*s%s}: Bad substitution", c, var, + (c > 0 && *p != CTLENDVAR) ? "..." : ""); + default: abort(); } @@ -836,7 +841,7 @@ */ STATIC void -varvalue(char *name, int quoted, int allow_split) +varvalue(char *name, int quoted, int subtype, int flag) { int num; char *p; @@ -848,7 +853,7 @@ #define STRTODEST(p) \ do {\ - if (allow_split) { \ + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) { \ syntax = quoted? DQSYNTAX : BASESYNTAX; \ while (*p) { \ if (syntax[(int)*p] == CCTL) \ @@ -883,7 +888,7 @@ } break; case '@': - if (allow_split && quoted) { + if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { STRTODEST(p); if (*ap) ==== //depot/projects/ia64/bin/sh/parser.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1228,12 +1228,17 @@ c = pgetc(); } } else { - if (! is_special(c)) -badsub: synerror("Bad substitution"); - USTPUTC(c, out); - c = pgetc(); + if (! is_special(c)) { + subtype = VSERROR; + if (c == '}') + pungetc(); + else + USTPUTC(c, out); + } else { + USTPUTC(c, out); + c = pgetc(); + } } - STPUTC('=', out); flags = 0; if (subtype == 0) { switch (c) { @@ -1243,9 +1248,13 @@ /*FALLTHROUGH*/ default: p = strchr(types, c); - if (p == NULL) - goto badsub; - subtype = p - types + VSNORMAL; + if (p == NULL) { + if (flags == VSNUL) + STPUTC(':', out); + STPUTC(c, out); + subtype = VSERROR; + } else + subtype = p - types + VSNORMAL; break; case '%': case '#': @@ -1261,9 +1270,10 @@ break; } } - } else { + } else if (subtype != VSERROR) { pungetc(); } + STPUTC('=', out); if (subtype != VSLENGTH && (dblquote || arinest)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; ==== //depot/projects/ia64/bin/sh/parser.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ */ /* control characters in argument strings */ @@ -60,6 +60,7 @@ #define VSTRIMRIGHT 0x8 /* ${var%pattern} */ #define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */ #define VSLENGTH 0xa /* ${#var} */ +#define VSERROR 0xb /* Syntax error, issue when expanded */ /* ==== //depot/projects/ia64/crypto/openssh/ChangeLog#13 (text+ko) ==== @@ -1,7 +1,117 @@ +20061107 + - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it + if we absolutely need it. Pointed out by Corinna, ok djm@ + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2006/11/06 21:25:28 + [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c + ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c] + add missing checks for openssl return codes; with & ok djm@ + - markus@cvs.openbsd.org 2006/11/07 10:31:31 + [monitor.c version.h] + correctly check for bad signatures in the monitor, otherwise the monitor + and the unpriv process can get out of sync. with dtucker@, ok djm@, + dtucker@ + - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump + versions. + - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@ + - (dtucker) Release 4.5p1. + +20061105 + - (djm) OpenBSD CVS Sync + - otto@cvs.openbsd.org 2006/10/28 18:08:10 + [ssh.1] + correct/expand example of usage of -w; ok jmc@ stevesk@ + - markus@cvs.openbsd.org 2006/10/31 16:33:12 + [kexdhc.c kexdhs.c kexgexc.c kexgexs.c] + check DH_compute_key() for -1 even if it should not happen because of + earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm + +20061101 + - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr + events fatal in Solaris process contract support and tell it to signal + only processes in the same process group when something happens. + Based on information from andrew.benham at thus.net and similar to + a patch from Chad Mynhier. ok djm@ + +20061027 +- (djm) [auth.c] gc some dead code + +20061023 + - (djm) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/30 17:48:22 + [sftp.c] + Clear errno before calling the strtol functions. + From Paul Stoeber <x0001 at x dot de1 dot cc>. + OK deraadt@. + - djm@cvs.openbsd.org 2006/10/06 02:29:19 + [ssh-agent.c ssh-keyscan.c ssh.c] + sys/resource.h needs sys/time.h; prompted by brad@ + (NB. Id sync only for portable) + - djm@cvs.openbsd.org 2006/10/09 23:36:11 + [session.c] + xmalloc -> xcalloc that was missed previously, from portable + (NB. Id sync only for portable, obviously) + - markus@cvs.openbsd.org 2006/10/10 10:12:45 + [sshconnect.c] + sleep before retrying (not after) since sleep changes errno; fixes + pr 5250; rad@twig.com; ok dtucker djm + - markus@cvs.openbsd.org 2006/10/11 12:38:03 + [clientloop.c serverloop.c] + exit instead of doing a blocking tcp send if we detect a client/server + timeout, since the tcp sendqueue might be already full (of alive + requests); ok dtucker, report mpf + - djm@cvs.openbsd.org 2006/10/22 02:25:50 + [sftp-client.c] + cancel progress meter when upload write fails; ok deraadt@ + - (tim) [Makefile.in scard/Makefile.in] Add datarootdir= lines to keep + autoconf 2.60 from complaining. + +20061018 + - (dtucker) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/25 04:55:38 + [ssh-keyscan.1 ssh.1] + Change "a SSH" to "an SSH". Hurray, I'm not the only one who + pronounces "SSH" as "ess-ess-aich". + OK jmc@ and stevesk@. + - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings + on older versions of OS X. ok djm@ + +20061016 + - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros + on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de. + +20061006 + - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. + Differentiate between OpenServer 5 and OpenServer 6 + - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for + SELinux functions so they're detected correctly. Patch from pebenito at + gentoo.org. + - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer). + Allow setting alternate awk in openssh-config.local. + +20061003 + - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific + section so additional platform specific CHECK_HEADER tests will work + correctly. Fixes "<net/if_tap.h> on FreeBSD" problem report by des AT des.no + Feedback and "seems like a good idea" dtucker@ + +20061001 + - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no. + +20060929 + - (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine + support. Patch from andrew.benham at thus net. + +20060928 + - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error + on Solaris 8 w/out /dev/random or prngd. Patch from rl at + math.technion.ac.il. + 20060926 - (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not referenced any more. ok djm@ - (dtucker) [sftp-server.8] Resync; spotted by djm@ + - (dtucker) Release 4.4p1. 20060924 - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added @@ -2496,2995 +2606,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -20050901 - - (djm) Update RPM spec file versions - -20050831 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/08/30 22:08:05 - [gss-serv.c sshconnect2.c] - destroy credentials if krb5_kuserok() call fails. Stops credentials being - delegated to users who are not authorised for GSSAPIAuthentication when - GSSAPIDeletegateCredentials=yes and another authentication mechanism - succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by - simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@ - - markus@cvs.openbsd.org 2005/08/31 09:28:42 - [version.h] - 4.2 - - (dtucker) [README] Update release note URL to 4.2 - - (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c - openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable - libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd(). - Feedback and OK dtucker@ - -20050830 - - (tim) [configure.ac] Back out last change. It needs to be done differently. - -20050829 - - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long - password support to 7.x for now. - -20050826 - - (tim) [CREDITS LICENCE auth.c configure.ac defines.h includes.h session.c - openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h - openbsd-compat/xcrypt.c] New files [openssh/openbsd-compat/port-uw.c - openssh/openbsd-compat/port-uw.h] Support long passwords (> 8-char) - on UnixWare 7 from Dhiraj Gulati and Ahsan Rashid. Cleanup and testing - by tim@. Feedback and OK dtucker@ - -20050823 - - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully- - qualified sshd pathname since some systems (eg Cygwin) may consider "/foo" - and "//foo" to be different. Spotted by vinschen at redhat.com. - - (tim) [configure.ac] Not all gcc's support -Wsign-compare. Enhancements - and OK dtucker@ - - (tim) [defines.h] PATH_MAX bits for OpenServer OK dtucker@ - -20050821 - - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for - LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@ - -20050816 - - (djm) [ttymodes.c] bugzilla #1025: Fix encoding of _POSIX_VDISABLE, - from Jacob Nevins; ok dtucker@ - -20050815 - - (tim) [sftp.c] wrap el_end() in #ifdef USE_LIBEDIT - - (tim) [configure.ac] corrections to libedit tests. Report and patches - by skeleten AT shillest.net - -20050812 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2005/07/28 17:36:22 - [packet.c] - missing packet_init_compression(); from solar - - djm@cvs.openbsd.org 2005/07/30 01:26:16 - [ssh.c] - fix -D listen_host initialisation, so it picks up gateway_ports setting - correctly - - djm@cvs.openbsd.org 2005/07/30 02:03:47 - [readconf.c] - listen_hosts initialisation here too; spotted greg AT y2005.nest.cx - - dtucker@cvs.openbsd.org 2005/08/06 10:03:12 - [servconf.c] - Unbreak sshd ListenAddress for bare IPv6 addresses. - Report from Janusz Mucka; ok djm@ - - jaredy@cvs.openbsd.org 2005/08/08 13:22:48 - [sftp.c] - sftp prompt enhancements: - - in non-interactive mode, do not print an empty prompt at the end - before finishing - - print newline after EOF in editline mode - - call el_end() in editline mode - ok dtucker djm - -20050810 - - (dtucker) [configure.ac] Test libedit library and headers for compatibility. - Report from skeleten AT shillest.net, ok djm@ - - (dtucker) [LICENCE configure.ac defines.h openbsd-compat/realpath.c] - Sync current (thread-safe) version of realpath.c from OpenBSD (which is - in turn based on FreeBSD's). ok djm@ - -20050809 - - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@ - Report by skeleten AT shillest.net - -20050803 - - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines - individually and use a value less likely to collide with real values from - netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@ - - (dtucker) [openbsd-compat/fake-rfc2553.h] MAX_INT -> INT_MAX since the - latter is specified in the standard. - -20050802 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/07/27 10:39:03 - [scp.c hostfile.c sftp-client.c] - Silence bogus -Wuninitialized warnings; ok djm@ - - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling - with gcc. ok djm@ - - (dtucker) [configure.ac] Add a --with-Werror option to configure for - adding -Werror to CFLAGS when all of the configure tests are done. ok djm@ - -20050726 - - (dtucker) [configure.ac] Update zlib warning message too, pointed out by - tim@. - - (djm) OpenBSD CVS Sync - - otto@cvs.openbsd.org 2005/07/19 15:32:26 - [auth-passwd.c] - auth_usercheck(3) can return NULL, so check for that. Report from - mpech@. ok markus@ - - markus@cvs.openbsd.org 2005/07/25 11:59:40 - [kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c] - [sshconnect2.c sshd.c sshd_config sshd_config.5] - add a new compression method that delays compression until the user - has been authenticated successfully and set compression to 'delayed' - for sshd. - this breaks older openssh clients (< 3.5) if they insist on - compression, so you have to re-enable compression in sshd_config. - ok djm@ - -20050725 - - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. - -20050717 -- OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/07/16 01:35:24 - [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] - [sshconnect.c] - spacing - - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] - [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL - in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") - - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line - - djm@cvs.openbsd.org 2005/07/17 06:49:04 - [channels.c channels.h session.c session.h] - Fix a number of X11 forwarding channel leaks: - 1. Refuse multiple X11 forwarding requests on the same session - 2. Clean up all listeners after a single_connection X11 forward, not just - the one that made the single connection - 3. Destroy X11 listeners when the session owning them goes away - testing and ok dtucker@ - - djm@cvs.openbsd.org 2005/07/17 07:17:55 - [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] - [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] - [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] - [sshconnect.c sshconnect2.c] - knf says that a 2nd level indent is four (not three or five) spaces - -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] - [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too - - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls - >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611111851.kABIppGb023876>