PERFORCE change 38411 for review
Serguei Tzukanov
tzukanov at FreeBSD.org
Mon Sep 22 03:28:12 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38411
Change 38411 by tzukanov at tzukanov_antares on 2003/09/22 03:27:58
IFC.
Affected files ...
.. //depot/projects/s390/Makefile.inc1#19 integrate
.. //depot/projects/s390/UPDATING#12 integrate
.. //depot/projects/s390/bin/df/df.c#7 integrate
.. //depot/projects/s390/bin/ls/Makefile#3 integrate
.. //depot/projects/s390/bin/ls/cmp.c#2 integrate
.. //depot/projects/s390/bin/ls/extern.h#3 integrate
.. //depot/projects/s390/bin/ls/ls.1#5 integrate
.. //depot/projects/s390/bin/ls/ls.c#6 integrate
.. //depot/projects/s390/bin/ls/ls.h#3 integrate
.. //depot/projects/s390/bin/ls/print.c#6 integrate
.. //depot/projects/s390/bin/ls/util.c#2 integrate
.. //depot/projects/s390/bin/sh/mkbuiltins#3 integrate
.. //depot/projects/s390/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/s390/contrib/gcc/config/freebsd-spec.h#6 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/fixdfdi.h#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/libgcc-glibc.ver#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/linux.h#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/s390-protos.h#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/s390.c#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/s390.h#3 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/s390.md#4 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/s390x.h#2 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/t-linux#2 integrate
.. //depot/projects/s390/contrib/gcc/config/s390/t-linux64#3 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc-common#7 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc-syms#4 integrate
.. //depot/projects/s390/contrib/groff/tmac/doc.tmac#5 integrate
.. //depot/projects/s390/contrib/groff/tmac/groff_mdoc.man#6 integrate
.. //depot/projects/s390/contrib/isc-dhcp/client/scripts/freebsd#5 integrate
.. //depot/projects/s390/contrib/nvi/clib/getopt.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/memchr.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/memmove.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/memset.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/mkstemp.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/mmap.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/snprintf.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strdup.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strerror.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strpbrk.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strsep.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strtol.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/strtoul.c#2 integrate
.. //depot/projects/s390/contrib/nvi/clib/vsnprintf.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/FREEBSD-upgrade#6 integrate
.. //depot/projects/s390/contrib/sendmail/LICENSE#2 integrate
.. //depot/projects/s390/contrib/sendmail/RELEASE_NOTES#6 integrate
.. //depot/projects/s390/contrib/sendmail/cf/README#6 integrate
.. //depot/projects/s390/contrib/sendmail/cf/cf/submit.cf#6 integrate
.. //depot/projects/s390/contrib/sendmail/cf/cf/submit.mc#3 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/cfhead.m4#4 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/proto.m4#5 integrate
.. //depot/projects/s390/contrib/sendmail/cf/m4/version.m4#6 integrate
.. //depot/projects/s390/contrib/sendmail/contrib/domainmap.m4#2 integrate
.. //depot/projects/s390/contrib/sendmail/contrib/doublebounce.pl#3 integrate
.. //depot/projects/s390/contrib/sendmail/contrib/expn.pl#3 integrate
.. //depot/projects/s390/contrib/sendmail/doc/op/op.me#6 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/conf.h#5 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/errstring.h#2 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/io.h#2 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate
.. //depot/projects/s390/contrib/sendmail/include/sm/shm.h#2 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/README#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/sample.html#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/docs/smfi_setreply.html#4 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/engine.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/libmilter.h#4 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/listener.c#5 integrate
.. //depot/projects/s390/contrib/sendmail/libmilter/signal.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/clock.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/errstring.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/flags.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/ldap.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/shm.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/smstdio.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/stdio.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/libsm/vasprintf.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/libsmdb/smdb2.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/mail.local/mail.local.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/smrsh/README#2 integrate
.. //depot/projects/s390/contrib/sendmail/smrsh/smrsh.8#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/README#5 integrate
.. //depot/projects/s390/contrib/sendmail/src/TRACEFLAGS#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/alias.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/src/bf.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/src/collect.c#5 integrate
.. //depot/projects/s390/contrib/sendmail/src/conf.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/control.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/daemon.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/deliver.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/domain.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/headers.c#8 integrate
.. //depot/projects/s390/contrib/sendmail/src/main.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/map.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/mci.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/milter.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/mime.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/src/parseaddr.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/queue.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/readcf.c#5 integrate
.. //depot/projects/s390/contrib/sendmail/src/recipient.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/sendmail.8#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/sendmail.h#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/sfsasl.c#4 integrate
.. //depot/projects/s390/contrib/sendmail/src/srvrsmtp.c#6 integrate
.. //depot/projects/s390/contrib/sendmail/src/stab.c#2 integrate
.. //depot/projects/s390/contrib/sendmail/src/udb.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/usersmtp.c#5 integrate
.. //depot/projects/s390/contrib/sendmail/src/util.c#3 integrate
.. //depot/projects/s390/contrib/sendmail/src/version.c#6 integrate
.. //depot/projects/s390/crypto/openssh/FREEBSD-tricks#3 integrate
.. //depot/projects/s390/crypto/openssh/buffer.c#2 integrate
.. //depot/projects/s390/crypto/openssh/channels.c#5 integrate
.. //depot/projects/s390/crypto/openssh/deattack.c#2 integrate
.. //depot/projects/s390/crypto/openssh/misc.c#3 integrate
.. //depot/projects/s390/crypto/openssh/session.c#6 integrate
.. //depot/projects/s390/crypto/openssh/ssh-agent.c#5 integrate
.. //depot/projects/s390/crypto/openssh/version.h#5 integrate
.. //depot/projects/s390/etc/Makefile#12 integrate
.. //depot/projects/s390/etc/defaults/pccard.conf#10 integrate
.. //depot/projects/s390/etc/defaults/rc.conf#11 integrate
.. //depot/projects/s390/etc/pccard_ether#5 integrate
.. //depot/projects/s390/etc/rc.d/dhclient#4 integrate
.. //depot/projects/s390/etc/rc.sendmail#2 integrate
.. //depot/projects/s390/etc/services#6 integrate
.. //depot/projects/s390/games/fortune/datfiles/fortunes-o.real#3 integrate
.. //depot/projects/s390/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate
.. //depot/projects/s390/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate
.. //depot/projects/s390/gnu/usr.bin/groff/tmac/ru.KOI8-R#4 integrate
.. //depot/projects/s390/gnu/usr.bin/man/manpath/manpath.config#4 integrate
.. //depot/projects/s390/lib/libc/gen/devname.3#5 integrate
.. //depot/projects/s390/lib/libc/net/getaddrinfo.3#4 integrate
.. //depot/projects/s390/lib/libc/net/getnameinfo.3#4 integrate
.. //depot/projects/s390/lib/libc/net/inet_net_pton.c#2 integrate
.. //depot/projects/s390/lib/libc/posix1e/mac_get.3#6 integrate
.. //depot/projects/s390/lib/libc/rpc/rpc_clnt_create.3#4 integrate
.. //depot/projects/s390/lib/libc/stdlib/exit.3#4 integrate
.. //depot/projects/s390/lib/libc/stdlib/grantpt.3#3 integrate
.. //depot/projects/s390/lib/libc/sys/ntp_gettime.2#3 integrate
.. //depot/projects/s390/lib/libc_r/man/pthread_condattr.3#3 integrate
.. //depot/projects/s390/lib/libpam/modules/pam_ssh/pam_ssh.c#4 integrate
.. //depot/projects/s390/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate
.. //depot/projects/s390/lib/libpthread/arch/amd64/amd64/context.S#2 integrate
.. //depot/projects/s390/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/s390/lib/libpthread/arch/i386/include/pthread_md.h#4 integrate
.. //depot/projects/s390/lib/libpthread/arch/ia64/ia64/context.S#2 integrate
.. //depot/projects/s390/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/s390/lib/libpthread/man/pthread_condattr.3#3 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_attr_setguardsize.c#3 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_attr_setinheritsched.c#2 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_attr_setscope.c#3 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_cond.c#6 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_create.c#6 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_exit.c#5 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_info.c#4 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_kern.c#9 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_private.h#8 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_sig.c#7 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_sigmask.c#5 integrate
.. //depot/projects/s390/lib/libpthread/thread/thr_stack.c#4 integrate
.. //depot/projects/s390/libexec/ftpd/ftpd.8#10 integrate
.. //depot/projects/s390/libexec/ftpd/ftpd.c#8 integrate
.. //depot/projects/s390/libexec/rtld-elf/Makefile#6 integrate
.. //depot/projects/s390/libexec/rtld-elf/libmap.c#4 integrate
.. //depot/projects/s390/libexec/rtld-elf/libmap.h#2 integrate
.. //depot/projects/s390/libexec/rtld-elf/rtld.c#9 integrate
.. //depot/projects/s390/release/Makefile#16 integrate
.. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#11 integrate
.. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate
.. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate
.. //depot/projects/s390/release/i386/drivers.conf#13 integrate
.. //depot/projects/s390/release/scripts/doFS.sh#8 integrate
.. //depot/projects/s390/release/scripts/print-cdrom-packages.sh#10 integrate
.. //depot/projects/s390/sbin/devfs/devfs.8#4 integrate
.. //depot/projects/s390/sbin/dump/optr.c#4 integrate
.. //depot/projects/s390/sbin/ifconfig/ifieee80211.c#3 integrate
.. //depot/projects/s390/sbin/mdconfig/mdconfig.8#6 integrate
.. //depot/projects/s390/sbin/newfs/newfs.8#8 integrate
.. //depot/projects/s390/sbin/raidctl/raidctl.8#5 integrate
.. //depot/projects/s390/share/examples/cvsup/cvs-supfile#5 integrate
.. //depot/projects/s390/share/examples/cvsup/doc-supfile#3 integrate
.. //depot/projects/s390/share/examples/cvsup/gnats-supfile#3 integrate
.. //depot/projects/s390/share/examples/cvsup/ports-supfile#4 integrate
.. //depot/projects/s390/share/examples/cvsup/refuse#5 integrate
.. //depot/projects/s390/share/examples/cvsup/refuse.README#5 integrate
.. //depot/projects/s390/share/examples/cvsup/stable-supfile#3 integrate
.. //depot/projects/s390/share/examples/cvsup/standard-supfile#3 integrate
.. //depot/projects/s390/share/examples/cvsup/www-supfile#3 integrate
.. //depot/projects/s390/share/examples/etc/README.examples#3 integrate
.. //depot/projects/s390/share/examples/ses/getencstat/getencstat.0#2 integrate
.. //depot/projects/s390/share/examples/ses/sesd/sesd.0#2 integrate
.. //depot/projects/s390/share/man/man4/ath.4#2 integrate
.. //depot/projects/s390/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/s390/share/man/man4/bge.4#6 integrate
.. //depot/projects/s390/share/man/man4/bridge.4#2 integrate
.. //depot/projects/s390/share/man/man4/mac_mls.4#9 integrate
.. //depot/projects/s390/share/man/man4/natm.4#3 integrate
.. //depot/projects/s390/share/man/man4/ng_atm.4#2 integrate
.. //depot/projects/s390/share/man/man4/ng_bt3c.4#4 integrate
.. //depot/projects/s390/share/man/man4/puc.4#3 integrate
.. //depot/projects/s390/share/man/man4/re.4#2 integrate
.. //depot/projects/s390/share/man/man4/rl.4#6 integrate
.. //depot/projects/s390/share/man/man4/sk.4#2 integrate
.. //depot/projects/s390/share/man/man4/uart.4#2 integrate
.. //depot/projects/s390/share/man/man4/ulpt.4#2 integrate
.. //depot/projects/s390/share/man/man4/usb.4#7 integrate
.. //depot/projects/s390/share/man/man4/wi.4#14 integrate
.. //depot/projects/s390/share/man/man5/device.hints.5#6 integrate
.. //depot/projects/s390/share/man/man5/libmap.conf.5#3 integrate
.. //depot/projects/s390/share/man/man5/make.conf.5#12 integrate
.. //depot/projects/s390/share/man/man5/rc.conf.5#14 integrate
.. //depot/projects/s390/share/man/man7/hier.7#9 integrate
.. //depot/projects/s390/share/man/man7/ports.7#7 integrate
.. //depot/projects/s390/share/man/man7/release.7#9 integrate
.. //depot/projects/s390/share/man/man7/tuning.7#8 integrate
.. //depot/projects/s390/share/man/man9/VOP_GETEXTATTR.9#5 integrate
.. //depot/projects/s390/share/man/man9/VOP_SETEXTATTR.9#5 integrate
.. //depot/projects/s390/share/man/man9/mtx_pool.9#3 integrate
.. //depot/projects/s390/share/man/man9/physio.9#2 integrate
.. //depot/projects/s390/share/man/man9/signal.9#4 integrate
.. //depot/projects/s390/share/man/man9/sx.9#3 integrate
.. //depot/projects/s390/sys/alpha/alpha/pmap.c#12 integrate
.. //depot/projects/s390/sys/alpha/conf/GENERIC#10 integrate
.. //depot/projects/s390/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/s390/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/s390/sys/boot/forth/beastie.4th#3 integrate
.. //depot/projects/s390/sys/boot/i386/libi386/comconsole.c#3 integrate
.. //depot/projects/s390/sys/boot/pc98/libpc98/comconsole.c#3 integrate
.. //depot/projects/s390/sys/cam/cam_periph.c#9 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_all.c#6 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#13 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#12 integrate
.. //depot/projects/s390/sys/coda/coda_vfsops.c#6 integrate
.. //depot/projects/s390/sys/conf/NOTES#16 integrate
.. //depot/projects/s390/sys/conf/files#18 integrate
.. //depot/projects/s390/sys/conf/files.ia64#11 integrate
.. //depot/projects/s390/sys/conf/options#13 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/rsaddr.c#4 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/rsirq.c#5 integrate
.. //depot/projects/s390/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate
.. //depot/projects/s390/sys/dev/aac/aac.c#14 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi.c#13 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_acad.c#5 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_button.c#4 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_cmbat.c#7 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_pci.c#4 integrate
.. //depot/projects/s390/sys/dev/acpica/acpiio.h#4 integrate
.. //depot/projects/s390/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/s390/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/s390/sys/dev/ata/atapi-cam.c#9 integrate
.. //depot/projects/s390/sys/dev/ata/atapi-cd.c#11 integrate
.. //depot/projects/s390/sys/dev/ata/atapi-cd.h#7 integrate
.. //depot/projects/s390/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/s390/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/s390/sys/dev/ed/if_ed_pccard.c#8 integrate
.. //depot/projects/s390/sys/dev/ic/ns16550.h#3 integrate
.. //depot/projects/s390/sys/dev/ips/ips.h#3 integrate
.. //depot/projects/s390/sys/dev/ips/ips_disk.c#3 integrate
.. //depot/projects/s390/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/s390/sys/dev/isp/isp.c#7 integrate
.. //depot/projects/s390/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/s390/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/s390/sys/dev/isp/isp_inline.h#3 integrate
.. //depot/projects/s390/sys/dev/isp/isp_target.c#6 integrate
.. //depot/projects/s390/sys/dev/isp/isp_target.h#2 integrate
.. //depot/projects/s390/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/s390/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/s390/sys/dev/mii/e1000phy.c#5 integrate
.. //depot/projects/s390/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/s390/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/s390/sys/dev/pccard/pccarddevs#10 integrate
.. //depot/projects/s390/sys/dev/pccard/pccarddevs.h#10 integrate
.. //depot/projects/s390/sys/dev/pccard/pccardvar.h#6 integrate
.. //depot/projects/s390/sys/dev/pci/pci.c#10 integrate
.. //depot/projects/s390/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/s390/sys/dev/pci/pcireg.h#5 integrate
.. //depot/projects/s390/sys/dev/pci/pcivar.h#6 integrate
.. //depot/projects/s390/sys/dev/puc/pucdata.c#9 integrate
.. //depot/projects/s390/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/s390/sys/dev/sio/sio.c#11 integrate
.. //depot/projects/s390/sys/dev/sio/sioreg.h#4 integrate
.. //depot/projects/s390/sys/dev/sound/isa/mpu.c#2 integrate
.. //depot/projects/s390/sys/dev/sound/isa/uartsio.c#3 integrate
.. //depot/projects/s390/sys/dev/sound/pci/ich.c#7 integrate
.. //depot/projects/s390/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_bus_pccard.c#1 branch
.. //depot/projects/s390/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_cpu_sparc64.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_dev_i8251.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_if.m#2 integrate
.. //depot/projects/s390/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/s390/sys/dev/usb/if_aue.c#9 integrate
.. //depot/projects/s390/sys/dev/usb/umass.c#13 integrate
.. //depot/projects/s390/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/s390/sys/dev/usb/usbdevs.h#11 integrate
.. //depot/projects/s390/sys/dev/usb/usbdevs_data.h#11 integrate
.. //depot/projects/s390/sys/dev/wi/if_wi_pccard.c#11 integrate
.. //depot/projects/s390/sys/fs/nwfs/nwfs_io.c#6 integrate
.. //depot/projects/s390/sys/fs/smbfs/smbfs_io.c#8 integrate
.. //depot/projects/s390/sys/i386/acpica/acpi_machdep.c#10 integrate
.. //depot/projects/s390/sys/i386/conf/GENERIC#14 integrate
.. //depot/projects/s390/sys/i386/conf/NOTES#13 integrate
.. //depot/projects/s390/sys/i386/i386/pmap.c#16 integrate
.. //depot/projects/s390/sys/i386/i386/trap.c#11 integrate
.. //depot/projects/s390/sys/i386/include/pci_cfgreg.h#4 integrate
.. //depot/projects/s390/sys/ia64/ia64/genassym.c#9 integrate
.. //depot/projects/s390/sys/ia64/ia64/machdep.c#10 integrate
.. //depot/projects/s390/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/s390/sys/ia64/ia64/trap.c#11 integrate
.. //depot/projects/s390/sys/ia64/ia64/uma_machdep.c#1 branch
.. //depot/projects/s390/sys/ia64/include/cpu.h#6 integrate
.. //depot/projects/s390/sys/isa/fd.c#10 integrate
.. //depot/projects/s390/sys/kern/kern_malloc.c#10 integrate
.. //depot/projects/s390/sys/kern/kern_proc.c#13 integrate
.. //depot/projects/s390/sys/kern/kern_prot.c#8 integrate
.. //depot/projects/s390/sys/kern/kern_xxx.c#3 integrate
.. //depot/projects/s390/sys/kern/linker_if.m#2 integrate
.. //depot/projects/s390/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/s390/sys/kern/sys_pipe.c#12 integrate
.. //depot/projects/s390/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/s390/sys/kern/vfs_subr.c#14 integrate
.. //depot/projects/s390/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/s390/sys/net/bridge.c#10 integrate
.. //depot/projects/s390/sys/net/if_iso88025subr.c#9 integrate
.. //depot/projects/s390/sys/net/raw_usrreq.c#4 integrate
.. //depot/projects/s390/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/s390/sys/netinet/ip_dummynet.c#11 integrate
.. //depot/projects/s390/sys/netinet/ip_fw2.c#11 integrate
.. //depot/projects/s390/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/s390/sys/netinet/tcp_subr.c#15 integrate
.. //depot/projects/s390/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/s390/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/s390/sys/netinet6/nd6.c#8 integrate
.. //depot/projects/s390/sys/netinet6/nd6_nbr.c#6 integrate
.. //depot/projects/s390/sys/netipx/ipx_input.c#6 integrate
.. //depot/projects/s390/sys/netipx/spx_usrreq.c#5 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_bio.c#7 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_node.c#7 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_subs.c#6 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#13 integrate
.. //depot/projects/s390/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/s390/sys/pc98/conf/NOTES#6 integrate
.. //depot/projects/s390/sys/pc98/i386/machdep.c#11 integrate
.. //depot/projects/s390/sys/pc98/pc98/clock.c#10 integrate
.. //depot/projects/s390/sys/pc98/pc98/fd.c#9 integrate
.. //depot/projects/s390/sys/pci/agp_intel.c#8 integrate
.. //depot/projects/s390/sys/pci/if_dc.c#13 integrate
.. //depot/projects/s390/sys/pci/if_rlreg.h#8 integrate
.. //depot/projects/s390/sys/pci/if_sk.c#8 integrate
.. //depot/projects/s390/sys/pci/if_skreg.h#2 integrate
.. //depot/projects/s390/sys/pci/if_xl.c#13 integrate
.. //depot/projects/s390/sys/pci/if_xlreg.h#10 integrate
.. //depot/projects/s390/sys/pci/yukonreg.h#1 branch
.. //depot/projects/s390/sys/posix4/ksched.c#8 integrate
.. //depot/projects/s390/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
.. //depot/projects/s390/sys/sparc64/sparc64/pmap.c#11 integrate
.. //depot/projects/s390/sys/sys/lock.h#5 integrate
.. //depot/projects/s390/sys/sys/mutex.h#8 integrate
.. //depot/projects/s390/sys/sys/param.h#15 integrate
.. //depot/projects/s390/sys/vm/pmap.h#9 integrate
.. //depot/projects/s390/sys/vm/uma.h#6 integrate
.. //depot/projects/s390/sys/vm/uma_core.c#12 integrate
.. //depot/projects/s390/sys/vm/uma_dbg.c#5 integrate
.. //depot/projects/s390/sys/vm/uma_int.h#5 integrate
.. //depot/projects/s390/sys/vm/vm_fault.c#10 integrate
.. //depot/projects/s390/sys/vm/vm_kern.c#7 integrate
.. //depot/projects/s390/sys/vm/vm_object.c#13 integrate
.. //depot/projects/s390/sys/vm/vm_page.c#11 integrate
.. //depot/projects/s390/sys/vm/vm_pageout.c#14 integrate
.. //depot/projects/s390/sys/vm/vnode_pager.c#11 integrate
.. //depot/projects/s390/tools/tools/ath/athstats.c#2 integrate
.. //depot/projects/s390/tools/tools/mtxstat/mtxstat.pl#2 integrate
.. //depot/projects/s390/tools/tools/tinderbox/tbmaster.pl#7 integrate
.. //depot/projects/s390/tools/tools/tinderbox/tinderbox.pl#6 integrate
.. //depot/projects/s390/usr.bin/colldef/colldef.1#6 integrate
.. //depot/projects/s390/usr.bin/doscmd/doscmd.1#3 integrate
.. //depot/projects/s390/usr.bin/make/dir.c#3 integrate
.. //depot/projects/s390/usr.bin/make/dir.h#2 integrate
.. //depot/projects/s390/usr.bin/make/main.c#6 integrate
.. //depot/projects/s390/usr.bin/make/make.1#5 integrate
.. //depot/projects/s390/usr.bin/make/var.c#5 integrate
.. //depot/projects/s390/usr.bin/tftp/tftp.1#3 integrate
.. //depot/projects/s390/usr.bin/window/main.c#2 integrate
.. //depot/projects/s390/usr.sbin/Makefile#13 integrate
.. //depot/projects/s390/usr.sbin/acpi/acpiconf/acpiconf.8#5 integrate
.. //depot/projects/s390/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate
.. //depot/projects/s390/usr.sbin/acpi/acpidump/acpi.c#7 integrate
.. //depot/projects/s390/usr.sbin/boot0cfg/boot0cfg.8#4 integrate
.. //depot/projects/s390/usr.sbin/i4b/isdnd/isdnd.rc.5#5 integrate
.. //depot/projects/s390/usr.sbin/i4b/isdndebug/isdndebug.8#3 integrate
.. //depot/projects/s390/usr.sbin/mrouted/mrouted.8#4 integrate
.. //depot/projects/s390/usr.sbin/mtree/mtree.8#4 integrate
.. //depot/projects/s390/usr.sbin/newsyslog/Makefile#3 integrate
.. //depot/projects/s390/usr.sbin/newsyslog/extern.h#1 branch
.. //depot/projects/s390/usr.sbin/newsyslog/newsyslog.c#11 integrate
.. //depot/projects/s390/usr.sbin/newsyslog/ptimes.c#1 branch
.. //depot/projects/s390/usr.sbin/rtadvd/if.c#3 integrate
.. //depot/projects/s390/usr.sbin/rtadvd/rtadvd.conf.5#4 integrate
.. //depot/projects/s390/usr.sbin/sysinstall/config.c#8 integrate
.. //depot/projects/s390/usr.sbin/sysinstall/dmenu.c#2 integrate
.. //depot/projects/s390/usr.sbin/sysinstall/menus.c#12 integrate
.. //depot/projects/s390/usr.sbin/vidcontrol/vidcontrol.c#3 integrate
.. //depot/projects/s390/usr.sbin/wicontrol/wicontrol.8#8 integrate
Differences ...
==== //depot/projects/s390/Makefile.inc1#19 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.390 2003/09/07 14:15:40 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.392 2003/09/16 12:53:18 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -51,6 +51,17 @@
SUBDIR+= lib
.endif
+# When upgrading to a dynamically linked root, install the runtime
+# linker early into its new location before make(1) has a chance
+# to run the dynamically linked /bin/sh.
+.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \
+ (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
+ !defined(DISTDIR) && \
+ (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \
+ !exists(/libexec/ld-elf.so.1)
+SUBDIR+= libexec/rtld-elf
+.endif
+
.if exists(${.CURDIR}/bin)
SUBDIR+= bin
.endif
@@ -819,8 +830,6 @@
# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
# shared libraries for ELF.
#
-# lib/libc (libc_pic.a) must be built before lib/libpthread.
-#
_startup_libs= gnu/lib/csu gnu/lib/libgcc
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
_startup_libs+= lib/csu/${MACHINE_ARCH}-elf
@@ -829,6 +838,7 @@
.endif
_prebuild_libs=
+
_generic_libs= gnu/lib
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
@@ -840,9 +850,6 @@
_generic_libs+= kerberos5/lib
.endif
-.if !defined(NOLIBPTHREAD)
-_prebuild_libs+= lib/libc
-.endif
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
lib/libkvm lib/libmd \
lib/libncurses lib/libopie lib/libpam lib/libradius \
==== //depot/projects/s390/UPDATING#12 (text+ko) ====
@@ -17,6 +17,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20030915:
+ A change to /etc/defaults/rc.conf now causes inetd to be started
+ with `-C 60' if it is not overridden in /etc/rc.conf. This
+ causes inetd to stop accepting connections from an IP address
+ that exceeds the rate of 60 connections per minute.
+
20030829:
The following rc.d scripts have been removed and should be
deleted from your installation: atm2.sh atm3.sh devdb
@@ -1356,4 +1362,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.265 2003/08/29 13:25:08 mtm Exp $
+$FreeBSD: src/UPDATING,v 1.266 2003/09/15 17:20:05 nectar Exp $
==== //depot/projects/s390/bin/df/df.c#7 (text+ko) ====
@@ -48,7 +48,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.51 2003/09/13 20:46:58 obrien Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -122,10 +122,10 @@
static char *getmntpt(const char *);
static size_t longwidth(long);
static char *makenetvfslist(void);
-static void prthuman(const struct statfs *, long);
+static void prthuman(const struct statfs *, size_t);
static void prthumanval(double);
static void prtstat(struct statfs *, struct maxwidths *);
-static long regetmntinfo(struct statfs **, long, const char **);
+static size_t regetmntinfo(struct statfs **, long, const char **);
static unit_t unit_adjust(double *);
static void update_maxwidths(struct maxwidths *, const struct statfs *);
static void usage(void);
@@ -148,8 +148,8 @@
const char *fstype;
char *mntpath, *mntpt;
const char **vfslist;
- long mntsize;
- int ch, i, rv;
+ size_t i, mntsize;
+ int ch, rv;
fstype = "ufs";
@@ -305,7 +305,7 @@
static char *
getmntpt(const char *name)
{
- long mntsize, i;
+ size_t mntsize, i;
struct statfs *mntbuf;
mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
@@ -321,7 +321,7 @@
* file system types not in vfslist and possibly re-stating to get
* current (not cached) info. Returns the new count of valid statfs bufs.
*/
-static long
+static size_t
regetmntinfo(struct statfs **mntbufp, long mntsize, const char **vfslist)
{
int i, j;
@@ -371,7 +371,7 @@
}
static void
-prthuman(const struct statfs *sfsp, long used)
+prthuman(const struct statfs *sfsp, size_t used)
{
prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize);
@@ -411,7 +411,7 @@
static long blocksize;
static int headerlen, timesthrough = 0;
static const char *header;
- long used, availblks, inodes;
+ size_t used, availblks, inodes;
if (++timesthrough == 1) {
mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem"));
@@ -456,8 +456,8 @@
if (iflag) {
inodes = sfsp->f_files;
used = inodes - sfsp->f_ffree;
- (void)printf(" %*ld %*ld %4.0f%% ",
- (u_int)mwp->iused, used,
+ (void)printf(" %*lu %*lu %4.0f%% ",
+ (u_int)mwp->iused, (u_long)used,
(u_int)mwp->ifree, sfsp->f_ffree,
inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0);
} else
==== //depot/projects/s390/bin/ls/Makefile#3 (text+ko) ====
@@ -1,10 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/2/93
-# $FreeBSD: src/bin/ls/Makefile,v 1.24 2002/10/24 00:07:30 rwatson Exp $
+# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $
PROG= ls
SRCS= cmp.c ls.c print.c util.c
-NO_WERROR=1
-WFORMAT=0
DPADD= ${LIBM}
LDADD= -lm
==== //depot/projects/s390/bin/ls/cmp.c#2 (text+ko) ====
==== //depot/projects/s390/bin/ls/extern.h#3 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $
*/
int acccmp(const FTSENT *, const FTSENT *);
@@ -43,11 +43,11 @@
int statcmp(const FTSENT *, const FTSENT *);
int revstatcmp(const FTSENT *, const FTSENT *);
-void printcol(DISPLAY *);
-void printlong(DISPLAY *);
+void printcol(const DISPLAY *);
+void printlong(const DISPLAY *);
int printname(const char *);
-void printscol(DISPLAY *);
-void printstream(DISPLAY *);
+void printscol(const DISPLAY *);
+void printstream(const DISPLAY *);
void usage(void);
size_t len_octal(const char *, int);
int prn_octal(const char *);
@@ -62,3 +62,4 @@
extern char *attrs_off;
extern char *enter_bold;
#endif
+extern int termwidth;
==== //depot/projects/s390/bin/ls/ls.1#5 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $
.\"
.Dd May 19, 2002
.Dt LS 1
@@ -175,7 +175,7 @@
When used with the
.Fl l
option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte
-and Petabyte in order to reduce the number of digits to three or less
+and Petabyte in order to reduce the number of digits to four or fewer
using base 2 for sizes.
.It Fl i
For each file, print the file's file serial number (inode number).
@@ -334,7 +334,7 @@
The file mode printed under the
.Fl l
option consists of the
-entry type, owner permissions, and group permissions.
+entry type and the permissions.
The entry type character describes the type of file, as
follows:
.Pp
@@ -645,7 +645,12 @@
.Xr getfmac 8 ,
.Xr sticky 8
.Sh STANDARDS
-The
+With the exception of options
+.Fl g ,
+.Fl n
+and
+.Fl o ,
+the
.Nm
utility conforms to
.St -p1003.1-2001 .
==== //depot/projects/s390/bin/ls/ls.c#6 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.72 2002/12/18 21:05:15 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -58,6 +58,7 @@
#include <errno.h>
#include <fts.h>
#include <grp.h>
+#include <inttypes.h>
#include <limits.h>
#include <locale.h>
#include <pwd.h>
@@ -80,12 +81,26 @@
*/
#define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1)
-static void display(FTSENT *, FTSENT *, int);
-static u_quad_t makenines(u_long);
+/*
+ * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width
+ * into a number that wide in decimal.
+ * XXX: Overflows are not considered.
+ */
+#define MAKENINES(n) \
+ do { \
+ intmax_t i; \
+ \
+ /* Use a loop as all values of n are small. */ \
+ for (i = 1; n > 0; i *= 10) \
+ n--; \
+ n = i - 1; \
+ } while(0)
+
+static void display(const FTSENT *, FTSENT *, int);
static int mastercmp(const FTSENT * const *, const FTSENT * const *);
static void traverse(int, char **, int);
-static void (*printfcn)(DISPLAY *);
+static void (*printfcn)(const DISPLAY *);
static int (*sortfcn)(const FTSENT *, const FTSENT *);
long blocksize; /* block size units */
@@ -114,7 +129,7 @@
int f_slash; /* similar to f_type, but only for dirs */
int f_sortacross; /* sort across rows, not down columns */
int f_statustime; /* use time of last mode change */
- int f_stream; /* stream the output, separate with commas */
+static int f_stream; /* stream the output, separate with commas */
static int f_timesort; /* sort by time vice name */
int f_type; /* add type character for non-regular files */
static int f_whiteout; /* show whiteout entries */
@@ -473,10 +488,10 @@
*/
if (output) {
putchar('\n');
- printname(p->fts_path);
+ (void)printname(p->fts_path);
puts(":");
} else if (argc > 1) {
- printname(p->fts_path);
+ (void)printname(p->fts_path);
puts(":");
output = 1;
}
@@ -499,14 +514,15 @@
* points to the parent directory of the display list.
*/
static void
-display(FTSENT *p, FTSENT *list, int options)
+display(const FTSENT *p, FTSENT *list, int options)
{
struct stat *sp;
DISPLAY d;
FTSENT *cur;
NAMES *np;
off_t maxsize;
- u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink;
+ long maxblock;
+ u_long btotal, labelstrlen, maxinode, maxlen, maxnlink;
u_long maxlabelstr;
int bcfile, maxflags;
gid_t maxgroup;
@@ -542,9 +558,10 @@
int ninitmax;
/* Fill-in "::" as "0:0:0" for the sake of scanf. */
- jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2);
+ jinitmax = malloc(strlen(initmax) * 2 + 2);
if (jinitmax == NULL)
err(1, "malloc");
+ initmax2 = jinitmax;
if (*initmax == ':')
strcpy(initmax2, "0:"), initmax2 += 2;
else
@@ -563,7 +580,7 @@
strcpy(initmax2, "0");
ninitmax = sscanf(jinitmax,
- " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ",
+ " %lu : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ",
&maxinode, &maxblock, &maxnlink, &maxuser,
&maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr);
f_notabs = 1;
@@ -603,10 +620,10 @@
default:
break;
}
- maxinode = makenines(maxinode);
- maxblock = makenines(maxblock);
- maxnlink = makenines(maxnlink);
- maxsize = makenines(maxsize);
+ MAKENINES(maxinode);
+ MAKENINES(maxblock);
+ MAKENINES(maxnlink);
+ MAKENINES(maxsize);
}
bcfile = 0;
flags = NULL;
@@ -732,7 +749,7 @@
mac_free(label);
label_out:
if (labelstr == NULL)
- labelstr = strdup("");
+ labelstr = strdup("-");
labelstrlen = strlen(labelstr);
if (labelstrlen > maxlabelstr)
maxlabelstr = labelstrlen;
@@ -787,7 +804,7 @@
d.s_inode = strlen(buf);
(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
d.s_nlink = strlen(buf);
- (void)snprintf(buf, sizeof(buf), "%qu", maxsize);
+ (void)snprintf(buf, sizeof(buf), "%ju", maxsize);
d.s_size = strlen(buf);
d.s_user = maxuser;
}
@@ -829,22 +846,3 @@
}
return (sortfcn(*a, *b));
}
-
-/*
- * Makenines() returns (10**n)-1. This is useful for converting a width
- * into a number that wide in decimal.
- */
-static u_quad_t
-makenines(u_long n)
-{
- u_long i;
- u_quad_t reg;
-
- reg = 1;
- /* Use a loop instead of pow(), since all values of n are small. */
- for (i = 0; i < n; i++)
- reg *= 10;
- reg--;
-
- return reg;
-}
==== //depot/projects/s390/bin/ls/ls.h#3 (text+ko) ====
==== //depot/projects/s390/bin/ls/print.c#6 (text+ko) ====
@@ -40,7 +40,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.64 2002/12/19 01:13:23 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.65 2003/05/03 16:39:33 markm Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -65,7 +65,7 @@
#include "ls.h"
#include "extern.h"
-static int printaname(FTSENT *, u_long, u_long);
+static int printaname(const FTSENT *, u_long, u_long);
static void printlink(const FTSENT *);
static void printtime(time_t);
static int printtype(u_int);
@@ -74,7 +74,7 @@
static void endcolor(int);
static int colortype(mode_t);
#endif
-static void aclmode(char *, FTSENT *, int *);
+static void aclmode(char *, const FTSENT *, int *);
#define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT)
@@ -128,7 +128,7 @@
#endif
void
-printscol(DISPLAY *dp)
+printscol(const DISPLAY *dp)
{
FTSENT *p;
@@ -155,7 +155,7 @@
}
void
-printlong(DISPLAY *dp)
+printlong(const DISPLAY *dp)
{
struct stat *sp;
FTSENT *p;
@@ -179,7 +179,7 @@
if (f_inode)
(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
if (f_size)
- (void)printf("%*lld ",
+ (void)printf("%*jd ",
dp->s_block, howmany(sp->st_blocks, blocksize));
strmode(sp->st_mode, buf);
/*
@@ -207,7 +207,7 @@
(void)printf("%3d, %3d ",
major(sp->st_rdev), minor(sp->st_rdev));
else if (dp->bcfile)
- (void)printf("%*s%*lld ",
+ (void)printf("%*s%*jd ",
8 - dp->s_size, "", dp->s_size, sp->st_size);
else
printsize(dp->s_size, sp->st_size);
@@ -235,10 +235,9 @@
}
void
-printstream(DISPLAY *dp)
+printstream(const DISPLAY *dp)
{
FTSENT *p;
- extern int termwidth;
int chcnt;
for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
@@ -260,9 +259,8 @@
}
void
-printcol(DISPLAY *dp)
+printcol(const DISPLAY *dp)
{
- extern int termwidth;
static FTSENT **array;
static int lastentries = -1;
FTSENT *p;
@@ -352,7 +350,7 @@
* return # of characters printed, no trailing characters.
*/
static int
-printaname(FTSENT *p, u_long inodefield, u_long sizefield)
+printaname(const FTSENT *p, u_long inodefield, u_long sizefield)
{
struct stat *sp;
int chcnt;
@@ -365,7 +363,7 @@
if (f_inode)
chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
if (f_size)
- chcnt += printf("%*lld ",
+ chcnt += printf("%*jd ",
(int)sizefield, howmany(sp->st_blocks, blocksize));
#ifdef COLORLS
if (f_color)
@@ -385,7 +383,7 @@
printtime(time_t ftime)
{
char longstring[80];
- static time_t now;
+ static time_t now = 0;
const char *format;
static int d_first = -1;
@@ -457,7 +455,7 @@
static int
writech(int c)
{
- char tmp = c;
+ char tmp = (char)c;
(void)write(STDOUT_FILENO, &tmp, 1);
return 0;
@@ -518,6 +516,7 @@
case S_IFCHR:
printcolor(C_CHR);
return (1);
+ default:;
}
if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) {
if (mode & S_ISUID)
@@ -543,10 +542,10 @@
if (cs == NULL)
cs = ""; /* LSCOLORS not set */
len = strlen(cs);
- for (i = 0; i < C_NUMCOLORS; i++) {
+ for (i = 0; i < (int)C_NUMCOLORS; i++) {
colors[i].bold = 0;
- if (len <= 2 * i) {
+ if (len <= 2 * (size_t)i) {
c[0] = defcolors[2 * i];
c[1] = defcolors[2 * i + 1];
} else {
@@ -568,7 +567,7 @@
else if (c[j] >= 'A' && c[j] <= 'H') {
colors[i].num[j] = c[j] - 'A';
colors[i].bold = 1;
- } else if (tolower((unsigned char)c[j] == 'x'))
+ } else if (tolower((unsigned char)c[j]) == 'x')
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list