Date: Mon, 26 Aug 2002 13:03:47 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 16599 for review Message-ID: <200208262003.g7QK3lpE007702@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16599 Change 16599 by peter@peter_daintree on 2002/08/26 13:03:02 IFC @16595 (acpi pci routing) - could be a bit shakey due to merge conflicts Affected files ... .. //depot/projects/ia64/bin/df/df.1#4 integrate .. //depot/projects/ia64/bin/df/df.c#10 integrate .. //depot/projects/ia64/bin/ed/main.c#5 integrate .. //depot/projects/ia64/bin/ls/ls.c#9 integrate .. //depot/projects/ia64/bin/mv/mv.1#7 integrate .. //depot/projects/ia64/bin/sh/expand.c#5 integrate .. //depot/projects/ia64/bin/sh/jobs.c#12 integrate .. //depot/projects/ia64/bin/sh/parser.c#8 integrate .. //depot/projects/ia64/bin/sh/sh.1#15 integrate .. //depot/projects/ia64/etc/periodic/security/100.chksetuid#5 integrate .. //depot/projects/ia64/etc/periodic/security/200.chkmounts#4 integrate .. //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#3 integrate .. //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#4 integrate .. //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#3 integrate .. //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#4 integrate .. //depot/projects/ia64/etc/periodic/security/700.kernelmsg#4 integrate .. //depot/projects/ia64/games/hack/hack.apply.c#2 integrate .. //depot/projects/ia64/games/hack/hack.c#3 integrate .. //depot/projects/ia64/games/hack/hack.do_name.c#2 integrate .. //depot/projects/ia64/games/hack/hack.dog.c#3 integrate .. //depot/projects/ia64/games/hack/hack.eat.c#3 integrate .. //depot/projects/ia64/games/hack/hack.mkobj.c#3 integrate .. //depot/projects/ia64/games/hack/hack.objnam.c#2 integrate .. //depot/projects/ia64/games/hack/hack.trap.c#3 integrate .. //depot/projects/ia64/games/hack/hack.wizard.c#2 integrate .. //depot/projects/ia64/games/phantasia/fight.c#2 integrate .. //depot/projects/ia64/games/phantasia/misc.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/diff.1#3 integrate .. //depot/projects/ia64/lib/libc/net/ns_addr.c#4 integrate .. //depot/projects/ia64/lib/libc/net/ns_ntoa.c#4 integrate .. //depot/projects/ia64/lib/libc/net/rcmd.c#3 integrate .. //depot/projects/ia64/lib/libc/regex/regcomp.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_kern.c#3 integrate .. //depot/projects/ia64/lib/libipx/ipx_addr.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#8 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#4 integrate .. //depot/projects/ia64/lib/libutil/property.c#2 integrate .. //depot/projects/ia64/libexec/bootpd/readfile.c#3 integrate .. //depot/projects/ia64/libexec/telnetd/state.c#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#38 integrate .. //depot/projects/ia64/sbin/clri/clri.c#7 integrate .. //depot/projects/ia64/sbin/dump/dump.8#8 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#8 integrate .. //depot/projects/ia64/sbin/gpt/recover.c#4 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.c#4 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#8 integrate .. //depot/projects/ia64/sbin/restore/interactive.c#3 integrate .. //depot/projects/ia64/sbin/restore/restore.c#7 integrate .. //depot/projects/ia64/sbin/routed/output.c#3 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#8 integrate .. //depot/projects/ia64/share/man/man4/fxp.4#4 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#6 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#3 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#12 integrate .. //depot/projects/ia64/share/man/man9/vfs_unmountall.9#4 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#4 integrate .. //depot/projects/ia64/share/termcap/termcap.src#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#15 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#15 integrate .. //depot/projects/ia64/sys/alpha/include/ansi.h#11 integrate .. //depot/projects/ia64/sys/arm/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#8 integrate .. //depot/projects/ia64/sys/conf/files#38 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcibvar.h#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#10 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#7 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#3 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#1 branch .. //depot/projects/ia64/sys/dev/pdq/pdq.c#3 integrate .. //depot/projects/ia64/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#15 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/scd.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#32 integrate .. //depot/projects/ia64/sys/isa/psm.c#6 integrate .. //depot/projects/ia64/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#16 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#6 integrate .. //depot/projects/ia64/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/ia64/sys/net/rtsock.c#11 integrate .. //depot/projects/ia64/sys/net/slcompress.c#2 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#5 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/ia64/sys/netns/ns_ip.c#2 integrate .. //depot/projects/ia64/sys/netns/spp_usrreq.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/ia64/sys/pci/agp.c#7 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#5 integrate .. //depot/projects/ia64/sys/pci/if_de.c#4 integrate .. //depot/projects/ia64/sys/pci/ncr.c#2 integrate .. //depot/projects/ia64/sys/powerpc/include/ansi.h#11 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/ia64/sys/sys/_types.h#5 integrate .. //depot/projects/ia64/sys/sys/ktr.h#5 integrate .. //depot/projects/ia64/sys/sys/lock.h#5 integrate .. //depot/projects/ia64/sys/sys/proc.h#26 integrate .. //depot/projects/ia64/sys/sys/types.h#15 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#8 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#6 integrate .. //depot/projects/ia64/sys/vm/pmap.h#8 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#19 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#7 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#12 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#15 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#3 integrate .. //depot/projects/ia64/usr.bin/chat/chat.c#4 integrate .. //depot/projects/ia64/usr.bin/doscmd/trap.c#3 integrate .. //depot/projects/ia64/usr.bin/lex/initscan.c#3 integrate .. //depot/projects/ia64/usr.bin/mail/aux.c#5 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/make/main.c#10 integrate .. //depot/projects/ia64/usr.bin/make/make.1#6 integrate .. //depot/projects/ia64/usr.bin/telnet/telnet.c#3 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#3 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#6 integrate .. //depot/projects/ia64/usr.bin/ul/ul.c#4 integrate .. //depot/projects/ia64/usr.bin/yacc/reader.c#9 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.c#3 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#5 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.c#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#11 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/async.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/datalink.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/fsm.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/prompt.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/slcompress.c#4 integrate .. //depot/projects/ia64/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/ia64/usr.sbin/stallion/stlstats/stlstats.c#2 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#7 integrate Differences ... ==== //depot/projects/ia64/bin/df/df.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.27 2002/08/21 17:32:31 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -46,7 +46,7 @@ .Oc .Op Fl ailn .Op Fl t Ar type -.Op Ar file | file system ... +.Op Ar file | filesystem ... .Sh DESCRIPTION The .Nm ==== //depot/projects/ia64/bin/df/df.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.42 2002/08/21 17:32:31 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.43 2002/08/26 04:56:23 trhodes Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -483,7 +483,7 @@ { (void)fprintf(stderr, - "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | file system ...]\n"); + "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n"); exit(EX_USAGE); } ==== //depot/projects/ia64/bin/ed/main.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.24 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.25 2002/08/25 13:01:43 charnier Exp $"); /* * CREDITS @@ -355,7 +355,7 @@ addr = addr_last; break; } - /* FALL THROUGH */ + /* FALLTHROUGH */ default: if (ibufp == hd) return EOF; @@ -489,7 +489,7 @@ case 'e': if (modified && !scripted) return EMOD; - /* fall through */ + /* FALLTHROUGH */ case 'E': if (addr_cnt > 0) { errmsg = "unexpected address"; ==== //depot/projects/ia64/bin/ls/ls.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.64 2002/08/11 13:05:17 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.65 2002/08/25 13:01:45 charnier Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -565,36 +565,36 @@ switch (ninitmax) { case 0: maxinode = 0; - /* fall through */ + /* FALLTHROUGH */ case 1: maxblock = 0; - /* fall through */ + /* FALLTHROUGH */ case 2: maxnlink = 0; - /* fall through */ + /* FALLTHROUGH */ case 3: maxuser = 0; - /* fall through */ + /* FALLTHROUGH */ case 4: maxgroup = 0; - /* fall through */ + /* FALLTHROUGH */ case 5: maxflags = 0; - /* fall through */ + /* FALLTHROUGH */ case 6: maxsize = 0; - /* fall through */ + /* FALLTHROUGH */ case 7: maxlen = 0; - /* fall through */ + /* FALLTHROUGH */ case 8: maxlattr = 0; - /* fall through */ + /* FALLTHROUGH */ #ifdef COLORLS if (!f_color) #endif f_notabs = 0; - /* fall through */ + /* FALLTHROUGH */ default: break; } ==== //depot/projects/ia64/bin/mv/mv.1#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.24 2002/08/21 17:32:35 trhodes Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.25 2002/08/26 06:16:51 keramida Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -102,7 +102,7 @@ .Fl n options.) .It Fl n -Do not overwriting an existing file. +Do not overwrite an existing file. (The .Fl n option overrides any previous ==== //depot/projects/ia64/bin/sh/expand.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.37 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.38 2002/08/25 13:01:47 charnier Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -893,7 +893,7 @@ } break; } - /* fall through */ + /* FALLTHROUGH */ case '*': if (ifsset() != 0) sep = ifsval()[0]; ==== //depot/projects/ia64/bin/sh/jobs.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.56 2002/08/18 06:43:44 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.57 2002/08/24 07:19:01 tjr Exp $"); #include <fcntl.h> #include <signal.h> @@ -978,7 +978,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 1); + showjob(thisjob, pid, 0, 0); } } else { TRACE(("Not printing status, rootshell=%d, job=0x%x\n", rootshell, job)); ==== //depot/projects/ia64/bin/sh/parser.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.43 2002/08/11 03:04:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.44 2002/08/25 13:01:47 charnier Exp $"); #include <stdlib.h> @@ -193,7 +193,7 @@ case TBACKGND: case TSEMI: tok = readtoken(); - /* fall through */ + /* FALLTHROUGH */ case TNL: if (tok == TNL) { parseheredoc(); ==== //depot/projects/ia64/bin/sh/sh.1#15 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.78 2002/08/21 17:32:44 trhodes Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.79 2002/08/24 12:41:23 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1285,7 +1285,7 @@ Continue the specified jobs (or the current job if no jobs are given) in the background. -.It Ic built-in Ar cmd Op Ar arg ... +.It Ic builtin Ar cmd Op Ar arg ... Execute the specified built-in command, .Ar cmd . This is useful when the user wishes to override a shell function ==== //depot/projects/ia64/etc/periodic/security/100.chksetuid#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.4 2002/08/03 22:33:34 gshapiro Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.5 2002/08/25 04:09:17 cjc Exp $ # # If there is a global system configuration file, suck it in. @@ -35,12 +35,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_chksetuid_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls ==== //depot/projects/ia64/etc/periodic/security/200.chkmounts#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show changes in the way filesystems are mounted @@ -38,13 +38,13 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" ignore="${daily_status_security_chkmounts_ignore}" rc=0 case "$daily_status_security_chkmounts_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` case "$daily_status_security_noamd" in [Yy][Ee][Ss]) ignore="${ignore}|^amd:" ==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ # # Show denied packets @@ -39,12 +39,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then if [ ! -f ${LOG}/ipfw.today ]; then rc=1 ==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show ipfw rules which have reached the log limit @@ -38,11 +38,11 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then ipfw -a l | grep " log " | perl -n -e \ ==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ # # Show IPv6 denied packets @@ -38,12 +38,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then if [ ! -f ${LOG}/ip6fw.today ]; then rc=1 ==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show ip6fw rules which have reached the log limit @@ -38,11 +38,11 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ip6fwlimit_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then ip6fw -a l | grep " log " | perl -n -e \ ==== //depot/projects/ia64/etc/periodic/security/700.kernelmsg#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.4 2002/06/28 10:32:18 brian Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.5 2002/08/25 04:09:17 cjc Exp $ # # Show kernel log messages @@ -38,12 +38,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if dmesg 2>/dev/null > ${TMP}; then if [ ! -f ${LOG}/dmesg.today ]; then rc=1 ==== //depot/projects/ia64/games/hack/hack.apply.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.apply.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.apply.c,v 1.5 2000/11/26 09:51:46 kris Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.apply.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include "def.edog.h" @@ -37,7 +39,7 @@ use_magic_whistle(obj); break; } - /* fall into next case */ + /* FALLTHROUGH */ case WHISTLE: use_whistle(obj); break; ==== //depot/projects/ia64/games/hack/hack.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.c,v 1.5 2002/05/23 00:38:07 des Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include <stdio.h> @@ -496,7 +498,7 @@ case '+': if(x != u.ux && y != u.uy) break; if(flags.run != 1) goto stop; - /* fall into next case */ + /* FALLTHROUGH */ case CORR_SYM: corr: if(flags.run == 1 || flags.run == 3) { ==== //depot/projects/ia64/games/hack/hack.do_name.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.do_name.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.do_name.c,v 1.5 1999/11/16 10:26:36 marcel Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.do_name.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include <stdio.h> @@ -209,7 +211,7 @@ (void) strcpy(buf, shkname(mtmp)); break; } - /* fall into next case */ + /* FALLTHROUGH */ default: (void) sprintf(buf, "the %s%s", mtmp->minvis ? "invisible " : "", ==== //depot/projects/ia64/games/hack/hack.dog.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.dog.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.dog.c,v 1.4 2002/05/23 00:38:07 des Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.dog.c,v 1.5 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include "hack.mfndpos.h" @@ -96,7 +98,7 @@ ); default: if(!obj->cursed) return(APPORT); - /* fall into next case */ + /* FALLTHROUGH */ case BALL_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -180,7 +182,7 @@ /* first we look for food */ gtyp = UNDEF; /* no goal as yet */ -#ifdef LINT +#ifdef lint gx = gy = 0; /* suppress 'used before set' message */ #endif /* LINT */ for(obj = fobj; obj; obj = obj->nobj) { ==== //depot/projects/ia64/games/hack/hack.eat.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.eat.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.eat.c,v 1.5 2002/05/23 00:38:07 des Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.eat.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" char POISONOUS[] = "ADKSVabhks"; @@ -394,11 +396,11 @@ case 'n': u.uhp = u.uhpmax; flags.botl = 1; - /* fall into next case */ + /* FALLTHROUGH */ case '@': pline("You cannibal! You will be sorry for this!"); /* not tp++; */ - /* fall into next case */ + /* FALLTHROUGH */ case 'd': Aggravate_monster |= INTRINSIC; break; @@ -411,12 +413,12 @@ Invis |= INTRINSIC; See_invisible |= INTRINSIC; } - /* fall into next case */ + /* FALLTHROUGH */ case 'y': #ifdef QUEST u.uhorizon++; #endif /* QUEST */ - /* fall into next case */ + /* FALLTHROUGH */ case 'B': Confusion = 50; break; ==== //depot/projects/ia64/games/hack/hack.mkobj.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.mkobj.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.mkobj.c,v 1.6 2002/05/23 00:38:07 des Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.mkobj.c,v 1.7 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" @@ -76,7 +78,7 @@ if(otmp->otyp == TIN) otmp->spe = rnd(...); #endif /* NOT_YET_IMPLEMENTED */ - /* fall into next case */ + /* FALLTHROUGH */ case GEM_SYM: otmp->quan = rn2(6) ? 1 : 2; case TOOL_SYM: ==== //depot/projects/ia64/games/hack/hack.objnam.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.objnam.c - version 1.0.2 */ -/* $FreeBSD: src/games/hack/hack.objnam.c,v 1.3 1999/11/16 02:57:08 billf Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.objnam.c,v 1.4 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #define Sprintf (void) sprintf @@ -112,7 +114,7 @@ break; } /* fungis ? */ - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->otyp == WORM_TOOTH && pl) { pl = 0; @@ -124,7 +126,7 @@ Strcpy(buf, "crysknives"); break; } - /* fall into next case */ + /* FALLTHROUGH */ case ARMOR_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -258,7 +260,7 @@ case ARMOR_SYM: if(obj->owornmask & W_ARMOR) Strcat(bp, " (being worn)"); - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->known) { Strcat(prefix, sitoa(obj->spe)); ==== //depot/projects/ia64/games/hack/hack.trap.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.trap.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.trap.c,v 1.6 2002/05/23 00:38:07 des Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.trap.c,v 1.7 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" @@ -256,7 +258,7 @@ break; case TRAPDOOR: if(!xdnstair || u.ustuck) break; - /* fall into next case */ + /* FALLTHROUGH */ default: dotrap(trap); } ==== //depot/projects/ia64/games/hack/hack.wizard.c#2 (text+ko) ==== @@ -1,9 +1,11 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.wizard.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.wizard.c,v 1.3 1999/11/16 02:57:14 billf Exp $ */ /* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/hack/hack.wizard.c,v 1.4 2002/08/25 13:03:59 charnier Exp $"); + #include "hack.h" extern struct permonst pm_wizard; extern struct monst *makemon(); @@ -137,7 +139,7 @@ case 1: pline("\"Destroy the thief, my pets!\""); aggravate(); /* aggravate all the monsters */ - /* fall into next case */ + /* FALLTHROUGH */ case 2: if (flags.no_of_wizards == 1 && rnd(5) == 0) /* if only 1 wizard, clone himself */ ==== //depot/projects/ia64/games/phantasia/fight.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * fight.c Phantasia monster fighting routines * - * $FreeBSD: src/games/phantasia/fight.c,v 1.7 1999/11/16 02:57:33 billf Exp $ + * $FreeBSD: src/games/phantasia/fight.c,v 1.8 2002/08/25 13:04:03 charnier Exp $ */ #include <string.h> @@ -1549,7 +1549,7 @@ } } /* end treasure types 10 - 13 */ - /* fall through to treasure type 9 if no treasure from above */ + /* FALLTHROUGH to treasure type 9 if no treasure from above */ case 9: /* treasure type 9 */ switch (whichtreasure) @@ -1563,7 +1563,7 @@ ++Player.p_crowns; break; } - /* fall through otherwise */ + /* FALLTHROUGH */ case 2: addstr("You've been blessed!\n"); ==== //depot/projects/ia64/games/phantasia/misc.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* * misc.c Phantasia miscellaneous support routines * - * $FreeBSD: src/games/phantasia/misc.c,v 1.9 2002/02/18 05:15:16 imp Exp $ + * $FreeBSD: src/games/phantasia/misc.c,v 1.10 2002/08/25 13:04:03 charnier Exp $ */ #include <string.h> @@ -1114,7 +1114,7 @@ case A_NEAR: /* pick random coordinates near */ xnew = Player.p_x + ROLL(1.0, 5.0); ynew = Player.p_y - ROLL(1.0, 5.0); - /* fall through for check */ + /* FALLTHROUGH for check */ case A_SPECIFIC: /* just move player */ if (Beyond && fabs(xnew) < D_BEYOND && fabs(ynew) < D_BEYOND) ==== //depot/projects/ia64/gnu/usr.bin/diff/diff.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.7 2002/07/11 21:11:26 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.8 2002/08/26 00:13:06 keramida Exp $ .TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools" .SH NAME diff \- find differences between two files @@ -317,6 +317,9 @@ to output a line taken from just the first file in if-then-else format. .TP +.B \-p +Show which C function each change is in. +.TP .B \-P When comparing directories, if a file appears only in the second directory of the two, treat it as present but empty in the other. ==== //depot/projects/ia64/lib/libc/net/ns_addr.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.10 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.11 2002/08/25 13:06:23 charnier Exp $"); #include <sys/param.h> #include <arpa/inet.h> @@ -167,7 +167,7 @@ case 'h': case 'H': base16 = 1; - /* fall into */ + /* FALLTHROUGH */ default: *--bp = 0; /* Ends Loop */ ==== //depot/projects/ia64/lib/libc/net/ns_ntoa.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.5 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.6 2002/08/25 13:06:23 charnier Exp $"); #include <sys/param.h> #include <arpa/inet.h> @@ -91,7 +91,7 @@ case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': *p += ('A' - 'a'); - /* fall into . . . */ + /* FALLTHROUGH */ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': ok = 1; case '1': case '2': case '3': case '4': case '5': ==== //depot/projects/ia64/lib/libc/net/rcmd.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.36 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.37 2002/08/24 17:37:42 jdp Exp $"); #include "namespace.h" #include <sys/param.h> @@ -621,7 +621,7 @@ /* We need to get the damn hostname back for netgroup matching. */ if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0, NI_NAMEREQD) != 0) - return (-1); + hname[0] = '\0'; while (fgets(buf, sizeof(buf), hostf)) { p = buf; @@ -660,16 +660,16 @@ break; } if (buf[1] == '@') /* match a host by netgroup */ - hostok = innetgr((char *)&buf[2], - (char *)&hname, NULL, ypdomain); + hostok = hname[0] != '\0' && + innetgr(&buf[2], hname, NULL, ypdomain); else /* match a host by addr */ hostok = __icheckhost(raddr, salen, (char *)&buf[1]); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208262003.g7QK3lpE007702>