Date: Sun, 17 Jun 2007 04:42:08 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 121827 for review Message-ID: <200706170442.l5H4g8xl068412@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121827 Change 121827 by sephe@sephe_enigma:sam_wifi on 2007/06/17 04:41:20 IFC @121815 (loopback wpa_supplicant inactive-deauth-reassoc fix) Affected files ... .. //depot/projects/wifi/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/wifi/contrib/diff/AUTHORS#1 branch .. //depot/projects/wifi/contrib/diff/COPYING#2 integrate .. //depot/projects/wifi/contrib/diff/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/diff/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/Makefile.in#2 delete .. //depot/projects/wifi/contrib/diff/NEWS#2 integrate .. //depot/projects/wifi/contrib/diff/README#2 integrate .. //depot/projects/wifi/contrib/diff/THANKS#1 branch .. //depot/projects/wifi/contrib/diff/TODO#1 branch .. //depot/projects/wifi/contrib/diff/analyze.c#2 delete .. //depot/projects/wifi/contrib/diff/bootstrap#1 branch .. //depot/projects/wifi/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/wifi/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/wifi/contrib/diff/config.h#2 integrate .. //depot/projects/wifi/contrib/diff/config.hin#2 delete .. //depot/projects/wifi/contrib/diff/configure#2 delete .. //depot/projects/wifi/contrib/diff/configure.in#2 delete .. //depot/projects/wifi/contrib/diff/context.c#2 delete .. //depot/projects/wifi/contrib/diff/diagmeet.note#2 delete .. //depot/projects/wifi/contrib/diff/diff.c#3 delete .. //depot/projects/wifi/contrib/diff/diff.h#2 delete .. //depot/projects/wifi/contrib/diff/diff.texi#2 delete .. //depot/projects/wifi/contrib/diff/diff3.c#2 delete .. //depot/projects/wifi/contrib/diff/dir.c#2 delete .. //depot/projects/wifi/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/wifi/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/wifi/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/wifi/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/wifi/contrib/diff/doc/version.texi#1 branch .. //depot/projects/wifi/contrib/diff/ed.c#2 delete .. //depot/projects/wifi/contrib/diff/exgettext#1 branch .. //depot/projects/wifi/contrib/diff/ifdef.c#2 delete .. //depot/projects/wifi/contrib/diff/install-sh#2 delete .. //depot/projects/wifi/contrib/diff/io.c#2 delete .. //depot/projects/wifi/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/basename.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/error.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/error.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exit.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/wifi/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/regex.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/regex.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/wifi/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/man/cmp.1#1 branch .. //depot/projects/wifi/contrib/diff/man/diff.1#1 branch .. //depot/projects/wifi/contrib/diff/man/diff3.1#1 branch .. //depot/projects/wifi/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/wifi/contrib/diff/normal.c#2 delete .. //depot/projects/wifi/contrib/diff/prepend_args.c#2 delete .. //depot/projects/wifi/contrib/diff/prepend_args.h#2 delete .. //depot/projects/wifi/contrib/diff/sdiff.c#2 delete .. //depot/projects/wifi/contrib/diff/side.c#2 delete .. //depot/projects/wifi/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/src/analyze.c#1 branch .. //depot/projects/wifi/contrib/diff/src/cmp.c#1 branch .. //depot/projects/wifi/contrib/diff/src/context.c#1 branch .. //depot/projects/wifi/contrib/diff/src/diff.c#1 branch .. //depot/projects/wifi/contrib/diff/src/diff.h#1 branch .. //depot/projects/wifi/contrib/diff/src/diff3.c#1 branch .. //depot/projects/wifi/contrib/diff/src/dir.c#1 branch .. //depot/projects/wifi/contrib/diff/src/ed.c#1 branch .. //depot/projects/wifi/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/wifi/contrib/diff/src/io.c#1 branch .. //depot/projects/wifi/contrib/diff/src/normal.c#1 branch .. //depot/projects/wifi/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/wifi/contrib/diff/src/side.c#1 branch .. //depot/projects/wifi/contrib/diff/src/system.h#1 branch .. //depot/projects/wifi/contrib/diff/src/util.c#1 branch .. //depot/projects/wifi/contrib/diff/stamp-h.in#2 delete .. //depot/projects/wifi/contrib/diff/system.h#2 delete .. //depot/projects/wifi/contrib/diff/util.c#2 delete .. //depot/projects/wifi/contrib/diff/version.c#2 delete .. //depot/projects/wifi/contrib/diff/xmalloc.c#2 delete .. //depot/projects/wifi/contrib/less/main.c#4 integrate .. //depot/projects/wifi/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#5 integrate .. //depot/projects/wifi/etc/pam.d/atrun#1 branch .. //depot/projects/wifi/etc/pam.d/imap#3 integrate .. //depot/projects/wifi/etc/pam.d/pop3#3 integrate .. //depot/projects/wifi/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/diff/diff.1#3 delete .. //depot/projects/wifi/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/wifi/include/arpa/inet.h#5 integrate .. //depot/projects/wifi/lib/libc/inet/inet_ntoa.c#5 integrate .. //depot/projects/wifi/lib/libc/net/inet.3#8 integrate .. //depot/projects/wifi/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/wifi/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/wifi/lib/libkvm/kvm.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_amd64.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_i386.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_private.h#5 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.8#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.c#4 integrate .. //depot/projects/wifi/lib/libutil/login_cap.3#4 integrate .. //depot/projects/wifi/lib/libutil/login_cap.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_log.c#4 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/wifi/libexec/atrun/Makefile#2 integrate .. //depot/projects/wifi/libexec/atrun/atrun.c#3 integrate .. //depot/projects/wifi/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/wifi/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#23 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#16 integrate .. //depot/projects/wifi/sbin/mknod/mknod.c#3 integrate .. //depot/projects/wifi/share/man/man4/Makefile#39 integrate .. //depot/projects/wifi/share/man/man4/nfe.4#6 integrate .. //depot/projects/wifi/share/man/man4/rum.4#2 integrate .. //depot/projects/wifi/share/man/man4/ural.4#12 integrate .. //depot/projects/wifi/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/wifi/share/man/man5/Makefile#10 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#18 integrate .. //depot/projects/wifi/share/man/man5/tmpfs.5#1 branch .. //depot/projects/wifi/share/man/man5/xfs.5#1 branch .. //depot/projects/wifi/share/man/man9/selrecord.9#3 integrate .. //depot/projects/wifi/share/misc/committers-ports.dot#7 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#13 integrate .. //depot/projects/wifi/sys/arm/include/intr.h#6 integrate .. //depot/projects/wifi/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.c#5 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/wifi/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/wifi/sys/conf/NOTES#43 integrate .. //depot/projects/wifi/sys/conf/files#56 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#17 integrate .. //depot/projects/wifi/sys/conf/options#36 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/wifi/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/wifi/sys/dev/fb/boot_font.c#7 integrate .. //depot/projects/wifi/sys/dev/fb/creator.c#8 integrate .. //depot/projects/wifi/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/wifi/sys/dev/fb/gallant12x22.h#3 delete .. //depot/projects/wifi/sys/dev/fb/gfb.h#4 integrate .. //depot/projects/wifi/sys/dev/fb/machfb.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/wifi/sys/dev/mc146818/mc146818.c#5 integrate .. //depot/projects/wifi/sys/dev/mc146818/mc146818var.h#4 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/wifi/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/wifi/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#17 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#21 integrate .. //depot/projects/wifi/sys/dev/sound/clone.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/clone.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.h#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.h#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_rate.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_volume.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sndstat.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#13 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#18 integrate .. //depot/projects/wifi/sys/dev/sound/version.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/ehcivar.h#10 integrate .. //depot/projects/wifi/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/ohcivar.h#8 integrate .. //depot/projects/wifi/sys/dev/usb/uhci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uhcivar.h#7 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/usb.h#7 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#11 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/wifi/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#17 integrate .. //depot/projects/wifi/sys/i386/isa/clock.c#13 integrate .. //depot/projects/wifi/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/wifi/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#25 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#23 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#21 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_ntptime.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_priv.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#17 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#27 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#31 integrate .. //depot/projects/wifi/sys/modules/Makefile#40 integrate .. //depot/projects/wifi/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/wifi/sys/net/bpf.c#23 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#15 integrate .. //depot/projects/wifi/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/wifi/sys/net/if_types.h#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#59 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate .. //depot/projects/wifi/sys/netinet/igmp.h#4 integrate .. //depot/projects/wifi/sys/netinet/in.c#17 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#10 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#12 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#13 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#7 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/wifi/sys/netipsec/key.c#5 integrate .. //depot/projects/wifi/sys/netipx/ipx.c#5 integrate .. //depot/projects/wifi/sys/netipx/ipx.h#6 integrate .. //depot/projects/wifi/sys/netipx/ipx_if.h#5 integrate .. //depot/projects/wifi/sys/netipx/ipx_ip.c#8 delete .. //depot/projects/wifi/sys/netipx/ipx_ip.h#6 delete .. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netsmb/smb_smb.c#4 integrate .. //depot/projects/wifi/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#14 integrate .. //depot/projects/wifi/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/wifi/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#10 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/wifi/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#20 integrate .. //depot/projects/wifi/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/wifi/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/wifi/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/wifi/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/eeprom.c#7 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/rtc.c#6 integrate .. //depot/projects/wifi/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/wifi/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/wifi/sys/sys/priv.h#6 integrate .. //depot/projects/wifi/sys/sys/tree.h#5 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#16 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#24 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#22 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#10 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#11 integrate .. //depot/projects/wifi/sys/vm/vm_phys.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#14 integrate .. //depot/projects/wifi/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/wifi/tools/regression/tmpfs/Makefile#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_create#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_dots#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_exec#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_link#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_mount#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_pipes#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_read_write#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_readdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_remove#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_rename#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_setattr#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_sizes#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_sockets#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_symlink#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_times#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_truncate#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_vnd#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#24 integrate .. //depot/projects/wifi/usr.bin/rpcgen/rpc_svcout.c#6 integrate .. //depot/projects/wifi/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/wifi/usr.bin/systat/tcp.c#3 integrate .. //depot/projects/wifi/usr.bin/top/machine.c#8 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.8#4 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.c#5 integrate .. //depot/projects/wifi/usr.sbin/mtree/mtree.8#9 integrate .. //depot/projects/wifi/usr.sbin/powerd/powerd.c#10 integrate Differences ... ==== //depot/projects/wifi/contrib/diff/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -279,7 +279,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -305,14 +305,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. ==== //depot/projects/wifi/contrib/diff/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,2100 @@ +2004-04-13 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.8.7. + * configure.ac (AM_GNU_GETTEXT_VERSION): Add. + (XGETTEXT): Restore from pre-2004-04-12 version. This fixes + a bug that lost many msgids in doc/diffutils.pot. + * bootstrap: New file. + * exgettext: Don't generate a temporary file, as this runs afoul + of "make distcheck" which operates with read-only directories. + * Makefile.am (EXTRA_DIST): Add bootstrap. + Remove config/config.rpath as it is deduced automatically these days. + +2004-04-12 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.8.6. + + * NEWS: Add news for 2.8.4, 2.8.6. + + * README: Move copyright notice to end. Defer to "configure + --help" for special "configure" options. Suggest latest libiconv. + Update version numbers of Autoconf etc. to current. + + * configure.ac: Quote various arguments better. + (AC_CONFIG_MACRO_DIR): Add call, specifying "m4". + (AC_CONFIG_HEADER): Replaces AM_CONFIG_HEADER. + (gl_USE_SYSTEM_EXTENSIONS): Replaces AC_GNU_SOURCE. + (AC_ISC_POSIX): Remove; nobody ports to ancient ISC any more. + (AC_PROG_CPP, AC_PROG_INSTALL, AC_C_INLINE, + AC_HEADER_STDBOOL, AC_HEADER_STDC, AM_GNU_GETTEXT, XGETTEXT, + AC_HEADER_STAT, AC_FUNC_VPRINTF, jm_FUNC_GLIBC_UNLOCKED_IO, + jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC, jm_FUNC_REALLOC, + jm_PREREQ_C_STACK, jm_PREREQ_ERROR, jm_PREREQ_HARD_LOCALE, + jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX, AC_FUNC_FNMATCH_GNU, jm_AC_DOS): + Remove; not needed here, as our files don't use them directly + or we rely on gnulib modules. + (AC_C_CONST): Remove; we assume C89 now. + (AC_CHECK_HEADERS): Remove libintl.h, limits.h, stdlib.h, string.h, + time.h. + (AC_CHECK_TYPE): Remove ptrdiff_t, ssize_t. + (AC_CHECK_FUNCS): Remove diraccess, strchr, strerror, tmpnam). + (AC_REPLACE_FUNCS): Remove memchr, mkstemp, strcasecmp. + (GNULIB_AUTOCONF_SNIPPET): Add call. This replaces much of + the above. + (AC_CONFIG_FILES): Remove lib/posix/Makefile. + (AC_CONFIG_COMMANDS): Remove. + + * doc/diff.texi (dircategory): Change to "Text creation and + manipulation" from "GNU packages". + (Translations): New node. + (Overview): Improve quality of algorithm citations. + (Binary): -q doesn't exactly cause diff to assume files are binary. + (Normal): Place after Side by Side, since it's less important. + (Detailed Context, Detailed Unified, Detailed ed, + Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal): + Place at end of menu. + (Detailed Unified): Mention that fractional timestamps are + omitted on hosts that don't support them. + Mention what happens when hunks contain just one line. + (Line Group Formats, Reject Names): Fix duplicate-word typos. + (Comparing Directories): Trailing white space and empty lines are + ignored in the -X file. + (diff Options): Add --strip-trailing-cr. + (Projects): gnu -> gvc@gnu.org. + + * lib/Makefile.am (SUBDIRS): Remove. + (EXTRA_DIST, noinst_HEADERS): Remove most entries. + (libdiffutils_a_SOURCES): Now just lib_SOURCES. + (lib_SOURCES): New macro. + (DISTCLEANFILES, MOSTLYCLEANFILES): Set to empty now. + (gnulib.mk): Include: this does most of the work eliminated + by the above changes. + + * lib/inttostr.c (inttostr): Protect i < 0 by compile-time + test intended to suppress compiler warnings. + * lib/inttostr.h: Include limits.h unilaterally. + (CHAR_BIT): Remove. + (PARAMS): Remove; all uses changed. + * lib/setmode.c (__attribute__): New macro. + (set_binary_mode): Define only if HAVE_SETMODE_DOS. + Otherwise define a dummy static char, as C89 requires + that we define something. + * lib/setmode.h (set_binary_mode): Return true, not 1. + + * src/analyze.c, src/context.c, src/diff.c, src/io.c, src/util.c: + Do not include regex.h, as diff.h does this now. + + * src/cmp.c: Sort includes. Include <exit.h>, <unlocked-io.h>. + (specify_comparison_type): Don't report an error if the comparison + type has already been specified the same way as this one. + + * src/cmp.c (usage): Mention exit status. + * src/diff.c (option_help_msgid): Likewise. + * src/diff3.c (usage): Likewise. + * src/sdiff.c (usage): Likewise. + + * src/cmp.c (main): Adjust to latest gnulib c_stack_action + calling conventions. + * src/diff.c (main): Likewise. + * src/diff3.c (main): Likewise. + * src/sdiff.c (main): Likewise. + + * src/cmp.c (main): Adjust to latest version_etc calling conventions. + * src/diff.c (main): Likewise. + * src/diff3.c (main): Likewise. + * src/sdiff.c (main): Likewise. + + * src/diff.c: Include <exit.h>. + (binary): Define to true if not declared. + (longopts): Set tabsize flag to 1. + (main): Don't output nanoseconds if platform lacks them. + Don't treat files as binary if !binary. + (set_mtime_to_now): Use 0, not NULL. + (compare_files): Mark files as nonexistent if it looks like + 'patch' created inaccessible regular empty files to denote + nonexistent backups. Don't compare such files. + Clear st_* members of status of nonexistent file. + Remove now-unnecessary tests. + + * src/diff.h: Include regex.h, unlocked-io.h. + (struct file_data.changed): Now char *, not bool *, to save + space on hosts where bool takes more space than char. + All uses changed. + + * src/diff3.c: Include unlocked-io.h. + (strip_trailing_cr): New var. + (STRIP_TRAILING_CR_OPTION): New enum. + (longopts, main, option_help_msgid, read_diff): + Add --strip-trailing-cr support. + (read_diff): Exit with status 126 (not 127) if errno != ENOENT + after failed execvp in child. Report this in parent. + + * src/dir.c: Include <strcase.h>. + (failed_locale_specific_sorting): Renamed from failed_strcoll. + All uses changed. + (compare_names): Don't invoke strcasecmp first thing when + ignore_file_name_case; if locale_specific_sorting, we should + just use that. + + * src/ifdef.c (next_line): Remove; replace with... + (next_line0, next_line1): New vars. + (print_ifdef_script, print_ifdef_hunk): + Use them to fix line-number computation bug. + + * src/io.c (find_and_hash_each_line): Don't convert char * + to unsigned char *; just leave pointers as char *. This + lessens the number of potentially-dangerous casts. + * src/util.c (lines_differ): Likewise. + + * src/sdiff.c: Include <unlocked-io.h>, <exit.h>. + (check_child_status): Renamed from ck_editor_status, and + accept a new arg MAX_OK_STATUS. All callers changed. + Handle status 126/127 as per POSIX. + (edit): Likewise. + (main): Likewise. Fix getopt typo: -E wasn't supported. + + * src/system.h (S_IRWXU, S_IRWXG, S_IRWXO): Define if not defined. + (S_IXUSR, S_IXGRP, S_IXOTH): Remove. + Include <time.h> unconditionally, since we can assume C89 now. + Likewise for <stdlib.h>, <string.h>. + (getenv, EXIT_SUCCESS, EXIT_FAILURE, SSIZE_MAX, strchr, strrchr, + memcmp, memcpy): Remove decl; no longer needed. + (strcasecoll, strcasecmp): Define if not built in. + (CTYPE_DOMAIN, ISPRINT, ISSPACE, TOLOWER, _tolower, errno): Remove; + we now assume C89 or better. All uses changed. + Include <stdbool.h> unconditionally now, since gnulib supports it + if the C compiler doesn't. All boolean uses of 0 and 1 now + changed to false and true. + (lin_is_printable_as_long_int): Renamed from lin_is_printable_as_long. + + * src/util.c (begin_output): Fix bug: 0 wasn't cast to char * arg, + which led to undefined behavior on 64-bit hosts. + Use more-standard test for exit status 126 versus 127. + (finish_output): Likewise. + (analyze_hunk): Do not cast bool to int. + +2004-03-15 Paul Eggert <eggert@twinsun.com> + + * src/cmp.c (main): Don't consider two files with the same name to + be the same, if their initial skip values differ. This fixes a + bug reported by Hideki Iwamoto in + <http://mail.gnu.org/archive/html/bug-gnu-utils/2004-03/msg00024.html>. + +2004-03-11 Paul Eggert <eggert@twinsun.com> + + * src/analyze.c (diag): Return void, not lin, since the return + value wasn't needed. All callers changed. + (diag, diff_2_files): + Use 'true' and 'false' instead of '1' and '0', when appropriate. + (compareseq): Use lin const * local variables instead of lin *. + Don't bother checking diag's return value. + (shift_boundaries, build_reverse_script, build_script, diff_2_files): + Use char arrays, not bool arrays, since + sizeof (bool) might be greater than 1. + +2004-02-09 Paul Eggert <eggert@twinsun.com> + + * m4/setmode.m4 (AC_FUNC_SETMODE_DOS): AC_LIBOBJ(setmode) if + we would return true. + +2002-10-14 Paul Eggert <eggert@twinsun.com> + + * src/Makefile.am (diff3.$(OBJEXT), diff.$(OBJEXT), + sdiff.$(OBJEXT)): Rename from (misspelled) diff3.$(OBJECT), + diff.$(OBJECT), sdiff.$(OBJECT). Patch by Paul D. Smith in + <http://mail.gnu.org/pipermail/bug-gnu-utils/2002-October/003251.html>. + Bug reported by Chris Bainbridge. + +2002-10-13 Paul Eggert <eggert@twinsun.com> + + * src/Makefile.am (MOSTLYCLEANFILES): Add paths.ht. + (paths.h): Send output to paths.ht first, and then rename to + paths.h at the end. This avoids problems if the disk is full. + It also works around what appears to be a bug with GNU make -j + (3.79.1); see <http://bugs.gentoo.org/show_bug.cgi?id=8934>. + +2002-06-27 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.8.4. + + * config/config.sub: Sync with latest version maintained in other + packages. + + * lib/file-type.h: Protect against double inclusion. Detect + whether <sys/stat.h> has been included. Fix from Jim Meyering. + + * src/analyze.c (briefly_report): Don't say "Binary files differ", + since one of the files may not be a binary file. + Bug reported by Dan Jacobson. + +2002-06-22 Paul Eggert <eggert@twinsun.com> + + * lib/c-stack.c (segv_handler, c_stack_action) [! defined + SA_SIGINFO]: Do not assume SA_SIGINFO behavior. + Bug reported by Jim Meyering on NetBSD 1.5.2. + +2002-06-16 Paul Eggert <eggert@twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.8.3. + + * config/depcomp, config/missing, README: Update to automake 1.6.2. + + * po/LINGUAS: Add en_US. + * po/en_US.po: New file. + * po/POTFILES.in: Remove lib/freesoft.c. + Add lib/file-type.c, lib/version-etc.c, lib/xmalloc.c. + +2002-06-15 Paul Eggert <eggert@twinsun.com> + + * doc/diff.texi (Special Files): Document behavior of symlink + loops. + + * lib/Makefile.am (noinst_HEADERS): Remove freesoft.h. + Add version-etc.h. + (libdiffutils_a_SOURCES): Remove freesoft.c. Add version-etc.c. + * lib/freesoft.c, lib/freesoft.h: Remove. + * lib/version-etc.h (PARAMS): Remove; we now assume C89 at least. + + * lib/version-etc.h (version_etc): Remove package and version args. + (version_etc_copyright): Remove. + * lib/version-etc.c: Likewise. + Do not include unlocked-io.h; no longer needed. + Include gettext.h rather than libinto.h. + (_): Define unconditionally. + (version_etc): Adjust wording to match current GNU coding standards. + Translate "(C)" if possible. + + * lib/version-etc.c, lib/version-etc.h: New files, taken from + fileutils. + + * src/Makefile.am (cmp_SOURCES, diff3_SOURCES, sdiff_SOURCES, + diff_SOURCES): Remove version.c. + (MAINTAINERCLEANFILES, $(srcdir)/version.c): Remove. + + * src/cmp.c: Include version-etc.h, not freesoft.h. + (copyright_notice): Remove. + (main): Use version_etc to print version. + * src/diff.c, src/diff3.c, src/sdiff.c: Likewise. + + * src/cmp.c (version_string): Remove decl. + * src/diff.h, src/diff3.c, src/sdiff.c: Likewise. + +2002-06-11 Paul Eggert <eggert@twinsun.com> + + * lib/fnmatch.c, lib/fnmatch_loop.c (WIDE_CHAR_SUPPORT): + New macro. Use it uniformly instead of + (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H). + It also uses HAVE_BTOWC, to fix a porting bug on Solaris 2.5.1 + reported by Vin Shelton. + * m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for btowc. + + * NEWS, configure.ac (AC_INIT): Version 2.8.2. + + * ABOUT-NLS, config/config.guess, config/config.sub, + config/depcomp, config/texinfo.tex, lib/posix/regex.h, + m4/c-bs-a.m4, m4/gettext.m4, m4/gnu-source.m4, m4/lib-link.m4, + m4/malloc.m4: + Update to recent version (maintained in other packages). + * m4/prereq.m4 (jm_PREREQ_EXCLUSIVE): AC_FUNC_FNMATCH_GNU + no longer takes a lib. + + * README: Incorporate contents from INSTALLME. + * INSTALLME: Remove. + * Makefile.am (EXTRA_DIST): Remove INSTALLME. + + * configure.ac (AC_GNU_SOURCE): Move up, so that it affects + later compilations properly. + (DEFAULT_DIFF_PROGRAM, AC_TYPE_SIGNAL): Remove. + (jm_AC_TYPE_INTMAX_T): Add. + (AC_FUNC_FNMATCH_GNU): Use this, instead of AC_FUNC_FNMATCH. + (AC_CONFIG_LINKS): regex.hin renamed from regex_.h. + + * doc/diff.texi: Reword "@option{-f} and @option{--foo}" to + "@option{-f} or @option{--foo}". + Use @acronym instead of @sc where appropriate. + (Specified Lines): Renamed from Specified Folding. + (Comparison, Blank Lines): + Clarify wordings for Blank Lines and Specified Lines nodes. + (Binary): Mention --verbose and --print-bytes. + (Tabs, sdiff Option Summary, diff Options): + New option --tabsize=COLUMNS. + + * lib/Makefile.am (EXTRA_DIST): Add fnmatch_loop.c. + (noinst_HEADERS): fnmatch_.h renamed from fnmatch.hin. + regex_.h renamed from regex.hin. + Add file-type.h. + (libdiffutils_a_SOURCES): Add file-type.c. + (DISTCLEANFILES): Remove fnmatch.hno, regex.hno. + + * lib/c-stack.c (__attribute__): New macro. + (EOVERFLOW): Define if not defined. + (stack_t): Define to struct sigaltstack if not defined or declared. + Include <sys/resource.h>, <ucontext.h> if available. + Include <stdio.h> if DEBUG. + Do not include <inttypes.h> or <stdint.h>. + (c_stack_die): Remove info and context args. All uses changed. + (segv_action): Likewise. + (alternate_signal_stack): Change uintmax_t to long, to ease porting. + (get_stack_location, min_address_from_argv, max_address_from_argv, + null_action): New functions. + (stack_base, stack_size): New vars. + (segv_handler): context arg may not be used. + Use global stack_base, stack_size if + ! HAVE_XSI_STACK_OVERFLOW_HEURISTIC. + Add debug code. + Invoke die (rather than segv_action) to exit. + (c_stack_action): Accept new argv arg, and simpler handler arg. + All uses changed. Move code into new functions above. + Allow null action. + [! (defined SA_ONSTACK && defined _SC_PAGESIZE)]: Assume all segvs + are stack overflows. + (main) [DEBUG]: Describe what output should be like. + + * lib/c-stack.h (siginfo_t, c_stack_die): Remove decl. + + * lib/file-type.c, lib/file-type.h: New files. These contain code + that was in src/diff.c, but is now librarified and spiffed up a + bit. Jim Meyering suggested this. + + * lib/fnmatch.c (alloca, __builtin_expect): Define for non-GCC hosts. + <strings.h>: Include only if HAVE_STRINGS_H. + <stddef.h>: Include if we include stdlib.h. + Do not comment out all code if ! HAVE_FNMATCH_GNU. + (getenv): Do not declare if HAVE_DECL_GETENV. + (__strchrnul, __wcschrnul): Remove; not used. + (MEMPCPY): Use mempcpy if not _LIBC; use memcpy if neither _LIBC + nor HAVE_MEMPCPY. + (FOLD) [HANDLE_MULTIBYTE]: Do not pass wide char to ISUPPER. + (STRLEN, STRCAT, MEMPCPY) [HANDLE_MULTIBYTE && !defined _LIBC]: + Use wcslen rather than __wcslen, and likewise for wcscat, wmempcpy. + (MEMPCPY) [HANDLE_MULTIBYTE]: Use wmempcpy if not _LIBC; use wmemcpy + if neither _LIBC nor HAVE_WMEMPCPY. + * lib/fnmatch_.h (__const): Do not define to empty, as this breaks + Sun cc. The code doesn't work with K&R anyway. + * lib/fnmatch_loop.c (struct patternlist.str): Size 1, not 0, + as C89 requires this. + (NEW_PATTERN): Use offsetof, not sizeof, since str now has size 1. + * lib/fnmatch_.h: Import from glibc fnmatch.h. + * lib/fnmatch.c, lib/fnmatch_loop.c: Import from glibc. + + * lib/posixver.c: Include posixver.h. + + * lib/regex_.h: Renamed from lib/regex.hin. + + * m4/c-stack.m4 (jm_PREREQ_C_STACK): Do not AC_REQUIRE + jm_AC_TYPE_UINTMAX_T and do not use uintmax_t. + Check for sys/resource.h, uccontext.h. + Check for decls and existence of getcontext, sigaltstack. + Check for stack_t. + + * m4/codeset.m4, m4/glibc21.m4, m4/lcmessage.m4: Remove. + + * m4/fnmatch.m4: Update to latest Autoconf CVS for AC_FUNC_FNMATCH_GNU. + * m4/gnu-source.m4: Likewise, for AC_GNU_SOURCE (renamed from + AC__GNU_SOURCE). + + * m4/mbstate_t.m4 (AC_TYPE_MBSTATE_T): Renamed from AC_MBSTATE_T. + All uses changed. Upgrade to recent Autoconf CVS. + + * m4/stdbool.m4 (AC_HEADER_STDBOOL): Do not cast pointer to + bool in integer constant expression; C99 does not allow it. + Reported by Bruno Haible. + + * po/LINGUAS: Add hu, pt_BR. + * po/hu.po, po/pt_BR.po: New files. + + * src/Makefile.am (noinst_HEADERS): Remove diff.h. + (DEFS): Remove. + (diff_sources): Add diff.h. + (MOSTLYCLEANFILES): New macro. + (cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend + on paths.h. + (paths.h): New rule. + + * src/analyze.c, src/cmp.c, src/diff.c, src/diff3.c, src/io.c, + src/sdiff.c: Include <file-type.h>. + + * src/cmp.c: Include paths.h. + (copyright_notice): Renamed from copyright_string. + Now a msgid, so that copyright symbol can be translated. + All uses changed. + * src/diff.c, src/diff3.c, src/sdiff.c: Likewise. + + * src/diff.c: Include posixver.h. + (TABSIZE_OPTION): New constant. + (main): Allow widths up to SIZE_MAX. + (filetype): Move to lib/file-type.c and rename to file_type. + All uses changed. + + * src/diff.c (longopts, main, usage): New option --tabsize=COLUMNS. + * src/io.c (find_and_hash_each_line): Likewise. + + * src/diff.h (TAB_WIDTH): Remove. + (tabsize): New decl. + (sdiff_half_width, sdiff_column2_offset): Now size_t rather than + unsigned int. + + * src/diff3.c (skipwhite, readnum): New functions. + (process_diff_control): Use them. + (SKIPWHITE, READNUM): Remove. + (read_diff): Don't worry about errno == ENOEXEC. + + * src/sdiff.c (catchsig, signal_handler, initial_action): Signal + handlers return void, not RETSIGTYPE, since we no longer support + K&R. + (TABSIZE_OPTION): New constant. + (longopts, usage, main): New option --tabsize=COLUMNS. + (cleanup): New arg signo. All uses changed. + (ck_editor_status, main, edit): Don't worry about ENOEXEC. + + * src/side.c (tab_from_to, print_half_line, print_1sdiff_line): + New option --tabsize=COLUMNS. + + * src/system.h (S_ISBLK, S_ISCHR, S_ISDIR, S_ISFIFO, S_ISREG, + S_ISSOCK): Remove; now in lib/file-type.h. + + * src/util.c (finish_output): Check for ENOEXEC. + (lines_differ, output_1_line): New option --tabsize=COLUMNS. + (analyze_hunk): If -b or -w is also specified, -B now considers + lines to be empty if they contain only white space. + +2002-04-05 Paul Eggert <eggert@sic.twinsun.com> + + * NEWS, configure.ac (AC_INIT): Version 2.8.1. + + * configure.ac (AC_HEADER_STDBOOL): Add. + (AC_CHECK_HEADERS): Remove stdbool.h. + * m4/stdbool.m4: New file. + * m4/prereq.m4 (jm_PREREQ_EXCLUDE): + Use AC_HEADER_STDBOOL rather than AC_CHECK_HEADERS(stdbool.h). + (jm_PREREQ_HASH): Likewise. + + * src/system.h (SSIZE_MAX): Define if limits.h doesn't. + + * src/analyze.c (diff_2_files): Assign PTRDIFF_MAX - 1 to a + size_t variable, just in case there's a problem with ptrdiff_t + versus size_t. + + * lib/cmpbuf.c (errno): Remove decl; K&R C is no longer supported. + Include limits.h. + (SIZE_MAX, SSIZE_MAX): Define if standard headers don't. + (MIN): New macro. + (block_read): Do not attempt to read more than SSIZE_MAX bytes, as the + resulting behavior is implementation-defined. Work around bug in + Tru64 5.1, which can't read more than INT_MAX bytes at a time. + * src/cmp.c (cmp): Use block_read instead of read, to work + around Tru64 5.1 bug. + * src/diff3.c (read_diff): Likewise. + * src/diff3.c: Include cmpbuf.h. + + * THANKS: Add Ulrich Drepper. + + * INSTALLME: Mention GNU texinfo. + + * doc/diff.texi: + Use new @copying directive. + Put @contents first, not last, since Texinfo now suggests this. + Fix bug in -w documentation noted by Karl Berry. + Mention links for speedup. + New node "Speedups" for future speedups. + Just say "Index", not "Concept Index". + +2002-03-26 Paul Eggert <eggert@twinsun.com> + + * src/Makefile.am: + (INCLUDES): Remove this obsolete macro, replacing it with: + (AM_CPPFLAGS): New macro. + +2002-03-26 Albert Chin-A-Young <china@thewrittenword.com> + + * src/Makefile.am (datadir): Remove, as it conflicts with --datadir. + +2002-03-26 Paul Eggert <eggert@twinsun.com> + + * doc/diff.texi (dircategory GNU packages): Fix typo: a "* " was + missing before the menu entry. Bug diagnosed by Adam Heath. + Also, put this dircategory after the Individual utilities dircategory, + to work around a compatibility problem with Debian install-info. + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706170442.l5H4g8xl068412>