From owner-p4-projects@FreeBSD.ORG Mon Jun 7 23:59:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B12616A4D1; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64B1916A4CE for ; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C01143D39 for ; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57NxGLG065834 for ; Mon, 7 Jun 2004 23:59:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57NxEZo065831 for perforce@freebsd.org; Mon, 7 Jun 2004 23:59:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Jun 2004 23:59:14 GMT Message-Id: <200406072359.i57NxEZo065831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 23:59:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=54369 Change 54369 by peter@peter_hammer on 2004/06/07 23:58:36 IFC @54367 Affected files ... .. //depot/projects/hammer/UPDATING#39 integrate .. //depot/projects/hammer/bin/cp/utils.c#7 integrate .. //depot/projects/hammer/bin/df/df.c#17 integrate .. //depot/projects/hammer/bin/test/test.1#3 integrate .. //depot/projects/hammer/etc/bluetooth/hcsecd.conf#2 integrate .. //depot/projects/hammer/etc/csh.login#2 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#14 integrate .. //depot/projects/hammer/etc/devd.conf#10 integrate .. //depot/projects/hammer/etc/devfs.conf#2 integrate .. //depot/projects/hammer/etc/disktab#2 integrate .. //depot/projects/hammer/etc/gettytab#3 integrate .. //depot/projects/hammer/etc/hosts.allow#2 integrate .. //depot/projects/hammer/etc/inetd.conf#7 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.D#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.F#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.L#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rc.sample#2 integrate .. //depot/projects/hammer/etc/isdn/unknown_incoming#2 integrate .. //depot/projects/hammer/etc/login.access#2 integrate .. //depot/projects/hammer/etc/login.conf#2 integrate .. //depot/projects/hammer/etc/mail/Makefile#4 integrate .. //depot/projects/hammer/etc/namedb/named.conf#3 integrate .. //depot/projects/hammer/etc/namedb/named.root#4 integrate .. //depot/projects/hammer/etc/network.subr#5 integrate .. //depot/projects/hammer/etc/pam.d/README#3 integrate .. //depot/projects/hammer/etc/pam.d/convert.pl#2 integrate .. //depot/projects/hammer/etc/pccard_ether#10 integrate .. //depot/projects/hammer/etc/pf.os#2 integrate .. //depot/projects/hammer/etc/printcap#3 integrate .. //depot/projects/hammer/etc/profile#2 integrate .. //depot/projects/hammer/etc/rc#13 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#12 integrate .. //depot/projects/hammer/etc/rc.d/preseedrandom#2 integrate .. //depot/projects/hammer/etc/rc.shutdown#4 integrate .. //depot/projects/hammer/etc/rc.subr#15 integrate .. //depot/projects/hammer/etc/remote#5 integrate .. //depot/projects/hammer/etc/rpc#2 integrate .. //depot/projects/hammer/etc/termcap.small#2 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#5 integrate .. //depot/projects/hammer/include/wchar.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#6 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#3 integrate .. //depot/projects/hammer/lib/libdisk/write_alpha_disk.c#6 integrate .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#4 integrate .. //depot/projects/hammer/lib/libdisk/write_i386_disk.c#7 integrate .. //depot/projects/hammer/lib/libdisk/write_pc98_disk.c#7 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#5 integrate .. //depot/projects/hammer/lib/msun/Makefile#9 integrate .. //depot/projects/hammer/lib/msun/alpha/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/alpha/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/amd64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/amd64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/arm/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/arm/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/i387/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/i387/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/ia64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/ia64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/man/feclearexcept.3#1 branch .. //depot/projects/hammer/lib/msun/man/fegetenv.3#1 branch .. //depot/projects/hammer/lib/msun/man/fegetround.3#1 branch .. //depot/projects/hammer/lib/msun/man/fenv.3#1 branch .. //depot/projects/hammer/lib/msun/man/round.3#1 branch .. //depot/projects/hammer/lib/msun/powerpc/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/powerpc/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/sparc64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/sparc64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#13 integrate .. //depot/projects/hammer/lib/msun/src/s_round.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_roundf.c#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/hammer/share/man/man3/Makefile#6 integrate .. //depot/projects/hammer/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#23 integrate .. //depot/projects/hammer/share/man/man4/screen.4#2 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#6 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#6 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#6 integrate .. //depot/projects/hammer/share/man/man9/Makefile#35 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#12 integrate .. //depot/projects/hammer/share/termcap/termcap.src#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#8 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#8 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#8 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#75 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#18 integrate .. //depot/projects/hammer/sys/arm/arm/exception.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#2 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#17 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#14 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#14 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#45 integrate .. //depot/projects/hammer/sys/conf/files#59 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#10 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#22 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#4 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#26 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#8 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#9 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#12 integrate .. //depot/projects/hammer/sys/dev/si/si.c#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#32 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#35 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#34 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#34 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#8 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#10 integrate .. //depot/projects/hammer/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#18 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#9 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_ext.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_sup.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#1 branch .. //depot/projects/hammer/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#41 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#50 integrate .. //depot/projects/hammer/sys/kern/subr_blist.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#19 integrate .. //depot/projects/hammer/sys/kern/tty.c#14 integrate .. //depot/projects/hammer/sys/kern/tty_conf.c#4 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#26 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/net/if_sl.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#16 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#14 integrate .. //depot/projects/hammer/sys/pc98/pc98/mse.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/olpt.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/scgdcrndr.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#21 integrate .. //depot/projects/hammer/sys/sparc64/include/asmacros.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#18 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_fhc.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/hammer/sys/sys/blist.h#4 integrate .. //depot/projects/hammer/sys/sys/bus.h#11 integrate .. //depot/projects/hammer/sys/sys/conf.h#12 integrate .. //depot/projects/hammer/sys/sys/linedisc.h#1 branch .. //depot/projects/hammer/sys/sys/param.h#32 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#15 integrate .. //depot/projects/hammer/sys/sys/systm.h#17 integrate .. //depot/projects/hammer/sys/sys/tty.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#24 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#19 integrate .. //depot/projects/hammer/usr.bin/calendar/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/printf/printf.1#2 integrate .. //depot/projects/hammer/usr.bin/printf/printf.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/main.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#6 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#8 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#6 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/IPXrouted.8#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#8 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.8#2 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#3 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.8#9 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#5 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#4 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.1#4 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.5#4 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#9 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.8#3 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.8#5 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#8 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#4 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#12 integrate .. //depot/projects/hammer/usr.sbin/lpr/lpr/printcap.5#5 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.8#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#7 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.c#7 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.8#5 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#13 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/ptimes.c#3 integrate .. //depot/projects/hammer/usr.sbin/nghook/nghook.8#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#7 integrate .. //depot/projects/hammer/usr.sbin/setkey/setkey.8#7 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#10 integrate Differences ... ==== //depot/projects/hammer/UPDATING#39 (text+ko) ==== @@ -17,6 +17,15 @@ developers choose to disable these features on build machines to maximize performance. +20040607: + Splitting kern_thread.c into 2 files (adding kern_kse.c) + requires that you re-run config after updating your tree. + +20040601: + The MIDI drivers have been removed. Until the new module-friendly + ones are merged, remove or comment out midi and seq from your + kernel configuration. + 20040423: Due to a new option in ipfw (versrcreach) the ipfw(8) command needs to be recompiled. Normal accept/reject rules without @@ -1602,4 +1611,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.307 2004/04/23 14:33:30 andre Exp $ +$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $ ==== //depot/projects/hammer/bin/cp/utils.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.44 2004/06/05 02:32:21 tjr Exp $"); #include #include @@ -88,6 +88,7 @@ if (nflag) { if (vflag) printf("%s not overwritten\n", to.p_path); + (void)close(from_fd); return (0); } else if (iflag) { (void)fprintf(stderr, "overwrite %s? %s", ==== //depot/projects/hammer/bin/df/df.c#17 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.61 2004/05/24 22:21:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.62 2004/06/04 09:30:51 das Exp $"); #include #include @@ -81,6 +81,7 @@ static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); static void prthumanval(int64_t); +static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); static void update_maxwidths(struct maxwidths *, const struct statfs *); @@ -345,10 +346,15 @@ * Convert statfs returned file system size into BLOCKSIZE units. * Attempts to avoid overflow for large file systems. */ -#define fsbtoblk(num, fsbs, bs) \ - (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / (intmax_t)((bs) / (fsbs)) : \ - (num) * (intmax_t)((fsbs) / (bs))) +static intmax_t +fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) +{ + + if (fsbs != 0 && fsbs < bs) + return (num / (intmax_t)(bs / fsbs)); + else + return (num * (intmax_t)(fsbs / bs)); +} /* * Print out status about a file system. @@ -392,11 +398,10 @@ prthuman(sfsp, used); } else { (void)printf(" %*jd %*jd %*jd", - mwp->total, (intmax_t)fsbtoblk(sfsp->f_blocks, + mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, (intmax_t)fsbtoblk(used, sfsp->f_bsize, - blocksize), - mwp->avail, (intmax_t)fsbtoblk(sfsp->f_bavail, + mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", ==== //depot/projects/hammer/bin/test/test.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.18 2004/04/06 20:06:54 markm Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.20 2004/06/07 12:47:31 yar Exp $ .\" .Dd May 31, 1993 .Dt TEST 1 @@ -210,11 +210,6 @@ comes after .Ar \&s\&2 based on the ASCII value of their characters. -.It Ar \&s\&1 -True if -.Ar \&s\&1 -is not the null -string. .It Ar \&n\&1 Fl \&eq Ar \&n\&2 True if the integers .Ar \&n\&1 @@ -255,6 +250,17 @@ .Ar \&n\&2 . .El .Pp +If +.Ar file +is a symbolic link, +.Nm +will fully dereference it and then evaluate the expression +against the file referenced, except for the +.Fl h +and +.Fl L +primaries. +.Pp These primaries can be combined with the following operators: .Bl -tag -width Ar .It Cm \&! Ar expression @@ -315,7 +321,8 @@ .Sh SEE ALSO .Xr builtin 1 , .Xr expr 1 , -.Xr sh 1 +.Xr sh 1 , +.Xr symlink 7 .Sh STANDARDS The .Nm ==== //depot/projects/hammer/etc/bluetooth/hcsecd.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $ -# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # HCI security daemon configuration file # @@ -24,14 +24,14 @@ # local device received the request. Everything is based on remote # device BD_ADDR. # -# "nokey" means that no link key has been defined and we should +# "nokey" means that no link key has been defined and we should # send Link_Key_Negative_Reply command to the device. # -# "nopin" means that no PIN code has been defined and we should +# "nopin" means that no PIN code has been defined and we should # send PIN_Code_Negative_Reply command to the device # -# Default entry is applied if no better match found +# Default entry is applied if no better match found # It MUST have 00:00:00:00:00:00 as bdaddr device { bdaddr 00:00:00:00:00:00; ==== //depot/projects/hammer/etc/csh.login#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/csh.login,v 1.20 2000/07/27 11:39:33 asmodai Exp $ +# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $ # # System-wide .login file for csh(1). -# Uncomment this to give you the default 4.2 behavior, where disk +# Uncomment this to give you the default 4.2 behavior, where disk # information is shown in K-Blocks # setenv BLOCKSIZE K -# +# # For the setting of languages and character sets please see # login.conf(5) and in particular the charset and lang options. # For full locales list check /usr/share/locale/* ==== //depot/projects/hammer/etc/defaults/pccard.conf#14 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.267 2004/04/09 17:15:18 rsm Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -243,7 +243,7 @@ card "PCMCIA" "CD-ROM" config 0x1 "ata" ? -# Novac DVD/CD Station +# Novac DVD/CD Station card "PCMCIA" "PnPIDE" config auto "ata" ? @@ -301,7 +301,7 @@ # Viking ATA Flash card card "/VIKING ATA/CF FLASH CARD */" "/TOR/AM */" config 0x2 "ata" ? - + ########## awi ########## # Generic AMD Am79c930 based card @@ -595,8 +595,8 @@ remove /etc/pccard_ether $device stop # Linksys Combo PCMCIA Ethernet Card -card "E-CARD" "E-CARD" - config auto "ed" ? +card "E-CARD" "E-CARD" + config auto "ed" ? logstr "Linksys Combo Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -610,7 +610,7 @@ # XXX Compex Net-A adapter, Telecom SuperSocket RE450T, # Apollo PCMCIA Ethernet Adapter, PLANEX ENW-3503-T and # Fiber line 10M Ethernet COMBO have same manufacturer and -# card version string. They should be distinguished by +# card version string. They should be distinguished by # other info. (such as additional information or OEM-ID/product-ID). # Note: There are several revisions of the card on the market. @@ -762,9 +762,9 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Linksys Combo PCMCIA EthernetCard (model EC2T on box) +# Linksys Combo PCMCIA EthernetCard (model EC2T on box) card "Linksys" "Combo PCMCIA EthernetCard (EC2T)" - config auto "ed" ? + config auto "ed" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -841,6 +841,7 @@ # MELCO LPC3-TX card "MELCO" "LPC3-TX" config auto "ed" ? 0x30000 + ether 0x1c8 insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -958,7 +959,7 @@ # GVC 10Mbps Ethernet Card card "PCMCIA" "Ethernet Card" config auto "ed" ? - logstr "Generic PCMCIA Ethernet Card" + logstr "Generic PCMCIA Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1386,9 +1387,9 @@ card "ADVANTECH" "COMpad-32/85" config auto "sio" ? 0x330 -# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. -card "AD PC_CARD" "RC288ACL" - config auto "sio" ? +# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. +card "AD PC_CARD" "RC288ACL" + config auto "sio" ? # AIWA PV-JF288 card "AIWA CO.,LTD." "/PV-JF288 */" @@ -1505,7 +1506,7 @@ config 0x27 "sio" ? # config auto "sio" ? -# Motorola Montana +# Motorola Montana card "Motorola" "MONTANA 33.6 FAX/MODEM" config auto "sio" ? @@ -1588,7 +1589,7 @@ card "PCCardModem" "CardModem 56" config auto "sio" ? -# Eiger PCCARD modem +# Eiger PCCARD modem # Apparently this modem does not work unless the recommended # init string (AT&F&C1&D2) is supplied. card "/PCMCIA */" "/33\.6K Fax/Modem */" @@ -1702,7 +1703,7 @@ card "PC CARD" "56Kbps Fax Modem PC Card" config auto "sio" ? -# Zoom 56K modem +# Zoom 56K modem # Freezes your system entirely if you don't have the reset.. card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax" config auto "sio" ? @@ -1767,7 +1768,7 @@ # RATOC REX-5536AM, REX-9836A, ICM PSC-2401 SCSI # There's a buggy revision of this card which has broken CIS tupples. -# If you can't use this card, change config entry from `auto' to +# If you can't use this card, change config entry from `auto' to # `default' and try the point enabler. (for example, # type "pccardc enabler 0 stg0 -a 0x4140 -i 5" from root command prompt) card "PCMCIA SCSI MBH10404" "01" @@ -1844,7 +1845,7 @@ # Actiontec PRISM wireless card "ACTIONTEC" "PRISM Wireless LAN PC Card" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1880,13 +1881,13 @@ # Belkin wireless card card "Belkin" "11Mbps Wireless Notebook Network Adapter" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop # Benq AWL100 wireless 11 Mbps pcmcia card card "BENQ" "AWL100 PCMCIA ADAPTER" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -2187,7 +2188,7 @@ card "T-Sinus" "130card" config auto "wi" ? insert /etc/pccard_ether $device start - remove /etc/pccard_ether $device stop + remove /etc/pccard_ether $device stop # TDK LAK-CD011WL card "TDK" "LAK-CD011WL for Wireless LAN" @@ -2322,9 +2323,9 @@ remove /etc/pccard_ether $device stop # ------------------------------------------------------------------- -# +# # "Wildcard" entries -# +# # ------------------------------------------------------------------- # GENERIC PCMCIA modem ==== //depot/projects/hammer/etc/devd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.13 2004/06/06 11:46:27 schweikh Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -17,7 +17,7 @@ pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. - set ethernet-nic-regex + set ethernet-nic-regex "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\ ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+"; ==== //depot/projects/hammer/etc/devfs.conf#2 (text+ko) ==== @@ -1,7 +1,6 @@ - # Copyright (c) 2003 The FreeBSD Project # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -10,7 +9,7 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -22,8 +21,8 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# -# $FreeBSD: src/etc/devfs.conf,v 1.1 2003/05/06 01:10:33 dougb Exp $ +# +# $FreeBSD: src/etc/devfs.conf,v 1.2 2004/06/06 11:46:27 schweikh Exp $ # These are examples of how to configure devices using /etc/rc.d/devfs. # The first parameter is always the action to take, the second is always the @@ -44,4 +43,3 @@ # Allow members of group operator to cat things to the speaker #own speaker root:operator #perm speaker 0660 - ==== //depot/projects/hammer/etc/disktab#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/disktab,v 1.24 2003/04/02 20:16:02 ru Exp $ +# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) @@ -122,7 +122,7 @@ :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\ :pb#15748:ob#15748:tb=swap:\ :pc#288750:oc#0:\ - :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: + :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: cp3100|Connor Peripherals 100MB IDE:\ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \ ==== //depot/projects/hammer/etc/gettytab#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.21 2003/09/09 15:37:19 yar Exp $ +# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -205,7 +205,7 @@ autologin|al.9600:\ :al=root:tc=std.9600: -# +# # Entries for 3-wire serial terminals. These don't supply carrier, so # clocal needs to be set, and crtscts needs to be unset. # ==== //depot/projects/hammer/etc/hosts.allow#2 (text+ko) ==== @@ -1,18 +1,18 @@ # # hosts.allow access control file for "tcp wrapped" applications. -# $FreeBSD: src/etc/hosts.allow,v 1.16 2002/02/06 20:39:36 markm Exp $ +# $FreeBSD: src/etc/hosts.allow,v 1.17 2004/06/06 11:46:27 schweikh Exp $ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. # See hosts_options(5) for the format of this file. # hosts_access(5) no longer fully applies. -# _____ _ _ +# _____ _ _ # | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | # | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | # | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| # |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) -# |_| +# |_| # !!! This is an example! You will need to modify it for your specific # !!! requirements! @@ -24,7 +24,7 @@ # Wrapping sshd(8) is not normally a good idea, but if you # need to do it, here's how -#sshd : .evil.cracker.example.com : deny +#sshd : .evil.cracker.example.com : deny # Protect against simple DNS spoofing attacks by checking that the # forward and reverse records for the remote host match. If a mismatch ==== //depot/projects/hammer/etc/inetd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.68 2004/04/03 17:52:29 mlaier Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.69 2004/06/06 11:46:27 schweikh Exp $ # # Internet server configuration database # @@ -67,7 +67,7 @@ #rstatd/1-3 dgram rpc/udp wait root /usr/libexec/rpc.rstatd rpc.rstatd #rusersd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.rusersd rpc.rusersd #walld/1 dgram rpc/udp wait root /usr/libexec/rpc.rwalld rpc.rwalld -#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd +#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd #rquotad/1 dgram rpc/udp wait root /usr/libexec/rpc.rquotad rpc.rquotad #sprayd/1 dgram rpc/udp wait root /usr/libexec/rpc.sprayd rpc.sprayd # ==== //depot/projects/hammer/etc/isdn/isdnd.rates.D#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Deutsche Telekom charging rates config file # ------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun Jan 17 18:38:29 1999] # @@ -25,7 +25,7 @@ # #=================== T-ISDN City ============================================================= # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra0 0 00.00-05.00:240 05.00-21.00:150 21.00-24.00:240 ra0 1 00.00-05.00:240 05.00-09.00:150 09.00-18.00:90 18.00-21.00:150 21.00-24.00:240 @@ -37,7 +37,7 @@ # #=================== T-ISDN Deutschland ====================================================== # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra1 0 00.00-24.00:60 ra1 1 00.00-02.00:60 02.00-05.00:120 05.00-09.00:60 09.00-18.00:30 18.00-24.00:60 ==== //depot/projects/hammer/etc/isdn/isdnd.rates.F#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Tarifs France Telecom # --------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Thu Mar 19 20:05:18 1998] # @@ -47,7 +47,7 @@ # #================== Zone 1 : < 25 km ================================== # -#rate-code Day rate1 rate2 rate3 +#rate-code Day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra1 0 00.00-24.00:222 ra1 1 00.00-08.00:222 08.00-19.00:111 19.00-24.00:222 @@ -61,8 +61,8 @@ # #================== Zone 2 : 25-30 km ================================= # -#rate-code Day rate1 rate2 rate3 -#--------- --- --------------- --------------- -------------- +#rate-code Day rate1 rate2 rate3 +#--------- --- --------------- --------------- -------------- ra2 0 00.00-24.00:148 ra2 1 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 ra2 2 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 @@ -73,7 +73,7 @@ # #=================== Zone 3 : 30-52 km ================================ # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra3 0 00.00-24.00:94 ra3 1 00.00-08.00:94 08.00-19.00:47 19.00-24.00:94 @@ -86,7 +86,7 @@ # #=================== Zone 4 : > 52 km ================================= # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra4 0 00.00-24.00:78 ra4 1 00.00-08.00:78 08.00-19.00:39 19.00-24.00:78 @@ -100,7 +100,7 @@ #=================== INTERNATIONAL : Allemagne ======================== # (pour appeler Hellmuth) # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra5 0 00.00-24.00:27 ra5 1 00.00-08.00:27 08.00-19.00:21 19.00-24.00:27 @@ -113,7 +113,7 @@ # #=================== INTERNATIONAL : Pays-Bas ========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra6 0 00.00-24.00:25 ra6 1 00.00-08.00:25 08.00-19.00:20 19.00-24.00:25 @@ -126,7 +126,7 @@ # #=================== INTERNATIONAL : Portugal =========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra7 0 00.00-24.00:22 ra7 1 00.00-08.00:22 08.00-19.00:18 19.00-24.00:22 @@ -139,7 +139,7 @@ # #=================== INTERNATIONAL : USA/Canada ======================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra8 0 00.00-24.00:25 ra8 1 00.00-13.00:25 13.00-19.00:20 19.00-24.00:25 ==== //depot/projects/hammer/etc/isdn/isdnd.rates.L#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # $Id: isdnd.rates.L,v 1.2 1999/12/13 21:25:24 hm Exp $ # -# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.1 1999/12/14 21:14:28 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Mon Dec 13 21:42:33 1999] # @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------------ # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- ---------------- ra0 0 00.00-24.00:960 ra0 1 00.00-06.00:960 06.00-08.00:480 08.00-19.00:240 19.00-23.00:480 23.00-24.00:960 ==== //depot/projects/hammer/etc/isdn/isdnd.rc.sample#2 (text+ko) ==== @@ -3,7 +3,7 @@ # example of a configuration file for the isdn daemon # --------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.3 2001/05/27 08:05:57 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun May 27 09:33:59 2001] # @@ -35,14 +35,14 @@ monitor-allowed = no # global switch: monitor on/off monitor-port = 451 # default monitor TCP port -# Monitor rights are granted due to the most specific host/net spec, i.e. in +# Monitor rights are granted due to the most specific host/net spec, i.e. in # the example below host 192.168.1.2 will have the rights specified on that # line, even so it belongs to net 192.168.1.0/24 as well. # # A monitor specification may either be: # # - the name of a local (UNIX-domain) socket; this MUST start with a "/" -monitor = "/var/run/isdn-monitor" +monitor = "/var/run/isdn-monitor" monitor-access = fullcmd monitor-access = channelstate, logevents monitor-access = callin, callout @@ -92,7 +92,7 @@ #============================================================================== # entry section: IP over ISDN example - i call back the remote end #============================================================================== -entry +entry name = I4BIP # name for reference. This name will # be used in the logfile to identfy @@ -119,9 +119,9 @@ local-phone-dialout = 321 # this is my number remote-phone-dialout = 00123456789 # i call this remote number - # in case i have several remote - # telephone numbers specified, this - # is used to specify which one is + # in case i have several remote + # telephone numbers specified, this + # is used to specify which one is # used next on dial fail or retry: remdial-handling = first # first, last or next @@ -139,7 +139,7 @@ # specified for telephone answering b1protocol = hdlc # hdlc, raw - # shorthold mode and idle time + # shorthold mode and idle time # configuration: ratetype = 0 # ratesfile entry to use unitlength = 90 # unitlength to assume @@ -170,18 +170,18 @@ #============================================================================== # entry section: IP over ISDN example - i am called back by the remote end #============================================================================== -entry - +entry + name = I4BIP1 # name for reference - + usrdevicename = ipr # ipr, tel, rbch usrdeviceunit = 1 # unit number - + isdncontroller = 0 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any # numbers used to DIAL OUT -remote-phone-dialout = 00401234567 # remote number to dial +remote-phone-dialout = 00401234567 # remote number to dial local-phone-dialout = 38 # our number to tell remote # numbers used to verify at DIAL IN @@ -194,7 +194,7 @@ unitlength = 90 # default unit length earlyhangup = 5 # safety zone unitlengthsrc = aocd # none, rate, cmdl, conf, aocd - + >>> TRUNCATED FOR MAIL (1000 lines) <<<