From owner-p4-projects@FreeBSD.ORG Sat Jan 26 21:46:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2268916A41B; Sat, 26 Jan 2008 21:46:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1B8C16A417 for ; Sat, 26 Jan 2008 21:46:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4B4213C442 for ; Sat, 26 Jan 2008 21:46:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0QLkoFm065511 for ; Sat, 26 Jan 2008 21:46:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0QLkoEq065508 for perforce@freebsd.org; Sat, 26 Jan 2008 21:46:50 GMT (envelope-from jb@freebsd.org) Date: Sat, 26 Jan 2008 21:46:50 GMT Message-Id: <200801262146.m0QLkoEq065508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2008 21:46:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=134151 Change 134151 by jb@jb_freebsd1 on 2008/01/26 21:46:37 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#9 integrate .. //depot/projects/dtrace/ports/UPDATING#49 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#36 integrate .. //depot/projects/dtrace/src/UPDATING#23 integrate .. //depot/projects/dtrace/src/etc/devd.conf#5 integrate .. //depot/projects/dtrace/src/etc/netstart#4 integrate .. //depot/projects/dtrace/src/etc/rc#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfw#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/netif#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/ppp#8 integrate .. //depot/projects/dtrace/src/etc/rc.subr#16 integrate .. //depot/projects/dtrace/src/include/fts.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#12 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/fts.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/fts.c#5 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/preen.c#5 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.8#6 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.c#8 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/dtrace/src/share/man/man4/Makefile#28 integrate .. //depot/projects/dtrace/src/share/man/man4/dcons.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/oldcard.4#4 delete .. //depot/projects/dtrace/src/share/man/man5/fstab.5#5 integrate .. //depot/projects/dtrace/src/sys/ddb/db_capture.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uark.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#12 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#35 integrate .. //depot/projects/dtrace/src/usr.bin/xargs/xargs.1#5 integrate .. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#6 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#12 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#20 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -723,8 +723,8 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev - This option is related to the keyboard. It installs a CDEV entry - in /dev. + This option is required to allow the creation of keyboard device + nodes in /dev. options ADAPTIVE_GIANT # Giant mutex is adaptive. @@ -740,6 +740,15 @@ sleep and wait for its next chance to run. If you are not sure, leave this in. + + Note that on &os; 8.0-CURRENT and later versions, all mutexes are + adaptive by default, unless explicitly set to non-adaptive by + compiling with the NO_ADAPTIVE_MUTEXES option. As + a result, Giant is adaptive by default now, and the + ADAPTIVE_GIANT option has been removed from the + kernel configuration. + + kernel options SMP ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -301,6 +301,15 @@ directory. + Additionally, you can use a simple &man.echo.1; statement + to find where a port exists in the ports tree. For + example: + + &prompt.root; echo /usr/ports/*/*lsof* +/usr/ports/sysutils/lsof + + + Yet another way to find a particular port is by using the Ports Collection's built-in search mechanism. To use the search feature, you will need to be in the ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#7 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -132,8 +132,8 @@ FreeBSD 在允許使用者執行程式前將會先問這兩個問題。 startup scripts - 在 FreeBSD 開機並跑完起動的 script 之後 - 這些起動的 script 是在開機的時候 FreeBSD 會自動執行的程式。 + 在 FreeBSD 開機並跑完啟動的 script 之後 + 這些啟動的 script 是在開機的時候 FreeBSD 會自動執行的程式。 他們主要的功能是將所有該執行的東西設定好， 並將您設定成背景執行的服務啟動。 ，它將會印出提示字元要求您輸入正確的帳號名稱： @@ -254,6 +254,32 @@ 開機程序的人而言，就會相當棘手。 + + + 更改 console 的顯示畫面 + + FreeBSD console 預設顯示大小可以調整為 1024x768、1280x1024 + 或其他顯示卡與螢幕有支援的解析度大小。 要切換顯示大小，必須要重新編譯 + kernel 並加入下面這兩項設定： + + options VESA +options SC_PIXEL_MODE + + 一旦 kernel 有加入這兩項並重新編譯完畢，就可以用 &man.vidcontrol.1; + 來偵測目前所支援的模式有哪些。 若要查看支援的模式，可以打： + + &prompt.root; vidcontrol -i mode + + 該指令會顯示該機器所支援的顯示模式清單。 然後可以在 + root console 內透過 &man.vidcontrol.1; 指令， + 來更改顯示模式： + + &prompt.root; vidcontrol MODE_279 + + 若對新的顯示模式覺得還不錯，可以在 /etc/rc.conf + 設定之，以讓每次重開機後會自動生效。 以上面這情況為例，就是： + + allscreens_flags="MODE_279" @@ -1859,8 +1885,8 @@ Shell 的另一項特點是使用了環境變數。 環境變數是以變數與鍵值（variable/key）的對應關係儲存於 shell 的環境空間中，任何由 shell 所產生的程序都可以讀取此空間， - 因此這個空間儲存了許多程序的設定組態。在此附上 - 一份常見環境變數與其含意的列表： + 因此這個空間儲存了許多程序的設定組態。 在此附上 + 一份常見環境變數與其涵義的列表： environment variables ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#9 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -247,12 +247,11 @@ - 若知道該 port 的正確名稱，但不知道放在哪個分類目錄， - 可以用 &man.whereis.1; 指令來找出來。 - 只要打 whereis - file 即可，而 - file 的地方請改為想裝的軟體名稱。 - 若找到該軟體，就會告訴你，就像下面這樣： + 若知道該 port 的正確名稱，但不知道放在哪個分類目錄，可以用 + &man.whereis.1; 指令來找出來。 只要打 whereis + file 即可，而 + file 的地方請改為想裝的軟體名稱。 + 若找到該軟體，就會告訴你，就像下面這樣： &prompt.root; whereis lsof lsof: /usr/ports/sysutils/lsof @@ -261,12 +260,19 @@ /usr/ports/sysutils/lsof 目錄。 + 此外，也可以用 &man.echo.1; 輕鬆找出該 port 是位於 porte tree + 的何處。 舉例來說： + + &prompt.root; echo /usr/ports/*/*lsof* +/usr/ports/sysutils/lsof + + + 還有另一招，就是用 Ports Collection 本身內建的搜尋機制。 - 要用的時候，請先切換到 /usr/ports 目錄。 - 然後，打 make search - name=program-name，其中 - program-name 請改為想找的軟體名稱。 - 舉例來說，若要找的是 lsof 的話，那麼就是： + 要用的時候，請先切換到 /usr/ports 目錄。 + 然後，打 make search name=程式名稱 + ，其中 程式名稱 請改為想找的軟體名稱。 + 舉例來說，若要找的是 lsof 的話，那麼就是： &prompt.root; cd /usr/ports &prompt.root; make search name=lsof @@ -999,6 +1005,21 @@ PREFIX 是相當困難，甚至是不可能的事。 + + + 重新設定 Ports 選項 + + 在編譯某些 port 時會出現選單畫面(ncurses-based)， + 可以用來選擇安裝選項。 通常裝好該 port 之後，便不太會需要重加、 + 移除、更改一些當初安裝的選項。 但日後若有需要的話， + 也有許多方式可以調整這些選項。 其中一種方式便是切到該 port 目錄， + 並打 make config + 即可再次回到選項畫面去作調整。 另外還可用 make + showconfig 以顯示該 port 安裝時所用的選項。 + 也可以用 make rmconfig + 來把所有選項回到初始設定。 這些選項跟其他動作都可參閱 &man.ports.7; + 內的詳細說明。 + ==== //depot/projects/dtrace/ports/UPDATING#49 (text+ko) ==== @@ -6,6 +6,16 @@ time you update your ports collection, before attempting any port upgrades. +20080126: + AFFECTS: users of net-p2p/deluge + AUTHOR: mezz@FreeBSD.org + + Update of deluge to 0.5.8.2, if you are using blocklist plugin. You have + to remove blocklist.conf first before you can run it or it will crash in + the start up. + + $ rm -f ~/.config/deluge/blocklist.conf + 20080125: AFFECTS: users of www/mod_security2 AUTHOR: araujo@FreeBSD.org @@ -6015,4 +6025,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.579 2008/01/25 11:31:31 araujo Exp $ +$FreeBSD: ports/UPDATING,v 1.580 2008/01/26 16:44:43 mezz Exp $ ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.126 2008/01/22 20:08:09 attilio Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080126: oldcard.4 removal +OLD_FILES+=usr/share/man/man4/card.4.gz +OLD_FILES+=usr/share/man/man4/oldcard.4.gz # 20080122: Removed from the tree OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz # 20080108: Moved to section 2 ==== //depot/projects/dtrace/src/UPDATING#23 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080126: + The fts(3) structures have been changed to use adequate + integer types for their members and so to be able to cope + with huge file trees. The old fts(3) ABI is preserved + through symbol versioning in libc, so third-party binaries + using fts(3) should still work, although they will not take + advantage of the extended types. At the same time, some + third-party software might fail to build after this change + due to unportable assumptions made in its source code about + fts(3) structure members. Such software should be fixed + by its vendor or, in the worst case, in the ports tree. + FreeBSD_version 800015 marks this change for the unlikely + case that a portable fix is impossible. + 20080123: To upgrade to -current after this date, you must be running FreeBSD not older than 6.0-RELEASE. Upgrading to -current @@ -955,4 +969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.516 2008/01/23 22:21:36 ru Exp $ +$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $ ==== //depot/projects/dtrace/src/etc/devd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -53,7 +53,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "ethernet"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # @@ -73,7 +73,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "802.11"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # An entry like this might be in a different file, but is included here @@ -91,11 +91,11 @@ # When a USB Bluetooth dongle appears activate it attach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth start $device-name"; + action "/etc/rc.d/bluetooth quietstart $device-name"; }; detach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth stop $device-name"; + action "/etc/rc.d/bluetooth quietstop $device-name"; }; # When a USB keyboard arrives, attach it as the console keyboard. @@ -112,7 +112,7 @@ # stops automatically (actually it bombs :) when the device disappears. attach 100 { device-name "ums[0-9]+"; - action "/etc/rc.d/moused start $device-name"; + action "/etc/rc.d/moused quietstart $device-name"; }; # Firmware download into the ActiveWire board. After the firmware download is ==== //depot/projects/dtrace/src/etc/netstart#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/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $ +# $FreeBSD: src/etc/netstart,v 1.68 2008/01/26 13:37:48 mtm Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -37,29 +37,31 @@ . /etc/rc.subr load_rc_config 'XXX' -/etc/rc.d/devd start -/etc/rc.d/hostname start -/etc/rc.d/ipmon start -/etc/rc.d/ipfilter start -/etc/rc.d/ipnat start -/etc/rc.d/ipfs start -/etc/rc.d/sppp start -# /etc/rc.d/atm1 start -# . /etc/rc.d/atm2.sh start -# . /etc/rc.d/atm3.sh start -/etc/rc.d/netif start -/etc/rc.d/ipsec start -/etc/rc.d/dhclient start -/etc/rc.d/isdnd start -/etc/rc.d/ppp start -/etc/rc.d/ipfw start -/etc/rc.d/ip6fw start -/etc/rc.d/network_ipv6 start -/etc/rc.d/routing start -/etc/rc.d/mroute6d start -/etc/rc.d/route6d start -/etc/rc.d/mrouted start -/etc/rc.d/routed start -/etc/rc.d/nisdomain start +_start=quietstart + +/etc/rc.d/devd ${_start} +/etc/rc.d/hostname ${_start} +/etc/rc.d/ipmon ${_start} +/etc/rc.d/ipfilter ${_start} +/etc/rc.d/ipnat ${_start} +/etc/rc.d/ipfs ${_start} +/etc/rc.d/sppp ${_start} +# /etc/rc.d/atm1 ${_start} +# . /etc/rc.d/atm2.sh ${_start} +# . /etc/rc.d/atm3.sh ${_start} +/etc/rc.d/netif ${_start} +/etc/rc.d/ipsec ${_start} +/etc/rc.d/dhclient ${_start} +/etc/rc.d/isdnd ${_start} +/etc/rc.d/ppp ${_start} +/etc/rc.d/ipfw ${_start} +/etc/rc.d/ip6fw ${_start} +/etc/rc.d/network_ipv6 ${_start} +/etc/rc.d/routing ${_start} +/etc/rc.d/mroute6d ${_start} +/etc/rc.d/route6d ${_start} +/etc/rc.d/mrouted ${_start} +/etc/rc.d/routed ${_start} +/etc/rc.d/nisdomain ${_start} exit 0 ==== //depot/projects/dtrace/src/etc/rc#5 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ +# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ # # System startup script run by init on autoboot @@ -56,7 +56,7 @@ rc_fast=yes # run_rc_command(): do fast booting else autoboot=no - _boot="start" + _boot="quietstart" fi dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` ==== //depot/projects/dtrace/src/etc/rc.d/ipfw#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ipfw @@ -24,7 +24,7 @@ if [ -r "${firewall_script}" ]; then if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd start + /etc/rc.d/natd quietstart fi /bin/sh "${firewall_script}" echo 'Firewall rules loaded.' @@ -52,7 +52,7 @@ # ${SYSCTL_W} net.inet.ip.fw.enable=0 if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd stop + /etc/rc.d/natd quietstop fi } ==== //depot/projects/dtrace/src/etc/rc.d/mountcritremote#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -65,7 +65,7 @@ done # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar reload + /etc/rc.d/cleanvar quietreload rm -f /var/run/clean_var /var/spool/lock/clean_var } ==== //depot/projects/dtrace/src/etc/rc.d/netif#6 (text+ko) ==== @@ -22,7 +22,7 @@ # (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/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $ # # PROVIDE: netif @@ -72,7 +72,7 @@ if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter - /etc/rc.d/ipfilter resync + /etc/rc.d/ipfilter quietresync fi if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then /etc/rc.d/bridge start $cmdifn ==== //depot/projects/dtrace/src/etc/rc.d/ppp#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.15 2007/10/18 17:10:40 emax Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ppp @@ -82,8 +82,8 @@ { # Re-Sync ipfilter and pf so they pick up any new network interfaces # - /etc/rc.d/ipfilter resync - /etc/rc.d/pf resync + /etc/rc.d/ipfilter quietresync + /etc/rc.d/pf quietresync } ppp_stop_profile() { ==== //depot/projects/dtrace/src/etc/rc.subr#16 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.79 2008/01/25 16:44:34 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.80 2008/01/26 11:22:11 mtm Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -377,9 +377,10 @@ # If argument has a given prefix, then change the operation as follows: # Prefix Operation # ------ --------- -# fast Skip the pid check, and set rc_fast=yes +# fast Skip the pid check, and set rc_fast=yes, rc_quiet=yes # force Set ${rcvar} to YES, and set rc_force=yes # one Set ${rcvar} to YES +# quiet Don't output some diagnostics, and set rc_quiet=yes # # The following globals are used: # @@ -522,6 +523,8 @@ # # rc_force Not empty if "force" was provided (q.v.) # +# rc_quiet Not empty if "quiet" was provided +# # run_rc_command() { @@ -542,6 +545,7 @@ fast*) # "fast" prefix; don't check pid rc_arg=${rc_arg#fast} rc_fast=yes + rc_quiet=yes ;; force*) # "force prefix; always run rc_force=yes @@ -558,6 +562,11 @@ eval ${rcvar}=YES fi ;; + quiet*) # "quiet" prefix; omit some messages + _rc_prefix=quiet + rc_arg=${rc_arg#${_rc_prefix}} + rc_quiet=yes + ;; esac eval _override_command=\$${name}_program @@ -606,6 +615,12 @@ # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then if ! checkyesno ${rcvar}; then + if [ -n "${rc_quiet}" ]; then + return 0 + fi + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." return 0 fi fi ==== //depot/projects/dtrace/src/include/fts.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: src/include/fts.h,v 1.11 2005/01/07 00:06:20 pjd Exp $ + * $FreeBSD: src/include/fts.h,v 1.12 2008/01/26 17:09:40 yar Exp $ */ #ifndef _FTS_H_ @@ -44,8 +44,8 @@ dev_t fts_dev; /* starting device # */ char *fts_path; /* path for this descent */ int fts_rfd; /* fd for root */ - int fts_pathlen; /* sizeof(path) */ - int fts_nitems; /* elements in the sort array */ + size_t fts_pathlen; /* sizeof(path) */ + size_t fts_nitems; /* elements in the sort array */ int (*fts_compar) /* compare function */ (const struct _ftsent * const *, const struct _ftsent * const *); @@ -69,22 +69,15 @@ struct _ftsent *fts_cycle; /* cycle node */ struct _ftsent *fts_parent; /* parent directory */ struct _ftsent *fts_link; /* next file in directory */ - union { - struct { - long __fts_number; /* local numeric value */ - void *__fts_pointer; /* local address value */ - } __struct_ftsent; - int64_t __fts_bignum; - } __union_ftsent; -#define fts_number __union_ftsent.__struct_ftsent.__fts_number -#define fts_pointer __union_ftsent.__struct_ftsent.__fts_pointer -#define fts_bignum __union_ftsent.__fts_bignum + long long fts_number; /* local numeric value */ +#define fts_bignum fts_number /* XXX non-std, should go away */ + void *fts_pointer; /* local address value */ char *fts_accpath; /* access path */ char *fts_path; /* root path */ int fts_errno; /* errno for this node */ int fts_symfd; /* fd for symlink */ - u_short fts_pathlen; /* strlen(fts_path) */ - u_short fts_namelen; /* strlen(fts_name) */ + size_t fts_pathlen; /* strlen(fts_path) */ + size_t fts_namelen; /* strlen(fts_name) */ ino_t fts_ino; /* inode */ dev_t fts_dev; /* device */ @@ -92,7 +85,7 @@ #define FTS_ROOTPARENTLEVEL -1 #define FTS_ROOTLEVEL 0 - short fts_level; /* depth (-1 to N) */ + long fts_level; /* depth (-1 to N) */ #define FTS_D 1 /* preorder directory */ #define FTS_DC 2 /* directory that causes cycles */ @@ -108,18 +101,18 @@ #define FTS_SL 12 /* symbolic link */ #define FTS_SLNONE 13 /* symbolic link without target */ #define FTS_W 14 /* whiteout object */ - u_short fts_info; /* user flags for FTSENT structure */ + int fts_info; /* user status for FTSENT structure */ #define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */ #define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */ #define FTS_ISW 0x04 /* this is a whiteout object */ - u_short fts_flags; /* private flags for FTSENT structure */ + unsigned fts_flags; /* private flags for FTSENT structure */ #define FTS_AGAIN 1 /* read node again */ #define FTS_FOLLOW 2 /* follow symbolic link */ #define FTS_NOINSTR 3 /* no instructions */ #define FTS_SKIP 4 /* discard node */ - u_short fts_instr; /* fts_set() instructions */ + int fts_instr; /* fts_set() instructions */ struct stat *fts_statp; /* stat(2) information */ char *fts_name; /* file name */ ==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.131 2008/01/26 17:09:40 yar Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -11,7 +11,7 @@ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \ exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \ - fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \ + fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ ==== //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#5 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.7 2007/11/27 16:22:21 jasone Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.8 2008/01/26 17:09:40 yar Exp $ */ FBSD_1.0 { @@ -134,14 +134,6 @@ setfsent; endfsent; ftok; - fts_open; - fts_close; - fts_read; - fts_set; - fts_children; - fts_get_clientptr; - fts_get_stream; - fts_set_clientptr; ftw; glob; globfree; @@ -336,6 +328,17 @@ wordfree; }; +FBSD_1.1 { + fts_open; + fts_close; + fts_read; + fts_set; + fts_children; + fts_get_clientptr; + fts_get_stream; + fts_set_clientptr; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; ==== //depot/projects/dtrace/src/lib/libc/gen/fts-compat.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fts-compat.c,v 1.29 2007/08/23 05:09:31 yar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fts-compat.c,v 1.30 2008/01/26 17:09:40 yar Exp $"); #include "namespace.h" #include @@ -46,12 +46,22 @@ #include #include #include -#include #include #include #include +#include "fts-compat.h" #include "un-namespace.h" +FTSENT *__fts_children_44bsd(FTS *, int); +int __fts_close_44bsd(FTS *); +void *__fts_get_clientptr_44bsd(FTS *); +FTS *__fts_get_stream_44bsd(FTSENT *); +FTS *__fts_open_44bsd(char * const *, int, + int (*)(const FTSENT * const *, const FTSENT * const *)); +FTSENT *__fts_read_44bsd(FTS *); +int __fts_set_44bsd(FTS *, FTSENT *, int); +void __fts_set_clientptr_44bsd(FTS *, void *); + static FTSENT *fts_alloc(FTS *, char *, int); static FTSENT *fts_build(FTS *, int); static void fts_lfree(FTSENT *); @@ -107,7 +117,7 @@ }; FTS * -fts_open(argv, options, compar) +__fts_open_44bsd(argv, options, compar) char * const *argv; int options; int (*compar)(const FTSENT * const *, const FTSENT * const *); @@ -246,7 +256,7 @@ } int -fts_close(sp) +__fts_close_44bsd(sp) FTS *sp; { FTSENT *freep, *p; @@ -301,7 +311,7 @@ ? p->fts_pathlen - 1 : p->fts_pathlen) FTSENT * -fts_read(sp) +__fts_read_44bsd(sp) FTS *sp; { FTSENT *p, *tmp; @@ -495,7 +505,7 @@ */ /* ARGSUSED */ int -fts_set(sp, p, instr) +__fts_set_44bsd(sp, p, instr) FTS *sp; FTSENT *p; int instr; @@ -510,7 +520,7 @@ } FTSENT * -fts_children(sp, instr) +__fts_children_44bsd(sp, instr) FTS *sp; int instr; { @@ -582,7 +592,7 @@ #endif void * -(fts_get_clientptr)(FTS *sp) +(__fts_get_clientptr_44bsd)(FTS *sp) { return (fts_get_clientptr(sp)); @@ -593,13 +603,13 @@ #endif FTS * -(fts_get_stream)(FTSENT *p) +(__fts_get_stream_44bsd)(FTSENT *p) { return (fts_get_stream(p)); } void -fts_set_clientptr(FTS *sp, void *clientptr) +__fts_set_clientptr_44bsd(FTS *sp, void *clientptr) { sp->fts_clientptr = clientptr; @@ -1220,3 +1230,12 @@ } return (priv->ftsp_linksreliable); } + +__sym_compat(fts_open, __fts_open_44bsd, FBSD_1.0); +__sym_compat(fts_close, __fts_close_44bsd, FBSD_1.0); +__sym_compat(fts_read, __fts_read_44bsd, FBSD_1.0); +__sym_compat(fts_set, __fts_set_44bsd, FBSD_1.0); +__sym_compat(fts_children, __fts_children_44bsd, FBSD_1.0); +__sym_compat(fts_get_clientptr, __fts_get_clientptr_44bsd, FBSD_1.0); +__sym_compat(fts_get_stream, __fts_get_stream_44bsd, FBSD_1.0); +__sym_compat(fts_set_clientptr, __fts_set_clientptr_44bsd, FBSD_1.0); ==== //depot/projects/dtrace/src/lib/libc/gen/fts-compat.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: src/lib/libc/gen/fts-compat.h,v 1.12 2007/08/23 05:09:31 yar Exp $ + * $FreeBSD: src/lib/libc/gen/fts-compat.h,v 1.13 2008/01/26 17:09:40 yar Exp $ */ #ifndef _FTS_H_ @@ -126,20 +126,7 @@ FTS *fts_fts; /* back pointer to main FTS */ } FTSENT; -#include - -__BEGIN_DECLS -FTSENT *fts_children(FTS *, int); -int fts_close(FTS *); -void *fts_get_clientptr(FTS *); #define fts_get_clientptr(fts) ((fts)->fts_clientptr) -FTS *fts_get_stream(FTSENT *); #define fts_get_stream(ftsent) ((ftsent)->fts_fts) -FTS *fts_open(char * const *, int, - int (*)(const FTSENT * const *, const FTSENT * const *)); -FTSENT *fts_read(FTS *); -int fts_set(FTS *, FTSENT *, int); -void fts_set_clientptr(FTS *, void *); -__END_DECLS #endif /* !_FTS_H_ */ ==== //depot/projects/dtrace/src/lib/libc/gen/fts.3#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.23 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $ .\" -.Dd January 7, 2005 +.Dd January 26, 2008 .Dt FTS 3 .Os .Sh NAME @@ -133,17 +133,16 @@ described in greater detail below: .Bd -literal typedef struct _ftsent { - u_short fts_info; /* flags for FTSENT structure */ + int fts_info; /* status for FTSENT structure */ char *fts_accpath; /* access path */ char *fts_path; /* root path */ - u_short fts_pathlen; /* strlen(fts_path) */ + size_t fts_pathlen; /* strlen(fts_path) */ char *fts_name; /* file name */ - u_short fts_namelen; /* strlen(fts_name) */ - short fts_level; /* depth (\-1 to N) */ + size_t fts_namelen; /* strlen(fts_name) */ + long fts_level; /* depth (\-1 to N) */ int fts_errno; /* file errno */ - long fts_number; /* local numeric value */ + long long fts_number; /* local numeric value */ void *fts_pointer; /* local address value */ - int64_t fts_bignum; /* local 64-bit numeric value */ struct ftsent *fts_parent; /* parent directory */ struct ftsent *fts_link; /* next file structure */ struct ftsent *fts_cycle; /* cycle structure */ @@ -292,8 +291,6 @@ .Nm functions. It is initialized to 0. -Note that this field is overlaid by -.Fa fts_bignum . .It Fa fts_pointer This field is provided for the use of the application program and is not modified by the @@ -301,18 +298,6 @@ functions. It is initialized to .Dv NULL . -Note that this field is overlaid by -.Fa fts_bignum . -.It Fa fts_bignum -This field is provided for the use of the application program and is -not modified by the -.Nm -functions. -It is initialized to 0. -Note that this field overlays -.Fa fts_number -and -.Fa fts_pointer . .It Fa fts_parent A pointer to the .Vt FTSENT ==== //depot/projects/dtrace/src/lib/libc/gen/fts.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<