PERFORCE change 90235 for review
Peter Wemm
peter at FreeBSD.org
Mon Jan 23 12:02:28 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=90235
Change 90235 by peter at peter_daintree on 2006/01/23 20:01:56
IFC @90234
Affected files ...
.. //depot/projects/hammer/etc/defaults/rc.conf#67 integrate
.. //depot/projects/hammer/etc/gettytab#4 integrate
.. //depot/projects/hammer/etc/periodic/daily/Makefile#4 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#45 integrate
.. //depot/projects/hammer/etc/rc.d/devfs#12 integrate
.. //depot/projects/hammer/etc/rc.d/ftpd#1 branch
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#57 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#21 integrate
.. //depot/projects/hammer/lib/libc/sys/rename.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/rmdir.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/undelete.2#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_info.c#5 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.8#12 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#28 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#20 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient-script#6 integrate
.. //depot/projects/hammer/share/man/man4/bktr.4#10 integrate
.. //depot/projects/hammer/share/man/man4/snd_atiixp.4#3 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#69 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#6 integrate
.. //depot/projects/hammer/sys/cam/cam_ccb.h#7 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#25 integrate
.. //depot/projects/hammer/sys/coda/coda_vnops.c#19 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#40 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#22 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#68 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#63 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#23 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#58 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.h#12 integrate
.. //depot/projects/hammer/sys/dev/isp/isp.c#16 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#19 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#12 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_inline.h#7 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#7 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#10 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_target.c#10 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_target.h#5 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_tpublic.h#5 integrate
.. //depot/projects/hammer/sys/dev/isp/ispmbox.h#8 integrate
.. //depot/projects/hammer/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/isp/ispvar.h#13 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_inb.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_sas.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_tool.h#1 branch
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#6 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#8 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#52 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_private.h#12 integrate
.. //depot/projects/hammer/sys/dev/sound/driver.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#15 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#18 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#18 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder.h#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#8 integrate
.. //depot/projects/hammer/sys/dev/tx/if_tx.c#25 integrate
.. //depot/projects/hammer/sys/dev/usb/if_ural.c#13 integrate
.. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#67 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#6 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#13 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#10 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#23 integrate
.. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#9 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#44 integrate
.. //depot/projects/hammer/sys/i386/i386/mem.c#13 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#37 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#53 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#56 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#27 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#47 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#51 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#51 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#40 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#65 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#19 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#98 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#56 integrate
.. //depot/projects/hammer/sys/libkern/fnmatch.c#5 integrate
.. //depot/projects/hammer/sys/net/if.c#59 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#30 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#28 integrate
.. //depot/projects/hammer/sys/netatm/atm_signal.c#5 integrate
.. //depot/projects/hammer/sys/netatm/ipatm/ipatm_vcm.c#9 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#20 integrate
.. //depot/projects/hammer/sys/netgraph/ng_source.c#14 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#37 integrate
.. //depot/projects/hammer/sys/netinet/ip_gre.c#15 integrate
.. //depot/projects/hammer/sys/netinet/ip_gre.h#5 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#27 integrate
.. //depot/projects/hammer/sys/netinet6/in6_cksum.c#9 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.c#10 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.h#3 integrate
.. //depot/projects/hammer/sys/netkey/keysock.c#14 integrate
.. //depot/projects/hammer/sys/netkey/keysock.h#4 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#25 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#10 integrate
.. //depot/projects/hammer/sys/sys/ata.h#14 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#50 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#50 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#50 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#59 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#24 integrate
.. //depot/projects/hammer/tools/regression/aio/kqueue/aio_kqueue.c#2 integrate
.. //depot/projects/hammer/tools/regression/aio/kqueue/lio/lio_kqueue.c#2 integrate
Differences ...
==== //depot/projects/hammer/etc/defaults/rc.conf#67 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.270 2006/01/08 10:15:30 dougb Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.271 2006/01/21 18:08:15 yar Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -227,6 +227,9 @@
sshd_enable="NO" # Enable sshd
sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one.
sshd_flags="" # Additional flags for sshd.
+ftpd_enable="NO" # Enable stand-alone ftpd.
+ftpd_program="/usr/libexec/ftpd" # Path to ftpd, if you want a different one.
+ftpd_flags="" # Additional flags to stand-alone ftpd.
### Network daemon (NFS): All need rpcbind_enable="YES" ###
amd_enable="NO" # Run amd service with $amd_flags (or NO).
==== //depot/projects/hammer/etc/gettytab#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $
+# $FreeBSD: src/etc/gettytab,v 1.23 2006/01/22 15:33:16 matteo Exp $
# from: @(#)gettytab 5.14 (Berkeley) 3/27/91
#
# Most of the table entries here are just copies of the old getty table,
@@ -211,6 +211,8 @@
#
3wire.9600|9600-3wire:\
:np:nc:sp#9600:
+3wire.19200|19200-3wire:\
+ :np:nc:sp#19200:
3wire.38400|38400-3wire:\
:np:nc:sp#38400:
3wire.57600|57600-3wire:\
==== //depot/projects/hammer/etc/periodic/daily/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.12 2003/10/27 20:14:53 jesper Exp $
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.13 2006/01/21 20:16:30 maxim Exp $
FILES= 100.clean-disks \
110.clean-tmps \
@@ -12,8 +12,9 @@
310.accounting \
330.news \
400.status-disks \
+ 405.status-ata-raid \
+ 406.status-gmirror \
420.status-network \
- 405.status-ata-raid \
430.status-rwho \
440.status-mailq \
450.status-security \
==== //depot/projects/hammer/etc/rc.d/Makefile#45 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.62 2005/12/15 01:04:48 iedowse Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.63 2006/01/21 18:08:15 yar Exp $
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -9,7 +9,7 @@
devd devfs dhclient \
dmesg dumpon \
early.sh encswap \
- fsck \
+ fsck ftpd \
gbde geli geli2 \
hcsecd \
hostname \
==== //depot/projects/hammer/etc/rc.d/devfs#12 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/devfs,v 1.11 2005/12/10 20:21:45 dougb Exp $
+# $FreeBSD: src/etc/rc.d/devfs,v 1.12 2006/01/21 14:31:45 matteo Exp $
#
# PROVIDE: devfs
@@ -41,19 +41,25 @@
{
if [ -r /etc/devfs.conf ]; then
cd /dev
- while read action device parameter; do
+ while read action devicelist parameter; do
case "${action}" in
- l*) if [ -c ${device} -a ! -e ${parameter} ]; then
- ln -fs ${device} ${parameter}
- fi
+ l*) for device in ${devicelist}; do
+ if [ -c ${device} -a ! -e ${parameter} ]; then
+ ln -fs ${device} ${parameter}
+ fi
+ done
;;
- o*) if [ -c ${device} ]; then
- chown ${parameter} ${device}
- fi
+ o*) for device in ${devicelist}; do
+ if [ -c ${device} ]; then
+ chown ${parameter} ${device}
+ fi
+ done
;;
- p*) if [ -c ${device} ]; then
- chmod ${parameter} ${device}
- fi
+ p*) for device in ${devicelist}; do
+ if [ -c ${device} ]; then
+ chmod ${parameter} ${device}
+ fi
+ done
;;
esac
done < /etc/devfs.conf
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#57 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.202 2005/12/25 23:26:34 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $
%
=======================================================================
@@ -8962,13 +8962,9 @@
Exposed to the attacks of friends and acquaintances; defamed;
slandered.
%
-ABSENTEE:
+Absentee, n.:
A person with an income who has had the forethought
- to remove themselves from the sphere of exaction.
-%
-Absentee, n.:
- A person with an income who has had the forethought to remove
-himself from the sphere of exaction.
+ to remove himself from the sphere of exaction.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Absinthe makes the tart grow fonder.
@@ -8976,13 +8972,9 @@
Absolutum obsoletum. (If it works, it's out of date.)
-- Stafford Beer
%
-ABSTAINER:
+Abstainer, n.:
A weak person who yields to the
temptation of denying himself a pleasure.
-%
-Abstainer, n.:
- A weak person who yields to the temptation of denying himself a
-pleasure.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Abstract:
@@ -8999,13 +8991,9 @@
Neck in Relation to Visual Performance." Human Factors 29,
#1 (Feb. 1987), pp. 67-71.
%
-ABSURDITY:
+Absurdity, n.:
A statement or belief manifestly
inconsistent with one's own opinion.
-%
-Absurdity, n.:
- A statement or belief manifestly inconsistent with one's own
-opinion.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Academic politics is the most vicious and bitter form of politics,
@@ -10004,9 +9992,6 @@
about today's software design would be accurate.
-- K. E. Iverson
%
-ALONE:
- In bad company.
-%
Alone, adj.:
In bad company.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -10107,9 +10092,6 @@
There is so much sand in Northern Africa that if it
were spread out it would completely cover the Sahara Desert.
%
-AMBIDEXTROUS:
- Able to pick with equal skill a right-hand pocket or a left.
-%
Ambidextrous, adj.:
Able to pick with equal skill a right-hand pocket or a left.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -10853,13 +10835,9 @@
at the same time with the other! (Well, you really can't, but the Americans
think you can, and that's the point, right?)
%
-ANOINT:
+Anoint, v.:
To grease a king or other great
functionary already sufficiently slippery.
-%
-Anoint, v.:
- To grease a king or other great functionary already
-sufficiently slippery.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Another day, another dollar.
@@ -11220,14 +11198,9 @@
April is the cruelest month...
-- Thomas Stearns Eliot
%
-AQUADEXTROUS:
+Aquadextrous, adj.:
Possessing the ability to turn the bathtub
faucet on and off with your toes.
- -- "Sniglets", Rich Hall & Friends
-%
-aquadextrous, adj.:
- Possessing the ability to turn the bathtub faucet on and off
-with your toes.
-- Rich Hall, "Sniglets"
%
AQUARIUS (Jan 20 - Feb 18)
@@ -12124,13 +12097,9 @@
[Babe] Ruth made a big mistake when he gave up pitching.
-- Tris Speaker, 1921
%
-BACCHUS:
+Bacchus, n.:
A convenient deity invented by the ancients
as an excuse for getting drunk.
-%
-Bacchus, n.:
- A convenient deity invented by the ancients as an excuse for
-getting drunk.
-- Ambrose Bierce, "The Devil's Dictionary"
%
BACHELOR:
@@ -12237,13 +12206,9 @@
Barker's Proof:
Proofreading is more effective after publication.
%
-BAROMETER:
+Barometer, n.:
An ingenious instrument which indicates
what kind of weather we are having.
-%
-Barometer, n.:
- An ingenious instrument which indicates what kind of weather we
-are having.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Barth's Distinction:
@@ -14191,14 +14156,9 @@
A fire at one end, a fool at the other, and a bit of tobacco in
between.
%
-CINEMUCK:
- The combination of popcorn, soda, and melted chocolate
- which covers the floors of movie theaters.
- -- "Sniglets", Rich Hall & Friends
-%
Cinemuck, n.:
The combination of popcorn, soda, and melted chocolate which
-covers the floors of movie theaters.
+ covers the floors of movie theaters.
-- Rich Hall, "Sniglets"
%
Circumstances rule men; men do not rule circumstances.
@@ -14975,9 +14935,6 @@
Courtship to marriage, as a very witty prologue to a very dull play.
-- William Congreve
%
-COWARD:
- One who in a perilous emergency thinks with his legs.
-%
Coward, n.:
One who in a perilous emergency thinks with his legs.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -15020,11 +14977,7 @@
Crime does not pay... as well as politics.
-- A. E. Neuman
%
-CRITIC:
- A person who boasts himself hard to please
- because nobody tries to please him.
-%
-critic, n.:
+Critic, n.:
A person who boasts himself hard to please because nobody tries
to please him.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -15225,9 +15178,6 @@
Davis's Dictum:
Problems that go away by themselves, come back by themselves.
%
-DAWN:
- The time when men of reason go to bed.
-%
Dawn, n.:
The time when men of reason go to bed.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -15642,13 +15592,9 @@
child.
-- Dr. Albert Hoffman
%
-DELIBERATION:
+Deliberation, n.:
The act of examining one's bread
to determine which side it is buttered on.
-%
-Deliberation, n.:
- The act of examining one's bread to determine which side it is
-buttered on.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Deliver yesterday, code today, think tomorrow.
@@ -15756,14 +15702,9 @@
%
Dental health is next to mental health.
%
-Dentist:
+Dentist, n.:
A Prestidigitator who, putting metal in one's mouth,
pulls coins out of one's pockets.
- -- Ambrose Bierce
-%
-Dentist, n.:
- A Prestidigitator who, putting metal in one's mouth, pulls
-coins out of one's pockets.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Denver, n:
@@ -16032,9 +15973,6 @@
Distinctive, adj.:
A different color or shape than our competitors.
%
-DISTRESS:
- A disease incurred by exposure to the prosperity of a friend.
-%
Distress, n.:
A disease incurred by exposure to the prosperity of a friend.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -16903,7 +16841,7 @@
%
Eat drink and be merry, for tomorrow we diet.
%
-"Eat, drink, and be merry, for tomorrow you may work."
+Eat, drink, and be merry, for tomorrow you may work.
%
Eat one live toad the first thing in the morning and nothing worse
will happen to you the rest of the day.
@@ -16996,9 +16934,6 @@
Egotism, n:
Doing the New York Times crossword puzzle with a pen.
-Egotist, n:
- A person of low taste, more interested in himself than me.
- -- Ambrose Bierce
%
Egotist, n.:
A person of low taste, more interested in himself than me.
@@ -21089,15 +21024,9 @@
(2) The strength of the turbulence
is directly proportional to the temperature of your coffee.
%
-GURMLISH:
+Gurmlish, n.:
The red warning flag at the top of a club sandwich which prevents
the person from biting into it and puncturing the roof of his mouth.
- -- "Sniglets", Rich Hall & Friends
-%
-Gurmlish, n.:
- The red warning flag at the top of a club sandwich which
-prevents the person from biting into it and puncturing the roof of his
-mouth.
-- Rich Hall & Friends, "Sniglets"
%
GURU:
@@ -28376,15 +28305,10 @@
(2) If a small boy can get dirty, he will.
(3) If a teenager can go out, he will.
%
-IMPARTIAL:
+Impartial, adj.:
Unable to perceive any promise of personal advantage from
espousing either side of a controversy or adopting either of two
conflicting opinions.
-%
-Impartial, adj.:
- Unable to perceive any promise of personal advantage from
-espousing either side of a controversy or adopting either of two
-conflicting opinions.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Important letters which contain no errors will develop errors in the
@@ -29111,9 +29035,6 @@
Increased knowledge will help you now.
Have mate's phone bugged.
%
-INCUMBENT:
- Person of liveliest interest to the outcumbents.
-%
Incumbent, n.:
Person of liveliest interest to the outcumbents.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -29304,15 +29225,10 @@
best at, that's what I say.
-- Doctor Who
%
-INTERPRETER:
+Interpreter, n.:
One who enables two persons of different languages to understand
each other by repeating to each what it would have been to the
interpreter's advantage for the other to have said.
-%
-Interpreter, n.:
- One who enables two persons of different languages to
-understand each other by repeating to each what it would have been to
-the interpreter's advantage for the other to have said.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Into love and out again,
@@ -31496,13 +31412,8 @@
%
Kleeneness is next to Godelness.
%
-Klein bottle for rent -- inquire within.
+Klein bottle for sale -- inquire within.
%
-Klein bottle for sale ... inquire within.
-%
-KLEPTOMANIAC:
- A rich thief.
-%
Kleptomaniac, n.:
A rich thief.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -31587,11 +31498,6 @@
Kramer's Law:
You can never tell which way the train went by looking at the tracks.
%
-KROGT:
- (chemical symbol: Kr) The metallic silver coating found
- on fast-food game cards.
- -- "Sniglets", Rich Hall & Friends
-%
Krogt, n. (chemical symbol: Kr):
The metallic silver coating found on fast-food game cards.
-- Rich Hall, "Sniglets"
@@ -31615,14 +31521,9 @@
2. Never be last.
3. Never volunteer for anything.
%
-LACTOMANGULATION:
- Manhandling the "open here" spout on a milk carton so badly that
- one has to resort to using the "illegal" side.
- -- "Sniglets", Rich Hall & Friends
-%
Lactomangulation, n.:
Manhandling the "open here" spout on a milk carton so badly
-that one has to resort to using the "illegal" side.
+ that one has to resort to using the "illegal" side.
-- Rich Hall, "Sniglets"
%
La-dee-dee, la-dee-dah.
@@ -32193,9 +32094,6 @@
L'hazard ne favorise que l'esprit prepare.
-- L. Pasteur
%
-LIAR:
- A lawyer with a roving commission.
-%
Liar, n.:
A lawyer with a roving commission.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -33183,11 +33081,8 @@
Macho does not prove mucho.
-- Zsa Zsa Gabor
%
-MAD:
+Mad, adj.:
Affected with a high degree of intellectual independence.
-%
-Mad, adj.:
- Affected with a high degree of intellectual independence ...
-- Ambrose Bierce, "The Devil's Dictionary"
%
Madam, there's no such thing as a tough child --
@@ -33234,23 +33129,14 @@
knowledge.
-- Ambrose Bierce, "The Devil's Dictionary"
%
-MAGNOCARTIC:
- Any automobile that, when left unattended, attracts shopping carts.
- -- "Sniglets", Rich Hall & Friends
-%
-magnocartic, adj:
+Magnocartic, adj:
Any automobile that, when left unattended, attracts shopping
carts.
-- Rich Hall, "Sniglets"
%
-MAGPIE:
+Magpie, n.:
A bird whose thievish disposition suggested
to someone that it might be taught to talk.
- -- A. Bierce
-%
-Magpie, n.:
- A bird whose thievish disposition suggested to someone that it
-might be taught to talk.
-- Ambrose Bierce, "The Devil's Dictionary"
%
MAIDEN AUNT:
@@ -34327,22 +34213,15 @@
Nowadays it insists on it.
-- Russell Baker
%
-MISFORTUNE:
- The kind of fortune that never misses.
-%
Misfortune, n.:
The kind of fortune that never misses.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Misfortunes arrive on wings and leave on foot.
%
-MISS:
+Miss, n.:
A title with which we brand unmarried
women to indicate that they are in the market.
-%
-Miss, n.:
- A title with which we brand unmarried women to indicate that
-they are in the market.
-- Ambrose Bierce, "The Devil's Dictionary"
%
Mistakes are often the stepping stones to utter failure.
@@ -34462,19 +34341,12 @@
woke the bruiser, and Moishe, his heart in his mouth, rose to the occasion.
"Feeling better now?" he asked solicitously.
%
-MOLECULE:
+Molecule, n.:
The ultimate, indivisible unit of matter. It is distinguished from
the corpuscle, also the ultimate, indivisible unit of matter, by a
closer resemblance to the atom, also the ultimate, indivisible unit
of matter... The ion differs from the molecule, the corpuscle and
the atom in that it is an ion...
-%
-Molecule, n.:
- The ultimate, indivisible unit of matter. It is distinguished
-from the corpuscle, also the ultimate, indivisible unit of matter, by a
-closer resemblance to the atom, also the ultimate, indivisible unit of
-matter ... The ion differs from the molecule, the corpuscle and the
-atom in that it is an ion ...
-- Ambrose Bierce, "The Devil's Dictionary"
%
Mollison's Bureaucracy Hypothesis:
@@ -36723,9 +36595,6 @@
Dim Sum, n:
Chinese for more food than you've ever seen in your entire life.
%
-November:
- The eleventh twelfth of a weariness.
-%
November, n.:
The eleventh twelfth of a weariness.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -37429,8 +37298,6 @@
Enough.
-- Ambrose Bierce, "The Devil's Dictionary"
%
-Once, adv.: Enough.
-%
Once again dread deed is done.
Canon sleeps,
his all-knowing eye shaded
@@ -43162,14 +43029,9 @@
%
Slowly and surely the unix crept up on the Nintendo user ...
%
-SLURM:
- The slime that accumulates on the underside of a soap bar when it
- sits in the dish too long.
- -- "Sniglets", Rich Hall & Friends
-%
Slurm, n.:
The slime that accumulates on the underside of a soap bar when
-it sits in the dish too long.
+ it sits in the dish too long.
-- Rich Hall, "Sniglets"
%
Small change can often be found under seat cushions.
@@ -43208,16 +43070,10 @@
Smuggling... It's not just a job, it's an adventure!
-- paid for by your local Colombian recruiting office
%
-SNACKTREK:
+Snacktrek, n.:
The peculiar habit, when searching for a snack, of constantly
returning to the refrigerator in hopes that something new will
have materialized.
- -- "Sniglets", Rich Hall & Friends
-%
-Snacktrek, n.:
- The peculiar habit, when searching for a snack, of constantly
-returning to the refrigerator in hopes that something new will have
-materialized.
-- Rich Hall, "Sniglets"
%
Snakes. Why did it have to be snakes?
@@ -53458,9 +53314,6 @@
%
Truth will be out this morning. (Which may really mess things up.)
%
-TRUTHFUL:
- Dumb and illiterate.
-%
Truthful, adj.:
Dumb and illiterate.
-- Ambrose Bierce, "The Devil's Dictionary"
@@ -58053,13 +57906,9 @@
Wishing without work is like fishing without bait.
-- Frank Tyger
%
-WIT:
+Wit, n.:
The salt with which the American Humorist spoils his cookery...
by leaving it out.
-%
-Wit, n.:
- The salt with which the American Humorist spoils his cookery
-... by leaving it out.
-- Ambrose Bierce, "The Devil's Dictionary"
%
With a gentleman I try to be a gentleman and a half, and with a fraud I
@@ -59038,14 +58887,9 @@
Yield to Temptation ... it may not pass your way again.
-- Lazarus Long, "Time Enough for Love"
%
-YINKEL:
+Yinkel, n.:
A person who combs his hair over his bald spot,
hoping no one will notice.
- -- "Sniglets", Rich Hall & Friends
-%
-Yinkel, n.:
- A person who combs his hair over his bald spot, hoping no one
-will notice.
-- Rich Hall, "Sniglets"
%
You ain't learning nothing when you're talking.
==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#21 (text+ko) ====
@@ -136,7 +136,7 @@
#define MALLOC_DEBUG
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.101 2006/01/20 03:11:11 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.103 2006/01/23 03:32:38 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -2980,7 +2980,7 @@
static region_t *
arena_chunk_reg_alloc(arena_t *arena, size_t size, bool fit)
{
- region_t *ret, *next;
+ region_t *ret;
chunk_node_t *chunk;
chunk = chunk_alloc(chunk_size);
@@ -3014,12 +3014,29 @@
region_prev_free_unset(&ret->sep);
region_next_free_unset(&ret->sep);
- /* Create a separator at the end of this new region. */
- next = (region_t *)&((char *)ret)[region_next_size_get(&ret->sep)];
- region_next_size_set(&next->sep, 0);
- region_prev_free_unset(&next->sep);
- region_next_free_unset(&next->sep);
- region_next_contig_unset(&next->sep);
+ /*
+ * Avoiding the following when possible is worthwhile, because it
+ * avoids touching a page that for many applications would never be
+ * touched otherwise.
+ */
+#ifdef USE_BRK
+ if ((uintptr_t)ret >= (uintptr_t)brk_base
+ && (uintptr_t)ret < (uintptr_t)brk_max) {
+ region_t *next;
+
+ /*
+ * This may be a re-used brk chunk, so we have no guarantee
+ * that the memory is zero-filled. Therefore manually create a
+ * separator at the end of this new region (all zero bits).
+ */
+ next = (region_t *)&((char *)ret)[region_next_size_get(
+ &ret->sep)];
+ region_next_size_set(&next->sep, 0);
+ region_prev_free_unset(&next->sep);
+ region_next_free_unset(&next->sep);
+ region_next_contig_unset(&next->sep);
+ }
+#endif
if (fit)
arena_reg_fit(arena, size, ret, (arena->split == NULL));
@@ -4348,12 +4365,12 @@
opt_abort = true;
break;
case 'c':
- opt_ndelay <<= 1;
+ opt_ndelay >>= 1;
if (opt_ndelay == 0)
opt_ndelay = 1;
break;
case 'C':
- opt_ndelay >>= 1;
+ opt_ndelay <<= 1;
if (opt_ndelay == 0)
opt_ndelay = 1;
break;
==== //depot/projects/hammer/lib/libc/sys/rename.2#4 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rename.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.22 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.24 2006/01/22 19:49:37 truckman Exp $
.\"
.Dd June 4, 1993
.Dt RENAME 2
==== //depot/projects/hammer/lib/libc/sys/rmdir.2#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rmdir.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.13 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.15 2006/01/22 19:49:37 truckman Exp $
.\"
-.Dd June 4, 1993
+.Dd January 22, 2006
.Dt RMDIR 2
.Os
.Sh NAME
@@ -85,6 +85,11 @@
The directory containing the directory to be removed is marked sticky,
and neither the containing directory nor the directory to be removed
are owned by the effective user ID.
+.It Bq Er EINVAL
+The last component of the path is
+.Ql .\&
+or
+.Ql .. .
.It Bq Er EBUSY
The directory to be removed is the mount point
for a mounted file system.
==== //depot/projects/hammer/lib/libc/sys/undelete.2#3 (text+ko) ====
@@ -31,9 +31,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)undelete.2 8.4 (Berkeley) 10/18/94
-.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.15 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.17 2006/01/22 19:49:37 truckman Exp $
.\"
-.Dd October 18, 1994
+.Dd January 22, 2006
.Dt UNDELETE 2
.Os
.Sh NAME
@@ -86,6 +86,9 @@
.It Bq Er EPERM
The directory containing the name is marked sticky,
and the containing directory is not owned by the effective user ID.
+.It Bq Er EINVAL
+The last component of the path is
+.Ql .. .
.It Bq Er EIO
An I/O error occurred while updating the directory entry.
.It Bq Er EROFS
==== //depot/projects/hammer/lib/libthr/thread/thr_info.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_info.c,v 1.5 2006/01/09 08:07:22 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_info.c,v 1.6 2006/01/23 06:11:23 davidxu Exp $
*/
#include <stdio.h>
@@ -38,6 +38,8 @@
#include "thr_private.h"
+__weak_reference(_pthread_set_name_np, pthread_set_name_np);
+
/* Set the thread name for debug. */
void
_pthread_set_name_np(pthread_t thread, char *name)
==== //depot/projects/hammer/libexec/ftpd/ftpd.8#12 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.69 2005/01/18 09:29:39 ru Exp $
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.70 2006/01/21 12:21:41 yar Exp $
.\"
.Dd January 27, 2000
.Dt FTPD 8
@@ -144,7 +144,9 @@
When
.Fl D
is specified, write the daemon's process ID to
-.Ar file .
+.Ar file
+instead of the default pid file,
+.Pa /var/run/ftpd.pid .
.It Fl R
With this option set,
.Nm
@@ -519,7 +521,7 @@
.Pa ~/bin
directory exist.
.Sh FILES
-.Bl -tag -width ".Pa /var/log/xferlog" -compact
+.Bl -tag -width ".Pa /var/run/ftpd.pid" -compact
.It Pa /etc/ftpusers
List of unwelcome/restricted users.
.It Pa /etc/ftpchroot
@@ -530,6 +532,8 @@
Welcome notice.
.It Pa /etc/ftpmotd
Welcome notice after login.
+.It Pa /var/run/ftpd.pid
+Default pid file for daemon mode.
.It Pa /var/run/nologin
Displayed and access refused.
.It Pa /var/log/ftpd
==== //depot/projects/hammer/libexec/ftpd/ftpd.c#28 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list