PERFORCE change 52728 for review
Peter Wemm
peter at FreeBSD.org
Wed May 12 15:56:03 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52728
Change 52728 by peter at peter_overcee on 2004/05/12 15:55:51
IFC @52727
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#21 integrate
.. //depot/projects/hammer/Makefile.inc1#50 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#21 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2#13 integrate
.. //depot/projects/hammer/games/morse/morse.6#4 integrate
.. //depot/projects/hammer/games/morse/morse.c#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#7 integrate
.. //depot/projects/hammer/include/fts.h#3 integrate
.. //depot/projects/hammer/lib/libc/gen/fts.c#5 integrate
.. //depot/projects/hammer/lib/libc/gen/syslog.c#4 integrate
.. //depot/projects/hammer/lib/libc/gen/ualarm.3#3 integrate
.. //depot/projects/hammer/lib/libc/locale/big5.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/btowc.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/euc.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/gb18030.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/gb2312.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/gbk.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/mblen.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/mblocal.h#1 branch
.. //depot/projects/hammer/lib/libc/locale/mbrlen.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/mbrtowc.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/mbsinit.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/mbtowc.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/mskanji.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/none.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/runetype.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#12 integrate
.. //depot/projects/hammer/lib/libc/locale/srune.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/table.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/tolower.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/toupper.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/utf2.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/utf8.c#6 integrate
.. //depot/projects/hammer/lib/libc/locale/wcrtomb.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/wcsrtombs.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/wctob.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/wctomb.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#12 integrate
.. //depot/projects/hammer/lib/libc/stdlib/radixsort.3#2 integrate
.. //depot/projects/hammer/lib/libc/sys/nfssvc.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/send.2#4 integrate
.. //depot/projects/hammer/lib/libradius/Makefile#5 integrate
.. //depot/projects/hammer/lib/libutil/login_cap.3#4 integrate
.. //depot/projects/hammer/lib/libutil/login_cap.c#5 integrate
.. //depot/projects/hammer/lib/libutil/login_class.3#4 integrate
.. //depot/projects/hammer/lib/libvgl/vgl.3#3 integrate
.. //depot/projects/hammer/lib/msun/Makefile#7 integrate
.. //depot/projects/hammer/lib/msun/man/ieee.3#2 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#12 integrate
.. //depot/projects/hammer/lib/msun/src/s_copysignl.c#1 branch
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#17 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#67 integrate
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.8#2 integrate
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.8#2 integrate
.. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.8#2 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#22 integrate
.. //depot/projects/hammer/sbin/natd/natd.c#7 integrate
.. //depot/projects/hammer/share/examples/diskless/README.TEMPLATING#2 integrate
.. //depot/projects/hammer/share/examples/etc/README.examples#4 integrate
.. //depot/projects/hammer/share/man/man4/ch.4#4 integrate
.. //depot/projects/hammer/share/man/man4/fxp.4#6 integrate
.. //depot/projects/hammer/share/man/man4/geom.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#20 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.i386/ichwd.4#1 branch
.. //depot/projects/hammer/share/man/man5/elf.5#6 integrate
.. //depot/projects/hammer/share/man/man5/style.Makefile.5#5 integrate
.. //depot/projects/hammer/share/man/man9/VOP_OPENCLOSE.9#5 integrate
.. //depot/projects/hammer/share/mk/sys.mk#13 integrate
.. //depot/projects/hammer/sys/conf/Makefile.alpha#6 integrate
.. //depot/projects/hammer/sys/conf/Makefile.amd64#14 integrate
.. //depot/projects/hammer/sys/conf/Makefile.i386#4 integrate
.. //depot/projects/hammer/sys/conf/Makefile.ia64#6 integrate
.. //depot/projects/hammer/sys/conf/Makefile.pc98#4 integrate
.. //depot/projects/hammer/sys/conf/Makefile.powerpc#6 integrate
.. //depot/projects/hammer/sys/conf/Makefile.sparc64#5 integrate
.. //depot/projects/hammer/sys/conf/files.i386#30 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#17 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#7 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src.diff#1 branch
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx.h#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_context.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_env.c#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_env.h#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self.h#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_step.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_step.h#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_str.c#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#5 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate
.. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#14 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#13 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#11 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#12 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#34 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#21 integrate
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#10 integrate
.. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#5 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#12 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#1 branch
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#1 branch
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#3 integrate
.. //depot/projects/hammer/sys/dev/led/led.h#2 integrate
.. //depot/projects/hammer/sys/dev/pccard/files.pccard#2 delete
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#23 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#23 integrate
.. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#5 integrate
.. //depot/projects/hammer/sys/dev/snc/if_snc_pccard.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#11 integrate
.. //depot/projects/hammer/sys/dev/twe/twe.c#8 integrate
.. //depot/projects/hammer/sys/dev/twe/twereg.h#6 integrate
.. //depot/projects/hammer/sys/dev/twe/twevar.h#6 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#19 integrate
.. //depot/projects/hammer/sys/dev/wl/if_wl.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#23 integrate
.. //depot/projects/hammer/sys/i386/acpica/madt.c#10 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#8 integrate
.. //depot/projects/hammer/sys/i386/i386/io_apic.c#6 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#32 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable.c#10 integrate
.. //depot/projects/hammer/sys/i386/include/apicvar.h#7 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic.c#10 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#8 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#16 integrate
.. //depot/projects/hammer/sys/i386/isa/icu.h#7 integrate
.. //depot/projects/hammer/sys/i386/isa/npx.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#16 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#9 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#23 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#30 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#27 integrate
.. //depot/projects/hammer/sys/modules/Makefile#42 integrate
.. //depot/projects/hammer/sys/modules/ichwd/Makefile#1 branch
.. //depot/projects/hammer/sys/net/rtsock.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bt3c.h#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_h4.h#4 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#29 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#21 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#5 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/include/pmap.h#14 integrate
.. //depot/projects/hammer/sys/sparc64/isa/isa.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/pci/apb.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#3 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#17 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#8 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/counter.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#24 integrate
.. //depot/projects/hammer/sys/sys/_label.h#6 integrate
.. //depot/projects/hammer/sys/sys/acl.h#4 integrate
.. //depot/projects/hammer/sys/sys/mac.h#19 integrate
.. //depot/projects/hammer/sys/sys/mac_policy.h#18 integrate
.. //depot/projects/hammer/sys/sys/regression.h#2 integrate
.. //depot/projects/hammer/sys/sys/socket.h#11 integrate
.. //depot/projects/hammer/sys/sys/ttycom.h#4 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#23 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#26 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#25 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/locale/test-mbrtowc.c#3 integrate
.. //depot/projects/hammer/usr.bin/ctags/ctags.c#2 integrate
.. //depot/projects/hammer/usr.bin/netstat/inet.c#9 integrate
.. //depot/projects/hammer/usr.bin/talk/io.c#4 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#9 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi_user.c#4 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.h#5 integrate
.. //depot/projects/hammer/usr.sbin/config/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/config/config.h#3 integrate
.. //depot/projects/hammer/usr.sbin/config/config.y#5 integrate
.. //depot/projects/hammer/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/hammer/usr.sbin/config/lang.l#3 integrate
.. //depot/projects/hammer/usr.sbin/config/main.c#4 integrate
.. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#6 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/config.c#13 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#19 integrate
Differences ...
==== //depot/projects/hammer/MAINTAINERS#21 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.88 2004/04/19 17:47:45 tackerman Exp $
+$FreeBSD: src/MAINTAINERS,v 1.89 2004/05/10 10:07:25 pjd Exp $
subsystem login notes
-----------------------------
@@ -92,6 +92,8 @@
changes pre-commit review requested.
contrib/pf mlaier Pre-commit review requested.
binutils obrien Insists on BU blocked from unapproved commits
+geom_concat pjd Pre-commit review requested.
+geom_gate pjd Pre-commit review requested.
Following are the entries from the Makefiles, and a few other sources.
==== //depot/projects/hammer/Makefile.inc1#50 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.424 2004/04/27 15:00:29 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.425 2004/05/12 07:02:17 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -897,12 +897,11 @@
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
lib/libkvm lib/libmd \
lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
- lib/libradius lib/librpcsvc \
+ lib/libradius \
lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
lib/libz lib/msun
lib/libopie__L lib/libtacplus__L: lib/libmd__L
-lib/libypclnt__L: lib/librpcsvc__L
_generic_libs+= lib
@@ -912,7 +911,12 @@
lib/libradius__L: secure/lib/libssl__L
.if !defined(NO_OPENSSH)
_prebuild_libs+= secure/lib/libssh
-secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L
+secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
+.if !defined(NO_KERBEROS)
+secure/lib/libssh__L: kerberos5/lib/libgssapi__L kerberos5/lib/libkrb5__L \
+ kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
+ kerberos5/lib/libroken__L
+.endif
.endif
.endif
_generic_libs+= secure/lib
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#21 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.130 2004/04/29 06:14:00 cperciva Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.134 2004/05/11 17:26:15 fanf Exp $
%
-- Gifts for Children --
@@ -7570,12 +7570,12 @@
"If I am elected, the concrete barriers around the WHITE HOUSE will be
replaced by tasteful foam replicas of ANN MARGARET!"
%
+If I could drop dead right now, I'd be the happiest man alive!
+ -- Samuel Goldwyn
+%
If I 'cp /bin/csh /dev/audio' shouldn't I hear the ocean?
-- Danno Coppock
%
-If I could drop dead right now, I'd be the happiest man alive!
- -- Samuel Goldwyn
-%
If I don't drive around the park,
I'm pretty sure to make my mark.
If I'm in bed each night by ten,
@@ -10141,6 +10141,9 @@
Neckties strangle clear thinking.
-- Lin Yutang
%
+Network packets are like buses. You wait all day, and then 3Com
+along at once.
+%
Never be led astray onto the path of virtue.
%
Never call a man a fool; borrow from him.
@@ -12969,6 +12972,8 @@
"The climate of Bombay is such that its inhabitants have to live
elsewhere."
%
+The computer gets faster! --Moore--
+%
"The Computer made me do it."
%
The computing field is always in need of new cliches.
==== //depot/projects/hammer/games/fortune/datfiles/fortunes2#13 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.65 2004/04/20 19:20:17 ceri Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.69 2004/05/11 17:43:36 fanf Exp $
%
=======================================================================
|| ||
@@ -7648,6 +7648,11 @@
scientists. Researchers into the phenomenon cite the added concentration
needed to "make sense" of such unnatural three dimensional objects.
%
+A regular expression goes into a pub with a friend, intending to
+help him find a girl. However, when the cockney barman finds this
+out, he says to it, "Ere! I'll have no pattern match-making in my
+pub!"
+%
A rich man told me recently that a liberal is a man who tells other
people what to do with their money.
-- Imamu Amiri Baraka (Leroi Jones)
==== //depot/projects/hammer/games/morse/morse.6#4 (text+ko) ====
@@ -31,9 +31,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)bcd.6 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/games/morse/morse.6,v 1.12 2004/02/20 11:55:38 fanf Exp $
+.\" $FreeBSD: src/games/morse/morse.6,v 1.13 2004/05/11 11:11:14 dds Exp $
.\"
-.Dd December 7, 2000
+.Dd May 11, 2004
.Dt MORSE 6
.Os
.Sh NAME
@@ -143,20 +143,20 @@
speaker device file
.El
.Sh ENVIRONMENT
-If your
+Your
.Ev LC_CTYPE
-locale codeset is
-.Ql KOI8-R ,
-characters with the high-order bit set are interpreted as
-Cyrillic characters. If your
-.Ev LC_CTYPE
-locale codeset is
-.Ql ISO8859-1
-compatible,
-they are interpreted
-as belonging to the
-.Ql ISO-8859-1
-character set.
+locale codeset determines how
+characters with the high-order bit set
+are interpreted.
+.Bl -tag -width ".Li ISO8859-15" -compact
+.It Li ISO8859-1
+.It Li ISO8859-15
+Interpret characters with the high-order bit set as Western European characters.
+.It Li KOI8-R
+Interpret characters with the high-order bit set as Cyrillic characters.
+.It Li ISO8859-7
+Interpret characters with the high-order bit set as Greek characters.
+.El
.Sh SEE ALSO
.Xr speaker 4
.Sh HISTORY
==== //depot/projects/hammer/games/morse/morse.c#4 (text+ko) ====
@@ -47,7 +47,7 @@
static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/games/morse/morse.c,v 1.17 2004/02/20 13:46:39 fanf Exp $";
+ "$FreeBSD: src/games/morse/morse.c,v 1.18 2004/05/11 11:11:14 dds Exp $";
#endif /* not lint */
#include <sys/time.h>
@@ -145,7 +145,7 @@
};
-static const struct morsetab iso8859tab[] = {
+static const struct morsetab iso8859_1tab[] = {
{'á', ".--.-"},
{'à', ".--.-"},
{'â', ".--.-"},
@@ -160,6 +160,67 @@
{'\0', ""}
};
+static const struct morsetab iso8859_7tab[] = {
+ /*
+ * The greek alphabet; you'll need an 8859-7 font in order
+ * to see the actual characters.
+ * This table does not implement:
+ * - the special sequences for the seven diphthongs,
+ * - the punctuation differences.
+ * Implementing these features would introduce too many
+ * special-cases in the program's main loop.
+ * The diphtong sequences are:
+ * alpha iota .-.-
+ * alpha upsilon ..--
+ * epsilon upsilon ---.
+ * eta upsilon ...-
+ * omikron iota ---..
+ * omikron upsilon ..-
+ * upsilon iota .---
+ * The different punctuation symbols are:
+ * ; ..-.-
+ * ! --..--
+ */
+ {'á', ".-"}, /* alpha */
+ {'Ü', ".-"}, /* alpha with acute */
+ {'â', "-..."}, /* beta */
+ {'ã', "--."}, /* gamma */
+ {'ä', "-.."}, /* delta */
+ {'å', "."}, /* epsilon */
+ {'Ý', "."}, /* epsilon with acute */
+ {'æ', "--.."}, /* zeta */
+ {'ç', "...."}, /* eta */
+ {'Þ', "...."}, /* eta with acute */
+ {'è', "-.-."}, /* theta */
+ {'é', ".."}, /* iota */
+ {'ß', ".."}, /* iota with acute */
+ {'ú', ".."}, /* iota with diairesis */
+ {'À', ".."}, /* iota with acute and diairesis */
+ {'ê', "-.-"}, /* kappa */
+ {'ë', ".-.."}, /* lamda */
+ {'ì', "--"}, /* mu */
+ {'í', "-."}, /* nu */
+ {'î', "-..-"}, /* xi */
+ {'ï', "---"}, /* omicron */
+ {'ü', "---"}, /* omicron with acute */
+ {'ð', ".--."}, /* pi */
+ {'ñ', ".-."}, /* rho */
+ {'ó', "..."}, /* sigma */
+ {'ò', "..."}, /* final sigma */
+ {'ô', "-"}, /* tau */
+ {'õ', "-.--"}, /* upsilon */
+ {'ý', "-.--"}, /* upsilon with acute */
+ {'û', "-.--"}, /* upsilon and diairesis */
+ {'à', "-.--"}, /* upsilon with acute and diairesis */
+ {'ö', "..-."}, /* phi */
+ {'÷', "----"}, /* chi */
+ {'ø', "--.-"}, /* psi */
+ {'ù', ".--"}, /* omega */
+ {'þ', ".--"}, /* omega with acute */
+
+ {'\0', ""}
+};
+
static const struct morsetab koi8rtab[] = {
/*
* the cyrillic alphabet; you'll need a KOI8R font in order
@@ -335,7 +396,9 @@
hightab = koi8rtab;
else if (strcmp(codeset, "ISO8859-1") == 0 ||
strcmp(codeset, "ISO8859-15") == 0)
- hightab = iso8859tab;
+ hightab = iso8859_1tab;
+ else if (strcmp(codeset, "ISO8859-7") == 0)
+ hightab = iso8859_7tab;
}
if (lflag)
==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#7 (text+ko) ====
@@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.47 2004/01/26 06:07:33 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.48 2004/05/10 17:45:51 obrien Exp $ */
/*
* This works like "remote" but, you use it like this:
@@ -537,9 +537,9 @@
* the last context switch to the debugger.
* XXX do something with the floating-point registers?
*/
- supply_register (SP_REGNUM, (char *)&pcbp->pcb_fp);
+ supply_register (SP_REGNUM, (char *)&pcbp->pcb_ufp);
supply_register (PC_REGNUM, (char *)&pcbp->pcb_pc);
- f_addr = extract_address (&pcbp->pcb_fp, SPARC_INTREG_SIZE);
+ f_addr = extract_address (&pcbp->pcb_ufp, SPARC_INTREG_SIZE);
/* Load the previous frame by hand (XXX) and supply it. */
read_memory (f_addr + SPOFF, (char *)&top, sizeof (top));
for (i = 0; i < 8; i++)
==== //depot/projects/hammer/include/fts.h#3 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fts.h 8.3 (Berkeley) 8/14/94
- * $FreeBSD: src/include/fts.h,v 1.7 2002/09/21 01:28:36 wollman Exp $
+ * $FreeBSD: src/include/fts.h,v 1.10 2004/05/12 21:38:39 peadar Exp $
*/
#ifndef _FTS_H_
==== //depot/projects/hammer/lib/libc/gen/fts.c#5 (text+ko) ====
@@ -37,11 +37,11 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.23 2004/05/05 06:33:00 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.25 2004/05/12 21:38:39 peadar Exp $");
#include "namespace.h"
-#include <sys/types.h>
#include <sys/param.h>
+#include <sys/mount.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -63,6 +63,7 @@
static FTSENT *fts_sort(FTS *, FTSENT *, int);
static u_short fts_stat(FTS *, FTSENT *, int);
static int fts_safe_changedir(FTS *, FTSENT *, int, char *);
+static int fts_ufslinks(FTS *, const FTSENT *);
#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
@@ -77,12 +78,42 @@
#define BNAMES 2 /* fts_children, names only */
#define BREAD 3 /* fts_read */
+/*
+ * Internal representation of an FTS, including extra implementation
+ * details. The FTS returned from fts_open points to this structure's
+ * ftsp_fts member (and can be cast to an _fts_private as required)
+ */
+struct _fts_private {
+ FTS ftsp_fts;
+ struct statfs ftsp_statfs;
+ dev_t ftsp_dev;
+ int ftsp_linksreliable;
+};
+
+/*
+ * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
+ * knows that a directory could not possibly have subdirectories. This
+ * is decided by looking at the link count: a subdirectory would
+ * increment its parent's link count by virtue of its own ".." entry.
+ * This assumption only holds for UFS-like filesystems that implement
+ * links and directories this way, so we must punt for others.
+ */
+
+static const char *ufslike_filesystems[] = {
+ "ufs",
+ "nfs",
+ "nfs4",
+ "ext2fs",
+ 0
+};
+
FTS *
fts_open(argv, options, compar)
char * const *argv;
int options;
int (*compar)(const FTSENT * const *, const FTSENT * const *);
{
+ struct _fts_private *priv;
FTS *sp;
FTSENT *p, *root;
int nitems;
@@ -96,9 +127,10 @@
}
/* Allocate/initialize the stream */
- if ((sp = malloc(sizeof(FTS))) == NULL)
+ if ((priv = malloc(sizeof(*priv))) == NULL)
return (NULL);
- memset(sp, 0, sizeof(FTS));
+ memset(priv, 0, sizeof(*priv));
+ sp = &priv->ftsp_fts;
sp->fts_compar = compar;
sp->fts_options = options;
@@ -637,7 +669,10 @@
/* Be quiet about nostat, GCC. */
nostat = 0;
} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
- nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
+ if (fts_ufslinks(sp, cur))
+ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
+ else
+ nlinks = -1;
nostat = 1;
} else {
nlinks = -1;
@@ -1154,3 +1189,37 @@
errno = oerrno;
return (ret);
}
+
+/*
+ * Check if the filesystem for "ent" has UFS-style links.
+ */
+static int
+fts_ufslinks(FTS *sp, const FTSENT *ent)
+{
+ struct _fts_private *priv;
+ const char **cpp;
+
+ priv = (struct _fts_private *)sp;
+ /*
+ * If this node's device is different from the previous, grab
+ * the filesystem information, and decide on the reliability
+ * of the link information from this filesystem for stat(2)
+ * avoidance.
+ */
+ if (priv->ftsp_dev != ent->fts_dev) {
+ if (statfs(ent->fts_path, &priv->ftsp_statfs) != -1) {
+ priv->ftsp_dev = ent->fts_dev;
+ priv->ftsp_linksreliable = 0;
+ for (cpp = ufslike_filesystems; *cpp; cpp++) {
+ if (strcmp(priv->ftsp_statfs.f_fstypename,
+ *cpp) == 0) {
+ priv->ftsp_linksreliable = 1;
+ break;
+ }
+ }
+ } else {
+ priv->ftsp_linksreliable = 0;
+ }
+ }
+ return (priv->ftsp_linksreliable);
+}
==== //depot/projects/hammer/lib/libc/gen/syslog.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.29 2003/02/10 08:31:28 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.30 2004/05/10 17:12:52 dds Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -222,6 +222,10 @@
cnt = sizeof(tbuf) - tbuf_cookie.left;
+ /* Remove a trailing newline */
+ if (tbuf[cnt - 1] == '\n')
+ cnt--;
+
/* Output to stderr if requested. */
if (LogStat & LOG_PERROR) {
struct iovec iov[2];
==== //depot/projects/hammer/lib/libc/gen/ualarm.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.17 2002/12/29 00:59:09 mike Exp $
+.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.18 2004/05/09 11:11:21 brueffer Exp $
.\"
.Dd April 19, 1994
.Dt UALARM 3
@@ -68,8 +68,8 @@
to the process every
.Fa interval
microseconds after the timer expires (e.g. after
-.Fa value
-microseconds have passed).
+.Fa microseconds
+number of microseconds have passed).
.Pp
Due to
.Xr setitimer 2
@@ -78,7 +78,7 @@
and
.Fa interval
is limited to 100000000000000
-(in case this value fit in the unsigned integer).
+(in case this value fits in the unsigned integer).
.Sh RETURN VALUES
When the signal has successfully been caught,
.Fn ualarm
==== //depot/projects/hammer/lib/libc/locale/big5.c#5 (text+ko) ====
@@ -39,18 +39,14 @@
static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.12 2004/04/12 13:09:17 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.14 2004/05/12 14:09:04 tjr Exp $");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _BIG5_init(_RuneLocale *);
size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
@@ -122,6 +118,10 @@
if (n == 0 || (size_t)(len = _big5_check(*s)) > n)
/* Incomplete multibyte sequence */
return ((size_t)-2);
+ if (n == 2 && s[1] == '\0') {
+ errno = EILSEQ;
+ return ((size_t)-1);
+ }
wc = 0;
i = len;
while (i-- > 0)
==== //depot/projects/hammer/lib/libc/locale/btowc.c#4 (text+ko) ====
@@ -25,10 +25,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.3 2004/04/06 13:14:03 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
#include <stdio.h>
#include <wchar.h>
+#include "mblocal.h"
wint_t
btowc(int c)
@@ -46,7 +47,7 @@
* counts.
*/
cc = (char)c;
- if (mbrtowc(&wc, &cc, 1, &mbs) > 1)
+ if (__mbrtowc(&wc, &cc, 1, &mbs) > 1)
return (WEOF);
return (wc);
}
==== //depot/projects/hammer/lib/libc/locale/euc.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.16 2004/04/12 13:09:17 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.18 2004/05/12 14:09:04 tjr Exp $");
#include <errno.h>
#include <limits.h>
@@ -47,11 +47,7 @@
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _EUC_init(_RuneLocale *);
size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
@@ -185,8 +181,14 @@
/* FALLTHROUGH */
case 1:
case 0:
- while (remain-- > 0)
+ wc = (unsigned char)*s++;
+ while (--remain > 0) {
+ if (*s == '\0') {
+ errno = EILSEQ;
+ return ((size_t)-1);
+ }
wc = (wc << 8) | (unsigned char)*s++;
+ }
break;
}
wc = (wc & ~CEI->mask) | CEI->bits[set];
==== //depot/projects/hammer/lib/libc/locale/gb18030.c#4 (text+ko) ====
@@ -30,18 +30,14 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.5 2004/04/12 13:09:17 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.6 2004/05/12 14:09:04 tjr Exp $");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GB18030_init(_RuneLocale *);
size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
==== //depot/projects/hammer/lib/libc/locale/gb2312.c#4 (text+ko) ====
@@ -26,18 +26,14 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.7 2004/04/12 13:09:18 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.8 2004/05/12 14:09:04 tjr Exp $");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GB2312_init(_RuneLocale *);
size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
==== //depot/projects/hammer/lib/libc/locale/gbk.c#6 (text+ko) ====
@@ -36,18 +36,14 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.7 2004/04/12 13:09:18 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.9 2004/05/12 14:09:04 tjr Exp $");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GBK_init(_RuneLocale *);
size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
@@ -119,6 +115,10 @@
if (n == 0 || (size_t)(len = _gbk_check(*s)) > n)
/* Incomplete multibyte sequence */
return ((size_t)-2);
+ if (n == 2 && s[1] == '\0') {
+ errno = EILSEQ;
+ return ((size_t)-1);
+ }
wc = 0;
i = len;
while (i-- > 0)
==== //depot/projects/hammer/lib/libc/locale/mblen.c#5 (text+ko) ====
@@ -25,12 +25,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.6 2004/04/06 13:14:03 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.7 2004/05/12 14:26:54 tjr Exp $");
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
+#include "mblocal.h"
int
mblen(const char *s, size_t n)
@@ -44,7 +45,7 @@
mbs = initial;
return (0);
}
- rval = mbrtowc(NULL, s, n, &mbs);
+ rval = __mbrtowc(NULL, s, n, &mbs);
if (rval == (size_t)-1 || rval == (size_t)-2)
return (-1);
if (rval > INT_MAX) {
==== //depot/projects/hammer/lib/libc/locale/mbrlen.c#3 (text+ko) ====
@@ -25,9 +25,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.3 2004/04/06 13:14:03 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
#include <wchar.h>
+#include "mblocal.h"
size_t
mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
@@ -36,5 +37,5 @@
if (ps == NULL)
ps = &mbs;
- return (mbrtowc(NULL, s, n, ps));
+ return (__mbrtowc(NULL, s, n, ps));
}
==== //depot/projects/hammer/lib/libc/locale/mbrtowc.c#6 (text+ko) ====
@@ -25,12 +25,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.6 2004/04/06 13:14:03 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.7 2004/05/12 14:09:04 tjr Exp $");
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
+#include "mblocal.h"
size_t
mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
==== //depot/projects/hammer/lib/libc/locale/mbsinit.c#3 (text+ko) ====
@@ -25,11 +25,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbsinit.c,v 1.2 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsinit.c,v 1.3 2004/05/12 14:09:04 tjr Exp $");
#include <wchar.h>
-
-extern int (*__mbsinit)(const mbstate_t *);
+#include "mblocal.h"
int
mbsinit(const mbstate_t *ps)
==== //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#3 (text+ko) ====
@@ -25,12 +25,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.3 2004/04/06 13:14:03 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
+#include "mblocal.h"
size_t
mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len,
@@ -49,7 +50,7 @@
ps = &mbs;
if (dst == NULL) {
for (;;) {
- if ((nb = (int)mbrtowc(&wc, s, MB_CUR_MAX, ps)) < 0)
+ if ((nb = (int)__mbrtowc(&wc, s, MB_CUR_MAX, ps)) < 0)
/* Invalid sequence - mbrtowc() sets errno. */
return ((size_t)-1);
else if (nb == 0)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list