From owner-p4-projects@FreeBSD.ORG Sun Jun 22 15:52:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E298610656AB; Sun, 22 Jun 2008 15:52:03 +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 A21B71065687 for ; Sun, 22 Jun 2008 15:52:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94D7D8FC15 for ; Sun, 22 Jun 2008 15:52:03 +0000 (UTC) (envelope-from gabor@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 m5MFq3iX060947 for ; Sun, 22 Jun 2008 15:52:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5MFq3bC060945 for perforce@freebsd.org; Sun, 22 Jun 2008 15:52:03 GMT (envelope-from gabor@freebsd.org) Date: Sun, 22 Jun 2008 15:52:03 GMT Message-Id: <200806221552.m5MFq3bC060945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143917 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: Sun, 22 Jun 2008 15:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=143917 Change 143917 by gabor@gabor_server on 2008/06/22 15:51:16 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/amdmi3.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#4 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#4 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#4 integrate .. //depot/projects/docproj_hu/www/en/cgi/query-pr-lib.pl#2 integrate .. //depot/projects/docproj_hu/www/en/community.xsl#2 integrate .. //depot/projects/docproj_hu/www/en/community/irc.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/index.xsl#2 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#4 integrate .. //depot/projects/docproj_hu/www/en/security/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/security/errata-rss.xsl#1 branch .. //depot/projects/docproj_hu/www/en/security/errata.rss#1 branch .. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#6 integrate .. //depot/projects/docproj_hu/www/share/sgml/notices.xml#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#2 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.450 2008/06/16 17:25:12 eri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.451 2008/06/19 15:03:43 amdmi3 Exp $ --> aaron@FreeBSD.org"> @@ -52,6 +52,8 @@ ambrisko@FreeBSD.org"> +amdmi3@FreeBSD.org"> + amorita@FreeBSD.org"> amurai@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -734,6 +734,11 @@ &pgpkey.ehaupt; + + &a.amdmi3; + &pgpkey.amdmi3; + + &a.kwm; &pgpkey.kwm; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#4 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -10,6 +10,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#4 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.463 2008/06/16 14:30:19 keramida Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.465 2008/06/21 07:18:59 pgj Exp $ --> @@ -3347,10 +3347,12 @@ + + @@ -3482,6 +3484,7 @@ + @@ -3794,6 +3797,19 @@ + + + + + + + + + + + + + @@ -4278,7 +4294,7 @@ - + @@ -4324,8 +4340,8 @@ - - + + ==== //depot/projects/docproj_hu/www/en/cgi/query-pr-lib.pl#2 (text+ko) ==== @@ -145,6 +145,7 @@ + ==== //depot/projects/docproj_es/www/en/community.xsl#2 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -42,7 +42,7 @@
&header3; -

FreeBSD is well supported by its active +

&os; is well supported by its active community.

There are more than one hundred IRC community. Many developers also maintain blogs about - their FreeBSD work.

+ their &os; work. &os; developers and key contributors + also maintain wiki, which + contains various information about &os; development + and &os; related projects.

Last year there were FreeBSD events in + (number($curdate.year) -1)])" /> &os; events in calendar and RSS feed of - upcoming FreeBSD-related events are maintained on our + upcoming &os;-related events are maintained on our events page.

==== //depot/projects/docproj_es/www/en/community/irc.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -12,7 +12,9 @@ project does not control them or endorse IRC as a support medium. You may be ignored, insulted, or kicked out if you ask questions on any channel in IRC, though you may have slightly better luck - in channels named #freebsdhelp where such exist. If you + in channels named #freebsdhelp where such exist. A list of known + &os; related IRC channels is available in the &os; wiki. If you want to try these or any other channels on IRC, it is nonetheless at your own risk and any complaints about conduct on those channels should not be directed to the FreeBSD project. See also @@ -22,4 +24,4 @@ &footer; -+ ==== //depot/projects/docproj_es/www/en/developers.sgml#3 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.195 2008/06/12 22:13:27 ivoras Exp $ +$FreeBSD: www/en/developers.sgml,v 1.196 2008/06/19 15:14:40 amdmi3 Exp $ --> @@ -29,6 +29,7 @@ + ==== //depot/projects/docproj_es/www/en/donations/donors.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2447,6 +2447,12 @@ Received + + brueffer + soekris vpn1401 + simon + Received + &footer; ==== //depot/projects/docproj_es/www/en/index.xsl#2 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + @@ -310,6 +310,16 @@ +
+
    +
  • + More +
    • +
  • + Errata Notices RSS Feed +
    • +
+
==== //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#4 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.88 2008/05/28 19:39:41 ed Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.89 2008/06/18 06:55:29 ed Exp $ @@ -1263,31 +1263,6 @@ - - COMPAT_43TTY - - -

Technical contact: Ed Schouten

-

Some ports may break when removing COMPAT_43TTY from the kernel - configuration since they assume old ioctl's when they identify - FreeBSD. The goal of this entry is to:

-
    -
  • Identify the ports which behave like this. A tinderbox setup is probably - needed. Using grep to find "#include <sgtty.h>" and this list - from Kris Kennaway might also be good starting points.
    • -
  • Fix breakages and send patches upstream.
    • -
-

Note: Ed is working on this. Please coordinate with him.

-

Requirements:

-
    -
  • Knowledge of autotools.
    • -
  • Time and patience.
    • -
- - - Improvements of OPTIONS ==== //depot/projects/docproj_es/www/en/projects/newbies.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -177,18 +177,6 @@ question or the odd few minutes to browse. More elementary material is near the front of the book, but there are short easy articles throughout.

- -

  • A UNIX - Introductory Course - from Ohio State University is available online in HTML, - postscript and Acrobat PDF formats.

    • - -

  • A UNIX - System Administration Course - from Ohio State University is available online in HTML, - postscript and Acrobat PDF formats.

  • UNIXhelp for Users is another introductory guide which is available in @@ -197,18 +185,13 @@

  • UNIX questions are dealt with in the newsgroup comp.unix.questions and the - associated - Frequently Asked Questions. - You can also get a copy of the + associated FAQ from the RMIT FTP site. Newbies are likely to be most interested in sections 1 and 2 initially.

  • Another interesting newsgroup is comp.unix.user-friendly - which also has a FAQ. + href="news:comp.unix.user-friendly">comp.unix.user-friendly. Although this newsgroup is for discussing user-friendliness, it can contain some good information for newbies. The FAQ ==== //depot/projects/docproj_es/www/en/security/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/security/Makefile,v 1.16 2008/03/01 01:55:27 simon Exp $ +# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -19,6 +19,7 @@ security.html: advisories.html.inc advisories.rdf DEPENDSET.DEFAULT= advisories +DEPENDSET.errata-rss= notices XML.DEFAULT= ${XML_ADVISORIES} XMLDOCS= advisories:mkindex.xsl::advisories.html.inc @@ -27,5 +28,6 @@ XMLDOCS+= advisories-rdf:security-rdf.xsl::advisories.rdf XMLDOCS+= advisories-rss:security-rss.xsl::rss.xml +XMLDOCS+= errata-rss:errata-rss.xsl::errata.xml .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#3 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.48 2008/05/24 13:39:27 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.49 2008/06/15 13:10:18 jkois Exp $ @@ -1003,6 +1003,23 @@ + + Psychsoft Consulting + http://www.psychsoftek.com + + Psychsoft Consulting is an Industry recognized leading technology + consulting firm based in Quincy, Massachusetts founded in 1987 with a + highly educated, trained and experienced staff to help in all your IT + needs. Psychsoft, Inc. personnel hold advanced degrees in various + fields and have years of experience in IT implementation, + troubleshooting, design and configuration. Areas of expertise include: + Linux, Microsoft Windows, UNIX (including FreeBSD), TCP/IP, LAN, WAN, + VPN, Network security, WIFI security, WIFI design, Database design, + SQL, Web site design, Server design, System integration, Network + printing and DSL/Broadband/T1 Internet access. + + + Questwork Consulting Limited http://www.questwork.com/ ==== //depot/projects/docproj_es/www/share/sgml/commercial.isp.xml#3 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.32 2008/06/09 19:58:37 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.33 2008/06/15 12:52:45 jkois Exp $ @@ -665,7 +665,7 @@ Verio - http://www.verio.com + http://www.verio.com/freebsd With our FreeBSD VPS v3 and MPS v2, we combine more that 10 years of virtualization and managed experience with the proven ==== //depot/projects/docproj_es/www/share/sgml/libcommon.xsl#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + FreeBSD Errata Notices + http://www.FreeBSD.org/security/ + + <xsl:value-of select="$title" /> + + Errata notices published from the FreeBSD Project + en-us + secteam@FreeBSD.org (FreeBSD Security Team) + secteam@FreeBSD.org (FreeBSD Security Team) + http://blogs.law.harvard.edu/tech/rss + 120 + + http://www.FreeBSD.org/logo/logo-full.png + <xsl:value-of select="$title" /> + + + + + rss.xml + + + + + + + + + + + + <xsl:value-of select="name"/> + + + http://www.FreeBSD.org/security + + + + + + + + + + + + + + + + + + ==== //depot/projects/docproj_es/www/share/sgml/news.xml#4 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.167 2008/06/13 03:16:31 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.169 2008/06/19 15:25:00 amdmi3 Exp $ @@ -30,6 +30,23 @@ 6 + + 19 + +

    New committer: Dmitry Marakasov + (ports)

    + + + + + 16 + + +

    New committer: Ermal + Luçi (src)

    +     +     + 10 ==== //depot/projects/docproj_es/www/share/sgml/notices.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/notices.xml,v 1.11 2008/04/17 00:18:16 cperciva Exp $ + $FreeBSD: www/share/sgml/notices.xml,v 1.12 2008/06/19 06:55:30 cperciva Exp $ @@ -10,6 +10,18 @@ 2008 + 6 + + + 19 + + + FreeBSD-EN-08:02.tcp + + + + + 4 ==== //depot/projects/docproj_es/www/share/sgml/press.xml#2 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.60 2008/03/07 07:30:57 jkoshy Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.61 2008/06/21 05:49:58 jkoshy Exp $ @@ -17,6 +17,19 @@ 2008 + 6 + + Writing a kernel module for FreeBSD 7 + http://www.freesoftwaremagazine.com/articles/writing_a_kernel_module_for_freebsd + Free Software Magazine + http://www.freesoftwaremagazine.com/ + 19 June 2008 + Yousef Ourabi +

    A short introduction to building kernel modules on FreeBSD 7.

    +     +     + + 3 From owner-p4-projects@FreeBSD.ORG Sun Jun 22 18:10:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C3D8106566C; Sun, 22 Jun 2008 18:10:34 +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 E2374106567C for ; Sun, 22 Jun 2008 18:10:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D66CD8FC23 for ; Sun, 22 Jun 2008 18:10:33 +0000 (UTC) (envelope-from trasz@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 m5MIAVUg087598 for ; Sun, 22 Jun 2008 18:10:31 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5MIATdn087595 for perforce@freebsd.org; Sun, 22 Jun 2008 18:10:29 GMT (envelope-from trasz@freebsd.org) Date: Sun, 22 Jun 2008 18:10:29 GMT Message-Id: <200806221810.m5MIATdn087595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 143927 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: Sun, 22 Jun 2008 18:10:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=143927 Change 143927 by trasz@trasz_traszkan on 2008/06/22 18:10:08 Little diff reduction, there should be no functional changes: make acl_set_fd(3) a wrapper around acl_set_fd_np(3), do the same with acl_get_fd(3) and acl_get_fd_np(3). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#2 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#2 (text+ko) ==== @@ -91,20 +91,7 @@ acl_t acl_get_fd(int fd) { - acl_t aclp; - int error; - - aclp = acl_init(ACL_MAX_ENTRIES); - if (aclp == NULL) - return (NULL); - - error = ___acl_get_fd(fd, ACL_TYPE_ACCESS, &aclp->ats_acl); - if (error) { - acl_free(aclp); - return (NULL); - } - - return (aclp); + return (acl_get_fd_np(fd, ACL_TYPE_ACCESS)); } acl_t ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#2 (text+ko) ==== @@ -96,17 +96,7 @@ int acl_set_fd(int fd, acl_t acl) { - int error; - - error = _posix1e_acl_sort(acl); - if (error) { - errno = error; - return(-1); - } - - acl->ats_cur_entry = 0; - - return (___acl_set_fd(fd, ACL_TYPE_ACCESS, &acl->ats_acl)); + return (acl_set_fd_np(fd, acl, ACL_TYPE_ACCESS)); } int From owner-p4-projects@FreeBSD.ORG Mon Jun 23 01:12:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC26106567C; Mon, 23 Jun 2008 01:12:39 +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 3FEBC10656AB for ; Mon, 23 Jun 2008 01:12:39 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2DC6C8FC20 for ; Mon, 23 Jun 2008 01:12:39 +0000 (UTC) (envelope-from snb@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 m5N1Cd7L053563 for ; Mon, 23 Jun 2008 01:12:39 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5N1CdWM053561 for perforce@freebsd.org; Mon, 23 Jun 2008 01:12:39 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 23 Jun 2008 01:12:39 GMT Message-Id: <200806230112.m5N1CdWM053561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 143941 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: Mon, 23 Jun 2008 01:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=143941 Change 143941 by snb@snb_toro on 2008/06/23 01:12:33 Return number of bytes freed by ufsdirhash_destroy() rather than 0 upon success. Also increment a counter vfs.ufs.dirhash_lowmemcount rather than printing a message when ufsdirhash_lowmem() is called. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#4 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#4 (text+ko) ==== @@ -81,6 +81,9 @@ static int ufs_dirhashcheck = 0; SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_docheck, CTLFLAG_RW, &ufs_dirhashcheck, 0, "enable extra sanity tests"); +static int ufs_dirhashlowmemcount = 0; +SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_lowmemcount, CTLFLAG_RD, + &ufs_dirhashlowmemcount, 0, "number of times low memory hook called"); static int ufsdirhash_hash(struct dirhash *dh, char *name, int namelen); @@ -1082,7 +1085,8 @@ * Assumes that ufsdirhash_list is locked, and leaves it locked. * If unable to obtain a lock on the first dirhash, moves down * the list until it can lock a dirhash and destroys it. Returns - * -1 if unable to find any dirhashes that can be destroyed. + * the amount of memory freed, or -1 if unable to find any + * dirhashes that can be destroyed. */ static int ufsdirhash_destroy() @@ -1130,7 +1134,7 @@ DIRHASHLIST_LOCK(); ufs_dirhashmem -= mem; - return (0); + return (mem); } /* @@ -1168,15 +1172,15 @@ static void ufsdirhash_lowmem() { - /* XXX: temporary silly way of notifying when this is called */ - printf("dirhash: ufsdirhash_lowmem() called\n"); + ufs_dirhashlowmemcount++; DIRHASHLIST_LOCK(); - /* - * Try deleting only one dirhash for now, and don't bother - * to check if it worked. - */ - ufsdirhash_destroy(); + if (ufs_dirhashmem > 0) + /* + * Try deleting only one dirhash for now, and don't bother + * to check if it worked. + */ + ufsdirhash_destroy(); DIRHASHLIST_UNLOCK(); } From owner-p4-projects@FreeBSD.ORG Mon Jun 23 11:32:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72D2F1065675; Mon, 23 Jun 2008 11:32:08 +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 342D81065677 for ; Mon, 23 Jun 2008 11:32:08 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21F1B8FC0A for ; Mon, 23 Jun 2008 11:32:08 +0000 (UTC) (envelope-from gabor@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 m5NBW8IP039723 for ; Mon, 23 Jun 2008 11:32:08 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NBW7pE039721 for perforce@freebsd.org; Mon, 23 Jun 2008 11:32:07 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 11:32:07 GMT Message-Id: <200806231132.m5NBW7pE039721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143957 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: Mon, 23 Jun 2008 11:32:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=143957 Change 143957 by gabor@gabor_server on 2008/06/23 11:31:28 - Tag the Hungarian www tree with %SOURCE% and %SRCID% so that we can check the availability of updates automagically Affected files ... .. //depot/projects/docproj_hu/www/hu/about.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/administration.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/applications.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/art.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/community.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/community/irc.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/community/newsgroups.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/community/webresources.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/copyright/copyright.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/docproj/doc-set.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docproj/docproj.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docproj/hungarian.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docproj/sgml.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docproj/submitting.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docproj/who.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docs.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/features.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/index.xsl#4 edit .. //depot/projects/docproj_hu/www/hu/internet.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/logo.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/mailto.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/news/news.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/alpha.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/i386.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/index.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/machines.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/todo.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/index.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/pc98.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/sun4v.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/platforms/xbox.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/search/index-site.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/search/search-mid.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/search/search.sgml#4 edit .. //depot/projects/docproj_hu/www/hu/search/searchhints.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/search/site.map#4 edit .. //depot/projects/docproj_hu/www/hu/search/web.atoz#4 edit .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/catalog#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/catalog.xml#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/l10n.ent#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#4 edit .. //depot/projects/docproj_hu/www/hu/support.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/support/bugreports.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/support/webresources.sgml#2 edit .. //depot/projects/docproj_hu/www/hu/where.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/about.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/about.sgml + %SRCID% 1.13 +--> ==== //depot/projects/docproj_hu/www/hu/administration.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/administration.sgml + %SRCID% 1.16 +--> &header; ==== //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/advocacy/index.sgml + %SRCID% 1.17 +--> &header; ==== //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#2 (text+ko) ==== @@ -10,7 +10,9 @@ + %SOURCE% en/advocacy/myths.sgml + %SRCID% 1.42 +--> &header; ==== //depot/projects/docproj_hu/www/hu/applications.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/applications.sgml + %SRCID% 1.34 +--> ==== //depot/projects/docproj_hu/www/hu/art.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/art.sgml + %SRCID% 1.9 +--> ==== //depot/projects/docproj_hu/www/hu/community.xsl#2 (text+ko) ==== @@ -10,7 +10,9 @@ + %SOURCE% en/community.xsl + %SRCID% 1.3 +--> ==== //depot/projects/docproj_hu/www/hu/community/irc.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/community/irc.sgml + %SRCID% 1.3 +--> ==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#4 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/community/mailinglists.sgml + %SRCID% 1.8 +--> ==== //depot/projects/docproj_hu/www/hu/community/newsgroups.sgml#4 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/community/newgroups.sgml + %SRCID% 1.5 +--> ==== //depot/projects/docproj_hu/www/hu/community/webresources.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/community/webresources.sgml + %SRCID% 1.4 +--> ==== //depot/projects/docproj_hu/www/hu/copyright/copyright.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/copyright/copyright.sgml + %SRCID% 1.12 +--> &header; ==== //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#4 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/developers/cvs.sgml + %SRCID% 1.8 +--> &header; ==== //depot/projects/docproj_hu/www/hu/docproj/doc-set.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/docproj/doc-set.sgml + %SRCID% 1.17 +--> ==== //depot/projects/docproj_hu/www/hu/docproj/docproj.sgml#2 (text+ko) ==== @@ -4,11 +4,12 @@ ]> - + %SOURCE% en/docproj/docproj.sgml + %SRCID% 1.13 +--> ==== //depot/projects/docproj_hu/www/hu/docproj/hungarian.sgml#2 (text+ko) ==== ==== //depot/projects/docproj_hu/www/hu/docproj/sgml.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/docproj/sgml.sgml + %SRCID% 1.28 +--> &header; ==== //depot/projects/docproj_hu/www/hu/docproj/submitting.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/docproj/submitting.sgml + %SRCID% 1.18 +--> &header; ==== //depot/projects/docproj_hu/www/hu/docproj/who.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/docproj/who.sgml + %SRCID% 1.14 +--> &header; ==== //depot/projects/docproj_hu/www/hu/docs.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/docs.sgml + %SRCID% 1.195 +--> ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#4 (text+ko) ==== @@ -13,7 +13,9 @@ + %SOURCE% en/docs/books.sgml + %SRCID% 1.35 +--> ==== //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/docs/webresources.sgml + %SRCID% 1.8 +--> &header; ==== //depot/projects/docproj_hu/www/hu/features.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/features.sgml + %SRCID% 1.34 +--> ==== //depot/projects/docproj_hu/www/hu/index.xsl#4 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/index.xsl + %SRCID% 1.163 +--> ==== //depot/projects/docproj_hu/www/hu/internet.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/internet.sgml + %SRCID% 1.39 +--> ==== //depot/projects/docproj_hu/www/hu/logo.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/logo.sgml + %SRCID% 1.7 +--> ==== //depot/projects/docproj_hu/www/hu/mailto.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/mailto.sgml + %SRCID% 1.32 +--> ==== //depot/projects/docproj_hu/www/hu/news/news.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/news/news.sgml + %SRCID% 1.48 +--> &header; ==== //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#2 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/news/pressreleases.sgml + %SRCID% 1.13 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/alpha.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/alpha.sgml + %SRCID% 1.6 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/amd64.sgml + %SRCID% 1.21 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#2 (text+ko) ==== @@ -10,7 +10,9 @@ + %SOURCE% en/platforms/arm.sgml + %SRCID% 1.11 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/i386.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/platforms/i386.sgml + %SRCID% 1.11 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/ia64/index.xsl#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/ia64/index.xsl + %SRCID% 1.7 +--> ==== //depot/projects/docproj_hu/www/hu/platforms/ia64/machines.sgml#2 (text+ko) ==== @@ -6,6 +6,12 @@ ]> + + &header; ==== //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/ia64/refs.sgml + %SRCID% 1.11 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/ia64/todo.xsl#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/ia64/todo.xsl + %SRCID% 1.9 +--> ==== //depot/projects/docproj_hu/www/hu/platforms/index.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/index.sgml + %SRCID% 1.24 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/mips.sgml + %SRCID% 1.6 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/pc98.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/pc98.sgml + %SRCID% 1.16 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#4 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/ppc.sgml + %SRCID% 1.20 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/platforms/sparc.sgml + %SRCID% 1.28 +--> &header; ==== //depot/projects/docproj_hu/www/hu/platforms/sun4v.sgml#2 (text+ko) ==== @@ -10,6 +10,8 @@ ==== //depot/projects/docproj_hu/www/hu/platforms/xbox.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/platforms/xbox.sgml + %SRCID% 1.9 +--> &header; ==== //depot/projects/docproj_hu/www/hu/projects/projects.sgml#2 (text+ko) ==== @@ -11,7 +11,9 @@ + %SOURCE% en/projects/projects.sgml + %SRCID% 1.209 +--> &header; ==== //depot/projects/docproj_hu/www/hu/search/index-site.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/search/index-site.sgml + %SRCID% 1.29 +--> &header; ==== //depot/projects/docproj_hu/www/hu/search/search-mid.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/search/search.mid.sgml + %SRCID% 1.10 +--> &header; ==== //depot/projects/docproj_hu/www/hu/search/search.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/search/search.sgml + %SRCID% 1.111 +--> &header; ==== //depot/projects/docproj_hu/www/hu/search/searchhints.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en/search/searchhints.sgml + %SRCID% 1.10 +--> &header; ==== //depot/projects/docproj_hu/www/hu/search/site.map#4 (text+ko) ==== @@ -10,7 +10,8 @@ # The FreeBSD Hungarian Documentation Project # Translated by: Gabor Kovesdan -# Original Revision: r1.31 +# %SOURCE% en/search/site.map +# %SRCID% 1.31 # NOTE: the entries in the main sections should be the same as the entries # in the navibar on the frontpage and should be listed in the same ==== //depot/projects/docproj_hu/www/hu/search/web.atoz#4 (text+ko) ==== @@ -8,7 +8,8 @@ # The FreeBSD Hungarian Documentation Project # Translated by: Gabor Kovesdan -# Original Revision: r1.90 +# %SOURCE% en/search/web.atoz +# %SRCID% 1.90 # NOTE: the entries should be sorted alphabetically by their relative # path to www/en. E.g. docs/man.sgml comes after docs/books.sgml, ==== //depot/projects/docproj_hu/www/hu/send-pr.sgml#2 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en/send-pr.sgml + %SRCID% 1.60 +--> ==== //depot/projects/docproj_hu/www/hu/share/sgml/catalog#2 (text+ko) ==== ==== //depot/projects/docproj_hu/www/hu/share/sgml/catalog.xml#2 (text+ko) ==== ==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#2 (text+ko) ==== @@ -3,7 +3,9 @@ + %SOURCE% share/sgml/header.l10n.ent + %SRCID% 1.9 +--> ==== //depot/projects/docproj_hu/www/hu/share/sgml/l10n.ent#2 (text+ko) ==== @@ -6,6 +6,8 @@ ==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#2 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% share/sgml/libcommon.xsl + %SRCID% 1.1 +--> ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#4 (text+ko) ==== @@ -3,7 +3,9 @@ + %SOURCE% share/sgml/navibar.l10n.ent + %SRCID% 1.18 +--> - Original Revision: r1.356 --> + %SOURCE% en/support.sgml + %SRCID% 1.356 +--> ==== //depot/projects/docproj_hu/www/hu/support/bugreports.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/support/bugreports.sgml + %SRCID% 1.4 +--> &header; ==== //depot/projects/docproj_hu/www/hu/support/webresources.sgml#2 (text+ko) ==== @@ -8,7 +8,9 @@ + %SOURCE% en/support/webresources.sgml + %SRCID% 1.3 +--> &header; ==== //depot/projects/docproj_hu/www/hu/where.sgml#4 (text+ko) ==== @@ -7,7 +7,9 @@ + %SOURCE% en/where.sgml + %SRCID% 1.97 +--> From owner-p4-projects@FreeBSD.ORG Mon Jun 23 12:06:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EB4110656B0; Mon, 23 Jun 2008 12:06:44 +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 E37AC1065690 for ; Mon, 23 Jun 2008 12:06:43 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D000B8FC2E for ; Mon, 23 Jun 2008 12:06:43 +0000 (UTC) (envelope-from gabor@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 m5NC6hxN043983 for ; Mon, 23 Jun 2008 12:06:43 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NC6h4Q043979 for perforce@freebsd.org; Mon, 23 Jun 2008 12:06:43 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 12:06:43 GMT Message-Id: <200806231206.m5NC6h4Q043979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143960 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: Mon, 23 Jun 2008 12:06:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=143960 Change 143960 by gabor@gabor_server on 2008/06/23 12:06:01 - Tag the Hungarian doc tree with %SOURCE% and %SRCID% so that we can check the availability of updates automagically Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/laptop/article.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/multi-os/article.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/colophon.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/users/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/flyer.tex#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bookinfo.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/books.ent#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/l10n.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/legalnotice.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/newsgroups.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/teams.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/translators.ent#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable-local.xsl#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-5.3.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-recent-releases.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-release-process.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-users.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/what-is-freebsd.xml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/freebsd-general/slides.xml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#7 (text+ko) ==== @@ -10,7 +10,9 @@ + %SOURCE% en_US.ISO8859-1/articles/compiz-fusion/article.sgml + %SRCID% 1.6 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#4 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% en_US.ISO8859-1/articles/dialup-firewall/article.sgml + %SRCID% 1.42 +-->
    ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#2 (text+ko) ==== @@ -2,7 +2,10 @@ + Original Revision: r1.22 + %SOURCE% en_US.ISO8859-1/articles/explaining-bsd/article.sgml + %SRCID% 1.22 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/laptop/article.sgml#4 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% en_US.ISO8859-1/articles/laptop/article.sgml + %SRCID% 1.25 +-->
    ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#4 (text+ko) ==== @@ -33,7 +33,9 @@ + %SOURCE% en_US.ISO8859-1/articles/linux-comparison/article.sgml + %SRCID% 1.10 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#8 (text+ko) ==== @@ -2,7 +2,9 @@ + %SOURCE% en_US.ISO8859-1/articles/linux-users/article.sgml + %SRCID% 1.6 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/multi-os/article.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/articles/multi-os/article.sgml + %SRCID% 1.39 +-->
    ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#7 (text+ko) ==== @@ -9,7 +9,9 @@ + %SOURCE% en_US.ISO8859-1/articles/version-guide/article.sgml + %SRCID% 1.13 +-->
    Válasszuk ki a nekünk igazán megfelelõ &os; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#3 (text+ko) ==== @@ -1,13 +1,15 @@ -<!-- The FreeBSD Hungarian Documentation Project - Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.838 --> - <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ <!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU"> %books.ent; <!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.sgml"> ]> +<!-- The FreeBSD Hungarian Documentation Project + Translated by: PALI, Gabor <pgj@FreeBSD.org> + %SOURCE% en_US.ISO8859-1/books/faq/book.sgml + %SRCID% 1.838 +--> + <book lang="hu"> <bookinfo> <title>Gyakran Ismételt Kérdések a &os; 5.X ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#5 (text+ko) ==== @@ -6,7 +6,9 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.408 --> + %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml + %SRCID% 1.408 +--> <chapter id="advanced-networking" lang="hu"> <title>Egyéb haladó hálózati ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,9 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.33 --> + %SOURCE% en_US.ISO8859-1/books/handbook/audit/chapter.sgml + %SRCID% 1.33 +--> <chapter id="audit" lang="hu"> <chapterinfo> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.153 --> + %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml + %SRCID% 1.153 +--> <chapter id="basics" lang="hu"> <chapterinfo> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,9 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.85 --> + %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml + %SRCID% 1.85 +--> <appendix id="bibliography" lang="hu"> <title>Irodalomjegyzék ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#5 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml + %SRCID% 1.172 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml + %SRCID% 1.65 +--> A &os; rendszerindítási folyamata ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/colophon.sgml#2 (text+ko) ==== @@ -5,8 +5,10 @@ --> + Translated by: PALI, Gabor + %SOURCE% en_US.ISO8859-1/books/handbook/colophon.sgml + %SRCID% 1.9 +--> Ez a könyv A &os; Dokumentációs ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#7 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml + %SRCID% 1.232 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml + %SRCID% 1.227 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#4 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml + %SRCID% 1.76 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml + %SRCID% 1.285 +--> Háttértárak ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#5 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml + %SRCID% 1.184 +--> Erõforrások az interneten ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#7 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml + %SRCID% 1.83 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.sgml + %SRCID% 1.41 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml + %SRCID% 1.390 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml + %SRCID% 1.123 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml + %SRCID% 1.15 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ==== @@ -5,7 +5,9 @@ --> + %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml + %SRCID% 1.184 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,9 @@ --> + %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml + %SRCID% 1.124 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml + %SRCID% 1.135 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#4 (text+ko) ==== @@ -5,7 +5,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml + %SRCID% 1.71 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/mail/chapter.sgml + %SRCID% 1.138 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml + %SRCID% 1.444 +--> A &os; beszerzése ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml + %SRCID% 1.129 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml + %SRCID% 1.104 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml#2 (text+ko) ==== @@ -4,7 +4,9 @@ --> + %SOURCE% en_US.ISO8859-1/books/handbook/pgpkexs/chapter.sgml + %SRCID% 1.286 +--> PGP-kulcsok ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml + %SRCID% 1.281 +--> Alkalmazások telepítése: csomagok ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.180 --> + %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml + %SRCID% 1.180 +--> <chapter id="ppp-and-slip"> <chapterinfo> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#2 (text+ko) ==== @@ -3,7 +3,9 @@ --> <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.39 --> + %SOURCE% en_US.ISO8859-1/books/handbook/preface/preface.sgml + %SRCID% 1.39 +--> <preface id="book-preface" lang="hu"> <title>Elõszó ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/printing/chapter.sgml + %SRCID% 1.114 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml + %SRCID% 1.321 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml + %SRCID% 1.128 +--> Soros vonali kommunikáció ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/users/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,9 @@ --> + %SOURCE% en_US.ISO8859-1/books/handbook/users/chapter.sgml + %SRCID% 1.59 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#4 (text+ko) ==== @@ -10,7 +10,9 @@ --> + %SOURCE% en_US.ISO8859-1/books/handbook/vinum/chapter.sgml + %SRCID% 1.45 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml + %SRCID% 1.16 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml + %SRCID% 1.186 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/flyer.tex#2 (text+ko) ==== @@ -31,8 +31,9 @@ % the \logo variable. By default the Beastie layout is enabled. % % The FreeBSD Hungarian Documentation Project -% Original Revision: r1.16 % Translated by: Gabor Kovesdan +%SOURCE% en_US.ISO8859-1/flyer/flyer.tex +%SRCID% 1.16 \documentclass[11pt]{article} \usepackage[T1]{fontenc} \usepackage[latin2]{inputenc} ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ --> + %SOURCE% en_US.ISO8859-1/share/sgml/bibliography.sgml + %SRCID% 1.9 +--> Irodalomjegyzék ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bookinfo.ent#2 (text+ko) ==== @@ -10,7 +10,9 @@ --> + %SOURCE% en_US.ISO8859-1/share/sgml/bookinfo.ent + %SRCID% 1.4 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/books.ent#4 (text+ko) ==== @@ -1,7 +1,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/books.ent + %SRCID% 1.4 +--> %l10n; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -2,7 +2,8 @@ $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.3 2008/04/24 18:34:27 pgj Exp $ The FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan - Original revision: 1.22 + %SOURCE% en_US.ISO8859-1/share/sgml/freebsd.dsl + %SRCID% 1.22 --> - Original Revision: 1.100 --> + %SOURCE% en_US.ISO8859-1/share/sgml/freebsd.ent + %SRCID% 1.100 +--> + %SOURCE% en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml + %SRCID% 1.31 +--> A &os;-s szakkifejezések gyûjteménye ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/l10n.ent#2 (text+ko) ==== @@ -5,7 +5,9 @@ --> + %SOURCE% en_US.ISO8859-1/share/sgml/l10n.ent + %SRCID% 1.2 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/legalnotice.sgml#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/legalnotice.sgml + %SRCID% 1.4 +--> A dokumentum továbbadása forrás (SGML DocBook) ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#4 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent + %SRCID% 1.58 +--> FreeBSD lista szerver"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl#2 (text+ko) ==== @@ -3,7 +3,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/mirrors-local.xsl + %SRCID% 1.6 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/newsgroups.ent#2 (text+ko) ==== @@ -6,7 +6,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/newsgroups.ent + %SRCID% 1.1 +--> comp.unix.bsd.freebsd.misc ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/teams.ent#2 (text+ko) ==== @@ -11,7 +11,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/teams.ent + %SRCID% 1.18 +--> admins@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#2 (text+ko) ==== @@ -13,7 +13,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/trademarks.ent + %SRCID% 1.43 +--> A 3Com és HomeConnect a 3Com Corporation bejegyzett védjegyei."> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/translators.ent#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable-local.xsl#2 (text+ko) ==== @@ -3,7 +3,9 @@ + %SOURCE% en_US.ISO8859-1/share/sgml/transtable-local.xsl + %SRCID% 1.2 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#2 (text+ko) ==== @@ -17,7 +17,9 @@ + %SOURCE% ja_JP.eucJP/share/sgml/bookinfo.ent + %SRCID% 1.4 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-5.3.xml#2 (text+ko) ==== @@ -2,7 +2,9 @@ + %SOURCE% en_US.ISO8859-1/slides/common/freebsd-5.3.xml + %SRCID% 1.2 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#2 (text+ko) ==== @@ -2,7 +2,9 @@ + %SOURCE% en_US.ISO8859-1/slides/common/freebsd-dev-model.xml + %SRCID% 1.2 +--> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#2 (text+ko) ==== @@ -2,7 +2,9 @@ + %SOURCE% en_US.ISO8859-1/slides/common/freebsd-linux-license.xml + %SRCID% 1.1 +--> Eltérések a Linuxtól ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 23 13:25:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68F771065676; Mon, 23 Jun 2008 13:25:03 +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 12F6A1065675 for ; Mon, 23 Jun 2008 13:25:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8A088FC20 for ; Mon, 23 Jun 2008 13:25:02 +0000 (UTC) (envelope-from gabor@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 m5NDP2Bv060559 for ; Mon, 23 Jun 2008 13:25:02 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NDP2ro060557 for perforce@freebsd.org; Mon, 23 Jun 2008 13:25:02 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 13:25:02 GMT Message-Id: <200806231325.m5NDP2ro060557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143965 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: Mon, 23 Jun 2008 13:25:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=143965 Change 143965 by gabor@gabor_server on 2008/06/23 13:24:09 - Add NLS support, a template catalog, and a Hungarian catalog Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#6 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#35 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#18 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#1 add .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#1 add .. //depot/projects/soc2008/gabor_textproc/grep/util.c#32 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#6 (text+ko) ==== @@ -136,9 +136,9 @@ struct file *f; if (fd == STDIN_FILENO) - snprintf(fname, sizeof fname, "(standard input)"); + snprintf(fname, sizeof fname, getstr(1)); else - snprintf(fname, sizeof fname, "(fd %d)", fd); + snprintf(fname, sizeof fname, getstr(2), fd); f = grep_malloc(sizeof *f); @@ -216,7 +216,7 @@ return (0); default: /* NOTREACHED */ - errx(2, "invalid file type"); + errx(2, getstr(3)); } } @@ -234,7 +234,7 @@ return (bzfgetln(f->bzf, l)); default: /* NOTREACHED */ - errx(2, "invalid file type"); + errx(2, getstr(3)); } } @@ -256,7 +256,7 @@ break; default: /* NOTREACHED */ - errx(2, "invalid file type"); + errx(2, getstr(3)); } free(f); } ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#35 (text+ko) ==== @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include #include @@ -51,6 +53,26 @@ #include "grep.h" +#ifndef WITHOUT_NLS +char *errstr[] = { + "", + "(standard input)", + "(fd %d)", + "invalid file type", + "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n", + "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n", + "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", + "\t[--null] [pattern] [file ...]\n", + "parentheses not balanced", + "context out of range", + "FreeBSD grep 2.5.1\n", + "Unknown binary-files option", + "Binary file %s matches\n" +}; + +nl_catd catalog; +#endif + /* Flags passed to regcomp() and regexec() */ int cflags; int eflags = REG_STARTEND; @@ -127,12 +149,11 @@ static void usage(void) { - fprintf(stderr, - "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n" - "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n" - "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n" - "\t[--null] [pattern] [file ...]\n" - , __progname); + fprintf(stderr, getstr(4), __progname); + fprintf(stderr, getstr(5)); + fprintf(stderr, getstr(5)); + fprintf(stderr, getstr(6)); + fprintf(stderr, getstr(7)); exit(2); } @@ -264,7 +285,7 @@ st = ptr + 1; } if (lbr != rbr) { - errx(2, "parentheses not balanced"); + errx(2, getstr(8)); } } @@ -344,6 +365,15 @@ char *ep; struct stat *finfo = 0; + setlocale(LC_ALL, ""); + +#ifndef WITHOUT_NLS + catalog = catopen("grep", NL_CAT_LOCALE); + if (catalog == ((nl_catd)-1)) + printf("HIBA: %d\n", errno); + +#endif + SLIST_INIT(&patfilelh); switch (__progname[0]) { case 'e': @@ -383,7 +413,7 @@ if (newarg || !isdigit(lastc)) Aflag = 0; else if (Aflag > INT_MAX / 10) - errx(2, "context out of range"); + errx(2, getstr(9)); Aflag = Bflag = (Aflag * 10) + (c - '0'); break; case 'A': @@ -391,7 +421,7 @@ l = strtol(optarg, &ep, 10); if (ep == optarg || *ep != '\0' || l <= 0 || l >= INT_MAX) - errx(2, "context out of range"); + errx(2, getstr(9)); if (c == 'A') Aflag = (int)l; else @@ -410,7 +440,7 @@ l = strtol(optarg, &ep, 10); if (ep == optarg || *ep != '\0' || l <= 0 || l >= INT_MAX) - errx(2, "context out of range"); + errx(2, getstr(9)); Aflag = Bflag = (int)l; } break; @@ -517,7 +547,7 @@ /* default, compatibility */ break; case 'V': - printf("FreeBSD grep 2.5.1\n"); + printf(getstr(10)); exit(0); case 'v': vflag = 1; @@ -539,7 +569,7 @@ else if (strcmp("text", optarg) == 0) binbehave = BIN_FILE_TEXT; else - errx(2, "Unknown binary-files option"); + errx(2, getstr(11)); break; case COLOR_OPT: if (optarg == NULL) @@ -639,6 +669,11 @@ } c+= procfile(*argv); } + +#ifndef WITHOUT_NLS + catclose(catalog); +#endif + if (c) { if (notfound && qflag) exit(0); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#18 (text+ko) ==== @@ -33,6 +33,18 @@ #include #include +#ifdef WITHOUT_NLS +#define getstr(n) errstr[n] +#else +#include + +extern nl_catd catalog; +#define getstr(n) catgets(catalog, 1, n, errstr[n]) +#endif + +extern char *errstr[]; + + #define BIN_FILE_BIN 0 #define BIN_FILE_SKIP 1 #define BIN_FILE_TEXT 2 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#32 (text+ko) ==== @@ -135,7 +135,7 @@ if (label != NULL) fn = label; else - fn = "(standard input)"; + fn = getstr(1); f = grep_fdopen(STDIN_FILENO, "r"); } else { f = grep_open(fn, "r"); @@ -198,7 +198,7 @@ printf("%s\n", fn); if (c && !cflag && !lflag && !Lflag && binbehave == BIN_FILE_BIN && nottext && !qflag) - printf("Binary file %s matches\n", fn); + printf(getstr(12), fn); return (c); } From owner-p4-projects@FreeBSD.ORG Mon Jun 23 15:30:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CEB2106566C; Mon, 23 Jun 2008 15:30:46 +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 3C400106564A; Mon, 23 Jun 2008 15:30:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id CE8B28FC25; Mon, 23 Jun 2008 15:30:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [IPv6:2001:470:1f11:75:2a0:d2ff:fe18:8b38]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m5NFU8cH034447; Mon, 23 Jun 2008 11:30:39 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Ed Schouten Date: Mon, 23 Jun 2008 11:06:04 -0400 User-Agent: KMail/1.9.7 References: <200806041833.m54IXVO6027895@repoman.freebsd.org> In-Reply-To: <200806041833.m54IXVO6027895@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806231106.04773.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [IPv6:2001:470:1f11:75::1]); Mon, 23 Jun 2008 11:30:40 -0400 (EDT) X-Virus-Scanned: ClamAV 0.93.1/7541/Mon Jun 23 10:21:03 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 142898 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: Mon, 23 Jun 2008 15:30:46 -0000 On Wednesday 04 June 2008 02:33:31 pm Ed Schouten wrote: > http://perforce.freebsd.org/chv.cgi?CH=142898 > > Change 142898 by ed@ed_dull on 2008/06/04 18:33:09 > > I can't delete ed_xbox anymore, because it still has an open changeset. Do this: p4 -c ed_xbox change -d 137353 (should work since it is an empty change). Then you can do: p4 client -d ed_xbox -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jun 23 15:46:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D11610656B3; Mon, 23 Jun 2008 15:46:30 +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 2C9811065688 for ; Mon, 23 Jun 2008 15:46:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16A328FC17 for ; Mon, 23 Jun 2008 15:46:30 +0000 (UTC) (envelope-from pgj@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 m5NFkTgm075923 for ; Mon, 23 Jun 2008 15:46:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NFkTWk075921 for perforce@freebsd.org; Mon, 23 Jun 2008 15:46:29 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 23 Jun 2008 15:46:29 GMT Message-Id: <200806231546.m5NFkTWk075921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143975 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: Mon, 23 Jun 2008 15:46:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=143975 Change 143975 by pgj@disznohal on 2008/06/23 15:46:05 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#8 integrate .. //depot/projects/docproj_hu/doc/share/mk/doc.xml.mk#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/brix.key#2 integrate .. //depot/projects/docproj_hu/www/en/community.xsl#3 integrate .. //depot/projects/docproj_hu/www/en/community/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/community/social.xsl#1 branch .. //depot/projects/docproj_hu/www/en/developers.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/events/Makefile#2 integrate .. //depot/projects/docproj_hu/www/share/mk/doc.xml.mk#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.events.xsl#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.pastevents.xsl#1 branch Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.451 2008/06/19 15:03:43 amdmi3 Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.452 2008/06/23 11:42:41 erik Exp $ --> aaron@FreeBSD.org"> @@ -318,6 +318,8 @@ erich@FreeBSD.org"> +erik@FreeBSD.org"> + erwin@FreeBSD.org"> fanf@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#8 (text+ko) ==== @@ -24,7 +24,7 @@ - $FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.6 2008/06/17 20:56:39 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.7 2008/06/23 08:07:27 pgj Exp $ &tm-attrib.freebsd; ==== //depot/projects/docproj_hu/doc/share/mk/doc.xml.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.13 2008/01/16 08:21:47 murray Exp $ +# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -187,6 +187,7 @@ .endif XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl +XSL_EVENTS_PAST= ${WEB_PREFIX}/share/sgml/templates.pastevents.xsl # DEPENDSET: commercial ........................................................ _DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \ ==== //depot/projects/docproj_hu/doc/share/pgpkeys/brix.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -6,7 +6,6 @@ pub 1024D/54E278F8 2003-04-09 Key fingerprint = 7B63 EF32 7831 A704 220D 7E61 BFE4 387E 54E2 78F8 uid Henrik Brix Andersen -uid Henrik Brix Andersen uid Henrik Brix Andersen sub 1024g/3B13C209 2003-04-09 ]]> @@ -115,110 +114,112 @@ p2dnSIaZefM4bnKifsWwr6fDRb4TowSTV/rAGiP0tTpj4GiNS3n570g4w2EO/jrt d+e7dxxQByOrkSP5AASQ2FBFdvWBHNmnLyMNHQGPeRdgxFGAUyRdQuplKZdQpMmI 64Pgp9jTRxmxVdYqYTaOdunVYs5B+7QkSGVucmlrIEJyaXggQW5kZXJzZW4gPGJy -aXhAYWF1dWcuZGs+iF4EExECAB4FAkNCRCUCGwMGCwkIBwMCAxUCAwMWAgECHgEC -F4AACgkQv+Q4flTiePhB6wCdEl+U42TOiSvAx9ECTSKR2pEyYoEAnj0O+McjsCxg -eWOAiHxkH6S1MSA5iEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo3JYwCgvJXm7Sv3 -0SSF/vkUA7lYZnMXpk4AoJhq9b0iLW4qwgNhgrYYbBE6c+6piJwEEAECAAYFAkQM -D3YACgkQH3+pCANY/L1+5QP7BxzDnx+SYAqmAWudmO5gqRzwhB4L9nrtPa3hGkWN -EMuxJjBCkJJHoX/rxMYkR2ZdSFIFX++7Y3qsI7d2GUCMBgCqN8zdfwWvrpjBBNpL -SVliNwvEujAi1BmTixDbiq4CKwai6gxsFEDYsA05cX2Njg1bYbX/XjRcGpNQPKun -a8GIRgQQEQIABgUCRAycfgAKCRAJxOeJkBbvUN6JAJ9fHHR1Ms09rYyajMra0aX+ -7XaUswCcCjNoayZQlf+6DkJBaQFiGi/FMTCIRgQQEQIABgUCRDFIzQAKCRDz3nmC -81+kz2+0AJ4pLGBcGNMBWAIOujapeYQfKif2TQCcCgcrHLwm7btUTbaHHD1g5LMw -paeIRgQQEQIABgUCRMz8SAAKCRBdVo7rtLWu28G4AJ92TcPH0fM68/NerGJRA5Qt -sYm9CwCdHCuab38MAWv115wvbrXLQZK4HcOIRgQTEQIABgUCRQ1LqQAKCRCfd8Cs -b3oRX3tPAKCMuerpLB9Boh39hsmcVfw8MZjlggCg7kMhr5MI6/a2z2oLvakXo2Ao -M5KIRgQQEQIABgUCRSzZqQAKCRDVCFOpIhPnco9wAJ93feKzaBOMflNEpZH4B+jt -N5bm9gCgrthnnQToMNZl3b5RWvLiP0f0pAyJAkgEEAECADIFAkVXKvErGmh0dHA6 -Ly93d3cucGFlcHMuY3gvZ3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNN -BXB4D/sFtImOodWUaR2QacEiFUduIK6NS5DhfiW2fXtEUAdFoh2IE8Iwlc61DVKM -f1jSFkIFaMs4OdTnYuiM702x9CW2XrT5pO4ORMXACpmCpqLJU4RoUKpE2Y5ABrwi -t3MqGUFoyunebnhc9IgItrJ620asHm0RfIwI5LC6fV+6wuSiES1zhsg/zPZ8aTnY -TfGCh/vCttqxDmuxUEsVK9E7T17XZJCLeV+PR93LLrMDvVSyRwJLOSkpCqgGL/g6 -/asvw/lGX0g8G4WmHmQW42FrtpfBJF+hRwO2d9iLZ5ubzqcdRkydwOBx/x3tzPjx -Cjq+U32tnSCys1YAo9mYaCfYQcuvaa0P4hditNAypAJYORxB+ik7wtXoioD08pUc -A2BhxgKjUe3D1r+C8x7njZ8lWSwGeJaNxUhmsRou5SI1nG9cG4blHWMNGg/jnGXA -ozmca5VRHzQJoTabBg84TIXdbBzTQECPBUJp0r69roYnF3Rmpyov4iHHe5gtIQ9H -gW2A7XDMNyDVeEtYHi8OqhOPVi2c/sU/mWTMP5n5w17+H+AHPrZP+iFRSREnIcEu -nBlKg3TfBgIT+isMVtG1HcEGNuQQTHVgrx/JSjLuwUWxdyOg23KFanBM2gY+p6ZY -Qng8xa2fGC4rzQmI+/4xoAiey8xEoYLU2DypEuhJadFUhSUx4YhGBBARAgAGBQJF -WOY9AAoJEK6UZT1dE6xF5SoAoITs52ZAf6SVB8FBT/eLnx5Ni2K1AJ42rKcj8HMb -NQf4bOjamJNrlo7YHYhGBBARAgAGBQJFWhAZAAoJEBRll9zcw5nHQ8cAnA99vx1/ -TIdt/r2h1byHrCgPvNTaAJ9zPyo9IzZlJ5oSiGDo0cr/Rkw154hGBBARAgAGBQJF -Y2gdAAoJEBdynXf0qFEvjiMAnRKDj/PC26266T+sdLZfSyRngb1oAJ4rbxayEIqu -63igRuCBsuAvOrtTBohGBBARAgAGBQJG7wWGAAoJEJ7XWD/BTrKCsQIAn2Lwn9l5 -UtDEcVk5E2knZtVfDX5zAJwMfIwV8u921zNypcgpzSwkLdrmKIhGBBARAgAGBQJG -739QAAoJECGmRpvR77qmhc8AoK4zsYbuIhYrdYV+HfB5xivwzuR0AJsEO3/FNwHO -neiAkRqUP5o0DtqrXIhrBBARAgArBQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNh -Y2VydC5vcmcvY3BzLnBocAAKCRDSuw0BZdD9WCXFAKCN9ym4MaPJrl1rXPLH7nhI -38iSUgCfXi386GkvwKKZuZzeOiibzcbjnauIcwQQEQIAMwUCQ/8J+wWDAeEzgCYa -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9 -WLlXAJ4mP3eT18lsEijZsQo65cXCTxnCbACfYva7F6eu2E2dG2TzMDb/e8TTTg+0 -I0hlbnJpayBCcml4IEFuZGVyc2VuIDwwMTA3OUBpaGEuZGs+iEkEMBECAAkFAkS5 -PskCHSAACgkQv+Q4flTiePj4BwCdEW0dQCinDGdSvvVLuWlF10mcv1MAoKeV3Qme -9GOG3KIDi2+0YYVfALWMiEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo39kwCeLYh6 -qjL75pvCYnPlu7cAaWloIPsAoKzVrhyrWPavpDOpjUHNK6aOjR4niEYEEBECAAYF -AkQMnH4ACgkQCcTniZAW71AFMwCfZlhOSlwpyKprNvg9oNgM7cDpo70AoIz2//rs -tyB3hBmF7m/HDtDRzAz9iEYEEBECAAYFAkQxSM0ACgkQ8955gvNfpM+OIQCeL9vt -1bc267tdDbSxFWvSUu1WeOIAnj+EtBz+Q4yi9OU6s01OOA31yjH6iEYEEBECAAYF -AkVY5j0ACgkQrpRlPV0TrEUvwACffomLxMEYRAkdxzEkcAhLzS31F+sAoIwCFDdH -fzbgMbsP4s5W2fCX1LWCiF4EExECAB4FAkNNAyICGwMGCwkIBwMCAxUCAwMWAgEC -HgECF4AACgkQv+Q4flTiePhQtACfUzPG3iBf/BMLQl17C6hl9bSOKAMAnRKgGiKW -i++keWWxfB5/qDNVxNzmiHMEEBECADMFAkP/CfsFgwHhM4AmGmh0dHA6Ly93d3cu -Y2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAACgkQ0rsNAWXQ/VhpSwCfa0RYTPKo -Hh6Ogsm2h7ScHHUYXosAn09Q7GxkfNbRg745zWgPkRt5HEVgiJwEEAECAAYFAkQM -D3YACgkQH3+pCANY/L3RtQP+IPJFC1yUq5Pgm3LEaUDB8ngxFYP2IPQ3KH0ehmbe -4OHU0c9E5yh1ViNlYKWKxTUhUKPUMJPjOESKdmU0WBHrnQ5FKZmr8K/uGCdHU+lh -YQwzgMYkjTn7AS44YukZLkQ490ZP5lhVMtFWLJdVEZGK1oO0bSeRcB0RMwrT+z1g -NYe0JEhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdpbXAub3JnPohJBDARAgAJ -BQJCCgVMAh0gAAoJEL/kOH5U4nj4M7oAn3LAoaE29feNavUpw/hqD0f4nnPkAJ9N -ZeroZkX09hlGDvA4liC34DPRI4hGBBARAgAGBQJDzHKcAAoJEDdMvp9TN5qNzO4A -n1IY29nD0bMD/5hxDtJUt8qO1x3vAJ9dlLb448dgdpxLUdDCf3aeHOlmpYhGBBIR -AgAGBQJB2VIpAAoJEK6f5wUIDEyl7ocAoIcvdubBFFCmxmwweGhXgU2SX6lQAJsE -Ym6joOMZ2tOLA8WcKzghMkGDBIhZBBMRAgAZBQI+lEJYBAsHAwIDFQIDAxYCAQIe -AQIXgAAKCRC/5Dh+VOJ4+PMeAJ9C58QMyzQBgC5SGUikeFA566K0dgCdEiMguJ0C -0qwtjERzndmsiY7DOmKIXgQTEQIAHgUCQgoFFwIbAwYLCQgHAwIDFQIDAxYCAQIe -AQIXgAAKCRC/5Dh+VOJ4+BpNAJwJBy7+NfNDQcxWU+6DKHkWAIovKwCfWPk+0S74 -OBOx0+NUXOxtcq/mCES0JkhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdlbnRv -by5vcmc+iEkEMBECAAkFAkUMaXgCHSAACgkQv+Q4flTiePhWGQCglliBZWa/HU+0 -qtQZnt/rIRn1b+IAniiTtF0Ll90A770pMIjsJ8cXe8AfiEYEEBECAAYFAkJrwiEA -CgkQqy9aWxUlaZBlggCg4Cp+lHk+M6HKbhoEAHK5XszVHQoAoI+422ohFYnow4bp -H+3sJXANyHc6iEYEEBECAAYFAkPMcpkACgkQN0y+n1M3mo3tggCeL+Oa440W4UVm -z2CHvUloy0oiRUgAoLRHa406iEBCgESdsl5I9LWw95pRiEYEEBECAAYFAkQMnHcA -CgkQCcTniZAW71DrigCdFfiK45WTr54R7kGFJ8Cbdv5LtDkAn2FJzdglgl6ZJPns -1OWZlipeOagoiEYEEBECAAYFAkQxSAUACgkQ8955gvNfpM8niwCeOhuAcBWGPQPu -xAsGj2Tze+bsCC8An26dkM9a5EkDkjF3+2lJ9DU31SA9iEYEEBECAAYFAkTM/EcA -CgkQXVaO67S1rtt1zQCg1KgdWTEID8WM+UDFa5BcoMsIP/YAoPWQDKrrU5e0iZZ6 -UyPv/CvGwUXjiEYEEBECAAYFAkVY5jkACgkQrpRlPV0TrEVxMACeIQSuxaCcBviL -RlzEv++ei+3v00EAoIkQmrMYVq5TQxgoIeaHrgVt3A33iEYEEhECAAYFAkHZUigA -CgkQrp/nBQgMTKUBegCgjS4riHWPKMibqhhdC1u50DbVdo4An32389aHCCSUIPOP -xUD3qgD0AVh+iEYEEhECAAYFAkMRYYQACgkQ80zyLxSSJydLEQCeNKplzVjXHY7q -qDC9xCxbGm/aEoUAn3crkx580XUKRUTP5x0mTm8DbU2ziEYEExECAAYFAkIKCGgA -CgkQ1QhTqSIT53IkPgCdGpOSyJ+mpFrzGZFgh/Lj8BnxNasAni1xPecPOx/jbMvM -jzkDF/tTqYHFiEYEExECAAYFAkIslDgACgkQ7p4sJIfNPb0oJwCfcEpNBQYY1j+W -9msAFlkSMi6HcDMAoK7Bh9O9Nl9xPHU7sr/IDIu6R+S4iF4EExECAB4CGwMGCwkI -BwMCAxUCAwMWAgECHgECF4AFAkUMaRoACgkQv+Q4flTiePiIPACbB8tt2u3orcg/ -5HxImRnaomc7TLMAnRv0PIUdFiEfK1l+gS2uwSXija00iF4EExECAB4FAkFWy4wC -GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePi8MQCgxoTyVFHwWKxh -nSKpFT/QuZHmNj0AoL+kL/3CB40D5yJnV8lg+wvQIGr8iGEEExECACECGwMGCwkI -BwMCAxUCAwMWAgECHgECF4AFAkIKCw8CGQEACgkQv+Q4flTiePh0CACfUPBi6e9J -JXlLmDmoDU+YDcUs+eQAniFqFhySOuqV5X/Pa3q8tgCtHDTjiHMEEBECADMFAkJX -FtcFgwHhM4AmGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAA -CgkQ0rsNAWXQ/VirxgCfWvTJDRYtAEvwBOmWHWT2x2DIarcAn185FVF/u3bR+ECL -qtsT+iDZz4z/iJwEEAECAAYFAkQMD3IACgkQH3+pCANY/L31AQP+M0Ai3kaYca4P -o6dnZ0iGmXnzOG5yon7FsK+nw0W+E6MEk1f6wBoj9LU6Y+BojUt5+e9IOMNhDv46 -7Xfnu3ccUAcjq5Ej+QAEkNhQRXb1gRzZpy8jDR0Bj3kXYMRRgFMkXULqZSmXUKTJ -iOuD4KfY00cZsVXWKmE2jnbp1WLOQfu0J0hlbnJpayBCcml4IEFuZGVyc2VuIDxi -cml4QEZyZWVCU0Qub3JnPohgBBMRAgAgBQJHKQT+AhsDBgsJCAcDAgQVAggDBBYC -AwECHgECF4AACgkQv+Q4flTiePhqeQCfWx0ViywCxSkExyqgaSqVNXH8+VsAoLoR -KzkDFGDGM8th/coby9cu73YeuQENBD6UQl8QBAD67SO20OScwP3/oJr1tjmNFTIB -BTo10Jt1/mBMlFp4rkEbysvcjv2vppRYRjbG7EwuYyfRebA6XLF+l9K+ZCIq5ICM -qto7UKNyNnWpjw9wLwiPkeMck5QrmXC8/bH1PHXCw8m6NxSiRYd2YbLYO/ErShDf -MrZJi9wt0pY97s6rkwADBgP+OgEQ2woWjwk3s9A6+cGoGCD/N84mNSBFl6LVOqiA -TkgFzm9VenDsV1LuVbvd8d/NUZ+jm2ANALFxlgKxeqthJhFZLXZIckp5GVPRqrUJ -KauF04fQZ8w9JI6Kp3brnaN6wa0nxC3pqYwZdBjDUjaOtes27UqqlTYX0sQaDLM0 -ARGIRgQYEQIABgUCPpRCXwAKCRC/5Dh+VOJ4+PRnAJ4p+ftWiiCBRqfHnRhf3pTl -zxGDUQCgw+Jkqwvej2KCMft2Xavc7w2qYVU= -=KjaD +aXhAYWF1dWcuZGs+iEkEMBECAAkFAkheiI8CHSAACgkQv+Q4flTiePhbMwCgwElj +kjekm3o6i4E7w53JcOZOnnUAmwVcqrVDeWo14NTVW6wcDA30dP7kiF4EExECAB4F +AkNCRCUCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePhB6wCdEl+U +42TOiSvAx9ECTSKR2pEyYoEAnj0O+McjsCxgeWOAiHxkH6S1MSA5iEYEEBECAAYF +AkPMcpwACgkQN0y+n1M3mo3JYwCgvJXm7Sv30SSF/vkUA7lYZnMXpk4AoJhq9b0i +LW4qwgNhgrYYbBE6c+6piJwEEAECAAYFAkQMD3YACgkQH3+pCANY/L1+5QP7BxzD +nx+SYAqmAWudmO5gqRzwhB4L9nrtPa3hGkWNEMuxJjBCkJJHoX/rxMYkR2ZdSFIF +X++7Y3qsI7d2GUCMBgCqN8zdfwWvrpjBBNpLSVliNwvEujAi1BmTixDbiq4CKwai +6gxsFEDYsA05cX2Njg1bYbX/XjRcGpNQPKuna8GIRgQQEQIABgUCRAycfgAKCRAJ +xOeJkBbvUN6JAJ9fHHR1Ms09rYyajMra0aX+7XaUswCcCjNoayZQlf+6DkJBaQFi +Gi/FMTCIRgQQEQIABgUCRDFIzQAKCRDz3nmC81+kz2+0AJ4pLGBcGNMBWAIOujap +eYQfKif2TQCcCgcrHLwm7btUTbaHHD1g5LMwpaeIRgQQEQIABgUCRMz8SAAKCRBd +Vo7rtLWu28G4AJ92TcPH0fM68/NerGJRA5QtsYm9CwCdHCuab38MAWv115wvbrXL +QZK4HcOIRgQTEQIABgUCRQ1LqQAKCRCfd8Csb3oRX3tPAKCMuerpLB9Boh39hsmc +Vfw8MZjlggCg7kMhr5MI6/a2z2oLvakXo2AoM5KIRgQQEQIABgUCRSzZqQAKCRDV +CFOpIhPnco9wAJ93feKzaBOMflNEpZH4B+jtN5bm9gCgrthnnQToMNZl3b5RWvLi +P0f0pAyJAkgEEAECADIFAkVXKvErGmh0dHA6Ly93d3cucGFlcHMuY3gvZ3BnL3Np +Z25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNNBXB4D/sFtImOodWUaR2QacEiFUdu +IK6NS5DhfiW2fXtEUAdFoh2IE8Iwlc61DVKMf1jSFkIFaMs4OdTnYuiM702x9CW2 +XrT5pO4ORMXACpmCpqLJU4RoUKpE2Y5ABrwit3MqGUFoyunebnhc9IgItrJ620as +Hm0RfIwI5LC6fV+6wuSiES1zhsg/zPZ8aTnYTfGCh/vCttqxDmuxUEsVK9E7T17X +ZJCLeV+PR93LLrMDvVSyRwJLOSkpCqgGL/g6/asvw/lGX0g8G4WmHmQW42FrtpfB +JF+hRwO2d9iLZ5ubzqcdRkydwOBx/x3tzPjxCjq+U32tnSCys1YAo9mYaCfYQcuv +aa0P4hditNAypAJYORxB+ik7wtXoioD08pUcA2BhxgKjUe3D1r+C8x7njZ8lWSwG +eJaNxUhmsRou5SI1nG9cG4blHWMNGg/jnGXAozmca5VRHzQJoTabBg84TIXdbBzT +QECPBUJp0r69roYnF3Rmpyov4iHHe5gtIQ9HgW2A7XDMNyDVeEtYHi8OqhOPVi2c +/sU/mWTMP5n5w17+H+AHPrZP+iFRSREnIcEunBlKg3TfBgIT+isMVtG1HcEGNuQQ +THVgrx/JSjLuwUWxdyOg23KFanBM2gY+p6ZYQng8xa2fGC4rzQmI+/4xoAiey8xE +oYLU2DypEuhJadFUhSUx4YhGBBARAgAGBQJFWOY9AAoJEK6UZT1dE6xF5SoAoITs +52ZAf6SVB8FBT/eLnx5Ni2K1AJ42rKcj8HMbNQf4bOjamJNrlo7YHYhGBBARAgAG +BQJFWhAZAAoJEBRll9zcw5nHQ8cAnA99vx1/TIdt/r2h1byHrCgPvNTaAJ9zPyo9 +IzZlJ5oSiGDo0cr/Rkw154hGBBARAgAGBQJFY2gdAAoJEBdynXf0qFEvjiMAnRKD +j/PC26266T+sdLZfSyRngb1oAJ4rbxayEIqu63igRuCBsuAvOrtTBohGBBARAgAG +BQJG7wWGAAoJEJ7XWD/BTrKCsQIAn2Lwn9l5UtDEcVk5E2knZtVfDX5zAJwMfIwV +8u921zNypcgpzSwkLdrmKIhGBBARAgAGBQJG739QAAoJECGmRpvR77qmhc8AoK4z +sYbuIhYrdYV+HfB5xivwzuR0AJsEO3/FNwHOneiAkRqUP5o0DtqrXIhrBBARAgAr +BQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNhY2VydC5vcmcvY3BzLnBocAAKCRDS +uw0BZdD9WCXFAKCN9ym4MaPJrl1rXPLH7nhI38iSUgCfXi386GkvwKKZuZzeOiib +zcbjnauIcwQQEQIAMwUCQ/8J+wWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3Jn +L2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9WLlXAJ4mP3eT18lsEijZsQo65cXC +TxnCbACfYva7F6eu2E2dG2TzMDb/e8TTTg+0I0hlbnJpayBCcml4IEFuZGVyc2Vu +IDwwMTA3OUBpaGEuZGs+iEkEMBECAAkFAkS5PskCHSAACgkQv+Q4flTiePj4BwCd +EW0dQCinDGdSvvVLuWlF10mcv1MAoKeV3Qme9GOG3KIDi2+0YYVfALWMiEYEEBEC +AAYFAkPMcpwACgkQN0y+n1M3mo39kwCeLYh6qjL75pvCYnPlu7cAaWloIPsAoKzV +rhyrWPavpDOpjUHNK6aOjR4niEYEEBECAAYFAkQMnH4ACgkQCcTniZAW71AFMwCf +ZlhOSlwpyKprNvg9oNgM7cDpo70AoIz2//rstyB3hBmF7m/HDtDRzAz9iEYEEBEC +AAYFAkQxSM0ACgkQ8955gvNfpM+OIQCeL9vt1bc267tdDbSxFWvSUu1WeOIAnj+E +tBz+Q4yi9OU6s01OOA31yjH6iEYEEBECAAYFAkVY5j0ACgkQrpRlPV0TrEUvwACf +fomLxMEYRAkdxzEkcAhLzS31F+sAoIwCFDdHfzbgMbsP4s5W2fCX1LWCiF4EExEC +AB4FAkNNAyICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePhQtACf +UzPG3iBf/BMLQl17C6hl9bSOKAMAnRKgGiKWi++keWWxfB5/qDNVxNzmiHMEEBEC +ADMFAkP/CfsFgwHhM4AmGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9pbmRleC5waHA/ +aWQ9MTAACgkQ0rsNAWXQ/VhpSwCfa0RYTPKoHh6Ogsm2h7ScHHUYXosAn09Q7Gxk +fNbRg745zWgPkRt5HEVgiJwEEAECAAYFAkQMD3YACgkQH3+pCANY/L3RtQP+IPJF +C1yUq5Pgm3LEaUDB8ngxFYP2IPQ3KH0ehmbe4OHU0c9E5yh1ViNlYKWKxTUhUKPU +MJPjOESKdmU0WBHrnQ5FKZmr8K/uGCdHU+lhYQwzgMYkjTn7AS44YukZLkQ490ZP +5lhVMtFWLJdVEZGK1oO0bSeRcB0RMwrT+z1gNYe0JEhlbnJpayBCcml4IEFuZGVy +c2VuIDxicml4QGdpbXAub3JnPohJBDARAgAJBQJCCgVMAh0gAAoJEL/kOH5U4nj4 +M7oAn3LAoaE29feNavUpw/hqD0f4nnPkAJ9NZeroZkX09hlGDvA4liC34DPRI4hG +BBARAgAGBQJDzHKcAAoJEDdMvp9TN5qNzO4An1IY29nD0bMD/5hxDtJUt8qO1x3v +AJ9dlLb448dgdpxLUdDCf3aeHOlmpYhGBBIRAgAGBQJB2VIpAAoJEK6f5wUIDEyl +7ocAoIcvdubBFFCmxmwweGhXgU2SX6lQAJsEYm6joOMZ2tOLA8WcKzghMkGDBIhZ +BBMRAgAZBQI+lEJYBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRC/5Dh+VOJ4+PMeAJ9C +58QMyzQBgC5SGUikeFA566K0dgCdEiMguJ0C0qwtjERzndmsiY7DOmKIXgQTEQIA +HgUCQgoFFwIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC/5Dh+VOJ4+BpNAJwJ +By7+NfNDQcxWU+6DKHkWAIovKwCfWPk+0S74OBOx0+NUXOxtcq/mCES0JkhlbnJp +ayBCcml4IEFuZGVyc2VuIDxicml4QGdlbnRvby5vcmc+iEkEMBECAAkFAkUMaXgC +HSAACgkQv+Q4flTiePhWGQCglliBZWa/HU+0qtQZnt/rIRn1b+IAniiTtF0Ll90A +770pMIjsJ8cXe8AfiEYEEBECAAYFAkJrwiEACgkQqy9aWxUlaZBlggCg4Cp+lHk+ +M6HKbhoEAHK5XszVHQoAoI+422ohFYnow4bpH+3sJXANyHc6iEYEEBECAAYFAkPM +cpkACgkQN0y+n1M3mo3tggCeL+Oa440W4UVmz2CHvUloy0oiRUgAoLRHa406iEBC +gESdsl5I9LWw95pRiEYEEBECAAYFAkQMnHcACgkQCcTniZAW71DrigCdFfiK45WT +r54R7kGFJ8Cbdv5LtDkAn2FJzdglgl6ZJPns1OWZlipeOagoiEYEEBECAAYFAkQx +SAUACgkQ8955gvNfpM8niwCeOhuAcBWGPQPuxAsGj2Tze+bsCC8An26dkM9a5EkD +kjF3+2lJ9DU31SA9iEYEEBECAAYFAkTM/EcACgkQXVaO67S1rtt1zQCg1KgdWTEI +D8WM+UDFa5BcoMsIP/YAoPWQDKrrU5e0iZZ6UyPv/CvGwUXjiEYEEBECAAYFAkVY +5jkACgkQrpRlPV0TrEVxMACeIQSuxaCcBviLRlzEv++ei+3v00EAoIkQmrMYVq5T +QxgoIeaHrgVt3A33iEYEEhECAAYFAkHZUigACgkQrp/nBQgMTKUBegCgjS4riHWP +KMibqhhdC1u50DbVdo4An32389aHCCSUIPOPxUD3qgD0AVh+iEYEEhECAAYFAkMR +YYQACgkQ80zyLxSSJydLEQCeNKplzVjXHY7qqDC9xCxbGm/aEoUAn3crkx580XUK +RUTP5x0mTm8DbU2ziEYEExECAAYFAkIKCGgACgkQ1QhTqSIT53IkPgCdGpOSyJ+m +pFrzGZFgh/Lj8BnxNasAni1xPecPOx/jbMvMjzkDF/tTqYHFiEYEExECAAYFAkIs +lDgACgkQ7p4sJIfNPb0oJwCfcEpNBQYY1j+W9msAFlkSMi6HcDMAoK7Bh9O9Nl9x +PHU7sr/IDIu6R+S4iF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkUM +aRoACgkQv+Q4flTiePiIPACbB8tt2u3orcg/5HxImRnaomc7TLMAnRv0PIUdFiEf +K1l+gS2uwSXija00iF4EExECAB4FAkFWy4wCGwMGCwkIBwMCAxUCAwMWAgECHgEC +F4AACgkQv+Q4flTiePi8MQCgxoTyVFHwWKxhnSKpFT/QuZHmNj0AoL+kL/3CB40D +5yJnV8lg+wvQIGr8iGEEExECACECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkIK +Cw8CGQEACgkQv+Q4flTiePh0CACfUPBi6e9JJXlLmDmoDU+YDcUs+eQAniFqFhyS +OuqV5X/Pa3q8tgCtHDTjiHMEEBECADMFAkJXFtcFgwHhM4AmGmh0dHA6Ly93d3cu +Y2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAACgkQ0rsNAWXQ/VirxgCfWvTJDRYt +AEvwBOmWHWT2x2DIarcAn185FVF/u3bR+ECLqtsT+iDZz4z/iJwEEAECAAYFAkQM +D3IACgkQH3+pCANY/L31AQP+M0Ai3kaYca4Po6dnZ0iGmXnzOG5yon7FsK+nw0W+ +E6MEk1f6wBoj9LU6Y+BojUt5+e9IOMNhDv467Xfnu3ccUAcjq5Ej+QAEkNhQRXb1 +gRzZpy8jDR0Bj3kXYMRRgFMkXULqZSmXUKTJiOuD4KfY00cZsVXWKmE2jnbp1WLO +Qfu0J0hlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QEZyZWVCU0Qub3JnPohgBBMR +AgAgBQJHKQT+AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQv+Q4flTiePhq +eQCfWx0ViywCxSkExyqgaSqVNXH8+VsAoLoRKzkDFGDGM8th/coby9cu73YeuQEN +BD6UQl8QBAD67SO20OScwP3/oJr1tjmNFTIBBTo10Jt1/mBMlFp4rkEbysvcjv2v +ppRYRjbG7EwuYyfRebA6XLF+l9K+ZCIq5ICMqto7UKNyNnWpjw9wLwiPkeMck5Qr +mXC8/bH1PHXCw8m6NxSiRYd2YbLYO/ErShDfMrZJi9wt0pY97s6rkwADBgP+OgEQ +2woWjwk3s9A6+cGoGCD/N84mNSBFl6LVOqiATkgFzm9VenDsV1LuVbvd8d/NUZ+j +m2ANALFxlgKxeqthJhFZLXZIckp5GVPRqrUJKauF04fQZ8w9JI6Kp3brnaN6wa0n +xC3pqYwZdBjDUjaOtes27UqqlTYX0sQaDLM0ARGIRgQYEQIABgUCPpRCXwAKCRC/ +5Dh+VOJ4+PRnAJ4p+ftWiiCBRqfHnRhf3pTlzxGDUQCgw+Jkqwvej2KCMft2Xavc +7w2qYVU= +=4lil -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_hu/www/en/community.xsl#3 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -59,11 +59,14 @@ active IRC community. Many developers also maintain blogs about - their &os; work. &os; developers and key contributors - also maintain wiki, which - contains various information about &os; development - and &os; related projects.

    + contains information about &os; development + and related projects. You can also find &os; represented + on a variety of different social + networking sites.

    Last year there were @@ -160,6 +160,7 @@ + ==== //depot/projects/docproj_hu/www/en/events/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/events/Makefile,v 1.14 2008/01/16 07:46:21 murray Exp $ +# $FreeBSD: www/en/events/Makefile,v 1.15 2008/06/22 23:18:55 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -10,12 +10,25 @@ SUBDIR= 2002 SUBDIR+= 2003 +# The year the top level events.html file starts from: +YEARSTART= 2007 +# Years to generate past events pages for and link from top level: +PASTYEARS= 2003 2004 2005 2006 + DATA= events.css INDEXLINK= events.html XMLDOCS+= events:${XSL_EVENTS}:${XML_EVENTS_EVENTS}: +PARAMS.events= --param startyear ${YEARSTART} +PARAMS.events+= --stringparam pastyears '${PASTYEARS}' DEPENDSET.events= events +.for year in ${PASTYEARS} +XMLDOCS+= events${year}:${XSL_EVENTS_PAST}:${XML_EVENTS_EVENTS}: +PARAMS.events${year}= --param year ${year} +DEPENDSET.events${year}= events${year} +.endfor + XMLDOCS+= events_ics:${XSL_EVENTS_ICS}:${XML_EVENTS_EVENTS}:events.ics DEPENDSET.events_ics= events ==== //depot/projects/docproj_hu/www/share/mk/doc.xml.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: www/share/mk/doc.xml.mk,v 1.13 2008/01/16 08:21:47 murray Exp $ +# $FreeBSD: www/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -189,6 +189,7 @@ .endif XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl +XSL_EVENTS_PAST= ${WEB_PREFIX}/share/sgml/templates.pastevents.xsl # DEPENDSET: commercial ........................................................ _DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \ ==== //depot/projects/docproj_hu/www/share/sgml/navibar.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + User Groups

  • Events
  • Web Resources
    • +
  • Social Networks
    • '> ]]> ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#7 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.169 2008/06/19 15:25:00 amdmi3 Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.170 2008/06/23 11:42:41 erik Exp $ @@ -30,6 +30,14 @@ 6 + + 23 + +

    New committer: Erik + Cederstrand (projects)

    +     +     + 19 ==== //depot/projects/docproj_hu/www/share/sgml/templates.events.xsl#3 (text+ko) ==== @@ -5,13 +5,14 @@ - + ]> - +
    @@ -309,4 +323,31 @@ + + + + + + + + +
  • + events.html + +
    • +     + + + + +     + +
  • + events.html + +
    • +     +     +     +     From owner-p4-projects@FreeBSD.ORG Mon Jun 23 15:48:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66F571065687; Mon, 23 Jun 2008 15:48:32 +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 289C1106567F for ; Mon, 23 Jun 2008 15:48:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 138E58FC20 for ; Mon, 23 Jun 2008 15:48:32 +0000 (UTC) (envelope-from gabor@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 m5NFmVdU076067 for ; Mon, 23 Jun 2008 15:48:31 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NFmV2J076065 for perforce@freebsd.org; Mon, 23 Jun 2008 15:48:31 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 15:48:31 GMT Message-Id: <200806231548.m5NFmV2J076065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143977 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: Mon, 23 Jun 2008 15:48:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=143977 Change 143977 by gabor@gabor_server on 2008/06/23 15:48:00 - Add some comments for better understanding of the NLS default constants Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#36 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#36 (text+ko) ==== @@ -56,18 +56,18 @@ #ifndef WITHOUT_NLS char *errstr[] = { "", - "(standard input)", - "(fd %d)", - "invalid file type", - "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n", - "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n", - "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", - "\t[--null] [pattern] [file ...]\n", - "parentheses not balanced", - "context out of range", - "FreeBSD grep 2.5.1\n", - "Unknown binary-files option", - "Binary file %s matches\n" +/* 1*/ "(standard input)", +/* 2*/ "(fd %d)", +/* 3*/ "invalid file type", +/* 4*/ "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n", +/* 5*/ "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n", +/* 6*/ "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", +/* 7*/ "\t[--null] [pattern] [file ...]\n", +/* 8*/ "parentheses not balanced", +/* 9*/ "context out of range", +/*10*/ "FreeBSD grep 2.5.1\n", +/*11*/ "Unknown binary-files option", +/*12*/ "Binary file %s matches\n" }; nl_catd catalog; From owner-p4-projects@FreeBSD.ORG Mon Jun 23 15:55:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B110F106566B; Mon, 23 Jun 2008 15:55:39 +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 72B21106567A for ; Mon, 23 Jun 2008 15:55:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C64E8FC14 for ; Mon, 23 Jun 2008 15:55:39 +0000 (UTC) (envelope-from pgj@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 m5NFtdb3076661 for ; Mon, 23 Jun 2008 15:55:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NFtdo6076659 for perforce@freebsd.org; Mon, 23 Jun 2008 15:55:39 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 23 Jun 2008 15:55:39 GMT Message-Id: <200806231555.m5NFtdo6076659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143978 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: Mon, 23 Jun 2008 15:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=143978 Change 143978 by pgj@disznohal on 2008/06/23 15:55:29 Prefer using the original English terms for (multi|any|uni)cast, because they are better known than the Hungarian translation I used for them. We hope this will enhance the readibility. Suggested by: gabor Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#3 (text+ko) ==== @@ -3,7 +3,8 @@ # The FreeBSD Hungarian Documentation Project # # $FreeBSD: doc/hu_HU.ISO8859-2/books/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ -# Original Revision: 1.4 +# %SOURCE% en_US.ISO8859-1/books/Makefile +# %SRCID% 1.14 # SUBDIR = faq ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile.inc#2 (text+ko) ==== @@ -3,7 +3,8 @@ # The FreeBSD Hungarian Documentation Project # # $FreeBSD: doc/hu_HU.ISO8859-2/books/Makefile.inc,v 1.1 2008/05/14 16:54:14 pgj Exp $ -# Original Revision: 1.2 +# %SOURCE% en_US.ISO8859-1/books/Makefile.inc +# %SRCID% 1.4 # DESTDIR?= ${DOCDIR}/hu_HU.ISO8859-2/books/${.CURDIR:T} ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/Makefile#2 (text+ko) ==== @@ -1,5 +1,7 @@ # # $FreeBSD: doc/en_US.ISO8859-1/books/faq/Makefile,v 1.12 2004/07/06 15:09:52 hrs Exp $ +# %SOURCE% en_US.ISO8859-1/books/faq/Makefile +# %SRCID% 1.12 # # Build the FreeBSD FAQ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#2 (text+ko) ==== @@ -3,7 +3,8 @@ # The FreeBSD Hungarian Documentation Project # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ -# Original Revision: 1.109 +# %SOURCE% en_US.ISO8859-1/books/handbook/Makefile +# %SRCID% 1.109 # # Build the FreeBSD Handbook. # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/isdn-bus.eps#2 (text+ko) ==== @@ -3,7 +3,6 @@ %%Creator: G. Adam Stanislav % The FreeBSD Hungarian Documentation Project % Translated by: PALI, Gabor -% Original Revision: 1.1 %%EndComments %%BeginProlog ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 (text+ko) ==== @@ -3,7 +3,6 @@ %%Creator: G. Adam Stanislav % The FreeBSD Hungarian Documentation Project % Translated by: PALI, Gabor -% Original Revision: 1.1 %%EndComments %%BeginProlog ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/natd.eps#2 (text+ko) ==== @@ -3,7 +3,6 @@ %%Creator: G. Adam Stanislav % The FreeBSD Hungarian Documentation Project % Translated by: PALI, Gabor -% Original Revision: 1.1 %%EndComments %%BeginProlog ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/net-routing.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/net-routing.pic,v 1.1 2008/05/14 16:54:14 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.2 +.\" %SOURCE% share/images/books/handbook/advanced-networking/net-routing.pic +.\" %SRCID% 1.2 .PS A: box "Helyi2"; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/static-routes.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/static-routes.pic,v 1.1 2008/05/14 16:54:14 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/advanced-networking/static-routes.pic +.\" %SRCID% 1.1 .PS I: box rad 0.10 wid 1 ht 0.55 "internet" dashed; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#2 (text+ko) ==== @@ -10,7 +10,8 @@ The FreeBSD Hungarian Documentation Project $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/chapters.ent,v 1.1 2008/05/14 16:54:14 pgj Exp $ - Original Revision: 1.37 + %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent + %SRCID% 1.37 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/striping.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/geom/striping.pic,v 1.1 2008/05/14 16:54:15 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/geom/striping.pic +.\" %SRCID% 1.1 .PS define disk_box { ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml#3 (text+ko) ==== @@ -4,7 +4,7 @@ --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-crypt-pkt.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-crypt-pkt.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/security/ipsec-crypt-pkt.pic +.\" %SRCID% 1.1 .PS A: box wid 2.7 ht 0.55 "Forrás: A.B.C.D" "Cél: W.X.Y.Z" \ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-encap-pkt.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-encap-pkt.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/security/ipsec-encap-pkt.pic +.\" %SRCID% 1.1 .PS A: box wid 2.1 ht 0.55 "Forrás: A.B.C.D" "Cél: W.X.Y.Z" \ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-network.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-network.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/security/ipsec-network.pic +.\" %SRCID% 1.1 .PS N1: "1. hálózat"; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-out-pkt.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/security/ipsec-out-pkt.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/security/ipsec-out-pkt.pic +.\" %SRCID% 1.1 .PS A: box wid 1.5 ht 0.55 "Forrás: 192.168.1.1" "Cél: 192.168.2.1" \ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/txtfiles.ent#2 (text+ko) ==== @@ -12,7 +12,8 @@ The FreeBSD Hungarian Documenation Project $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/txtfiles.ent,v 1.1 2008/05/14 16:54:14 pgj Exp $ - Original Revision: 1.4 + %SOURCE% en_US.ISO8859-1/books/handbook/txtfiles.ent + %SRCID% 1.4 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-concat.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-concat.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-concat.pic +.\" %SRCID% 1.1 .PS h = .3i dh = .02i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-mirrored-vol.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-mirrored-vol.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-mirrored-vol.pic +.\" %SRCID% 1.1 .PS move right 1i T: ellipse ht .3i wid 4i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-raid10-vol.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-raid10-vol.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-raid10-vol.pic +.\" %SRCID% 1.1 .PS move right 1i T: ellipse ht .3i wid 4i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-raid5-org.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-raid5-org.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-raid5-org.pic +.\" %SRCID% 1.1 .PS h = .3i dh = .02i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-simple-vol.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-simple-vol.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-simple-vol.pic +.\" %SRCID% 1.1 .PS move right 1i T: ellipse ht .3i wid 4i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-striped-vol.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-striped-vol.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-striped-vol.pic +.\" %SRCID% 1.1 .PS move right 1i T: ellipse ht .3i wid 4i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-striped.pic#2 (text+ko) ==== @@ -1,7 +1,8 @@ .\" $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/vinum-striped.pic,v 1.1 2008/05/14 16:54:18 pgj Exp $ .\" The FreeBSD Hungarian Documentation Project .\" Translated by: PALI, Gabor -.\" Original Revision: 1.1 +.\" %SOURCE% share/images/books/handbook/vinum/vinum-striped.pic +.\" %SRCID% 1.1 .PS h = .3i dh = .02i ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#4 (text+ko) ==== @@ -3,7 +3,7 @@ --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/books.ent#5 (text+ko) ==== @@ -1,8 +1,8 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#3 (text+ko) ==== @@ -11,7 +11,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl#3 (text+ko) ==== @@ -3,7 +3,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#3 (text+ko) ==== @@ -13,7 +13,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable-local.xsl#3 (text+ko) ==== @@ -3,7 +3,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#3 (text+ko) ==== @@ -17,7 +17,7 @@ ==== //depot/projects/docproj_hu/www/hu/community/newsgroups.sgml#5 (text+ko) ==== @@ -8,7 +8,7 @@ ==== //depot/projects/docproj_hu/www/hu/search/search-mid.sgml#3 (text+ko) ==== @@ -6,7 +6,7 @@ From owner-p4-projects@FreeBSD.ORG Mon Jun 23 21:40:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77B2F10656AF; Mon, 23 Jun 2008 21:40:28 +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 03CC11065679 for ; Mon, 23 Jun 2008 21:40:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF1AF8FC28 for ; Mon, 23 Jun 2008 21:40:27 +0000 (UTC) (envelope-from gabor@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 m5NLeRY9030474 for ; Mon, 23 Jun 2008 21:40:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NLeRBJ030472 for perforce@freebsd.org; Mon, 23 Jun 2008 21:40:27 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 21:40:27 GMT Message-Id: <200806232140.m5NLeRBJ030472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143994 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: Mon, 23 Jun 2008 21:40:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=143994 Change 143994 by gabor@gabor_server on 2008/06/23 21:39:58 - Small cleanup Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#7 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#7 (text+ko) ==== @@ -48,10 +48,9 @@ bin_file(FILE *f) { char buf[BUFSIZ]; - size_t i, m; - int ret = 0; + int i, m, ret = 0; - if (fseek(f, 0L, SEEK_SET) == -1) + if (fseek(f, 0, SEEK_SET) == -1) return (0); if ((m = fread(buf, 1, BUFSIZ, f)) == 0) @@ -71,10 +70,9 @@ gzbin_file(gzFile *f) { char buf[BUFSIZ]; - int i, m; - int ret = 0; + int i, m, ret = 0; - if (gzseek(f, (z_off_t)0, SEEK_SET) == -1) + if (gzseek(f, 0, SEEK_SET) == -1) return (0); if ((m = gzread(f, buf, BUFSIZ)) <= 0) From owner-p4-projects@FreeBSD.ORG Mon Jun 23 21:49:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C60561065682; Mon, 23 Jun 2008 21:49:37 +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 8707F1065670 for ; Mon, 23 Jun 2008 21:49:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D8688FC0C for ; Mon, 23 Jun 2008 21:49:37 +0000 (UTC) (envelope-from gabor@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 m5NLnbjS031329 for ; Mon, 23 Jun 2008 21:49:37 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NLnbcH031327 for perforce@freebsd.org; Mon, 23 Jun 2008 21:49:37 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 21:49:37 GMT Message-Id: <200806232149.m5NLnbcH031327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143996 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: Mon, 23 Jun 2008 21:49:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=143996 Change 143996 by gabor@gabor_server on 2008/06/23 21:48:46 - Revert unwanted changes Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#8 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#8 (text+ko) ==== @@ -48,9 +48,10 @@ bin_file(FILE *f) { char buf[BUFSIZ]; - int i, m, ret = 0; + size_t i, m; + int ret = 0; - if (fseek(f, 0, SEEK_SET) == -1) + if (fseek(f, 0L, SEEK_SET) == -1) return (0); if ((m = fread(buf, 1, BUFSIZ, f)) == 0) @@ -72,7 +73,7 @@ char buf[BUFSIZ]; int i, m, ret = 0; - if (gzseek(f, 0, SEEK_SET) == -1) + if (gzseek(f, 0L, SEEK_SET) == -1) return (0); if ((m = gzread(f, buf, BUFSIZ)) <= 0) From owner-p4-projects@FreeBSD.ORG Mon Jun 23 22:29:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4FF71065671; Mon, 23 Jun 2008 22:29:17 +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 5F350106566C for ; Mon, 23 Jun 2008 22:29:17 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4576C8FC20 for ; Mon, 23 Jun 2008 22:29:17 +0000 (UTC) (envelope-from gabor@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 m5NMTHA7035546 for ; Mon, 23 Jun 2008 22:29:17 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5NMTHuo035544 for perforce@freebsd.org; Mon, 23 Jun 2008 22:29:17 GMT (envelope-from gabor@freebsd.org) Date: Mon, 23 Jun 2008 22:29:17 GMT Message-Id: <200806232229.m5NMTHuo035544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143998 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: Mon, 23 Jun 2008 22:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=143998 Change 143998 by gabor@gabor_server on 2008/06/23 22:28:22 - Allow values up to ULLONG_MAX for -A/-B/-C/-m Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#37 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#19 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#33 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#37 (text+ko) ==== @@ -67,7 +67,8 @@ /* 9*/ "context out of range", /*10*/ "FreeBSD grep 2.5.1\n", /*11*/ "Unknown binary-files option", -/*12*/ "Binary file %s matches\n" +/*12*/ "Binary file %s matches\n", +/*12*/ "Value out of range" }; nl_catd catalog; @@ -87,8 +88,8 @@ char re_error[RE_ERROR_BUF + 1]; /* Command-line flags */ -int Aflag; /* -A x: print x lines trailing each match */ -int Bflag; /* -B x: print x lines leading each match */ +unsigned long long Aflag; /* -A x: print x lines trailing each match */ +unsigned long long Bflag; /* -B x: print x lines leading each match */ int Dflag; /* -D: do not process device files if optarg is passed */ int Eflag; /* -E: interpret pattern as extended regexp */ int Fflag; /* -F: interpret pattern as list of fixed strings */ @@ -118,7 +119,7 @@ int nullflag; /* --null */ char *label; /* --label */ char *color; /* --color */ -long long mcount; /* count for -m */ +unsigned long long mcount; /* count for -m */ int binbehave = BIN_FILE_BIN; @@ -361,17 +362,14 @@ { int c, lastc, prevoptind, newarg, i, needpattern; struct patfile *patfile, *pf_next; - long l; char *ep; struct stat *finfo = 0; + unsigned long long l; setlocale(LC_ALL, ""); #ifndef WITHOUT_NLS catalog = catopen("grep", NL_CAT_LOCALE); - if (catalog == ((nl_catd)-1)) - printf("HIBA: %d\n", errno); - #endif SLIST_INIT(&patfilelh); @@ -412,20 +410,27 @@ case '5': case '6': case '7': case '8': case '9': if (newarg || !isdigit(lastc)) Aflag = 0; - else if (Aflag > INT_MAX / 10) + else if (Aflag > LLONG_MAX / 10) errx(2, getstr(9)); Aflag = Bflag = (Aflag * 10) + (c - '0'); break; + case 'C': + if (optarg == NULL) { + Aflag = Bflag = 2; + break; + } + /* FALLTHROUGH */ case 'A': case 'B': - l = strtol(optarg, &ep, 10); - if (ep == optarg || *ep != '\0' || - l <= 0 || l >= INT_MAX) + l = strtoull(optarg, &ep, 10); + if ((errno == ERANGE) && (l == ULLONG_MAX)) errx(2, getstr(9)); if (c == 'A') - Aflag = (int)l; + Aflag = l; + else if (c == 'B') + Bflag = l; else - Bflag = (int)l; + Aflag = Bflag = l; break; case 'a': binbehave = BIN_FILE_TEXT; @@ -433,17 +438,6 @@ case 'b': bflag = 1; break; - case 'C': - if (optarg == NULL) - Aflag = Bflag = 2; - else { - l = strtol(optarg, &ep, 10); - if (ep == optarg || *ep != '\0' || - l <= 0 || l >= INT_MAX) - errx(2, getstr(9)); - Aflag = Bflag = (int)l; - } - break; case 'c': cflag = 1; break; @@ -511,7 +505,9 @@ break; case 'm': mflag++; - mcount = strtoll(optarg, (char **)NULL, 10); + mcount = strtoull(optarg, (char **)NULL, 10); + if ((errno == ERANGE) && (mcount == ULLONG_MAX)) + err(2, getstr(13)); break; case 'n': nflag = 1; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#19 (text+ko) ==== @@ -72,11 +72,11 @@ extern int cflags, eflags; /* Command line flags */ -extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, +extern int Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Oflag, Pflag, Rflag, Zflag, bflag, cflag, dflag, hflag, iflag, lflag, mflag, nflag, oflag, qflag, sflag, vflag, wflag, xflag, nullflag; -extern long long mcount; +extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#33 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 24 00:00:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC5B1065677; Tue, 24 Jun 2008 00:00:49 +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 51BCF1065675 for ; Tue, 24 Jun 2008 00:00:49 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 376BE8FC20 for ; Tue, 24 Jun 2008 00:00:49 +0000 (UTC) (envelope-from sson@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 m5O00n12043992 for ; Tue, 24 Jun 2008 00:00:49 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O00nUF043990 for perforce@freebsd.org; Tue, 24 Jun 2008 00:00:49 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 24 Jun 2008 00:00:49 GMT Message-Id: <200806240000.m5O00nUF043990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 144001 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: Tue, 24 Jun 2008 00:00:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144001 Change 144001 by sson@sson_amd64 on 2008/06/24 00:00:17 Don't need to open audit trigger file if using Mach IPC. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#28 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#28 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#27 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#28 $ */ #include @@ -77,11 +77,11 @@ static int ret, minval; static char *lastfile = NULL; static int allhardcount = 0; -static int triggerfd = 0; static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; #ifndef USE_MACH_IPC static int sigterms, sigterms_handled; +static int triggerfd = 0; #else /* USE_MACH_IPC */ @@ -449,7 +449,7 @@ } endac(); -#ifdef USE_MACH_IPC +#ifndef USE_MACH_IPC if (close(triggerfd) != 0) syslog(LOG_ERR, "Error closing control file"); #endif @@ -1050,12 +1050,12 @@ #ifdef USE_MACH_IPC mach_setup(); -#endif - +#else if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { syslog(LOG_ERR, "Error opening trigger file"); fail_exit(); } +#endif /* * To provide event feedback cycles and avoid auditd becoming From owner-p4-projects@FreeBSD.ORG Tue Jun 24 01:23:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D987710656AD; Tue, 24 Jun 2008 01:23:12 +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 9A0DC1065670 for ; Tue, 24 Jun 2008 01:23:12 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6538E8FC38 for ; Tue, 24 Jun 2008 01:23:12 +0000 (UTC) (envelope-from thompsa@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 m5O1NCJh064391 for ; Tue, 24 Jun 2008 01:23:12 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O1NCrJ064389 for perforce@freebsd.org; Tue, 24 Jun 2008 01:23:12 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 24 Jun 2008 01:23:12 GMT Message-Id: <200806240123.m5O1NCrJ064389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 144004 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: Tue, 24 Jun 2008 01:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=144004 Change 144004 by thompsa@thompsa_burger on 2008/06/24 01:22:15 Restore BWI_FIRMWARE that was removed. Affected files ... .. //depot/projects/vap/share/mk/bsd.own.mk#9 edit Differences ... ==== //depot/projects/vap/share/mk/bsd.own.mk#9 (text+ko) ==== @@ -376,6 +376,7 @@ # .for var in \ BIND_LIBS \ + BWI_FIRMWARE \ GNU_CPIO \ HESIOD \ IDEA From owner-p4-projects@FreeBSD.ORG Tue Jun 24 01:30:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 506EA1065675; Tue, 24 Jun 2008 01:30:20 +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 0F3A81065671 for ; Tue, 24 Jun 2008 01:30:20 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E61018FC19 for ; Tue, 24 Jun 2008 01:30:19 +0000 (UTC) (envelope-from thompsa@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 m5O1UJx2064941 for ; Tue, 24 Jun 2008 01:30:19 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O1UJ3I064939 for perforce@freebsd.org; Tue, 24 Jun 2008 01:30:19 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 24 Jun 2008 01:30:19 GMT Message-Id: <200806240130.m5O1UJ3I064939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 144005 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: Tue, 24 Jun 2008 01:30:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=144005 Change 144005 by thompsa@thompsa_burger on 2008/06/24 01:29:20 IFC @144000 Affected files ... .. //depot/projects/vap/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/vap/contrib/top/top.X#3 integrate .. //depot/projects/vap/contrib/top/top.c#5 integrate .. //depot/projects/vap/etc/network.subr#13 integrate .. //depot/projects/vap/etc/pccard_ether#3 integrate .. //depot/projects/vap/etc/rc#4 integrate .. //depot/projects/vap/etc/rc.d/abi#3 integrate .. //depot/projects/vap/etc/rc.d/archdep#3 integrate .. //depot/projects/vap/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/vap/etc/rc.d/bgfsck#3 integrate .. //depot/projects/vap/etc/rc.d/cleartmp#3 integrate .. //depot/projects/vap/etc/rc.d/dumpon#3 integrate .. //depot/projects/vap/etc/rc.d/fsck#4 integrate .. //depot/projects/vap/etc/rc.d/hostid#5 integrate .. //depot/projects/vap/etc/rc.d/hostname#3 integrate .. //depot/projects/vap/etc/rc.d/ldconfig#4 integrate .. //depot/projects/vap/etc/rc.d/local#4 integrate .. //depot/projects/vap/etc/rc.d/localpkg#3 integrate .. //depot/projects/vap/etc/rc.d/lockd#4 integrate .. //depot/projects/vap/etc/rc.d/motd#4 integrate .. //depot/projects/vap/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/vap/etc/rc.d/mountlate#5 integrate .. //depot/projects/vap/etc/rc.d/moused#4 integrate .. //depot/projects/vap/etc/rc.d/netif#9 integrate .. //depot/projects/vap/etc/rc.d/netoptions#3 integrate .. //depot/projects/vap/etc/rc.d/newsyslog#4 integrate .. //depot/projects/vap/etc/rc.d/power_profile#4 integrate .. //depot/projects/vap/etc/rc.d/routing#5 integrate .. //depot/projects/vap/etc/rc.d/savecore#4 integrate .. //depot/projects/vap/etc/rc.d/statd#4 integrate .. //depot/projects/vap/etc/rc.d/swap1#4 integrate .. //depot/projects/vap/etc/rc.d/sysctl#4 integrate .. //depot/projects/vap/etc/rc.subr#6 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/vap/include/unistd.h#10 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/vap/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/vap/lib/libc/gen/exec.3#4 integrate .. //depot/projects/vap/lib/libc/gen/exec.c#4 integrate .. //depot/projects/vap/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/vap/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#21 integrate .. //depot/projects/vap/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/vap/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/vap/sbin/natd/natd.8#6 integrate .. //depot/projects/vap/sbin/natd/natd.c#4 integrate .. //depot/projects/vap/sbin/natd/natd.h#3 integrate .. //depot/projects/vap/sbin/swapon/swapon.8#4 integrate .. //depot/projects/vap/sbin/swapon/swapon.c#4 integrate .. //depot/projects/vap/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/vap/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_cbus.c#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_isa.c#6 integrate .. //depot/projects/vap/sys/dev/fe/if_fe_pccard.c#7 integrate .. //depot/projects/vap/sys/dev/fe/if_fevar.h#7 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#29 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vap/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.c#9 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/vap/sys/pci/viapm.c#7 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/vap/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/vap/sys/vm/vm_kern.c#9 integrate .. //depot/projects/vap/sys/vm/vm_map.c#11 integrate .. //depot/projects/vap/tools/regression/fifo/fifo_create/fifo_create.c#3 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-scanfloat.c#4 integrate .. //depot/projects/vap/usr.bin/cpio/cmdline.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.h#2 integrate .. //depot/projects/vap/usr.bin/cpio/matching.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/test/main.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/test/test.h#2 integrate .. //depot/projects/vap/usr.sbin/powerd/powerd.8#3 integrate .. //depot/projects/vap/usr.sbin/powerd/powerd.c#4 integrate Differences ... ==== //depot/projects/vap/contrib/gdtoa/gethex.c#3 (text+ko) ==== @@ -113,8 +113,11 @@ e += e1; } *sp = (char*)s; - if (zret) - return havedig ? STRTOG_Zero : STRTOG_NoNumber; + if (zret) { + if (!havedig) + *sp = s0 - 1; + return STRTOG_Zero; + } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) k++; ==== //depot/projects/vap/contrib/top/top.X#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.21 2008/06/21 15:48:16 ru Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -10,7 +10,7 @@ .SH SYNOPSIS .B top [ -.B \-abCHIijnqStuv +.B \-abCHIijnPqStuv ] [ .BI \-d count ] [ @@ -119,6 +119,9 @@ Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq mode. .TP +.B \-P +Display per-cpu CPU usage statistics. +.TP .B \-q Renice .I top ==== //depot/projects/vap/contrib/top/top.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.26 2008/06/21 15:48:16 ru Exp $ */ /* @@ -283,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -412,14 +412,10 @@ pcpu_stats = Yes; break; - case 'p': - pcpu_stats = No; - break; - default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-abCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); ==== //depot/projects/vap/etc/network.subr#13 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.189 2008/05/26 10:10:11 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ # # @@ -48,10 +48,6 @@ ipx_up ${ifn} && cfg=0 childif_create ${ifn} - if [ "$cfg" -eq 0 ]; then - ifconfig ${ifn} - fi - return $cfg } @@ -73,10 +69,6 @@ ifscript_down ${ifn} && cfg=0 childif_destroy ${ifn} - if [ "$cfg" -eq 0 ]; then - echo -n " ${ifn}" - fi - return $cfg } ==== //depot/projects/vap/etc/pccard_ether#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.54 2006/12/08 15:48:42 hrs Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.55 2008/06/23 20:50:11 mtm Exp $ # # pccard_ether interfacename [start|stop|restart] # @@ -78,7 +78,7 @@ done fi - /etc/rc.d/netif start $ifn + /etc/rc.d/netif quietstart $ifn # Do route configuration if needed. # XXX: should probably do this by calling rc.d/routing. @@ -99,7 +99,7 @@ fi fi - /etc/rc.d/netif stop $ifn + /etc/rc.d/netif quietstop $ifn # clean ARP table ifexists $ifn && arp -d -i $ifn -a ==== //depot/projects/vap/etc/rc#4 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.342 2008/06/23 04:18:22 mtm Exp $ # # System startup script run by init on autoboot @@ -69,7 +69,6 @@ # and to make the configuration file variables available to rc itself. # . /etc/rc.subr -echo "Loading configuration files." load_rc_config 'XXX' skip="-s nostart" ==== //depot/projects/vap/etc/rc.d/abi#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.11 2006/12/30 22:53:19 yar Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.12 2008/06/22 16:19:50 mtm Exp $ # # PROVIDE: abi @@ -45,13 +45,19 @@ abi_start() { - echo -n 'Additional ABI support:' + local _echostop + + _echostop= + if checkyesno sysvipc_enable || checkyesno linux_enable || checkyesno svr4_enable; then + echo -n 'Additional ABI support:' + _echostop=yes + fi checkyesno sysvipc_enable && sysv_start checkyesno linux_enable && linux_start checkyesno svr4_enable && svr4_start - echo '.' + [ -n "${_echostop}" ] && echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.15 2008/06/22 15:57:50 mtm Exp $ # # PROVIDE: archdep @@ -13,37 +13,32 @@ start_cmd="archdep_start" stop_cmd=":" -# SCO binary emulation -# -ibcs2_compat() -{ - if checkyesno ibcs2_enable; then - echo -n ' ibcs2' - load_kld ibcs2 - case ${ibcs2_loaders} in - [Nn][Oo]) - ;; - *) - for i in ${ibcs2_loaders}; do - load_kld ibcs2_$i - done - ;; - esac - fi -} - archdep_start() { local _arch _arch=`${SYSCTL_N} hw.machine_arch` - echo -n "Initial $_arch initialization:" case $_arch in i386) - ibcs2_compat + # SCO binary emulation + # + if checkyesno ibcs2_enable; then + echo -n 'Initial i386 initialization:' + echo -n ' ibcs2' + load_kld ibcs2 + case ${ibcs2_loaders} in + [Nn][Oo]) + ;; + *) + for i in ${ibcs2_loaders}; do + load_kld ibcs2_$i + done + ;; + esac + echo '.' + fi ;; esac - echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/auto_linklocal#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.5 2006/12/29 15:56:21 hrs Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.6 2008/06/23 22:06:28 mtm Exp $ # # PROVIDE: auto_linklocal @@ -18,7 +18,10 @@ auto_linklocal_start() { if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + if ! ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 >/dev/null 2>&1; then + warn "failed to set sysctl(8)" + return 1 + fi laddr=`network6_getladdr lo0` if [ -z "${laddr}" ]; then ifconfig lo0 inet6 fe80::1 prefixlen 64 ==== //depot/projects/vap/etc/rc.d/bgfsck#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.8 2007/03/11 06:53:06 brooks Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.9 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: bgfsck @@ -31,7 +31,7 @@ bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi if [ -z "${rc_force}" ]; then - echo "${bgfsck_msg}." + [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}." fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ ==== //depot/projects/vap/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.19 2008/06/23 04:42:58 mtm Exp $ # # PROVIDE: cleartmp @@ -25,7 +25,7 @@ ${tmp}/.ICE-unix ${tmp}/.font-unix" if checkyesno ${rcvar1}; then - echo "Clearing ${tmp}." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}." # This is not needed for mfs, but doesn't hurt anything. # Things to note: @@ -44,7 +44,7 @@ elif checkyesno clear_tmp_X; then # Remove X lock files, since they will prevent you from # restarting X. Remove other X related directories. - echo "Clearing ${tmp} (X related)." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)." rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} fi if checkyesno clear_tmp_X; then ==== //depot/projects/vap/etc/rc.d/dumpon#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.12 2008/06/23 04:39:36 mtm Exp $ # # PROVIDE: dumpon @@ -15,11 +15,12 @@ dumpon_try() { - if /sbin/dumpon -v "${1}" ; then + if /sbin/dumpon "${1}" ; then # Make a symlink in devfs for savecore ln -fs "${1}" /dev/dumpdev return 0 fi + warn "unable to specify $1 as a dump device" return 1 } ==== //depot/projects/vap/etc/rc.d/fsck#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: fsck @@ -23,7 +23,7 @@ # During fsck ignore SIGQUIT trap : 3 - echo "Starting file system checks:" + [ -z "${rc_quiet}" ] && echo "Starting file system checks:" if checkyesno background_fsck; then fsck -F -p else ==== //depot/projects/vap/etc/rc.d/hostid#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/rc.d/hostid,v 1.9 2008/05/06 10:40:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.10 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostid @@ -47,10 +47,12 @@ # Generate hostid based on hostuuid - take first four bytes from md5(uuid). id=`echo -n $uuid | /sbin/md5` id="0x${id%????????????????????????}" + # Set both kern.hostuuid and kern.hostid. - echo "Setting hostuuid: ${uuid}." + # + [ -z "${rc_quiet}" ] && echo "Setting hostuuid: ${uuid}." ${SYSCTL_W} kern.hostuuid="${uuid}" >/dev/null - echo "Setting hostid: ${id}." + [ -z "${rc_quiet}" ] && echo "Setting hostid: ${id}." ${SYSCTL_W} kern.hostid=${id} >/dev/null } ==== //depot/projects/vap/etc/rc.d/hostname#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostname @@ -72,7 +72,7 @@ # All right, it is safe to invoke hostname(1) now. # - echo "Setting hostname: ${hostname}." + [ -z "${rc_quiet}" ] && echo "Setting hostname: ${hostname}." /bin/hostname "${hostname}" } ==== //depot/projects/vap/etc/rc.d/ldconfig#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.20 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: ldconfig @@ -36,7 +36,7 @@ _LDC="${_LDC} ${i}" fi done - echo 'ELF ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in @@ -55,7 +55,8 @@ _LDC="${_LDC} ${i}" fi done - echo '32-bit compatibility ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 -m ${_ins} ${_LDC} ;; esac @@ -71,7 +72,8 @@ _LDC="${_LDC} ${i}" fi done - echo 'a.out ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo 'a.out ldconfig path:' ${_LDC} ${ldconfig} -aout ${_ins} ${_LDC} ;; esac ==== //depot/projects/vap/etc/rc.d/local#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.8 2008/06/22 16:23:39 mtm Exp $ # # PROVIDE: local @@ -16,20 +16,20 @@ local_start() { - echo -n 'Starting local daemons:' if [ -f /etc/rc.local ]; then + echo -n 'Starting local daemons:' . /etc/rc.local + echo '.' fi - echo '.' } local_stop() { - echo -n 'Shutting down local daemons:' if [ -f /etc/rc.shutdown.local ]; then + echo -n 'Shutting down local daemons:' . /etc/rc.shutdown.local + echo '.' fi - echo '.' } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/localpkg#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.8 2006/02/12 10:04:56 matteo Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.10 2008/06/23 03:49:30 mtm Exp $ # # PROVIDE: localpkg @@ -16,15 +16,21 @@ pkg_start() { + local initdone + # For each dir in $local_startup, search for init scripts matching *.sh # case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Local package initialization:' + initdone= find_local_scripts_old for script in ${zlist} ${slist}; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Local package initialization:' + initdone=yes + fi if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 @@ -33,20 +39,26 @@ echo -n " (skipping ${script}, not executable)" fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } pkg_stop() { + local initdone + case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Shutting down daemon processes:' + initdone= find_local_scripts_old for script in `reverse_list ${slist} ${zlist}`; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Shutting down local packages:' + initdone=yes + fi if [ -x "${script}" ]; then if [ `sysctl -n debug.bootverbose` -eq 1 ]; then echo "==>" ${script} @@ -56,7 +68,7 @@ ${script} stop) fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } ==== //depot/projects/vap/etc/rc.d/lockd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $ # # PROVIDE: lockd @@ -15,7 +15,7 @@ rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' +stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable' status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get @@ -26,7 +26,7 @@ local ret ret=0 - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable + if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable then ret=1 fi ==== //depot/projects/vap/etc/rc.d/motd#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.11 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: motd @@ -22,13 +22,13 @@ # Must be done *before* interactive logins are possible # to prevent possible race conditions. # - echo -n 'Updating motd' + [ -z "${rc_quiet}" ] && echo -n 'Updating motd:' if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd fi if [ ! -w /etc/motd ]; then - echo ' ... /etc/motd is not writable, update failed.' + echo ' /etc/motd is not writable, update failed.' return fi @@ -42,7 +42,7 @@ } rm -f $T - echo . + [ -z "${rc_quiet}" ] && echo . } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/mountcritremote#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.19 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -36,9 +36,15 @@ { # Mount nfs filesystems. # - echo -n 'Mounting NFS file systems:' - mount -a -t nfs - echo '.' + case "`/sbin/mount -d -a -t nfs`" in + '') + ;; + *) + echo -n 'Mounting NFS file systems:' + mount -a -t nfs + echo '.' + ;; + esac # Mount other network filesystems if present in /etc/fstab. case ${extra_netfs_types} in ==== //depot/projects/vap/etc/rc.d/mountlate#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.6 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountlate @@ -16,13 +16,24 @@ mountlate_start() { - local err + local err latefs # Mount "late" filesystems. - echo -n 'Mounting late file systems:' - mount -a -l - err=$? - echo '.' + # + err=0 + latefs= + # / (root) fs is always remounted, so remove from list + latefs="`/sbin/mount -d -a -l | grep -v ' /$'`" + case ${latefs} in + '') + ;; + *) + echo -n 'Mounting late file systems:' + mount -a -l + err=$? + echo '.' + ;; + esac case ${err} in 0) ==== //depot/projects/vap/etc/rc.d/moused#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: moused @@ -51,7 +51,7 @@ mytype="$moused_type" fi - echo -n "Starting ${ms} moused:" + [ -z "${rc_quiet}" ] && echo -n "Starting ${ms} moused." /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${pidarg} mousechar_arg= @@ -59,7 +59,6 @@ [Nn][Oo] | '') ;; *) - echo -n ' mousechar_start' mousechar_arg="-M ${mousechar_start}" ;; esac @@ -67,7 +66,6 @@ for ttyv in /dev/ttyv* ; do vidcontrol < ${ttyv} ${mousechar_arg} -m on done - echo '.' } run_rc_command $* ==== //depot/projects/vap/etc/rc.d/netif#9 (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.28 2008/05/18 02:57:54 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $ # # PROVIDE: netif @@ -85,11 +85,8 @@ # cmdifn=$* - echo -n "Stopping network:" - # Deconfigure the interface(s) network_common ifn_stop - echo '.' } # network_common routine @@ -98,7 +95,7 @@ # an interface and then calls $routine. network_common() { - local _cooked_list _fail _func + local _cooked_list _fail _func _ok _str _func= @@ -123,12 +120,31 @@ fi _fail= + _ok= for ifn in ${_cooked_list}; do - if ! ${_func} ${ifn} $2; then + if ${_func} ${ifn} $2; then + _ok="${_ok} ${ifn}" + else _fail="${_fail} ${ifn}" fi done + _str= + if [ -n "${_ok}" ]; then + case ${_func} in + ifn_start) + _str='Starting' + ;; + ifn_stop) + _str='Stopping' + ;; + esac + echo "${_str} Network:${_ok}." + if [ -z "${rc_quiet}" ]; then + /sbin/ifconfig ${_ok} + fi + fi + debug "The following interfaces were not configured: $_fail" } ==== //depot/projects/vap/etc/rc.d/netoptions#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.146 2008/06/23 12:06:35 mtm Exp $ # # PROVIDE: netoptions @@ -9,9 +9,17 @@ . /etc/rc.subr +_netoptions_initdone= +netoptions_init() +{ + if [ -z "${_netoptions_initdone}" ]; then + echo -n 'Additional TCP/IP options:' + _netoptions_initdone=yes + fi +} + load_rc_config 'XXX' -echo -n 'Additional IP options:' case ${log_in_vain} in [Nn][Oo] | '') log_in_vain=0 @@ -22,21 +30,24 @@ [0-9]*) ;; *) + netoptions_init echo " invalid log_in_vain setting: ${log_in_vain}" log_in_vain=0 ;; esac -[ "${log_in_vain}" -ne 0 ] && ( +if [ "${log_in_vain}" -ne 0 ]; then + netoptions_init echo -n " log_in_vain=${log_in_vain}" sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null -) +fi case ${tcp_extensions} in [Yy][Ee][Ss] | '') ;; *) + netoptions_init echo -n ' tcp extensions=NO' sysctl net.inet.tcp.rfc1323=0 >/dev/null ;; @@ -44,6 +55,7 @@ case ${tcp_keepalive} in [Nn][Oo]) + netoptions_init echo -n ' TCP keepalive=NO' sysctl net.inet.tcp.always_keepalive=0 >/dev/null ;; @@ -51,6 +63,7 @@ case ${tcp_drop_synfin} in [Yy][Ee][Ss]) + netoptions_init echo -n ' drop SYN+FIN packets=YES' sysctl net.inet.tcp.drop_synfin=1 >/dev/null ;; @@ -60,6 +73,7 @@ [Nn][Oo] | '') ;; *) + netoptions_init >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 24 06:46:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6874B1065673; Tue, 24 Jun 2008 06:46:39 +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 266E21065671 for ; Tue, 24 Jun 2008 06:46:39 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B0B08FC0A for ; Tue, 24 Jun 2008 06:46:39 +0000 (UTC) (envelope-from konrad@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 m5O6kcYm013358 for ; Tue, 24 Jun 2008 06:46:38 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O6kcfI013356 for perforce@freebsd.org; Tue, 24 Jun 2008 06:46:38 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 24 Jun 2008 06:46:38 GMT Message-Id: <200806240646.m5O6kcfI013356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 144011 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: Tue, 24 Jun 2008 06:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=144011 Change 144011 by konrad@vspredator on 2008/06/24 06:46:07 style(9) fixes. Additional functionalty added. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef/colldef.c#4 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef/colldef.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#define DEFAULT_IN_FILE "../colldef_in.src.simple" #define DEFAULT_OUT_FILE "LC_COLLATE" #define WEIGHT_TABLE_SIZE (1 << 16) #define NWEIGHTS 4 @@ -45,21 +44,22 @@ struct sym_entry { char *name; int val; - SLIST_ENTRY(sym_entry) sym_next; + SLIST_ENTRY(sym_entry) next; }; -SLIST_HEAD(, sym_entry) head; +static SLIST_HEAD(, sym_entry) head; /* * This will have to be a structure, to at least accomodate symbol chaining. */ -uint8_t weight_table[WEIGHT_TABLE_SIZE][NWEIGHTS]; -struct weight_uncompressed { +static uint8_t weight_table[WEIGHT_TABLE_SIZE][NWEIGHTS]; + +static struct weight_uncompressed { uint16_t w[NWEIGHTS]; char used; } weights_uncompressed[WEIGHT_TABLE_SIZE]; -int verbose = 0; +static int verbose = 0; void usage(char *name); void assign_weights(int codepoint, char *weights); @@ -76,9 +76,10 @@ if ((sym = malloc(sizeof(*sym))) == NULL) err(1, "add_symbol: malloc(%d)", sizeof(*sym)); - sym->name = strdup(name); + if ((sym->name = strdup(name)) == NULL) + err(1, "add_symbol: strdup(%d)", strlen(name) + 1); sym->val = counter++; - SLIST_INSERT_HEAD(&head, sym, sym_next); + SLIST_INSERT_HEAD(&head, sym, next); } /* @@ -90,10 +91,10 @@ { struct sym_entry *sym; - SLIST_FOREACH(sym, &head, sym_next) { + SLIST_FOREACH(sym, &head, next) if (strcmp(sym->name, name) == 0) return sym->val; - } + return 0; } @@ -102,10 +103,9 @@ { struct sym_entry *sym; - SLIST_FOREACH(sym, &head, sym_next) { + SLIST_FOREACH(sym, &head, next) printf("sym->name=%s sym->val=%d\n", sym->name, sym->val); - } } void @@ -122,6 +122,10 @@ } } +/* + * Decode a unicode codepoint stored in UTF-8 format, each byte coded + * as a hexadecimal constant. + */ int get_codepoint(char *p, char **p_end) { @@ -131,7 +135,10 @@ wchar_t out = 0; do { - /* without leading "0x" will also work */ + /* + * Scanf without leading "0x" will also work, + * but we don't have such cases in our input data. + */ p[0] = '0'; sscanf(p, "%x%n", &tmp, &len); p += len; @@ -141,30 +148,31 @@ len = mbtowc(&out, synthesis, i); assert(len == i || synthesis[0] == 0); if (p_end != NULL) - *p_end = p; /* return where we got to */ + *p_end = p; /* Return where we got to. */ return tmp; } void -process_file(char *name) +process_file(FILE *f) { unsigned codepoint = 0; char buf[512], *p; bzero(weights_uncompressed, sizeof(weights_uncompressed)); SLIST_INIT(&head); - if (freopen(name, "r", stdin) == NULL) - err(1, "freopen: %s", name); - while (fgets(buf, sizeof(buf), stdin)) { + while (fgets(buf, sizeof(buf), f)) { #ifdef DEBUG fputs(buf, stdout); #endif buf[strlen(buf) - 1] = 0; switch (buf[0]) { case '<': - /*assert(buf[1] == 'X');*/ - if (buf[1] == 'X') /* XXX */ + /* + * XXX. The assumption here is that collating + * symbols start with 'X'. + */ + if (buf[1] == 'X') add_symbol(buf); break; case '\\': @@ -174,10 +182,15 @@ } } - - fclose(stdin); /* not really needed - freopen closes */ } +/* + * This function decodes a weight, which can be given as: + * 1. a symbol name in angle brackets - in which case we have to look it up in + * our symbol table. + * 2. IGNORE keyword - this weight should be ignored. + * 3. A literal hexadecimal value prefixed with "\x". + */ int get_weight_val(char **p) { @@ -189,17 +202,18 @@ case '<': p3 = strchr(p2, '>'); assert(p3); - p3[1] = 0; /* truncate the string for get_symval */ + p3[1] = 0; /* Truncate the string for get_symval. */ ret = get_symval(p2); - *p = p3 + 2; /* skip over ';' also */ - p3[1] = ';'; /* restore string; we shouldn't care... */ + if (ret == 0) + errx(1, "get_weight_val: symbol %s not found", + p2); + *p = p3 + 2; /* Skip over ';' also. */ + p3[1] = ';'; /* Restore string; we shouldn't care... */ return ret; - case 'I': - /* IGNORE */ - *p += 7; - return 0; /* IGNORE means 0 (I think) */ - case '\\': - /* we get literal value, instead of symbol */ + case 'I': /* IGNORE */ + *p += 7; /* IGNORE has 6 letters, + ';'. */ + return 0; /* IGNORE means 0 (I think). */ + case '\\': /* Literal value. Decode it. */ ret = get_codepoint(p2, &p3); *p = p3 + 1; return ret; @@ -209,21 +223,28 @@ } } +/* + * Take a string of four weights, separated by semicolons, + * decode them and assign to the weight table at the given codepoint + * position. + */ void assign_weights(int codepoint, char *weights) { - int i; + int i, val; assert(weights != NULL); weights_uncompressed[codepoint].used = 1; for (i = 0; i < 4; i++) { - int val; - val = get_weight_val(&weights); weights_uncompressed[codepoint].w[i] = val; } } +/* + * Assign new weight value to all codepoint with the given value 'val'. + * Do this only for the first level (w[0]). + */ void reduce(int val, int new_val) { @@ -242,15 +263,15 @@ * Find 2 minimums from the given set. * Optimised to only make one pass throught the set. (data locality) */ -#define MIN_MAX (1<<15) +#define MIN_MAX (1 << 15) int find_min(int start, int *min2_ret) { int min = MIN_MAX, min2, min3 = MIN_MAX; - int i; + int i, val; for (i = 0; i < WEIGHT_TABLE_SIZE; i++) { - int val = weights_uncompressed[i].w[0]; + val = weights_uncompressed[i].w[0]; /* 1. case, at first we find no a minimum */ if (val >= start && val < min) { min2 = min; @@ -275,15 +296,14 @@ int i; printf("%d: ", level); - for (i = 0; i < WEIGHT_TABLE_SIZE; i++) { + for (i = 0; i < WEIGHT_TABLE_SIZE; i++) if (weights_uncompressed[i].used && weights_uncompressed[i].w[0] == level) printf(" (%d %d %d)", weights_uncompressed[i].w[1], - weights_uncompressed[i].w[2], - weights_uncompressed[i].w[3]); + weights_uncompressed[i].w[2], + weights_uncompressed[i].w[3]); - } - printf("\n"); + putchar('\n'); } /* @@ -319,66 +339,75 @@ } void -binary_output(char *out_file) +binary_output(FILE *f) { int i, j; - int out; - - /* - * I just use open and write, instead of stdio in this case. - * This program isn't meant to be portable from UNIX. - */ - if ((out = open(out_file, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1) - err(1, "open(%s)", out_file); + for (i = 0; i < WEIGHT_TABLE_SIZE; i++) for (j = 0; j < NWEIGHTS; j++) weight_table[i][j] = weights_uncompressed[i].w[j]; - if (write(out, weight_table, sizeof(weight_table)) != - sizeof(weight_table)) + if (fwrite(weight_table, sizeof(weight_table), 1, f) != 1) errx(1, "not full write"); - close(out); } /* - * I divided the process into 3 main functions, so we could optionally - * process multiple input files with better argument processing. - * Another questionable optimisation. + * I divided the process into 3 main functions, so we can + * process multiple input files with one call. */ int main(int argc, char *argv[]) { + FILE *f, *of; int ch; - char *in_file = DEFAULT_IN_FILE; - char *out_file = DEFAULT_OUT_FILE; + char name[512]; - while ((ch = getopt(argc, argv, "hf:o:v")) != -1) { + while ((ch = getopt(argc, argv, "h:v")) != -1) { switch (ch) { - case 'f': - in_file = optarg; - break; - case 'o': - out_file = optarg; - break; case 'v': verbose = 1; - break; + break; default: usage(argv[0]); } } + argv += optind; + argc -= optind; /* - * need to setlocale to an UTF-8 locale, so thet - * mbtowc works correctly + * Need to setlocale to an UTF-8 locale, so that + * mbtowc works correctly. */ setlocale(LC_ALL, "en_US.UTF-8"); - process_file(in_file); + if (argc) for (; argc; argc--, argv++) { + if ((f = fopen(argv[0], "r")) == NULL) + err(1, "fopen: %s", argv[0]); + process_file(f); + fclose(f); +#ifdef DEBUG2 + dump_table(); +#endif + compress_weights(); + snprintf(name, sizeof(name), + "%s.%s", argv[0], DEFAULT_OUT_FILE); + if ((of = fopen(name, "w")) == NULL) + err(1, "fopen: %s", name); + binary_output(of); + fclose(of); + } else { + process_file(stdin); #ifdef DEBUG2 - dump_table(); + dump_table(); #endif - compress_weights(); - binary_output(out_file); + compress_weights(); + /* + * We could write to stdout here... + */ + if ((of = fopen(DEFAULT_OUT_FILE, "w")) == NULL) + err(1, "fopen: %s", name); + binary_output(of); + fclose(of); + } return 0; } @@ -387,9 +416,11 @@ usage(char *name) { printf( "usage: " - "\t%s [-f input_file] [-o output_file]\n" - "\tdefault output file is LC_COLLATE\n" + "\t%s [-h] [-v] [input_file_1] ... [input_file_n] \n" + "\t output file name is LC_COLLATE\n" + "\t if one or more input files given as arguments, " + "\t output file name is the input file name with\n" + "LC_COLLATE concatenaded.\n" , name); exit(1); } - From owner-p4-projects@FreeBSD.ORG Tue Jun 24 09:03:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9945410656AE; Tue, 24 Jun 2008 09:03:01 +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 59919106567F for ; Tue, 24 Jun 2008 09:03:01 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 450C08FC23 for ; Tue, 24 Jun 2008 09:03:01 +0000 (UTC) (envelope-from gabor@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 m5O92uaj035933 for ; Tue, 24 Jun 2008 09:02:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O92uWt035931 for perforce@freebsd.org; Tue, 24 Jun 2008 09:02:56 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 09:02:56 GMT Message-Id: <200806240902.m5O92uWt035931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144014 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: Tue, 24 Jun 2008 09:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=144014 Change 144014 by gabor@gabor_server on 2008/06/24 09:02:45 - Use an easier to understand and cleaner layout for device, directory and link actions Inspired by: NetBSD Project Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#38 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#20 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#34 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#38 (text+ko) ==== @@ -90,20 +90,15 @@ /* Command-line flags */ unsigned long long Aflag; /* -A x: print x lines trailing each match */ unsigned long long Bflag; /* -B x: print x lines leading each match */ -int Dflag; /* -D: do not process device files if optarg is passed */ int Eflag; /* -E: interpret pattern as extended regexp */ int Fflag; /* -F: interpret pattern as list of fixed strings */ int Gflag; /* -G: interpret pattern as basic regexp */ int Hflag; /* -H: always print file name */ int Jflag; /* -J: grep in bzipped file */ int Lflag; /* -L: only show names of files with no matches */ -int Oflag; /* -O: if -R, follow explicitly listed symlinks */ -int Pflag; /* -P: if -R, no symlinks are followed */ -int Rflag; /* -R: recursively search directory trees */ int Zflag; /* -Z: grep in gzipped file */ int bflag; /* -b: show block numbers for each match */ int cflag; /* -c: only show a count of matching lines */ -int dflag; /* -d: skip reading of directories */ int hflag; /* -h: don't print filename headers */ int iflag; /* -i: ignore case */ int lflag; /* -l: only show names of files with matches */ @@ -121,7 +116,10 @@ char *color; /* --color */ unsigned long long mcount; /* count for -m */ -int binbehave = BIN_FILE_BIN; +int binbehave = BIN_FILE_BIN; +int devbehave = DEV_GREP; +int dirbehave = DIR_GREP; +int linkbehave = LINK_GREP; enum { BIN_OPT = CHAR_MAX + 1, @@ -443,14 +441,14 @@ break; case 'D': if (strcmp(optarg, "skip") == 0) - Dflag = 1; + devbehave = DEV_SKIP; break; case 'd': if (strcmp("recurse", optarg) == 0) { Hflag++; - Rflag++; + dirbehave = DIR_RECURSE; } else if (strcmp("skip", optarg) == 0) - dflag++; + dirbehave = DIR_SKIP; else if (strcmp("read", optarg) != 0) usage(); break; @@ -513,23 +511,23 @@ nflag = 1; break; case 'O': - Oflag++; + linkbehave = LINK_EXPLICIT; break; case 'o': oflag++; break; case 'P': - Pflag++; + linkbehave = LINK_SKIP; break; case 'q': qflag = 1; break; case 'S': - Pflag = 0; + linkbehave = LINK_GREP; break; case 'R': case 'r': - Rflag++; + dirbehave = DIR_RECURSE; Hflag++; break; case 's': @@ -645,11 +643,11 @@ if (argc == 0) exit(!procfile(NULL)); - if (Rflag) + if (dirbehave == DIR_RECURSE) c = grep_tree(argv); else for (c = 0; argc--; ++argv) { - if (Dflag) { + if (devbehave == DEV_SKIP) { if (!(finfo = malloc(sizeof(struct stat)))) err(2, NULL); if (stat(*argv, finfo) == -1) ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#20 (text+ko) ==== @@ -49,6 +49,17 @@ #define BIN_FILE_SKIP 1 #define BIN_FILE_TEXT 2 +#define DIR_GREP 0 +#define DIR_SKIP 1 +#define DIR_RECURSE 2 + +#define DEV_GREP 0 +#define DEV_SKIP 1 + +#define LINK_GREP 0 +#define LINK_EXPLICIT 1 +#define LINK_SKIP 2 + struct str { size_t len; int line_no; @@ -72,13 +83,12 @@ extern int cflags, eflags; /* Command line flags */ -extern int Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, - Lflag, Oflag, Pflag, Rflag, Zflag, - bflag, cflag, dflag, hflag, iflag, lflag, mflag, nflag, oflag, +extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, + bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, qflag, sflag, vflag, wflag, xflag, nullflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; -extern int binbehave; +extern int binbehave, devbehave, dirbehave, linkbehave; extern int first, prev, matchall, patterns, tail, notfound; extern char **pattern; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#34 (text+ko) ==== @@ -69,9 +69,9 @@ c = fts_flags = 0; - if (Oflag) + if (linkbehave == LINK_EXPLICIT) fts_flags = FTS_COMFOLLOW; - if (Pflag) + if (linkbehave == LINK_SKIP) fts_flags = FTS_PHYSICAL; else fts_flags = FTS_LOGICAL; @@ -90,7 +90,7 @@ case FTS_DP: break; default: - if (Dflag || Rflag || dflag) { + if ((devbehave == DEV_SKIP) || (dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) { struct stat *finfo; if (!(finfo = malloc(sizeof(struct stat)))) @@ -98,14 +98,14 @@ if (stat(p->fts_path, finfo) == -1) err(2, NULL); - if (Dflag && (S_ISBLK(finfo->st_mode) || + if ((devbehave == DEV_SKIP) && (S_ISBLK(finfo->st_mode) || S_ISCHR(finfo->st_mode) || S_ISFIFO(finfo->st_mode) || S_ISSOCK(finfo->st_mode))) { free(finfo); break; } - if ((Rflag || dflag) && S_ISDIR(finfo->st_mode)) { + if (((dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) && S_ISDIR(finfo->st_mode)) { free(finfo); break; } From owner-p4-projects@FreeBSD.ORG Tue Jun 24 09:10:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC2781065679; Tue, 24 Jun 2008 09:10:03 +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 9D4DC106566C for ; Tue, 24 Jun 2008 09:10:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88F228FC2D for ; Tue, 24 Jun 2008 09:10:03 +0000 (UTC) (envelope-from gabor@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 m5O9A37a037604 for ; Tue, 24 Jun 2008 09:10:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O9A3I8037602 for perforce@freebsd.org; Tue, 24 Jun 2008 09:10:03 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 09:10:03 GMT Message-Id: <200806240910.m5O9A3I8037602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144015 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: Tue, 24 Jun 2008 09:10:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144015 Change 144015 by gabor@gabor_server on 2008/06/24 09:09:45 - More consistent macro naming for the previous change Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#39 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#21 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#35 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#39 (text+ko) ==== @@ -116,7 +116,7 @@ char *color; /* --color */ unsigned long long mcount; /* count for -m */ -int binbehave = BIN_FILE_BIN; +int binbehave = BINFILE_BIN; int devbehave = DEV_GREP; int dirbehave = DIR_GREP; int linkbehave = LINK_GREP; @@ -431,7 +431,7 @@ Aflag = Bflag = l; break; case 'a': - binbehave = BIN_FILE_TEXT; + binbehave = BINFILE_TEXT; break; case 'b': bflag = 1; @@ -482,7 +482,7 @@ hflag = 1; break; case 'I': - binbehave = BIN_FILE_SKIP; + binbehave = BINFILE_SKIP; break; case 'i': case 'y': @@ -534,7 +534,7 @@ sflag = 1; break; case 'U': - binbehave = BIN_FILE_BIN; + binbehave = BINFILE_BIN; break; case 'u': case MMAP_OPT: @@ -557,11 +557,11 @@ break; case BIN_OPT: if (strcmp("binary", optarg) == 0) - binbehave = BIN_FILE_BIN; + binbehave = BINFILE_BIN; else if (strcmp("without-match", optarg) == 0) - binbehave = BIN_FILE_SKIP; + binbehave = BINFILE_SKIP; else if (strcmp("text", optarg) == 0) - binbehave = BIN_FILE_TEXT; + binbehave = BINFILE_TEXT; else errx(2, getstr(11)); break; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#21 (text+ko) ==== @@ -45,9 +45,9 @@ extern char *errstr[]; -#define BIN_FILE_BIN 0 -#define BIN_FILE_SKIP 1 -#define BIN_FILE_TEXT 2 +#define BINFILE_BIN 0 +#define BINFILE_SKIP 1 +#define BINFILE_TEXT 2 #define DIR_GREP 0 #define DIR_SKIP 1 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#35 (text+ko) ==== @@ -149,7 +149,7 @@ } nottext = grep_bin_file(f); - if (nottext && binbehave == BIN_FILE_SKIP) { + if (nottext && binbehave == BINFILE_SKIP) { grep_close(f); return (0); } @@ -197,7 +197,7 @@ if (Lflag && c == 0) printf("%s\n", fn); if (c && !cflag && !lflag && !Lflag && - binbehave == BIN_FILE_BIN && nottext && !qflag) + binbehave == BINFILE_BIN && nottext && !qflag) printf(getstr(12), fn); return (c); @@ -279,7 +279,7 @@ if (vflag) c = !c; - if (c && binbehave == BIN_FILE_BIN && nottext) + if (c && binbehave == BINFILE_BIN && nottext) return (c); /* Binary file */ if ((tail || c) && !cflag && !qflag) { From owner-p4-projects@FreeBSD.ORG Tue Jun 24 09:33:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05836106567A; Tue, 24 Jun 2008 09:33:28 +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 BA24F106566B for ; Tue, 24 Jun 2008 09:33:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A70E58FC42 for ; Tue, 24 Jun 2008 09:33:27 +0000 (UTC) (envelope-from gabor@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 m5O9XRlm039445 for ; Tue, 24 Jun 2008 09:33:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5O9XRXi039443 for perforce@freebsd.org; Tue, 24 Jun 2008 09:33:27 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 09:33:27 GMT Message-Id: <200806240933.m5O9XRXi039443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144017 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: Tue, 24 Jun 2008 09:33:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144017 Change 144017 by gabor@gabor_server on 2008/06/24 09:32:58 - Complete NLS support: - Add Makefile glue - It can be disabled now with WITHOUT_NLS Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 (text+ko) ==== @@ -20,4 +20,14 @@ LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} +.if !defined(WITHOUT_NLS) +NLS= hu_HU.ISO8859-2 +NLSSRCFILES= ${NLS:S@$@.msg@} +.for lang in ${NLS} +NLSSRCDIR_${lang}= ${.CURDIR}/nls +.endfor +.else +CFLAGS+= -DWITHOUT_NLS +.endif + .include ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,10 @@ #include "grep.h" #ifndef WITHOUT_NLS +#include +nl_catd catalog; +#endif + char *errstr[] = { "", /* 1*/ "(standard input)", @@ -71,9 +74,6 @@ /*12*/ "Value out of range" }; -nl_catd catalog; -#endif - /* Flags passed to regcomp() and regexec() */ int cflags; int eflags = REG_STARTEND; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 24 11:52:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3F521065675; Tue, 24 Jun 2008 11:52:47 +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 7BB0A106566B for ; Tue, 24 Jun 2008 11:52:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9AD8FC15 for ; Tue, 24 Jun 2008 11:52:47 +0000 (UTC) (envelope-from gabor@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 m5OBqleF052691 for ; Tue, 24 Jun 2008 11:52:47 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OBqloS052689 for perforce@freebsd.org; Tue, 24 Jun 2008 11:52:47 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 11:52:47 GMT Message-Id: <200806241152.m5OBqloS052689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144019 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: Tue, 24 Jun 2008 11:52:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=144019 Change 144019 by gabor@gabor_server on 2008/06/24 11:51:51 - Remove the gzip and bzip2 support. I'll pre-extract these files to /temp, using mktemp, which will get rid of some limitations, simplify the implementation of the wide character set and make the code much more cleaner - Rename grep_fdopen to grep_stdin_open and simplify the cases, where it is involved. That function is only used to open the standard input, thus it doesn't need to be such complicated. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#9 edit .. //depot/projects/soc2008/gabor_textproc/grep/file.c#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#41 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#23 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#36 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#9 (text+ko) ==== @@ -34,70 +34,57 @@ #endif #endif /* not lint */ -#include #include #include #include -#include +#include +#include +#include #include "grep.h" -#define isbinary(ch) (!isspace((ch)) && iscntrl((ch))) +#define iswbinary(ch) (!iswspace((ch)) && iswcntrl((ch))) int bin_file(FILE *f) { - char buf[BUFSIZ]; - size_t i, m; + wint_t ch = L'\0'; + size_t i; int ret = 0; if (fseek(f, 0L, SEEK_SET) == -1) return (0); - if ((m = fread(buf, 1, BUFSIZ, f)) == 0) - return (0); - - for (i = 0; i < m; i++) - if (isbinary(buf[i])) { + for (i = 0; (i <= BUFSIZ) && (ch != WEOF); i++) { + ch = fgetwc(f); + if (iswbinary(ch)) { ret = 1; break; } + } rewind(f); return (ret); } int -gzbin_file(gzFile *f) +mmbin_file(struct mmfile *f) { - char buf[BUFSIZ]; - int i, m, ret = 0; - - if (gzseek(f, 0L, SEEK_SET) == -1) + int i; + wchar_t *wbuf; + size_t s; + + if ((s = mbstowcs(NULL, f->base, 0)) == -1) return (0); - if ((m = gzread(f, buf, BUFSIZ)) <= 0) - return (0); + if ((wbuf = malloc((s + 1) * sizeof(wchar_t))) == NULL) + err(2, NULL); - for (i = 0; i < m; i++) - if (isbinary(buf[i])) { - ret = 1; - break; - } + mbstowcs(wbuf, f->base, s); - if (gzrewind(f) != 0) - err(1, "gzbin_file"); - return (ret); -} - -int -mmbin_file(struct mmfile *f) -{ - int i; - /* XXX knows too much about mmf internals */ for (i = 0; i < BUFSIZ && i < f->len; i++) - if (isbinary(f->base[i])) + if (iswbinary(wbuf[i])) return (1); return (0); } ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#7 (text+ko) ==== @@ -46,8 +46,6 @@ #include "grep.h" static char fname[MAXPATHLEN]; -static char *lnbuf; -static size_t lnbuflen; #define FILE_STDIO 0 #define FILE_MMAP 1 @@ -59,106 +57,21 @@ int noseek; FILE *f; struct mmfile *mmf; - gzFile *gzf; - BZFILE *bzf; }; -static char * -bzfgetln(BZFILE *f, size_t *len) -{ - size_t n; - char c; - int bzerr = 0; - - for (n = 0; ; ++n) { - BZ2_bzRead(&bzerr, f, &c, 1); - - if ((bzerr == BZ_STREAM_END) || (bzerr == BZ_SEQUENCE_ERROR)) { - if (n == 0) - return (NULL); - else - break; - } else if (bzerr != BZ_OK) - err(2, NULL); - - if (n >= lnbuflen) { - lnbuflen *= 2; - lnbuf = grep_realloc(lnbuf, ++lnbuflen); - } - if (c == '\n') - break; - lnbuf[n] = c; - } - - *len = n; - return (lnbuf); -} - -static char * -gzfgetln(gzFile *f, size_t *len) -{ - size_t n; - int c; - - for (n = 0; ; ++n) { - c = gzgetc(f); - if (c == -1) { - const char *gzerrstr; - int gzerr; - - if (gzeof(f)) - break; - - gzerrstr = gzerror(f, &gzerr); - if (gzerr == Z_ERRNO) - err(2, "%s", fname); - else - errx(2, "%s: %s", fname, gzerrstr); - } - if (n >= lnbuflen) { - lnbuflen *= 2; - lnbuf = grep_realloc(lnbuf, ++lnbuflen); - } - if (c == '\n') - break; - lnbuf[n] = c; - } - - if (gzeof(f) && n == 0) - return (NULL); - *len = n; - return (lnbuf); -} - struct file * -grep_fdopen(int fd, char *mode) +grep_stdin_open(char *mode) { struct file *f; - if (fd == STDIN_FILENO) - snprintf(fname, sizeof fname, getstr(1)); - else - snprintf(fname, sizeof fname, getstr(2), fd); + snprintf(fname, sizeof fname, getstr(1)); f = grep_malloc(sizeof *f); - if (Zflag) { - f->type = FILE_GZIP; - f->noseek = lseek(fd, 0L, SEEK_SET) == -1; - if ((f->gzf = gzdopen(fd, mode)) != NULL) - return (f); - } else if (Jflag) { - f->type = FILE_BZIP; - f->noseek = lseek(fd, 0L, SEEK_SET) == -1; - if ((f->bzf = BZ2_bzdopen(fd, mode)) != NULL) - return (f); - } else - { - f->type = FILE_STDIO; - f->noseek = isatty(fd); - if ((f->f = fdopen(fd, mode)) != NULL) - return (f); - } + f->type = FILE_STDIO; + f->noseek = isatty(FILE_STDIO); + if ((f->f = fdopen(FILE_STDIO, mode)) != NULL) + return (f); free(f); return (NULL); @@ -174,24 +87,16 @@ f = grep_malloc(sizeof *f); f->noseek = 0; - if (Zflag) { - f->type = FILE_GZIP; - if ((f->gzf = gzopen(fname, mode)) != NULL) - return (f); - } else if (Jflag) { - f->type = FILE_BZIP; - if ((f->bzf = BZ2_bzopen(fname, mode)) != NULL) - return (f); - } else { - /* try mmap first; if it fails, try stdio */ - if ((f->mmf = mmopen(fname, mode)) != NULL) { - f->type = FILE_MMAP; - return (f); - } - f->type = FILE_STDIO; - if ((f->f = fopen(path, mode)) != NULL) - return (f); +/* XXX: pre-extract gzip and bzip2 files */ + + /* try mmap first; if it fails, try stdio */ + if ((f->mmf = mmopen(fname, mode)) != NULL) { + f->type = FILE_MMAP; + return (f); } + f->type = FILE_STDIO; + if ((f->f = fopen(path, mode)) != NULL) + return (f); free(f); return (NULL); @@ -208,12 +113,6 @@ return (bin_file(f->f)); case FILE_MMAP: return (mmbin_file(f->mmf)); - case FILE_GZIP: - return (gzbin_file(f->gzf)); - case FILE_BZIP: -/* XXX: we cannot seek in bzip2 files, just suppose that it is not binary - return (bzbin_file(f->bzf)); */ - return (0); default: /* NOTREACHED */ errx(2, getstr(3)); @@ -228,10 +127,6 @@ return (fgetln(f->f, l)); case FILE_MMAP: return (mmfgetln(f->mmf, l)); - case FILE_GZIP: - return (gzfgetln(f->gzf, l)); - case FILE_BZIP: - return (bzfgetln(f->bzf, l)); default: /* NOTREACHED */ errx(2, getstr(3)); @@ -248,12 +143,6 @@ case FILE_MMAP: mmclose(f->mmf); break; - case FILE_GZIP: - gzclose(f->gzf); - break; - case FILE_BZIP: - BZ2_bzclose(f->bzf); - break; default: /* NOTREACHED */ errx(2, getstr(3)); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#41 (text+ko) ==== @@ -553,6 +553,7 @@ xflag = 1; break; case 'Z': + Jflag = 0; Zflag++; break; case BIN_OPT: ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#23 (text+ko) ==== @@ -129,7 +129,7 @@ /* file.c */ struct file; -struct file *grep_fdopen(int fd, char *mode); +struct file *grep_stdin_open(char *mode); struct file *grep_open(char *path, char *mode); int grep_bin_file(struct file *f); char *grep_fgetln(struct file *f, size_t *l); @@ -137,5 +137,4 @@ /* binary.c */ int bin_file(FILE * f); -int gzbin_file(gzFile * f); int mmbin_file(struct mmfile *f); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#36 (text+ko) ==== @@ -136,7 +136,7 @@ fn = label; else fn = getstr(1); - f = grep_fdopen(STDIN_FILENO, "r"); + f = grep_stdin_open("r"); } else { f = grep_open(fn, "r"); } From owner-p4-projects@FreeBSD.ORG Tue Jun 24 11:58:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B2731065685; Tue, 24 Jun 2008 11:58:54 +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 D1BB31065681 for ; Tue, 24 Jun 2008 11:58:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB7138FC15 for ; Tue, 24 Jun 2008 11:58:53 +0000 (UTC) (envelope-from gabor@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 m5OBwrTs053137 for ; Tue, 24 Jun 2008 11:58:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OBwr12053135 for perforce@freebsd.org; Tue, 24 Jun 2008 11:58:53 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 11:58:53 GMT Message-Id: <200806241158.m5OBwr12053135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144020 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: Tue, 24 Jun 2008 11:58:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144020 Change 144020 by gabor@gabor_server on 2008/06/24 11:58:09 - Forced submit to note, that partial wide char support was also added to this file in the next submit. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#8 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 24 16:16:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87D2B1065674; Tue, 24 Jun 2008 16:16:12 +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 46F0E1065672 for ; Tue, 24 Jun 2008 16:16:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EF108FC16 for ; Tue, 24 Jun 2008 16:16:12 +0000 (UTC) (envelope-from gabor@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 m5OGGC1I096089 for ; Tue, 24 Jun 2008 16:16:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OGGCEr096087 for perforce@freebsd.org; Tue, 24 Jun 2008 16:16:12 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 16:16:12 GMT Message-Id: <200806241616.m5OGGCEr096087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144026 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: Tue, 24 Jun 2008 16:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=144026 Change 144026 by gabor@gabor_server on 2008/06/24 16:15:17 - Cleanup: use grep_malloc instead of malloc Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#42 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#37 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 (text+ko) ==== @@ -77,8 +77,7 @@ if ((s = mbstowcs(NULL, f->base, 0)) == -1) return (0); - if ((wbuf = malloc((s + 1) * sizeof(wchar_t))) == NULL) - err(2, NULL); + wbuf = grep_malloc((s + 1) * sizeof(wchar_t)); mbstowcs(wbuf, f->base, s); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#42 (text+ko) ==== @@ -649,8 +649,7 @@ else for (c = 0; argc--; ++argv) { if (devbehave == DEV_SKIP) { - if (!(finfo = malloc(sizeof(struct stat)))) - err(2, NULL); + finfo = grep_malloc(sizeof(struct stat)); if (stat(*argv, finfo) == -1) err(2, NULL); if (S_ISBLK(finfo->st_mode) || ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#37 (text+ko) ==== @@ -93,8 +93,7 @@ if ((devbehave == DEV_SKIP) || (dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) { struct stat *finfo; - if (!(finfo = malloc(sizeof(struct stat)))) - err(2, NULL); + finfo = grep_malloc(sizeof(struct stat)); if (stat(p->fts_path, finfo) == -1) err(2, NULL); @@ -233,12 +232,9 @@ if ((r == 0) && (color != NULL) && !oflag && !nottext) { char *tmp, *begin, *matched, *end; - if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 1)) == NULL) - errx(2, NULL); - if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char))) == NULL) - errx(2, NULL); - if ((end = malloc(strlen(l->dat) - pmatch.rm_eo + 1)) == NULL) - errx(2, NULL); + begin = grep_malloc(strlen(l->dat) - pmatch.rm_so + 1); + matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char)); + end = grep_malloc(strlen(l->dat) - pmatch.rm_eo + 1); strlcpy(begin, l->dat, pmatch.rm_so + 1); strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); @@ -256,8 +252,7 @@ if (r == 0 && oflag && !nottext) { char *tmp, *matched; - if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char))) == NULL) - errx(2, NULL); + matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char)); strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); if (color != NULL) From owner-p4-projects@FreeBSD.ORG Tue Jun 24 16:20:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4ED8106567A; Tue, 24 Jun 2008 16:20:16 +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 7D4971065677 for ; Tue, 24 Jun 2008 16:20:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 759C08FC1F for ; Tue, 24 Jun 2008 16:20:16 +0000 (UTC) (envelope-from gabor@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 m5OGKGwr096463 for ; Tue, 24 Jun 2008 16:20:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OGKGpj096461 for perforce@freebsd.org; Tue, 24 Jun 2008 16:20:16 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 16:20:16 GMT Message-Id: <200806241620.m5OGKGpj096461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144027 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: Tue, 24 Jun 2008 16:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144027 Change 144027 by gabor@gabor_server on 2008/06/24 16:20:03 - Drop some unnecessary function parameters Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#9 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#24 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#38 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#9 (text+ko) ==== @@ -60,7 +60,7 @@ }; struct file * -grep_stdin_open(char *mode) +grep_stdin_open(void) { struct file *f; @@ -70,7 +70,7 @@ f->type = FILE_STDIO; f->noseek = isatty(FILE_STDIO); - if ((f->f = fdopen(FILE_STDIO, mode)) != NULL) + if ((f->f = fdopen(FILE_STDIO, "r")) != NULL) return (f); free(f); @@ -78,7 +78,7 @@ } struct file * -grep_open(char *path, char *mode) +grep_open(char *path) { struct file *f; @@ -90,12 +90,12 @@ /* XXX: pre-extract gzip and bzip2 files */ /* try mmap first; if it fails, try stdio */ - if ((f->mmf = mmopen(fname, mode)) != NULL) { + if ((f->mmf = mmopen(fname, "r")) != NULL) { f->type = FILE_MMAP; return (f); } f->type = FILE_STDIO; - if ((f->f = fopen(path, mode)) != NULL) + if ((f->f = fopen(path, "r")) != NULL) return (f); free(f); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#24 (text+ko) ==== @@ -129,8 +129,8 @@ /* file.c */ struct file; -struct file *grep_stdin_open(char *mode); -struct file *grep_open(char *path, char *mode); +struct file *grep_stdin_open(void); +struct file *grep_open(char *path); int grep_bin_file(struct file *f); char *grep_fgetln(struct file *f, size_t *l); void grep_close(struct file *f); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#38 (text+ko) ==== @@ -135,9 +135,9 @@ fn = label; else fn = getstr(1); - f = grep_stdin_open("r"); + f = grep_stdin_open(); } else { - f = grep_open(fn, "r"); + f = grep_open(fn); } if (f == NULL) { if (!sflag) From owner-p4-projects@FreeBSD.ORG Tue Jun 24 16:30:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AAE6106567D; Tue, 24 Jun 2008 16:30:44 +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 0BFD2106567A; Tue, 24 Jun 2008 16:30:44 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from kientzle.com (h-66-166-149-50.snvacaid.covad.net [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id E18C58FC1D; Tue, 24 Jun 2008 16:30:43 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from [10.0.0.128] (p54.kientzle.com [66.166.149.54]) by kientzle.com (8.12.9/8.12.9) with ESMTP id m5OGUhtv080970; Tue, 24 Jun 2008 09:30:43 -0700 (PDT) (envelope-from kientzle@freebsd.org) Message-ID: <48612133.5060309@freebsd.org> Date: Tue, 24 Jun 2008 09:30:43 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Gabor Kovesdan References: <200806241616.m5OGGCEr096087@repoman.freebsd.org> In-Reply-To: <200806241616.m5OGGCEr096087@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 144026 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: Tue, 24 Jun 2008 16:30:44 -0000 Gabor, Unrelated, but I noticed that you have an unchecked call to mbstowcs() here. mbstowcs() can fail; I recently went through a couple months of pain reworking chunks of libarchive to correctly handle such failures. I ended up falling back on mbtowc() to convert one character at a time. You'll see conversion failures, for example, if someone is using a multi-character locale such as UTF-8 and runs grep over a file encoded in ISO-8859-1. (People often use "grep -R /usr/src" for example, and a lot of C source files have people's names in ISO-8859-1.) Throwing out the entire file (or even entire line) because of a single character that can't be interpreted is probably not going to be feasible. Tim Gabor Kovesdan wrote: > http://perforce.freebsd.org/chv.cgi?CH=144026 > > Change 144026 by gabor@gabor_server on 2008/06/24 16:15:17 > > - Cleanup: use grep_malloc instead of malloc > > Affected files ... > > .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 edit > .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#42 edit > .. //depot/projects/soc2008/gabor_textproc/grep/util.c#37 edit > > Differences ... > > ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 (text+ko) ==== > > @@ -77,8 +77,7 @@ > if ((s = mbstowcs(NULL, f->base, 0)) == -1) > return (0); > > - if ((wbuf = malloc((s + 1) * sizeof(wchar_t))) == NULL) > - err(2, NULL); > + wbuf = grep_malloc((s + 1) * sizeof(wchar_t)); > > mbstowcs(wbuf, f->base, s); From owner-p4-projects@FreeBSD.ORG Tue Jun 24 19:21:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 673461065676; Tue, 24 Jun 2008 19:21:26 +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 28BE2106566C; Tue, 24 Jun 2008 19:21:26 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from viefep32-int.chello.at (viefep32-int.chello.at [62.179.121.50]) by mx1.freebsd.org (Postfix) with ESMTP id 48A6F8FC0A; Tue, 24 Jun 2008 19:21:24 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from [89.134.207.231] by viefep11-int.chello.at (InterMail vM.7.08.02.02 201-2186-121-104-20070414) with ESMTP id <20080624190611.LUHY5076.viefep11-int.chello.at@[89.134.207.231]>; Tue, 24 Jun 2008 21:06:11 +0200 Message-ID: <486145A2.8090409@FreeBSD.org> Date: Tue, 24 Jun 2008 21:06:10 +0200 From: Gabor Kovesdan User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) MIME-Version: 1.0 To: Tim Kientzle References: <200806241616.m5OGGCEr096087@repoman.freebsd.org> <48612133.5060309@freebsd.org> In-Reply-To: <48612133.5060309@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 144026 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: Tue, 24 Jun 2008 19:21:26 -0000 Tim Kientzle escribió: > Gabor, > > Unrelated, but I noticed that you have an unchecked > call to mbstowcs() here. mbstowcs() can fail; I > recently went through a couple months of pain reworking > chunks of libarchive to correctly handle such failures. > I ended up falling back on mbtowc() to convert one > character at a time. Thanks Tim, I've forgotten about this check here, but yes, I understand its importance. > > You'll see conversion failures, for example, if > someone is using a multi-character locale such > as UTF-8 and runs grep over a file encoded in ISO-8859-1. > (People often use "grep -R /usr/src" for example, > and a lot of C source files have people's names > in ISO-8859-1.) > > Throwing out the entire file (or even entire line) > because of a single character that can't be > interpreted is probably not going to be feasible. I've tried it with LC_ALL=hu_HU.UTF-8 on ISO8859-[12] files and it still works. But to be sure, I'll just return 0 instead of calling err. Do you think it's ok, or do we need something special? Gabor From owner-p4-projects@FreeBSD.ORG Tue Jun 24 19:29:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F26E61065670; Tue, 24 Jun 2008 19:29:29 +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 B485F106567F for ; Tue, 24 Jun 2008 19:29:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95FA68FC13 for ; Tue, 24 Jun 2008 19:29:29 +0000 (UTC) (envelope-from gabor@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 m5OJTTa7024678 for ; Tue, 24 Jun 2008 19:29:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OJTTSA024676 for perforce@freebsd.org; Tue, 24 Jun 2008 19:29:29 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 19:29:29 GMT Message-Id: <200806241929.m5OJTTSA024676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144040 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: Tue, 24 Jun 2008 19:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=144040 Change 144040 by gabor@gabor_server on 2008/06/24 19:28:52 - Don't forget to check if mbstowcs() succeeds Reported by: tkientzle Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#11 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#11 (text+ko) ==== @@ -79,7 +79,8 @@ wbuf = grep_malloc((s + 1) * sizeof(wchar_t)); - mbstowcs(wbuf, f->base, s); + if (mbstowcs(wbuf, f->base, s) == -1) + return (0); /* XXX knows too much about mmf internals */ for (i = 0; i < BUFSIZ && i < f->len; i++) From owner-p4-projects@FreeBSD.ORG Tue Jun 24 19:38:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D74E1065674; Tue, 24 Jun 2008 19:38:39 +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 1F4A5106566B for ; Tue, 24 Jun 2008 19:38:39 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 010728FC0C for ; Tue, 24 Jun 2008 19:38:39 +0000 (UTC) (envelope-from gabor@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 m5OJccCC025533 for ; Tue, 24 Jun 2008 19:38:38 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OJcc3t025531 for perforce@freebsd.org; Tue, 24 Jun 2008 19:38:38 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 19:38:38 GMT Message-Id: <200806241938.m5OJcc3t025531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144042 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: Tue, 24 Jun 2008 19:38:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=144042 Change 144042 by gabor@gabor_server on 2008/06/24 19:37:57 - Add pt_BR.ISO8859-1 NLS catalog Reviewed by: garga Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#6 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#1 add Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#6 (text+ko) ==== @@ -22,6 +22,7 @@ .if !defined(WITHOUT_NLS) NLS= hu_HU.ISO8859-2 +NLS+= pt_BR.ISO8859-1 NLSSRCFILES= ${NLS:S@$@.msg@} .for lang in ${NLS} NLSSRCDIR_${lang}= ${.CURDIR}/nls From owner-p4-projects@FreeBSD.ORG Tue Jun 24 20:05:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E1541065686; Tue, 24 Jun 2008 20:05:06 +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 E3CE31065680 for ; Tue, 24 Jun 2008 20:05:05 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEB968FC23 for ; Tue, 24 Jun 2008 20:05:05 +0000 (UTC) (envelope-from gabor@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 m5OK55wj029097 for ; Tue, 24 Jun 2008 20:05:05 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OK55RF029095 for perforce@freebsd.org; Tue, 24 Jun 2008 20:05:05 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 20:05:05 GMT Message-Id: <200806242005.m5OK55RF029095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144045 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: Tue, 24 Jun 2008 20:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=144045 Change 144045 by gabor@gabor_server on 2008/06/24 20:04:34 - Implement pre-extract of gzip and bzip2 files Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#10 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#10 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -49,8 +50,6 @@ #define FILE_STDIO 0 #define FILE_MMAP 1 -#define FILE_GZIP 2 -#define FILE_BZIP 3 struct file { int type; @@ -81,13 +80,61 @@ grep_open(char *path) { struct file *f; + char *templ; + int tempfd; snprintf(fname, sizeof fname, "%s", path); f = grep_malloc(sizeof *f); f->noseek = 0; -/* XXX: pre-extract gzip and bzip2 files */ + if (Zflag || Jflag) { + templ = grep_malloc(sizeof(char) * 15); + strlcpy(templ, "/tmp/grep.XXXXXXXX", 14); + if ((tempfd = mkstemp(templ)) == -1) + err(2, NULL); + free(templ); + if (Zflag) { + gzFile *gzf; + char buf[BUFSIZ]; + int i; + + if ((gzf = gzopen(fname, "r")) == NULL) + err(2, NULL); + while ((i = gzread(gzf, buf, BUFSIZ)) > 0) { + write(tempfd, buf, BUFSIZ); + } + gzclose(gzf); + lseek(tempfd, 0L, SEEK_SET); + f->type = FILE_STDIO; + if ((f->f = fdopen(tempfd, "r")) != NULL) + return (f); + else + return (NULL); + } else { + BZFILE *bzf; + char buf[BUFSIZ]; + int bzerror; + FILE *file; + + if ((file = fopen(fname, "r")) == NULL) + err(2, NULL); + if ((bzf = BZ2_bzReadOpen(&bzerror, file, 0, 0, NULL, 0)) == NULL) + err(2, NULL); + do { + BZ2_bzRead(&bzerror, bzf, buf, BUFSIZ); + write(tempfd, buf, BUFSIZ); + } while (bzerror == BZ_OK); + BZ2_bzReadClose(&bzerror, bzf); + fclose(file); + lseek(tempfd, 0L, SEEK_SET); + f->type = FILE_STDIO; + if ((f->f = fdopen(tempfd, "r")) != NULL) + return (f); + else + return (NULL); + } + } /* try mmap first; if it fails, try stdio */ if ((f->mmf = mmopen(fname, "r")) != NULL) { From owner-p4-projects@FreeBSD.ORG Tue Jun 24 20:12:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA4C6106566C; Tue, 24 Jun 2008 20:12:18 +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 9C26A106567E for ; Tue, 24 Jun 2008 20:12:18 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA1A8FC25 for ; Tue, 24 Jun 2008 20:12:18 +0000 (UTC) (envelope-from gabor@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 m5OKCIFK029836 for ; Tue, 24 Jun 2008 20:12:18 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OKCD4p029827 for perforce@freebsd.org; Tue, 24 Jun 2008 20:12:13 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 20:12:13 GMT Message-Id: <200806242012.m5OKCD4p029827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144048 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: Tue, 24 Jun 2008 20:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=144048 Change 144048 by gabor@gabor_server on 2008/06/24 20:11:19 - Add forgotten free() Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#12 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#12 (text+ko) ==== @@ -84,7 +84,10 @@ /* XXX knows too much about mmf internals */ for (i = 0; i < BUFSIZ && i < f->len; i++) - if (iswbinary(wbuf[i])) + if (iswbinary(wbuf[i])) { + free(wbuf); return (1); + } + free(wbuf); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Jun 24 20:41:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E0F21065674; Tue, 24 Jun 2008 20:41:48 +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 A1204106567A for ; Tue, 24 Jun 2008 20:41:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C7B18FC0A for ; Tue, 24 Jun 2008 20:41:48 +0000 (UTC) (envelope-from gabor@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 m5OKfmJD035427 for ; Tue, 24 Jun 2008 20:41:48 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OKfmY5035425 for perforce@freebsd.org; Tue, 24 Jun 2008 20:41:48 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 20:41:48 GMT Message-Id: <200806242041.m5OKfmY5035425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144052 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: Tue, 24 Jun 2008 20:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=144052 Change 144052 by gabor@gabor_server on 2008/06/24 20:41:16 - Fix -C - Improve some error message Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#43 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#43 (text+ko) ==== @@ -69,9 +69,11 @@ /* 8*/ "parentheses not balanced", /* 9*/ "context out of range", /*10*/ "FreeBSD grep 2.5.1\n", -/*11*/ "Unknown binary-files option", +/*11*/ "Unknown --binary-files option", /*12*/ "Binary file %s matches\n", -/*12*/ "Value out of range" +/*12*/ "Value out of range", +/*13*/ "Unknown -d or --directory option", +/*14*/ "Unknown --color option" }; /* Flags passed to regcomp() and regexec() */ @@ -156,7 +158,7 @@ exit(2); } -static char *optstr = "0123456789A:B:CD:EFGHIJLOPSRUVZabcd:e:f:hilm:noqrsuvwxy"; +static char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:noqrsuvwxy"; struct option long_options[] = { @@ -450,7 +452,7 @@ } else if (strcmp("skip", optarg) == 0) dirbehave = DIR_SKIP; else if (strcmp("read", optarg) != 0) - usage(); + errx(2, getstr(13)); break; case 'E': Fflag = Gflag = 0; @@ -576,7 +578,7 @@ } else if (strcmp("never", optarg) == 0) color = NULL; else - usage(); + errx(2, getstr(14)); break; case LABEL_OPT: label = optarg; ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#2 (text+ko) ==== @@ -12,5 +12,8 @@ 8 "parentheses not balanced" 9 "context out of range" 10 "FreeBSD grep 2.5.1\n" -11 "Unknown binary-files option" +11 "Unknown --binary-files option" 12 "Binary file %s matches\n" +12 "Value out of range" +13 "Unknown -d or --directory option" +14 "Unknown --color option" From owner-p4-projects@FreeBSD.ORG Tue Jun 24 20:49:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3205B1065674; Tue, 24 Jun 2008 20:49:57 +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 E7D6F1065671 for ; Tue, 24 Jun 2008 20:49:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2F668FC18 for ; Tue, 24 Jun 2008 20:49:56 +0000 (UTC) (envelope-from gabor@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 m5OKnuQr045398 for ; Tue, 24 Jun 2008 20:49:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OKnucB045396 for perforce@freebsd.org; Tue, 24 Jun 2008 20:49:56 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 20:49:56 GMT Message-Id: <200806242049.m5OKnucB045396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144053 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: Tue, 24 Jun 2008 20:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144053 Change 144053 by gabor@gabor_server on 2008/06/24 20:49:30 - Clean up NLS messages to be consistent Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#44 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#3 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#2 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#44 (text+ko) ==== @@ -69,11 +69,11 @@ /* 8*/ "parentheses not balanced", /* 9*/ "context out of range", /*10*/ "FreeBSD grep 2.5.1\n", -/*11*/ "Unknown --binary-files option", +/*11*/ "unknown --binary-files option", /*12*/ "Binary file %s matches\n", -/*12*/ "Value out of range", -/*13*/ "Unknown -d or --directory option", -/*14*/ "Unknown --color option" +/*12*/ "value out of range", +/*13*/ "unknown -d or --directory option", +/*14*/ "unknown --color option" }; /* Flags passed to regcomp() and regexec() */ ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#3 (text+ko) ==== @@ -12,8 +12,8 @@ 8 "parentheses not balanced" 9 "context out of range" 10 "FreeBSD grep 2.5.1\n" -11 "Unknown --binary-files option" +11 "unknown --binary-files option" 12 "Binary file %s matches\n" -12 "Value out of range" -13 "Unknown -d or --directory option" -14 "Unknown --color option" +12 "value out of range" +13 "unknown -d or --directory option" +14 "unknown --color option" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#2 (text+ko) ==== @@ -12,5 +12,8 @@ 8 "párosítatlan zárójelek" 9 "a kontextus a megengedett tartományon kívül esik" 10 "FreeBSD grep 2.5.1\n" -11 "Ismeretlen binary-files opció" +11 "ismeretlen --binary-files opció" 12 "%s bináris fájl illeszkedik\n" +12 "az érték a megengedett tartományon kívül esik" +13 "ismeretlen -d vagy --directory opció" +14 "ismeretlen --color opció" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#2 (text+ko) ==== @@ -12,5 +12,8 @@ 8 "paręnteses nâo balanceados" 9 "contexto está fora da escala" 10 "FreeBSD grep 2.5.1\n" -11 "Opcăo năo conhecida de binary-files" +11 "Opcăo năo conhecida de --binary-files" 12 "Arquivo binário %s casa com o padrăo\n" +12 "el valor está fora da escala" +13 "Opcăo năo conhecida de -d ou --directory" +14 "Opcăo năo conhecida de --color" From owner-p4-projects@FreeBSD.ORG Wed Jun 25 01:32:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A75106567F; Wed, 25 Jun 2008 01:32:43 +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 A5A78106567D for ; Wed, 25 Jun 2008 01:32:42 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A38C78FC18 for ; Wed, 25 Jun 2008 01:32:42 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5P1WggR090933 for ; Wed, 25 Jun 2008 01:32:42 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5P1WgSe090931 for perforce@freebsd.org; Wed, 25 Jun 2008 01:32:42 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 25 Jun 2008 01:32:42 GMT Message-Id: <200806250132.m5P1WgSe090931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 144061 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: Wed, 25 Jun 2008 01:32:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=144061 Change 144061 by peter@peter_overcee on 2008/06/25 01:32:19 Make it compile. Affected files ... .. //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#7 edit Differences ... ==== //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#7 (text+ko) ==== @@ -645,6 +645,7 @@ printf("\tsp_delta_overflows 0x%d\n", PRT.sp_delta_overflows); } +#if 0 const char *pt_state(int ts) { static char buf[200]; @@ -692,6 +693,7 @@ printf("\tsp_state 0x%x %s\n", PRT.sp_state, sp_state(PRT.sp_state)); printf("\tsp_delta_overflows 0x%d\n", PRT.sp_delta_overflows); } +#endif int islevel(char *tk) From owner-p4-projects@FreeBSD.ORG Wed Jun 25 01:33:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8A81065679; Wed, 25 Jun 2008 01:33:44 +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 07DD71065675 for ; Wed, 25 Jun 2008 01:33:44 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 041B88FC18 for ; Wed, 25 Jun 2008 01:33:44 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5P1Xh6g091084 for ; Wed, 25 Jun 2008 01:33:43 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5P1XhJq091082 for perforce@freebsd.org; Wed, 25 Jun 2008 01:33:43 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 25 Jun 2008 01:33:43 GMT Message-Id: <200806250133.m5P1XhJq091082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 144063 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: Wed, 25 Jun 2008 01:33:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=144063 Change 144063 by peter@peter_overcee on 2008/06/25 01:33:17 IFC @144060 Affected files ... .. //depot/projects/hammer/etc/network.subr#24 integrate .. //depot/projects/hammer/etc/pccard_ether#18 integrate .. //depot/projects/hammer/etc/rc#22 integrate .. //depot/projects/hammer/etc/rc.d/abi#11 integrate .. //depot/projects/hammer/etc/rc.d/archdep#11 integrate .. //depot/projects/hammer/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/hammer/etc/rc.d/bgfsck#8 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#14 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#12 integrate .. //depot/projects/hammer/etc/rc.d/fsck#9 integrate .. //depot/projects/hammer/etc/rc.d/hostid#6 integrate .. //depot/projects/hammer/etc/rc.d/hostname#10 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#17 integrate .. //depot/projects/hammer/etc/rc.d/local#7 integrate .. //depot/projects/hammer/etc/rc.d/localpkg#7 integrate .. //depot/projects/hammer/etc/rc.d/lockd#5 integrate .. //depot/projects/hammer/etc/rc.d/motd#9 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#16 integrate .. //depot/projects/hammer/etc/rc.d/mountlate#4 integrate .. //depot/projects/hammer/etc/rc.d/moused#12 integrate .. //depot/projects/hammer/etc/rc.d/netif#24 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#8 integrate .. //depot/projects/hammer/etc/rc.d/newsyslog#6 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#12 integrate .. //depot/projects/hammer/etc/rc.d/routing#10 integrate .. //depot/projects/hammer/etc/rc.d/savecore#10 integrate .. //depot/projects/hammer/etc/rc.d/statd#4 integrate .. //depot/projects/hammer/etc/rc.d/swap1#9 integrate .. //depot/projects/hammer/etc/rc.d/syscons#14 integrate .. //depot/projects/hammer/etc/rc.d/sysctl#9 integrate .. //depot/projects/hammer/etc/rc.subr#44 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#81 integrate .. //depot/projects/hammer/include/unistd.h#25 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#37 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#11 integrate .. //depot/projects/hammer/lib/libc/gen/exec.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#44 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#8 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#34 integrate .. //depot/projects/hammer/sbin/natd/natd.8#11 integrate .. //depot/projects/hammer/sbin/natd/natd.c#13 integrate .. //depot/projects/hammer/sbin/natd/natd.h#3 integrate .. //depot/projects/hammer/sbin/swapon/swapon.8#8 integrate .. //depot/projects/hammer/sbin/swapon/swapon.c#9 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#27 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#49 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#27 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_cbus.c#6 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#19 integrate .. //depot/projects/hammer/sys/dev/fe/if_fevar.h#7 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#35 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#10 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#33 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#82 integrate .. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#6 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#35 integrate .. //depot/projects/hammer/sys/netinet/in.c#30 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/hammer/sys/pci/viapm.c#17 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#13 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#7 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#47 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#46 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#30 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#49 integrate .. //depot/projects/hammer/sys/sys/umtx.h#19 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#72 integrate .. //depot/projects/hammer/tools/regression/fifo/fifo_create/fifo_create.c#2 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#3 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.8#8 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#13 integrate Differences ... ==== //depot/projects/hammer/etc/network.subr#24 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.189 2008/05/26 10:10:11 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ # # @@ -48,10 +48,6 @@ ipx_up ${ifn} && cfg=0 childif_create ${ifn} - if [ "$cfg" -eq 0 ]; then - ifconfig ${ifn} - fi - return $cfg } @@ -73,10 +69,6 @@ ifscript_down ${ifn} && cfg=0 childif_destroy ${ifn} - if [ "$cfg" -eq 0 ]; then - echo -n " ${ifn}" - fi - return $cfg } ==== //depot/projects/hammer/etc/pccard_ether#18 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.54 2006/12/08 15:48:42 hrs Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.55 2008/06/23 20:50:11 mtm Exp $ # # pccard_ether interfacename [start|stop|restart] # @@ -78,7 +78,7 @@ done fi - /etc/rc.d/netif start $ifn + /etc/rc.d/netif quietstart $ifn # Do route configuration if needed. # XXX: should probably do this by calling rc.d/routing. @@ -99,7 +99,7 @@ fi fi - /etc/rc.d/netif stop $ifn + /etc/rc.d/netif quietstop $ifn # clean ARP table ifexists $ifn && arp -d -i $ifn -a ==== //depot/projects/hammer/etc/rc#22 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.342 2008/06/23 04:18:22 mtm Exp $ # # System startup script run by init on autoboot @@ -69,7 +69,6 @@ # and to make the configuration file variables available to rc itself. # . /etc/rc.subr -echo "Loading configuration files." load_rc_config 'XXX' skip="-s nostart" ==== //depot/projects/hammer/etc/rc.d/abi#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.11 2006/12/30 22:53:19 yar Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.12 2008/06/22 16:19:50 mtm Exp $ # # PROVIDE: abi @@ -45,13 +45,19 @@ abi_start() { - echo -n 'Additional ABI support:' + local _echostop + + _echostop= + if checkyesno sysvipc_enable || checkyesno linux_enable || checkyesno svr4_enable; then + echo -n 'Additional ABI support:' + _echostop=yes + fi checkyesno sysvipc_enable && sysv_start checkyesno linux_enable && linux_start checkyesno svr4_enable && svr4_start - echo '.' + [ -n "${_echostop}" ] && echo '.' } load_rc_config $name ==== //depot/projects/hammer/etc/rc.d/archdep#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.15 2008/06/22 15:57:50 mtm Exp $ # # PROVIDE: archdep @@ -13,37 +13,32 @@ start_cmd="archdep_start" stop_cmd=":" -# SCO binary emulation -# -ibcs2_compat() -{ - if checkyesno ibcs2_enable; then - echo -n ' ibcs2' - load_kld ibcs2 - case ${ibcs2_loaders} in - [Nn][Oo]) - ;; - *) - for i in ${ibcs2_loaders}; do - load_kld ibcs2_$i - done - ;; - esac - fi -} - archdep_start() { local _arch _arch=`${SYSCTL_N} hw.machine_arch` - echo -n "Initial $_arch initialization:" case $_arch in i386) - ibcs2_compat + # SCO binary emulation + # + if checkyesno ibcs2_enable; then + echo -n 'Initial i386 initialization:' + echo -n ' ibcs2' + load_kld ibcs2 + case ${ibcs2_loaders} in + [Nn][Oo]) + ;; + *) + for i in ${ibcs2_loaders}; do + load_kld ibcs2_$i + done + ;; + esac + echo '.' + fi ;; esac - echo '.' } load_rc_config $name ==== //depot/projects/hammer/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.5 2006/12/29 15:56:21 hrs Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.6 2008/06/23 22:06:28 mtm Exp $ # # PROVIDE: auto_linklocal @@ -18,7 +18,10 @@ auto_linklocal_start() { if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + if ! ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 >/dev/null 2>&1; then + warn "failed to set sysctl(8)" + return 1 + fi laddr=`network6_getladdr lo0` if [ -z "${laddr}" ]; then ifconfig lo0 inet6 fe80::1 prefixlen 64 ==== //depot/projects/hammer/etc/rc.d/bgfsck#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.8 2007/03/11 06:53:06 brooks Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.9 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: bgfsck @@ -31,7 +31,7 @@ bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi if [ -z "${rc_force}" ]; then - echo "${bgfsck_msg}." + [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}." fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ ==== //depot/projects/hammer/etc/rc.d/cleartmp#14 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.19 2008/06/23 04:42:58 mtm Exp $ # # PROVIDE: cleartmp @@ -25,7 +25,7 @@ ${tmp}/.ICE-unix ${tmp}/.font-unix" if checkyesno ${rcvar1}; then - echo "Clearing ${tmp}." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}." # This is not needed for mfs, but doesn't hurt anything. # Things to note: @@ -44,7 +44,7 @@ elif checkyesno clear_tmp_X; then # Remove X lock files, since they will prevent you from # restarting X. Remove other X related directories. - echo "Clearing ${tmp} (X related)." + [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)." rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} fi if checkyesno clear_tmp_X; then ==== //depot/projects/hammer/etc/rc.d/dumpon#12 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.12 2008/06/23 04:39:36 mtm Exp $ # # PROVIDE: dumpon @@ -15,11 +15,12 @@ dumpon_try() { - if /sbin/dumpon -v "${1}" ; then + if /sbin/dumpon "${1}" ; then # Make a symlink in devfs for savecore ln -fs "${1}" /dev/dumpdev return 0 fi + warn "unable to specify $1 as a dump device" return 1 } ==== //depot/projects/hammer/etc/rc.d/fsck#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: fsck @@ -23,7 +23,7 @@ # During fsck ignore SIGQUIT trap : 3 - echo "Starting file system checks:" + [ -z "${rc_quiet}" ] && echo "Starting file system checks:" if checkyesno background_fsck; then fsck -F -p else ==== //depot/projects/hammer/etc/rc.d/hostid#6 (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/rc.d/hostid,v 1.9 2008/05/06 10:40:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.10 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostid @@ -47,10 +47,12 @@ # Generate hostid based on hostuuid - take first four bytes from md5(uuid). id=`echo -n $uuid | /sbin/md5` id="0x${id%????????????????????????}" + # Set both kern.hostuuid and kern.hostid. - echo "Setting hostuuid: ${uuid}." + # + [ -z "${rc_quiet}" ] && echo "Setting hostuuid: ${uuid}." ${SYSCTL_W} kern.hostuuid="${uuid}" >/dev/null - echo "Setting hostid: ${id}." + [ -z "${rc_quiet}" ] && echo "Setting hostid: ${id}." ${SYSCTL_W} kern.hostid=${id} >/dev/null } ==== //depot/projects/hammer/etc/rc.d/hostname#10 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: hostname @@ -72,7 +72,7 @@ # All right, it is safe to invoke hostname(1) now. # - echo "Setting hostname: ${hostname}." + [ -z "${rc_quiet}" ] && echo "Setting hostname: ${hostname}." /bin/hostname "${hostname}" } ==== //depot/projects/hammer/etc/rc.d/ldconfig#17 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.20 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: ldconfig @@ -36,7 +36,7 @@ _LDC="${_LDC} ${i}" fi done - echo 'ELF ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in @@ -55,7 +55,8 @@ _LDC="${_LDC} ${i}" fi done - echo '32-bit compatibility ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 -m ${_ins} ${_LDC} ;; esac @@ -71,7 +72,8 @@ _LDC="${_LDC} ${i}" fi done - echo 'a.out ldconfig path:' ${_LDC} + [ -z "${rc_quiet}" ] && + echo 'a.out ldconfig path:' ${_LDC} ${ldconfig} -aout ${_ins} ${_LDC} ;; esac ==== //depot/projects/hammer/etc/rc.d/local#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.8 2008/06/22 16:23:39 mtm Exp $ # # PROVIDE: local @@ -16,20 +16,20 @@ local_start() { - echo -n 'Starting local daemons:' if [ -f /etc/rc.local ]; then + echo -n 'Starting local daemons:' . /etc/rc.local + echo '.' fi - echo '.' } local_stop() { - echo -n 'Shutting down local daemons:' if [ -f /etc/rc.shutdown.local ]; then + echo -n 'Shutting down local daemons:' . /etc/rc.shutdown.local + echo '.' fi - echo '.' } load_rc_config $name ==== //depot/projects/hammer/etc/rc.d/localpkg#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.8 2006/02/12 10:04:56 matteo Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.10 2008/06/23 03:49:30 mtm Exp $ # # PROVIDE: localpkg @@ -16,15 +16,21 @@ pkg_start() { + local initdone + # For each dir in $local_startup, search for init scripts matching *.sh # case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Local package initialization:' + initdone= find_local_scripts_old for script in ${zlist} ${slist}; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Local package initialization:' + initdone=yes + fi if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 @@ -33,20 +39,26 @@ echo -n " (skipping ${script}, not executable)" fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } pkg_stop() { + local initdone + case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Shutting down daemon processes:' + initdone= find_local_scripts_old for script in `reverse_list ${slist} ${zlist}`; do + if [ -z "${initdone}" -a -f "${script}" ]; then + echo -n 'Shutting down local packages:' + initdone=yes + fi if [ -x "${script}" ]; then if [ `sysctl -n debug.bootverbose` -eq 1 ]; then echo "==>" ${script} @@ -56,7 +68,7 @@ ${script} stop) fi done - echo '.' + [ -n "${initdone}" ] && echo '.' ;; esac } ==== //depot/projects/hammer/etc/rc.d/lockd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $ # # PROVIDE: lockd @@ -15,7 +15,7 @@ rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' +stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable' status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get @@ -26,7 +26,7 @@ local ret ret=0 - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable + if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable then ret=1 fi ==== //depot/projects/hammer/etc/rc.d/motd#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.11 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: motd @@ -22,13 +22,13 @@ # Must be done *before* interactive logins are possible # to prevent possible race conditions. # - echo -n 'Updating motd' + [ -z "${rc_quiet}" ] && echo -n 'Updating motd:' if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd fi if [ ! -w /etc/motd ]; then - echo ' ... /etc/motd is not writable, update failed.' + echo ' /etc/motd is not writable, update failed.' return fi @@ -42,7 +42,7 @@ } rm -f $T - echo . + [ -z "${rc_quiet}" ] && echo . } load_rc_config $name ==== //depot/projects/hammer/etc/rc.d/mountcritremote#16 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.19 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -36,9 +36,15 @@ { # Mount nfs filesystems. # - echo -n 'Mounting NFS file systems:' - mount -a -t nfs - echo '.' + case "`/sbin/mount -d -a -t nfs`" in + '') + ;; + *) + echo -n 'Mounting NFS file systems:' + mount -a -t nfs + echo '.' + ;; + esac # Mount other network filesystems if present in /etc/fstab. case ${extra_netfs_types} in ==== //depot/projects/hammer/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.6 2008/06/22 15:40:19 mtm Exp $ # # PROVIDE: mountlate @@ -16,13 +16,24 @@ mountlate_start() { - local err + local err latefs # Mount "late" filesystems. - echo -n 'Mounting late file systems:' - mount -a -l - err=$? - echo '.' + # + err=0 + latefs= + # / (root) fs is always remounted, so remove from list + latefs="`/sbin/mount -d -a -l | grep -v ' /$'`" + case ${latefs} in + '') + ;; + *) + echo -n 'Mounting late file systems:' + mount -a -l + err=$? + echo '.' + ;; + esac case ${err} in 0) ==== //depot/projects/hammer/etc/rc.d/moused#12 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.13 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: moused @@ -51,7 +51,7 @@ mytype="$moused_type" fi - echo -n "Starting ${ms} moused:" + [ -z "${rc_quiet}" ] && echo -n "Starting ${ms} moused." /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${pidarg} mousechar_arg= @@ -59,7 +59,6 @@ [Nn][Oo] | '') ;; *) - echo -n ' mousechar_start' mousechar_arg="-M ${mousechar_start}" ;; esac @@ -67,7 +66,6 @@ for ttyv in /dev/ttyv* ; do vidcontrol < ${ttyv} ${mousechar_arg} -m on done - echo '.' } run_rc_command $* ==== //depot/projects/hammer/etc/rc.d/netif#24 (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.28 2008/05/18 02:57:54 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $ # # PROVIDE: netif @@ -85,11 +85,8 @@ # cmdifn=$* - echo -n "Stopping network:" - # Deconfigure the interface(s) network_common ifn_stop - echo '.' } # network_common routine @@ -98,7 +95,7 @@ # an interface and then calls $routine. network_common() { - local _cooked_list _fail _func + local _cooked_list _fail _func _ok _str _func= @@ -123,12 +120,31 @@ fi _fail= + _ok= for ifn in ${_cooked_list}; do - if ! ${_func} ${ifn} $2; then + if ${_func} ${ifn} $2; then + _ok="${_ok} ${ifn}" + else _fail="${_fail} ${ifn}" fi done + _str= + if [ -n "${_ok}" ]; then + case ${_func} in + ifn_start) + _str='Starting' + ;; + ifn_stop) + _str='Stopping' + ;; + esac + echo "${_str} Network:${_ok}." + if [ -z "${rc_quiet}" ]; then + /sbin/ifconfig ${_ok} + fi + fi + debug "The following interfaces were not configured: $_fail" } ==== //depot/projects/hammer/etc/rc.d/netoptions#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.146 2008/06/23 12:06:35 mtm Exp $ # # PROVIDE: netoptions @@ -9,9 +9,17 @@ . /etc/rc.subr +_netoptions_initdone= +netoptions_init() +{ + if [ -z "${_netoptions_initdone}" ]; then + echo -n 'Additional TCP/IP options:' + _netoptions_initdone=yes + fi +} + load_rc_config 'XXX' -echo -n 'Additional IP options:' case ${log_in_vain} in [Nn][Oo] | '') log_in_vain=0 @@ -22,21 +30,24 @@ [0-9]*) ;; *) + netoptions_init echo " invalid log_in_vain setting: ${log_in_vain}" log_in_vain=0 ;; esac -[ "${log_in_vain}" -ne 0 ] && ( +if [ "${log_in_vain}" -ne 0 ]; then + netoptions_init echo -n " log_in_vain=${log_in_vain}" sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null -) +fi case ${tcp_extensions} in [Yy][Ee][Ss] | '') ;; *) + netoptions_init echo -n ' tcp extensions=NO' sysctl net.inet.tcp.rfc1323=0 >/dev/null ;; @@ -44,6 +55,7 @@ case ${tcp_keepalive} in [Nn][Oo]) + netoptions_init echo -n ' TCP keepalive=NO' sysctl net.inet.tcp.always_keepalive=0 >/dev/null ;; @@ -51,6 +63,7 @@ case ${tcp_drop_synfin} in [Yy][Ee][Ss]) + netoptions_init echo -n ' drop SYN+FIN packets=YES' sysctl net.inet.tcp.drop_synfin=1 >/dev/null ;; @@ -60,6 +73,7 @@ [Nn][Oo] | '') ;; *) + netoptions_init echo -n " ip_portrange_first=$ip_portrange_first" sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null ;; @@ -69,9 +83,10 @@ [Nn][Oo] | '') ;; *) + netoptions_init echo -n " ip_portrange_last=$ip_portrange_last" sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null ;; esac -echo '.' +[ -n "${_netoptions_initdone}" ] && echo '.' ==== //depot/projects/hammer/etc/rc.d/newsyslog#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.6 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.7 2008/06/23 04:46:54 mtm Exp $ # # PROVIDE: newsyslog @@ -17,9 +17,9 @@ newsyslog_start() { - echo -n "Creating and/or trimming log files:" + [ -z "${rc_quiet}" ] && echo -n "Creating and/or trimming log files:" ${command} ${rc_flags} - echo "." + [ -z "${rc_quiet}" ] && echo "." } load_rc_config $name ==== //depot/projects/hammer/etc/rc.d/power_profile#12 (text+ko) ==== @@ -5,7 +5,7 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.12 2007/12/08 23:00:28 dougb Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.13 2008/06/23 22:06:28 mtm Exp $ # # PROVIDE: power_profile @@ -50,7 +50,11 @@ esac # Set the desired value - [ -n "${value}" ] && sysctl ${node}=${value} + if [ -n "${value}" ]; then + if ! sysctl ${node}=${value} > /dev/null 2>&1; then + warn "unable to set ${node}=${value}" + fi + fi } if [ $# -ne 1 ]; then ==== //depot/projects/hammer/etc/rc.d/routing#10 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.145 2008/06/05 17:26:47 brooks Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.146 2008/06/23 04:00:45 mtm Exp $ # # PROVIDE: routing @@ -59,11 +59,20 @@ fi } +_ropts_initdone= +ropts_init() +{ + if [ -z "${_ropts_initdone}" ]; then + echo -n 'Additional routing options:' + _ropts_initdone=yes + fi +} + options_start() { - echo -n 'Additional routing options:' case ${icmp_bmcastecho} in [Yy][Ee][Ss]) + ropts_init echo -n ' broadcast ping responses=YES' >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 25 02:54:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 446B91065672; Wed, 25 Jun 2008 02:54:10 +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 05453106564A for ; Wed, 25 Jun 2008 02:54:10 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 021C48FC14 for ; Wed, 25 Jun 2008 02:54:10 +0000 (UTC) (envelope-from pgj@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 m5P2s94l098763 for ; Wed, 25 Jun 2008 02:54:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5P2s99U098761 for perforce@freebsd.org; Wed, 25 Jun 2008 02:54:09 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 25 Jun 2008 02:54:09 GMT Message-Id: <200806250254.m5P2s99U098761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144064 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: Wed, 25 Jun 2008 02:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=144064 Change 144064 by pgj@disznohal on 2008/06/25 02:53:59 Add '%SRCID%' and '%SOURCE%' tags to Makefiles and other files. Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile.inc#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/laptop/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/multi-os/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/audit/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mail/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/users/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/freebsd-general/Makefile#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/Makefile,v 1.2 2008/05/14 16:54:13 pgj Exp $ +# %SOURCE% en_US.ISO8859-1/Makefile +# %SRCID% 1.7 SUBDIR = articles SUBDIR+= books ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#6 (text+ko) ==== @@ -2,6 +2,8 @@ # # The FreeBSD Hungarian Documentation Project +# %SOURCE% en_US.ISO8859-1/articles/Makefile +# %SRCID% 1.60 # MAINTAINER= gabor@FreeBSD.org ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,7 @@ # # The FreeBSD Hungarian Documentation Project +# %SOURCE% en_US.ISO8859-1/articles/Makefile.inc +# %SRCID% 1.4 # # $FreeBSD: doc/hu_HU.ISO8859-2/articles/Makefile.inc,v 1.1 2007/04/20 19:45:01 gabor Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile#4 (text+ko) ==== @@ -2,6 +2,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile,v 1.1 2008/05/28 17:19:18 pgj Exp $ # # Article: Installing and using compiz-fusion +# +# %SOURCE% en_US.ISO8859-1/articles/compiz-fusion/Makefile +# %SRCID% 1.1 +# NO_TIDY = yes ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#4 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile,v 1.2 2008/05/21 04:14:48 pgj Exp $ # # Article: Dialup firewalling with FreeBSD +# +# %SOURCE% en_US.ISO8859-1/articles/dialup-firewall/Makefile +# %SRCID% 1.5 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#2 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile,v 1.1 2007/08/20 12:41:34 gabor Exp $ # # Article: Explaining BSD +# +# %SOURCE% en_US.ISO8859-1/articles/explaining-bsd/Makefile +# %SRCID% 1.6 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/laptop/Makefile#4 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/laptop/Makefile,v 1.2 2008/05/21 04:14:48 pgj Exp $ # # Article: FreeBSD on Laptops +# +# %SOURCE% en_US.ISO8859-1/articles/laptop/Makefile +# %SRCID% 1.4 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#2 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile,v 1.1 2007/04/15 15:23:55 gabor Exp $ # # Article: FreeBSD and Linux Comparison Whitepaper +# +# %SOURCE% en_US.ISO8859-1/articles/linux-comparison/Makefile +# %SRCID% 1.1 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/Makefile#4 (text+ko) ==== @@ -2,6 +2,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-users/Makefile,v 1.1 2008/05/26 20:21:05 pgj Exp $ # # Article: FreeBSD Quickstart for Linux Users +# +# %SOURCE% en_US.ISO8859-1/articles/linux-users/Makefile +# %SRCID% 1.1 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/multi-os/Makefile#4 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/multi-os/Makefile,v 1.2 2008/05/21 04:14:49 pgj Exp $ # # Article: Installing and Using FreeBSD With Other Operating Systems +# +# %SOURCE% en_US.ISO8859-1/articles/multi-os/Makefile +# %SRCID% 1.12 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/Makefile#4 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/Makefile,v 1.2 2008/05/21 04:14:49 pgj Exp $ # # Article: FreeBSD Version Guide +# +# %SOURCE% en_US.ISO8859-1/articles/version-guide/Makefile +# %SRCID% 1.3 +# # # Tidy messes up iso-8859-2 characters ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/Makefile +# %SRCID% 1.2 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/audit/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/audit/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/audit/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/basics/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/basics/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile,v 1.1 2008/05/14 16:54:14 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/boot/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/boot/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/config/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/config/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/desktop/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/desktop/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/disks/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/disks/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/eresources/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/eresources/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/geom/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/geom/Makefile,v 1.1 2008/05/14 16:54:15 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/install/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/install/Makefile,v 1.1 2008/05/14 16:54:16 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/introduction/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/introduction/Makefile,v 1.1 2008/05/14 16:54:16 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile,v 1.1 2008/05/14 16:54:16 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/l10n/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/l10n/Makefile,v 1.1 2008/05/14 16:54:16 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile,v 1.1 2008/05/14 16:54:16 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/mac/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/mac/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mail/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/mail/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/mail/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/Makefile +# %SRCID% 1.2 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/pgpkeys/Makefile +# %SRCID% 1.3 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/ports/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/ports/Makefile,v 1.1 2008/05/14 16:54:17 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/printing/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/printing/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/security/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/security/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/serialcomms/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/users/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/users/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/users/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/vinum/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/vinum/Makefile,v 1.1 2008/05/14 16:54:18 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile,v 1.1 2008/05/14 16:54:19 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # Build the Handbook with just the content from this chapter. # +# %SOURCE% en_US.ISO8859-1/books/handbook/x11/Makefile +# %SRCID% 1.1 +# # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/x11/Makefile,v 1.1 2008/05/14 16:54:19 pgj Exp $ # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/flyer/Makefile,v 1.1 2007/12/16 14:03:45 gabor Exp $ -# +# %SOURCE% en_US.ISO8859-1/flyer/Makefile +# %SRCID% 1.2 pdf: dvi ps ps2pdf13 -sPAPERSIZE=a4 flyer.ps ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#3 (text+ko) ==== @@ -1,5 +1,8 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 (text+ko) ==== @@ -5,6 +5,9 @@ -- Hungarian specific ...................................................... -- -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.3 2008/04/24 18:34:27 pgj Exp $ -- + + -- %SOURCE% share/sgml/catalog + -- %SRCID% 1.31 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU" "articles.ent" ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/Makefile#2 (text+ko) ==== @@ -1,4 +1,6 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/slides/Makefile,v 1.1 2007/12/26 13:29:22 gabor Exp $ +# %SOURCE% en_US.ISO8859-1/slides/Makefile +# %SRCID% 1.1 SUBDIR= freebsd-general ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/freebsd-general/Makefile#2 (text+ko) ==== @@ -1,6 +1,9 @@ # # $FreeBSD: doc/hu_HU.ISO8859-2/slides/freebsd-general/Makefile,v 1.1 2007/12/26 13:29:22 gabor Exp $ # +# %SOURCE% en_US.ISO8859-1/slides/freebsd-general/Makefile +# %SRCID% 1.1 +# # Build an example FreeBSD Presentation # From owner-p4-projects@FreeBSD.ORG Wed Jun 25 10:29:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31903106566C; Wed, 25 Jun 2008 10:29:50 +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 E7BEC106564A for ; Wed, 25 Jun 2008 10:29:49 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF0F38FC18 for ; Wed, 25 Jun 2008 10:29:49 +0000 (UTC) (envelope-from gabor@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 m5PATnrZ071925 for ; Wed, 25 Jun 2008 10:29:49 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PATneL071923 for perforce@freebsd.org; Wed, 25 Jun 2008 10:29:49 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 10:29:49 GMT Message-Id: <200806251029.m5PATneL071923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144082 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: Wed, 25 Jun 2008 10:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144082 Change 144082 by gabor@gabor_server on 2008/06/25 10:29:05 - Remove the mmap code and apply some possible cleanups after the removal. Using mmap is completely unnecessary as it doesn't bring us any deliverables, just makes the code more complicated and involves more cases. Suggested by: ache Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#13 delete .. //depot/projects/soc2008/gabor_textproc/grep/file.c#11 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#45 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#25 edit .. //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#5 delete .. //depot/projects/soc2008/gabor_textproc/grep/util.c#39 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#7 (text+ko) ==== @@ -2,7 +2,7 @@ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ PROG= grep -SRCS= binary.c file.c grep.c mmfile.c queue.c util.c +SRCS= file.c grep.c queue.c util.c LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#11 (text+ko) ==== @@ -42,21 +42,40 @@ #include #include #include +#include +#include #include #include "grep.h" static char fname[MAXPATHLEN]; -#define FILE_STDIO 0 -#define FILE_MMAP 1 +#define iswbinary(ch) (!iswspace((ch)) && iswcntrl((ch))) + +int +bin_file(struct file *f) +{ + wint_t ch = L'\0'; + size_t i; + int ret = 0; + + if (f->noseek) + return (0); + + if (fseek(f->f, 0L, SEEK_SET) == -1) + return (0); + + for (i = 0; (i <= BUFSIZ) && (ch != WEOF); i++) { + ch = fgetwc(f->f); + if (iswbinary(ch)) { + ret = 1; + break; + } + } -struct file { - int type; - int noseek; - FILE *f; - struct mmfile *mmf; -}; + rewind(f->f); + return (ret); +} struct file * grep_stdin_open(void) @@ -67,9 +86,8 @@ f = grep_malloc(sizeof *f); - f->type = FILE_STDIO; - f->noseek = isatty(FILE_STDIO); - if ((f->f = fdopen(FILE_STDIO, "r")) != NULL) + f->noseek = isatty(STDIN_FILENO); + if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) return (f); free(f); @@ -106,7 +124,6 @@ } gzclose(gzf); lseek(tempfd, 0L, SEEK_SET); - f->type = FILE_STDIO; if ((f->f = fdopen(tempfd, "r")) != NULL) return (f); else @@ -128,7 +145,6 @@ BZ2_bzReadClose(&bzerror, bzf); fclose(file); lseek(tempfd, 0L, SEEK_SET); - f->type = FILE_STDIO; if ((f->f = fdopen(tempfd, "r")) != NULL) return (f); else @@ -136,63 +152,9 @@ } } - /* try mmap first; if it fails, try stdio */ - if ((f->mmf = mmopen(fname, "r")) != NULL) { - f->type = FILE_MMAP; - return (f); - } - f->type = FILE_STDIO; if ((f->f = fopen(path, "r")) != NULL) return (f); free(f); return (NULL); } - -int -grep_bin_file(struct file *f) -{ - if (f->noseek) - return (0); - - switch (f->type) { - case FILE_STDIO: - return (bin_file(f->f)); - case FILE_MMAP: - return (mmbin_file(f->mmf)); - default: - /* NOTREACHED */ - errx(2, getstr(3)); - } -} - -char * -grep_fgetln(struct file *f, size_t *l) -{ - switch (f->type) { - case FILE_STDIO: - return (fgetln(f->f, l)); - case FILE_MMAP: - return (mmfgetln(f->mmf, l)); - default: - /* NOTREACHED */ - errx(2, getstr(3)); - } -} - -void -grep_close(struct file *f) -{ - switch (f->type) { - case FILE_STDIO: - fclose(f->f); - break; - case FILE_MMAP: - mmclose(f->mmf); - break; - default: - /* NOTREACHED */ - errx(2, getstr(3)); - } - free(f); -} ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#45 (text+ko) ==== @@ -540,7 +540,7 @@ break; case 'u': case MMAP_OPT: - /* default, compatibility */ + /* noop, compatibility */ break; case 'V': printf(getstr(10)); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#25 (text+ko) ==== @@ -60,6 +60,12 @@ #define LINK_EXPLICIT 1 #define LINK_SKIP 2 +struct file { + int noseek; + FILE *f; + struct mmfile *mmf; +}; + struct str { size_t len; int line_no; @@ -115,26 +121,7 @@ void printqueue(void); void clearqueue(void); -/* mmfile.c */ -struct mmfile { - int fd; - size_t len; - char *base, *end, *ptr; -}; - -struct mmfile *mmopen(char *fn, char *mode); -void mmclose(struct mmfile *mmf); -char *mmfgetln(struct mmfile *mmf, size_t *l); - /* file.c */ -struct file; - +int bin_file(struct file * f); struct file *grep_stdin_open(void); struct file *grep_open(char *path); -int grep_bin_file(struct file *f); -char *grep_fgetln(struct file *f, size_t *l); -void grep_close(struct file *f); - -/* binary.c */ -int bin_file(FILE * f); -int mmbin_file(struct mmfile *f); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#39 (text+ko) ==== @@ -147,9 +147,10 @@ return (0); } - nottext = grep_bin_file(f); + nottext = bin_file(f); if (nottext && binbehave == BINFILE_SKIP) { - grep_close(f); + fclose(f->f); + free(f); return (0); } @@ -164,7 +165,7 @@ initqueue(); for (c = 0; c == 0 || !(lflag || qflag); ) { ln.off += ln.len + 1; - if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL) + if ((ln.dat = fgetln(f->f, &ln.len)) == NULL) break; if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') --ln.len; @@ -184,7 +185,8 @@ } if (Bflag > 0) clearqueue(); - grep_close(f); + fclose(f->f); + free(f); if (cflag) { if (!hflag) From owner-p4-projects@FreeBSD.ORG Wed Jun 25 10:45:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 954151065686; Wed, 25 Jun 2008 10:45:05 +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 571951065674 for ; Wed, 25 Jun 2008 10:45:05 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E8128FC14 for ; Wed, 25 Jun 2008 10:45:05 +0000 (UTC) (envelope-from gabor@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 m5PAj5ZU073240 for ; Wed, 25 Jun 2008 10:45:05 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PAj5l6073238 for perforce@freebsd.org; Wed, 25 Jun 2008 10:45:05 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 10:45:05 GMT Message-Id: <200806251045.m5PAj5l6073238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144083 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: Wed, 25 Jun 2008 10:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=144083 Change 144083 by gabor@gabor_server on 2008/06/25 10:44:04 - Check EILSEQ when dealing with wide chars and return 1, when EILSEQ is triggered. Suggested by: ache Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#12 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#12 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -65,8 +66,12 @@ if (fseek(f->f, 0L, SEEK_SET) == -1) return (0); - for (i = 0; (i <= BUFSIZ) && (ch != WEOF); i++) { - ch = fgetwc(f->f); + for (i = 0; i <= BUFSIZ; i++) { + if ((ch = fgetwc(f->f)) == WEOF) { + if (errno == EILSEQ) + ret = 1; + break; + } if (iswbinary(ch)) { ret = 1; break; From owner-p4-projects@FreeBSD.ORG Wed Jun 25 12:05:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B80F10656F1; Wed, 25 Jun 2008 12:05:27 +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 040BB106566B for ; Wed, 25 Jun 2008 12:05:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A14D88FC22 for ; Wed, 25 Jun 2008 12:05:26 +0000 (UTC) (envelope-from gabor@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 m5PC5Qws083319 for ; Wed, 25 Jun 2008 12:05:26 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PC5QVD083316 for perforce@freebsd.org; Wed, 25 Jun 2008 12:05:26 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 12:05:26 GMT Message-Id: <200806251205.m5PC5QVD083316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144086 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: Wed, 25 Jun 2008 12:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144086 Change 144086 by gabor@gabor_server on 2008/06/25 12:05:02 - Remove the fastgrep code. The regex library can auto-detect the fixed strings and operate with the same speed. If -F is specified, also set the REG_NOSPEC explicitly. - As the whole fastgrep code is removed, there is no need to fix the wide char handling there, grep should be localized now. Obtained from: NetBSD Project Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#46 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#26 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#40 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#46 (text+ko) ==== @@ -84,7 +84,6 @@ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; -struct fastgrep *fg_pattern; /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -616,24 +615,17 @@ ++argv; } - if (Eflag) + if (Fflag) + cflags |= REG_NOSPEC; + else if (Eflag) cflags |= REG_EXTENDED; - fg_pattern = grep_calloc(patterns, sizeof(*fg_pattern)); r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); for (i = 0; i < patterns; ++i) { - /* Check if cheating is allowed (always is for fgrep). */ - if (Fflag) { - fgrepcomp(&fg_pattern[i], pattern[i]); - } else { - if (fastcomp(&fg_pattern[i], pattern[i])) { - /* Fall back to full regex library */ - c = regcomp(&r_pattern[i], pattern[i], cflags); - if (c != 0) { - regerror(c, &r_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } - } + c = regcomp(&r_pattern[i], pattern[i], cflags); + if (c != 0) { + regerror(c, &r_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); } } ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#26 (text+ko) ==== @@ -98,7 +98,6 @@ extern int first, prev, matchall, patterns, tail, notfound; extern char **pattern; -extern struct fastgrep *fg_pattern; extern regex_t *r_pattern; /* For regex errors */ @@ -112,8 +111,6 @@ void *grep_calloc(size_t nmemb, size_t size); void *grep_realloc(void *ptr, size_t size); void printline(struct str *line, int sep); -int fastcomp(struct fastgrep *, const char *); -void fgrepcomp(struct fastgrep *, const char *); /* queue.c */ void initqueue(void); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#40 (text+ko) ==== @@ -56,9 +56,6 @@ static int linesqueued; static int procline(struct str *l, int); -static int grep_search(struct fastgrep *, unsigned char *, size_t, regmatch_t *pmatch); -static int grep_cmp(const unsigned char *, const unsigned char *, size_t); -static void grep_revstr(unsigned char *, int); int grep_tree(char **argv) @@ -204,13 +201,6 @@ return (c); } - -/* - * Process an individual line in a file. Return non-zero if it matches. - */ - -#define isword(x) (isalnum(x) || (x) == '_') - static int procline(struct str *l, int nottext) { @@ -219,14 +209,9 @@ if (!matchall) { for (c = i = 0; i < patterns; i++) { - if (fg_pattern[i].pattern) { - r = grep_search(&fg_pattern[i], (unsigned char *)l->dat, - l->len, &pmatch); - } else { - pmatch.rm_so = 0; - pmatch.rm_eo = l->len; - r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); - } + pmatch.rm_so = 0; + pmatch.rm_eo = l->len; + r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); if (r == 0 && xflag) { if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; @@ -306,283 +291,6 @@ return (c); } -void -fgrepcomp(struct fastgrep *fg, const char *pattern) -{ - int i; - - /* Initialize. */ - fg->patternLen = strlen(pattern); - fg->bol = 0; - fg->eol = 0; - fg->wmatch = wflag; - fg->reversedSearch = 0; - - /* - * Make a copy and upper case it for later if in -i mode, - * else just copy the pointer. - */ - if (iflag) { - fg->pattern = grep_malloc(fg->patternLen + 1); - for (i = 0; i < fg->patternLen; i++) - fg->pattern[i] = toupper(pattern[i]); - fg->pattern[fg->patternLen] = '\0'; - } else - fg->pattern = (unsigned char *)pattern; /* really const */ - - /* Preprocess pattern. */ - for (i = 0; i <= UCHAR_MAX; i++) - fg->qsBc[i] = fg->patternLen; - for (i = 1; i < fg->patternLen; i++) { - fg->qsBc[fg->pattern[i]] = fg->patternLen - i; - /* - * If case is ignored, make the jump apply to both upper and - * lower cased characters. As the pattern is stored in upper - * case, apply the same to the lower case equivalents. - */ - if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i; - } -} - -/* - * Returns: -1 on failure, 0 on success - */ -int -fastcomp(struct fastgrep *fg, const char *pattern) -{ - int i; - int bol = 0; - int eol = 0; - int shiftPatternLen; - int hasDot = 0; - int firstHalfDot = -1; - int firstLastHalfDot = -1; - int lastHalfDot = 0; - - /* Initialize. */ - fg->patternLen = strlen(pattern); - fg->bol = 0; - fg->eol = 0; - fg->wmatch = 0; - fg->reversedSearch = 0; - - /* Remove end-of-line character ('$'). */ - if (pattern[fg->patternLen - 1] == '$') { - eol++; - fg->eol = 1; - fg->patternLen--; - } - - /* Remove beginning-of-line character ('^'). */ - if (pattern[0] == '^') { - bol++; - fg->bol = 1; - fg->patternLen--; - } - - /* Remove enclosing [[:<:]] and [[:>:]] (word match). */ - if (wflag) { - /* basic re's use \( \), extended re's ( ) */ - int extra = Eflag ? 1 : 2; - fg->patternLen -= 14 + 2 * extra; - fg->wmatch = 7 + extra; - } else if (fg->patternLen >= 14 && - strncmp(pattern + fg->bol, "[[:<:]]", 7) == 0 && - strncmp(pattern + fg->bol + fg->patternLen - 7, "[[:>:]]", 7) == 0) { - fg->patternLen -= 14; - fg->wmatch = 7; - } - - /* - * Copy pattern minus '^' and '$' characters as well as word - * match character classes at the beginning and ending of the - * string respectively. - */ - fg->pattern = grep_malloc(fg->patternLen + 1); - memcpy(fg->pattern, pattern + bol + fg->wmatch, fg->patternLen); - fg->pattern[fg->patternLen] = '\0'; - - /* Look for ways to cheat...er...avoid the full regex engine. */ - for (i = 0; i < fg->patternLen; i++) - { - /* Can still cheat? */ - if ((isalnum(fg->pattern[i])) || isspace(fg->pattern[i]) || - (fg->pattern[i] == '_') || (fg->pattern[i] == ',') || - (fg->pattern[i] == '=') || (fg->pattern[i] == '-') || - (fg->pattern[i] == ':') || (fg->pattern[i] == '/')) { - /* As long as it is good, upper case it for later. */ - if (iflag) - fg->pattern[i] = toupper(fg->pattern[i]); - } else if (fg->pattern[i] == '.') { - hasDot = i; - if (i < fg->patternLen / 2) { - if (firstHalfDot < 0) - /* Closest dot to the beginning */ - firstHalfDot = i; - } else { - /* Closest dot to the end of the pattern. */ - lastHalfDot = i; - if (firstLastHalfDot < 0) - firstLastHalfDot = i; - } - } else { - /* Free memory and let others know this is empty. */ - free(fg->pattern); - fg->pattern = NULL; - return (-1); - } - } - - /* - * Determine if a reverse search would be faster based on the placement - * of the dots. - */ - if ((!(lflag || cflag)) && ((!(bol || eol)) && - ((lastHalfDot) && ((firstHalfDot < 0) || - ((fg->patternLen - (lastHalfDot + 1)) < firstHalfDot))))) { - fg->reversedSearch = 1; - hasDot = fg->patternLen - (firstHalfDot < 0 ? - firstLastHalfDot : firstHalfDot) - 1; - grep_revstr(fg->pattern, fg->patternLen); - } - - /* - * Normal Quick Search would require a shift based on the position the - * next character after the comparison is within the pattern. With - * wildcards, the position of the last dot effects the maximum shift - * distance. - * The closer to the end the wild card is the slower the search. A - * reverse version of this algorithm would be useful for wildcards near - * the end of the string. - * - * Examples: - * Pattern Max shift - * ------- --------- - * this 5 - * .his 4 - * t.is 3 - * th.s 2 - * thi. 1 - */ - - /* Adjust the shift based on location of the last dot ('.'). */ - shiftPatternLen = fg->patternLen - hasDot; - - /* Preprocess pattern. */ - for (i = 0; i <= UCHAR_MAX; i++) - fg->qsBc[i] = shiftPatternLen; - for (i = hasDot + 1; i < fg->patternLen; i++) { - fg->qsBc[fg->pattern[i]] = fg->patternLen - i; - /* - * If case is ignored, make the jump apply to both upper and - * lower cased characters. As the pattern is stored in upper - * case, apply the same to the lower case equivalents. - */ - if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i; - } - - /* - * Put pattern back to normal after pre-processing to allow for easy - * comparisons later. - */ - if (fg->reversedSearch) - grep_revstr(fg->pattern, fg->patternLen); - - return (0); -} - -/* - * Word boundaries using regular expressions are defined as the point - * of transition from a non-word char to a word char, or vice versa. - * This means that grep -w +a and grep -w a+ never match anything, - * because they lack a starting or ending transition, but grep -w a+b - * does match a line containing a+b. - */ -#define wmatch(d, l, s, e) \ - ((s == 0 || !isword(d[s-1])) && (e == l || !isword(d[e])) && \ - e > s && isword(d[s]) && isword(d[e-1])) - -static int -grep_search(struct fastgrep *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch) -{ - int j; - int rtrnVal = REG_NOMATCH; - - pmatch->rm_so = -1; - pmatch->rm_eo = -1; - - /* No point in going farther if we do not have enough data. */ - if (dataLen < fg->patternLen) - return (rtrnVal); - - /* Only try once at the beginning or ending of the line. */ - if (fg->bol || fg->eol) { - /* Simple text comparison. */ - /* Verify data is >= pattern length before searching on it. */ - if (dataLen >= fg->patternLen) { - /* Determine where in data to start search at. */ - if (fg->eol) - j = dataLen - fg->patternLen; - else - j = 0; - if (!((fg->bol && fg->eol) && (dataLen != fg->patternLen))) - if (grep_cmp(fg->pattern, data + j, - fg->patternLen) == -1) { - pmatch->rm_so = j; - pmatch->rm_eo = j + fg->patternLen; - if (!fg->wmatch || wmatch(data, dataLen, - pmatch->rm_so, pmatch->rm_eo)) - rtrnVal = 0; - } - } - } else if (fg->reversedSearch) { - /* Quick Search algorithm. */ - j = dataLen; - do { - if (grep_cmp(fg->pattern, data + j - fg->patternLen, - fg->patternLen) == -1) { - pmatch->rm_so = j - fg->patternLen; - pmatch->rm_eo = j; - if (!fg->wmatch || wmatch(data, dataLen, - pmatch->rm_so, pmatch->rm_eo)) { - rtrnVal = 0; - break; - } - } - /* Shift if within bounds, otherwise, we are done. */ - if (j == fg->patternLen) - break; - j -= fg->qsBc[data[j - fg->patternLen - 1]]; - } while (j >= fg->patternLen); - } else { - /* Quick Search algorithm. */ - j = 0; - do { - if (grep_cmp(fg->pattern, data + j, fg->patternLen) == -1) { - pmatch->rm_so = j; - pmatch->rm_eo = j + fg->patternLen; - if (fg->patternLen == 0 || !fg->wmatch || - wmatch(data, dataLen, pmatch->rm_so, - pmatch->rm_eo)) { - rtrnVal = 0; - break; - } - } - - /* Shift if within bounds, otherwise, we are done. */ - if (j + fg->patternLen == dataLen) - break; - else - j += fg->qsBc[data[j + fg->patternLen]]; - } while (j <= (dataLen - fg->patternLen)); - } - - return (rtrnVal); -} - - void * grep_malloc(size_t size) { @@ -612,38 +320,6 @@ return (ptr); } -/* - * Returns: i >= 0 on failure (position that it failed) - * -1 on success - */ -static int -grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len) -{ - int i; - - for (i = 0; i < len; i++) { - if (((pattern[i] == data[i]) || (!Fflag && pattern[i] == '.')) - || (iflag && pattern[i] == toupper(data[i]))) - continue; - return (i); - } - - return (-1); -} - -static void -grep_revstr(unsigned char *str, int len) -{ - int i; - char c; - - for (i = 0; i < len / 2; i++) { - c = str[i]; - str[i] = str[len - i - 1]; - str[len - i - 1] = c; - } -} - void printline(struct str *line, int sep) { From owner-p4-projects@FreeBSD.ORG Wed Jun 25 12:09:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B21106567A; Wed, 25 Jun 2008 12:09:31 +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 602461065676 for ; Wed, 25 Jun 2008 12:09:31 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 551E48FC1B for ; Wed, 25 Jun 2008 12:09:31 +0000 (UTC) (envelope-from andenore@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 m5PC9Vdh083603 for ; Wed, 25 Jun 2008 12:09:31 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PC9Vx0083601 for perforce@freebsd.org; Wed, 25 Jun 2008 12:09:31 GMT (envelope-from andenore@FreeBSD.org) Date: Wed, 25 Jun 2008 12:09:31 GMT Message-Id: <200806251209.m5PC9Vx0083601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 144088 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: Wed, 25 Jun 2008 12:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=144088 Change 144088 by andenore@andenore_laptop on 2008/06/25 12:09:02 pkg_create's -O option have been modified to register the port to be installed in cache. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/pl.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#4 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#2 (text+ko) ==== @@ -1,5 +1,5 @@ -Changes made to pkg_install during SoC2008 by Anders Nore ( andenore@FreeBSD.org ) -Last modified: 2008 06 17 +Changes made to pkg_install during SoC2008 by Anders Nore (andenore@FreeBSD.org) +Last modified: 2008 06 25 Converter: @@ -20,4 +20,9 @@ Lib: - Changed methods in match.c to use cache if available - Added global variable 'database' of type DB* (the database object) - - Added database helper functions+ - Added database helper functions + - Added function to cache a Packagelist (cache_plist()) + +Create: + - The -O option has been modified to cache information when installing ports + from /usr/ports/ ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#3 (text+ko) ==== @@ -60,45 +60,48 @@ return 1; } - key.size = strlen(pkg.name) + 1; - key.data = pkg.name; - data.size = strlen(pkg.origin) + 1; - data.data = pkg.origin; + return cache_plist(&pkg, Verbose); - if(!Quiet) - printf("Saving package: %s\n", key.data); - dbsave(&key, &data); - - for (itr = pkg.head; itr != pkg.tail; itr = itr->next) { - if (itr->type == PLIST_CWD && skip == FALSE) { - cwd = itr->name; - } - else if (itr->type == PLIST_IGNORE) { - skip = TRUE; - if(Verbose && itr->next) - printf("\tIgnored: %s\n", itr->next->name); - - continue; - } - else if (itr->type == PLIST_FILE && skip == FALSE) { - /* Save abspath of file installed in key, and pkgname in data */ - char *entry = NULL; - asprintf(&entry, "%s/%s", cwd, itr->name); - - key.size = strlen(entry) + 1; - key.data = entry; - data.size = strlen(pkgname) + 1; - data.data = pkgname; - - if(Verbose) - printf("\tSaving entry %s -> %s\n", key.data, data.data); - dbsave(&key, &data); - free(entry); - } - skip = FALSE; - } - free_plist(&pkg); - + +// key.size = strlen(pkg.name) + 1; +// key.data = pkg.name; +// data.size = strlen(pkg.origin) + 1; +// data.data = pkg.origin; +// +// if(!Quiet) +// printf("Saving package: %s\n", key.data); +// dbsave(&key, &data); +// +// for (itr = pkg.head; itr != pkg.tail; itr = itr->next) { +// if (itr->type == PLIST_CWD && skip == FALSE) { +// cwd = itr->name; +// } +// else if (itr->type == PLIST_IGNORE) { +// skip = TRUE; +// if(Verbose && itr->next) +// printf("\tIgnored: %s\n", itr->next->name); +// +// continue; +// } +// else if (itr->type == PLIST_FILE && skip == FALSE) { +// /* Save abspath of file installed in key, and pkgname in data */ +// char *entry = NULL; +// asprintf(&entry, "%s/%s", cwd, itr->name); +// +// key.size = strlen(entry) + 1; +// key.data = entry; +// data.size = strlen(pkgname) + 1; +// data.data = pkgname; +// +// if(Verbose) +// printf("\tSaving entry %s -> %s\n", key.data, data.data); +// dbsave(&key, &data); +// free(entry); +// } +// skip = FALSE; +// } +// free_plist(&pkg); + return 0; } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#2 (text+ko) ==== @@ -94,7 +94,7 @@ errx(1, "no packages match pattern"); } /* - * Is there is only one installed package matching the pattern, + * If there is only one installed package matching the pattern, * we need to respect the optional pkg-filename parameter. If, * however, the pattern matches several packages, this parameter * makes no sense and is ignored. @@ -196,47 +196,59 @@ printf(".\n"); } - /* If a SrcDir override is set, add it now */ - if (SrcDir) { - if (Verbose && !PlistOnly) - printf("Using SrcDir value of %s\n", SrcDir); - add_plist(&plist, PLIST_SRC, SrcDir); - } + /* If a SrcDir override is set, add it now */ + if (SrcDir) { + if (Verbose && !PlistOnly) + printf("Using SrcDir value of %s\n", SrcDir); + add_plist(&plist, PLIST_SRC, SrcDir); + } - /* Slurp in the packing list */ - read_plist(&plist, pkg_in); + /* Slurp in the packing list */ + read_plist(&plist, pkg_in); /* Prefix should add an @cwd to the packing list */ - if (Prefix) - add_plist_top(&plist, PLIST_CWD, Prefix); + if (Prefix) + add_plist_top(&plist, PLIST_CWD, Prefix); /* Add the origin if asked, at the top */ - if (Origin) - add_plist_top(&plist, PLIST_ORIGIN, Origin); + if (Origin) { + add_plist_top(&plist, PLIST_ORIGIN, Origin); + plist.origin = Origin; + } /* * Run down the list and see if we've named it, if not stick in a name * at the top. */ - if (find_plist(&plist, PLIST_NAME) == NULL) - add_plist_top(&plist, PLIST_NAME, basename(pkg)); + if (find_plist(&plist, PLIST_NAME) == NULL) { + add_plist_top(&plist, PLIST_NAME, basename(pkg)); + plist.name = basename(pkg); + } if (asprintf(&cp, "PKG_FORMAT_REVISION:%d.%d", PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR) == -1) { - errx(2, "%s: asprintf() failed", __func__); - } - add_plist_top(&plist, PLIST_COMMENT, cp); - free(cp); + errx(2, "%s: asprintf() failed", __func__); + } + add_plist_top(&plist, PLIST_COMMENT, cp); + free(cp); + + /* + * We're just here for to dump out a revised plist for the FreeBSD ports + * hack. It's not a real create in progress. + * Ports uses this to fake a pkg_add installation so that we can call + * pkg_delete later. + * See /usr/ports/Mk/bsd.port.mk (in the fake-pkg target) + */ + if (PlistOnly) { + openDatabase(PKG_DBCACHE_FILE); + + check_list(home, &plist); + int retval = cache_plist(&plist, FALSE); + write_plist(&plist, stdout); - /* - * We're just here for to dump out a revised plist for the FreeBSD ports - * hack. It's not a real create in progress. - */ - if (PlistOnly) { - check_list(home, &plist); - write_plist(&plist, stdout); - exit(0); - } + closeDatabase(); + exit(retval); + } /* Make a directory to stomp around in */ home = make_playpen(PlayPen, 0); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/pl.c#2 (text+ko) ==== @@ -31,69 +31,71 @@ void add_cksum(Package *pkg, PackingList p, const char *fname) { - char *cp = NULL, buf[33]; + char *cp = NULL, buf[33]; + + if (issymlink(fname)) { + int len; + char lnk[FILENAME_MAX]; - if (issymlink(fname)) { - int len; - char lnk[FILENAME_MAX]; + if ((len = readlink(fname, lnk, FILENAME_MAX)) > 0) + cp = MD5Data((unsigned char *)lnk, len, buf); - if ((len = readlink(fname, lnk, FILENAME_MAX)) > 0) - cp = MD5Data((unsigned char *)lnk, len, buf); - } else if (isfile(fname)) { - /* Don't record MD5 checksum for device nodes and such */ - cp = MD5File(fname, buf); - } + } else if (isfile(fname)) { + /* Don't record MD5 checksum for device nodes and such */ + cp = MD5File(fname, buf); + } - if (cp != NULL) { - PackingList tmp = new_plist_entry(); + if (cp != NULL) { + PackingList tmp = new_plist_entry(); - tmp->name = copy_string(strconcat("MD5:", cp)); - tmp->type = PLIST_COMMENT; - tmp->next = p->next; - tmp->prev = p; - p->next = tmp; - if (pkg->tail == p) - pkg->tail = tmp; - } + tmp->name = copy_string(strconcat("MD5:", cp)); + tmp->type = PLIST_COMMENT; + tmp->next = p->next; + tmp->prev = p; + p->next = tmp; + + if (pkg->tail == p) + pkg->tail = tmp; + } } /* Check a list for files that require preconversion */ void check_list(const char *home, Package *pkg) { - const char *where = home; - const char *there = NULL; - char name[FILENAME_MAX]; - char *prefix = NULL; - PackingList p; + const char *where = home; + const char *there = NULL; + char name[FILENAME_MAX]; + char *prefix = NULL; + PackingList p; - for (p = pkg->head; p != NULL; p = p->next) + for (p = pkg->head; p != NULL; p = p->next) switch (p->type) { case PLIST_CWD: - if (!prefix) - prefix = p->name; - where = (p->name == NULL) ? prefix : p->name; - break; + if (!prefix) + prefix = p->name; + where = (p->name == NULL) ? prefix : p->name; + break; case PLIST_IGNORE: - p = p->next; - break; + p = p->next; + break; case PLIST_SRC: - there = p->name; - break; + there = p->name; + break; case PLIST_FILE: - if (there) - snprintf(name, sizeof(name), "%s/%s", there, p->name); - else - snprintf(name, sizeof(name), "%s%s/%s", - BaseDir && where && where[0] == '/' ? BaseDir : "", where, p->name); + if (there) + snprintf(name, sizeof(name), "%s/%s", there, p->name); + else + snprintf(name, sizeof(name), "%s%s/%s", + BaseDir && where && where[0] == '/' ? BaseDir : "", where, p->name); - add_cksum(pkg, p, name); - break; + add_cksum(pkg, p, name); + break; default: - break; + break; } } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#4 (text+ko) ==== @@ -2,6 +2,9 @@ #include int compare_func(const DBT *, const DBT *); +int closedb(DB *db); +int dbput(const DB *db, DBT *key, DBT *data); + /* * Btree information structure @@ -49,7 +52,7 @@ * TODO: Add warnings, verbose check and such */ void openDatabase(const char *filename) { - DEBUG("openDatabase()\n"); +// DEBUG("openDatabase()\n"); if(database == NULL) database = opendb(filename); else @@ -66,7 +69,7 @@ int dbsave(const DBT *key, const DBT *data) { assert(database != NULL); - return dbput(database, key, data); + return dbput(database, (DBT *)key, (DBT *)data); } int dbAddPackage(const char *pkgname, const char *pkgdata) { @@ -78,7 +81,7 @@ key.data = tmp; data.size = strlen(pkgdata) + 1; - data.data = pkgdata; + data.data = (char *)pkgdata; int retval = dbsave(&key, &data); free(tmp); @@ -105,14 +108,14 @@ DBT data, key; key.size = strlen(aKey) + 1; - key.data = aKey; + key.data = (char *)aKey; if(database->get(database, &key, &data, 0) != 0) return NULL; // result = malloc(data.size); - strlcpy(&result, data.data, data.size); + strlcpy((char *)&result, (char *)data.data, data.size); - return &result; + return (char **)&result; } /* @@ -126,7 +129,7 @@ DBT key; key.size = strlen(aKey) + 1; - key.data = aKey; + key.data = (char *)aKey; return database->del(database, &key, 0); } @@ -139,7 +142,7 @@ DBT key; key.size = strlen(aKey) + 1; - key.data = aKey; + key.data = (char *)aKey; if(database->get(database, &key, data, 0) == 0) return TRUE; @@ -157,7 +160,7 @@ int retval; key.size = strlen(pkgname) + 1; - key.data = pkgname; + key.data = (char *)pkgname; if ((retval = database->get(database, &key, &data, 0)) == 0) { return TRUE; @@ -169,12 +172,12 @@ } - /* * Scans the database, returning a new key/data pair for each call * Returns 1 when finished */ -int dbscan(const DB *db, DBT *key, DBT *data) { +int +dbscan(const DB *db, DBT *key, DBT *data) { return db->seq(db, key, data, R_NEXT); } @@ -182,13 +185,74 @@ /* * Close the database file */ -int closedb(DB *db) { +int +closedb(DB *db) +{ return db->close(db); } -void closeDatabase() { +void +closeDatabase() +{ assert(database != NULL); - DEBUG("closeDatabase()\n"); +// DEBUG("closeDatabase()\n"); closedb(database); } + +/* + * cache_plist + */ +int +cache_plist(Package *pkg, Boolean showmsg) +{ + PackingList itr = NULL; + Boolean skip = FALSE; + char *cwd; + DBT key, data; + + if (pkg->name == NULL || pkg->origin == NULL) { + if(showmsg) + warnx("%s does not appear to be a valid package!", pkg->name); + return 1; + } + + key.size = strlen(pkg->name) + 1; + key.data = (char *)pkg->name; + data.size = strlen(pkg->origin) + 1; + data.data = (char *)pkg->origin; + + if(showmsg) + printf("Saving package: %s\n", (char *)key.data); + dbsave(&key, &data); + + for (itr = pkg->head; itr != pkg->tail; itr = itr->next) { + if (itr->type == PLIST_CWD && skip == FALSE) { + cwd = itr->name; + } + else if (itr->type == PLIST_IGNORE) { + skip = TRUE; + if(Verbose && showmsg && itr->next) + printf("\tIgnored: %s\n", (char *)itr->next->name); + + continue; + } + else if (itr->type == PLIST_FILE && skip == FALSE) { + /* Save abspath of file installed in key, and pkgname in data */ + char *entry = NULL; + asprintf(&entry, "%s/%s", cwd, (char *)itr->name); + + key.size = strlen(entry) + 1; + key.data = entry; + data.size = strlen(pkg->name) + 1; + data.data = (char *)pkg->name; + + if(Verbose && showmsg) + printf("\tSaving entry %s -> %s\n", (char *)key.data, (char *)data.data); + dbsave(&key, &data); + free(entry); + } + skip = FALSE; + } + return 0; +} ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#5 (text+ko) ==== @@ -258,6 +258,7 @@ Boolean dbPackageExists(const char *portname); void closeDatabase(void); int dbscan(const DB *db, DBT *key, DBT *data); +int cache_plist(Package *pkg, Boolean showmsg); /* Externs */ extern Boolean Quiet; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#4 (text+ko) ==== @@ -431,7 +431,7 @@ getPkgName(const char *makefile) { FILE *fp; - fp = fopen(tmp, "r"); + fp = fopen(makefile, "r"); if (!fp) { warnx("Could not open %s, trying make -V PKGNAME", makefile); return NULL; From owner-p4-projects@FreeBSD.ORG Wed Jun 25 12:34:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 511AD1065676; Wed, 25 Jun 2008 12:34:57 +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 12C15106566B for ; Wed, 25 Jun 2008 12:34:57 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 093248FC1B for ; Wed, 25 Jun 2008 12:34:57 +0000 (UTC) (envelope-from gabor@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 m5PCYurV085739 for ; Wed, 25 Jun 2008 12:34:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PCYuPO085737 for perforce@freebsd.org; Wed, 25 Jun 2008 12:34:56 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 12:34:56 GMT Message-Id: <200806251234.m5PCYuPO085737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144090 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: Wed, 25 Jun 2008 12:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144090 Change 144090 by gabor@gabor_server on 2008/06/25 12:34:28 - Cleanup and style changes - Use strlcpy which is safer than memcpy Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#47 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#47 (text+ko) ==== @@ -293,10 +293,11 @@ while (pat[0] == '*') pat++; - if (!xflag && (len == 0 || matchall)) { + if (len == 0 || matchall) { matchall = 1; return; } + if (patterns == pattern_sz) { pattern_sz *= 2; pattern = grep_realloc(pattern, ++pattern_sz * sizeof(*pattern)); @@ -322,7 +323,7 @@ len += 14 + extra; } else { pattern[patterns] = grep_malloc(len + 1); - memcpy(pattern[patterns], pat, len); + strlcpy(pattern[patterns], pat, len); pattern[patterns][len] = '\0'; } ++patterns; @@ -617,6 +618,8 @@ if (Fflag) cflags |= REG_NOSPEC; + else if (Gflag) + cflags |= REG_BASIC; else if (Eflag) cflags |= REG_EXTENDED; r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); From owner-p4-projects@FreeBSD.ORG Wed Jun 25 13:03:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F903106567A; Wed, 25 Jun 2008 13:03:26 +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 BD6E81065676 for ; Wed, 25 Jun 2008 13:03:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B31C18FC1F for ; Wed, 25 Jun 2008 13:03:25 +0000 (UTC) (envelope-from gabor@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 m5PD3PhC098294 for ; Wed, 25 Jun 2008 13:03:25 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PD3Ptl098292 for perforce@freebsd.org; Wed, 25 Jun 2008 13:03:25 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 13:03:25 GMT Message-Id: <200806251303.m5PD3Ptl098292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144092 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: Wed, 25 Jun 2008 13:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=144092 Change 144092 by gabor@gabor_server on 2008/06/25 13:02:50 - Cleanups [1] - Revert a nit, which was incorrect Obtained from: NetBSD Project [1] Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#48 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#27 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#48 (text+ko) ==== @@ -35,7 +35,6 @@ #endif /* not lint */ #include -#include #include #include @@ -138,12 +137,6 @@ int tail; /* lines left to print */ int notfound; /* file not found */ -struct patfile { - const char *pf_file; - SLIST_ENTRY(patfile) pf_next; -}; -SLIST_HEAD(, patfile) patfilelh; - extern char *__progname; static void @@ -323,25 +316,13 @@ len += 14 + extra; } else { pattern[patterns] = grep_malloc(len + 1); - strlcpy(pattern[patterns], pat, len); + memcpy(pattern[patterns], pat, len); pattern[patterns][len] = '\0'; } ++patterns; } static void -add_patterns(char *pats) -{ - char *nl; - - while ((nl = strchr(pats, '\n')) != NULL) { - add_pattern(pats, nl - pats); - pats = nl + 1; - } - add_pattern(pats, strlen(pats)); -} - -static void read_patterns(const char *fn) { FILE *f; @@ -360,8 +341,7 @@ int main(int argc, char *argv[]) { - int c, lastc, prevoptind, newarg, i, needpattern; - struct patfile *patfile, *pf_next; + int c, lastc, prevoptind, newarg, i; char *ep; struct stat *finfo = 0; unsigned long long l; @@ -372,7 +352,6 @@ catalog = catopen("grep", NL_CAT_LOCALE); #endif - SLIST_INIT(&patfilelh); switch (__progname[0]) { case 'e': Eflag++; @@ -402,7 +381,6 @@ lastc = '\0'; newarg = 1; prevoptind = 1; - needpattern = 1; while ((c = getopt_long(argc, argv, optstr, long_options, NULL)) != -1) { switch (c) { @@ -459,18 +437,14 @@ Eflag++; break; case 'e': - add_patterns(optarg); - needpattern = 0; + add_pattern(optarg, strlen(optarg)); break; case 'F': Eflag = Gflag = 0; Fflag++; break; case 'f': - patfile = grep_malloc(sizeof(*patfile)); - patfile->pf_file = optarg; - SLIST_INSERT_HEAD(&patfilelh, patfile, pf_next); - needpattern = 0; + read_patterns(optarg); break; case 'G': Eflag = Fflag = 0; @@ -600,18 +574,11 @@ argc -= optind; argv += optind; - for (patfile = SLIST_FIRST(&patfilelh); patfile != NULL; - patfile = pf_next) { - pf_next = SLIST_NEXT(patfile, pf_next); - read_patterns(patfile->pf_file); - free(patfile); - } - - if (argc == 0 && needpattern) + if (argc == 0 && patterns == 0) usage(); - if (argc != 0 && needpattern) { - add_patterns(*argv); + if (patterns == 0) { + add_pattern(*argv, strlen(*argv)); --argc; ++argv; } ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#27 (text+ko) ==== @@ -74,17 +74,6 @@ char *dat; }; -struct fastgrep { - unsigned char *pattern; - int patternLen; - int qsBc[UCHAR_MAX + 1]; - /* flags */ - int bol; - int eol; - int wmatch; - int reversedSearch; -}; - /* Flags passed to regcomp() and regexec() */ extern int cflags, eflags; From owner-p4-projects@FreeBSD.ORG Wed Jun 25 13:17:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 840E01065671; Wed, 25 Jun 2008 13:17:40 +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 2CAF1106566B for ; Wed, 25 Jun 2008 13:17:40 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21D5C8FC23 for ; Wed, 25 Jun 2008 13:17:40 +0000 (UTC) (envelope-from andenore@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 m5PDHdbY099432 for ; Wed, 25 Jun 2008 13:17:39 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PDHdwP099430 for perforce@freebsd.org; Wed, 25 Jun 2008 13:17:39 GMT (envelope-from andenore@FreeBSD.org) Date: Wed, 25 Jun 2008 13:17:39 GMT Message-Id: <200806251317.m5PDHdwP099430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 144093 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: Wed, 25 Jun 2008 13:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=144093 Change 144093 by andenore@andenore_laptop on 2008/06/25 13:16:58 pkg_info -s option prints human readable output Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/show.c#4 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#3 (text+ko) ==== @@ -10,6 +10,8 @@ - Profiling showed that the default behavior for pkg_info was to read plist everytime even though not needed. Added check for this and speed improved significantly. + - Uses human readable output for -s (size option) I'm not sure if this breaks + things, but it looks Ok. (The old output is available via the -b option) Add: - Indexes information to dbcache according to the add ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#2 (text+ko) ==== @@ -15,7 +15,7 @@ .\" .\" .\" @(#)pkg_info.1 -.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.62 2007/12/09 11:01:58 krion Exp $ +.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.60 2007/03/04 13:30:02 ru Exp $ .\" .Dd January 9, 2006 .Dt PKG_INFO 1 @@ -72,11 +72,7 @@ .It Fl b Use the .Ev BLOCKSIZE -environment variable for output even when the -.Fl q -or -.Fl Q -flag is present. +environment variable for size output. .It Fl v Turn on verbose output. .It Fl p ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/show.c#4 (text+ko) ==== @@ -29,6 +29,19 @@ #include #include +char sizeTable[][4] = { "B", "kB", "MB", "GB", "TB" }; + +unsigned int +human_readable(unsigned int size, int *index) +{ + if (size >= 1024) { + *index = *index + 1; + return human_readable(size/1024, index); + } + + return size; +} + void show_file(const char *title, const char *fname) { @@ -250,67 +263,74 @@ } /* Calculate and show size of all installed package files (except ignored ones) - * TODO: Make size easier to read (It should be unnecessary to set BLOCKSIZE in - * environment). If the files are static in size, maybe it could be cached - * instead of calculated every time. Could also be made default to show. - * */ void show_size(const char *title, Package *plist) { - PackingList p; - Boolean ign = FALSE; - const char *dir = "."; - struct stat sb; - char tmp[FILENAME_MAX]; - unsigned long size = 0; - long blksize; - int headerlen; - char *descr; - char *prefix = NULL; + PackingList p; + Boolean ign = FALSE; + const char *dir = "."; + struct stat sb; + char tmp[FILENAME_MAX]; + unsigned long size = 0; + long blksize; + int headerlen; + char *descr; + char *prefix = NULL; + + descr = getbsize(&headerlen, &blksize); + if (!Quiet) + printf("%s%s", InfoPrefix, title); - descr = getbsize(&headerlen, &blksize); - if (!Quiet) - printf("%s%s", InfoPrefix, title); - for (p = plist->head; p != NULL; p = p->next) { + for (p = plist->head; p != NULL; p = p->next) { switch (p->type) { case PLIST_FILE: - if (!ign) { - snprintf(tmp, FILENAME_MAX, "%s/%s", dir, p->name); - if (!lstat(tmp, &sb)) { - size += sb.st_size; - if (Verbose) - printf("%lu\t%s\n", (unsigned long) howmany(sb.st_size, blksize), tmp); + if (!ign) { + snprintf(tmp, FILENAME_MAX, "%s/%s", dir, p->name); + if (!lstat(tmp, &sb)) { + size += sb.st_size; + + if (Verbose) + printf("%lu\t%s\n", + (unsigned long) howmany(sb.st_size, blksize), tmp); + } } - } - ign = FALSE; - break; + ign = FALSE; + break; case PLIST_CWD: - if (!prefix) - prefix = p->name; - if (p->name == NULL) - dir = prefix; - else - dir = p->name; - break; + if (!prefix) + prefix = p->name; + + if (p->name == NULL) + dir = prefix; + else + dir = p->name; + break; case PLIST_IGNORE: - ign = TRUE; - break; + ign = TRUE; + break; /* Silence GCC in the -Wall mode */ default: - break; + break; + } } - } - if (!Quiet) - printf("%lu\t(%s)\n", howmany(size, blksize), descr); - else - if (UseBlkSz) - printf("%lu\n", howmany(size, blksize)); - else - printf("%lu\n", size); + + if (!Quiet) { + if (UseBlkSz) + printf("%lu\t(%s)\n", howmany(size, blksize), descr); + else { + int index = 0; + printf("%lu ", human_readable(size, &index)); + printf("%s\n", &sizeTable[index]); + } + } else + if (UseBlkSz) + printf("%lu\n", howmany(size, blksize)); + else + printf("%lu\n", size); } /* Show files that don't match the recorded checksum */ From owner-p4-projects@FreeBSD.ORG Wed Jun 25 13:19:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B64106568F; Wed, 25 Jun 2008 13:19:42 +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 5982F106568A for ; Wed, 25 Jun 2008 13:19:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F5528FC1E for ; Wed, 25 Jun 2008 13:19:42 +0000 (UTC) (envelope-from gabor@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 m5PDJg85099583 for ; Wed, 25 Jun 2008 13:19:42 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PDJgv1099579 for perforce@freebsd.org; Wed, 25 Jun 2008 13:19:42 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 13:19:42 GMT Message-Id: <200806251319.m5PDJgv1099579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144094 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: Wed, 25 Jun 2008 13:19:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=144094 Change 144094 by gabor@gabor_server on 2008/06/25 13:18:43 - Show a warning on recursive directories - Better check for -d and -D behaviour Obtained from: NetBSD Project Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#49 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#41 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#49 (text+ko) ==== @@ -343,7 +343,6 @@ { int c, lastc, prevoptind, newarg, i; char *ep; - struct stat *finfo = 0; unsigned long long l; setlocale(LC_ALL, ""); @@ -611,22 +610,7 @@ if (dirbehave == DIR_RECURSE) c = grep_tree(argv); else - for (c = 0; argc--; ++argv) { - if (devbehave == DEV_SKIP) { - finfo = grep_malloc(sizeof(struct stat)); - if (stat(*argv, finfo) == -1) - err(2, NULL); - if (S_ISBLK(finfo->st_mode) || - S_ISCHR(finfo->st_mode) || - S_ISFIFO(finfo->st_mode) || - S_ISSOCK(finfo->st_mode)) { - free(finfo); - continue; - } else - free(finfo); - } - c+= procfile(*argv); - } + c+= procfile(*argv); #ifndef WITHOUT_NLS catclose(catalog); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#41 (text+ko) ==== @@ -85,28 +85,13 @@ errx(2, "%s: %s", p->fts_path, strerror(p->fts_errno)); break; case FTS_DP: + case FTS_D: + break; + case FTS_DC: + warnx("warning: %s: recursive directory loop", + p->fts_path); break; default: - if ((devbehave == DEV_SKIP) || (dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) { - struct stat *finfo; - - finfo = grep_malloc(sizeof(struct stat)); - if (stat(p->fts_path, finfo) == -1) - err(2, NULL); - - if ((devbehave == DEV_SKIP) && (S_ISBLK(finfo->st_mode) || - S_ISCHR(finfo->st_mode) || - S_ISFIFO(finfo->st_mode) || - S_ISSOCK(finfo->st_mode))) { - free(finfo); - break; - } - if (((dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) && S_ISDIR(finfo->st_mode)) { - free(finfo); - break; - } - free(finfo); - } c += procfile(p->fts_path); break; } @@ -122,6 +107,8 @@ { struct str ln; struct file *f; + struct stat sb; + mode_t s; int c, t, nottext; if (mflag && (mcount <= 0)) @@ -134,6 +121,16 @@ fn = getstr(1); f = grep_stdin_open(); } else { + if (stat(fn, &sb)) + err(2, NULL); + else { + s = sb.st_mode & S_IFMT; + if (s == S_IFDIR && dirbehave == DIR_SKIP) + return (0); + if ((s == S_IFIFO || s == S_IFCHR || s == S_IFBLK + || s == S_IFSOCK) && devbehave == DEV_SKIP) + return (0); + } f = grep_open(fn); } if (f == NULL) { From owner-p4-projects@FreeBSD.ORG Wed Jun 25 13:25:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D622E1065671; Wed, 25 Jun 2008 13:25:48 +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 970F9106566B for ; Wed, 25 Jun 2008 13:25:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8CC508FC14 for ; Wed, 25 Jun 2008 13:25:48 +0000 (UTC) (envelope-from gabor@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 m5PDPmsp000215 for ; Wed, 25 Jun 2008 13:25:48 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PDPmfF000213 for perforce@freebsd.org; Wed, 25 Jun 2008 13:25:48 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 13:25:48 GMT Message-Id: <200806251325.m5PDPmfF000213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144095 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: Wed, 25 Jun 2008 13:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=144095 Change 144095 by gabor@gabor_server on 2008/06/25 13:25:04 - Change some comments about the GNU compat parts - Add a WITHOUT_GNU_COMPAT part, just in case somebody wants to disable that. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#8 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#50 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#8 (text+ko) ==== @@ -31,4 +31,8 @@ CFLAGS+= -DWITHOUT_NLS .endif +.if defined(WITHOUT_GNU_COMPAT) +CFLAGS+= -DWITH_OUT_GNU_COMPAT +.endif + .include ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#50 (text+ko) ==== @@ -202,12 +202,15 @@ static void add_pattern(char *pat, size_t len) { +#ifndef WITHOUT_GNU_COMPAT char *ptr, *st; int lbr, rbr; -/* Workaround for our libc-regex library to match GNU behaviour. - Our library rejects '|' with empty subexpressions. Just cut out - those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */ +/* Workaround for our libc-regex library for better GNU compatibility. + Our library rejects some non-standard regular expressions, for example + '|' cannot stand with empty subexpressions. In these cases the + non-standard regex will be pre-edited, + e.g. "(|a|b||c|)" will be "(a|b|c)" */ st = pat; while (((ptr = strstr(st, "|)"))) != NULL) { if (strstr(st, "\\|)") != (ptr - 1)) @@ -281,10 +284,9 @@ errx(2, getstr(8)); } } - -/* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') pat++; +#endif if (len == 0 || matchall) { matchall = 1; From owner-p4-projects@FreeBSD.ORG Wed Jun 25 13:58:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8797106567F; Wed, 25 Jun 2008 13:58:21 +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 518271065674 for ; Wed, 25 Jun 2008 13:58:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46D3C8FC1D for ; Wed, 25 Jun 2008 13:58:21 +0000 (UTC) (envelope-from gabor@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 m5PDwL8I002683 for ; Wed, 25 Jun 2008 13:58:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PDwLac002681 for perforce@freebsd.org; Wed, 25 Jun 2008 13:58:21 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 13:58:21 GMT Message-Id: <200806251358.m5PDwLac002681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144096 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: Wed, 25 Jun 2008 13:58:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=144096 Change 144096 by gabor@gabor_server on 2008/06/25 13:57:53 - Change the procline() layout to count the matches and store the matching offsets. This will lead as a working --color support. The change is incomplete now, thus --color and -o won't work yet. Obtained from: NetBSD Project Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#28 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#42 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#28 (text+ko) ==== @@ -60,6 +60,8 @@ #define LINK_EXPLICIT 1 #define LINK_SKIP 2 +#define MAX_LINE_MATCHES 32 + struct file { int noseek; FILE *f; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#42 (text+ko) ==== @@ -202,55 +202,42 @@ procline(struct str *l, int nottext) { regmatch_t pmatch; - int c, i, r; + regmatch_t matches[MAX_LINE_MATCHES]; + regoff_t st = 0; + int c = 0, i, r, m = 0, t; if (!matchall) { - for (c = i = 0; i < patterns; i++) { - pmatch.rm_so = 0; + t = vflag ? REG_NOMATCH : 0; + + while (st <= l->len) { + pmatch.rm_so = st; pmatch.rm_eo = l->len; - r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); - if (r == 0 && xflag) { - if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) - r = REG_NOMATCH; - } - if ((r == 0) && (color != NULL) && !oflag && !nottext) { - char *tmp, *begin, *matched, *end; - begin = grep_malloc(strlen(l->dat) - pmatch.rm_so + 1); - matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char)); - end = grep_malloc(strlen(l->dat) - pmatch.rm_eo + 1); - - strlcpy(begin, l->dat, pmatch.rm_so + 1); - strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); - strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - pmatch.rm_eo + 1); - - asprintf(&tmp, "%s\33[%sm\33[K%s\33[m\33[K%s", begin, color, matched, end); - - free(begin); - free(matched); - free(end); - - l->len += strlen(color) + 12; - l->dat = tmp; + for (i = 0; i < patterns; i++) { + pmatch.rm_so = 0; + pmatch.rm_eo = l->len; + r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); + if (r == REG_NOMATCH && t == 0) + continue; + if (r == 0 && xflag) + if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) + r = REG_NOMATCH; + if (r == t) { + if (m == 0) + c++; + if (m < MAX_LINE_MATCHES) + matches[m] = pmatch; + m++; + } + st = pmatch.rm_eo; + break; } - if (r == 0 && oflag && !nottext) { - char *tmp, *matched; + /* One pass if we are not recording matches */ + if (!oflag && !color) + break; - matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char)); - strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); - - if (color != NULL) - asprintf(&tmp, "\33[%sm%s\33[m", color, matched); - else - tmp = matched; - - l->dat = tmp; - l->len = strlen(l->dat); - } - if (r == 0) { - c++; - break; - } + if (st == pmatch.rm_so) + break; /* No matches */ } } else c = !vflag; From owner-p4-projects@FreeBSD.ORG Wed Jun 25 14:51:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 136431065676; Wed, 25 Jun 2008 14:51:15 +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 C5FC01065672 for ; Wed, 25 Jun 2008 14:51:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA7BB8FC1B for ; Wed, 25 Jun 2008 14:51:14 +0000 (UTC) (envelope-from gabor@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 m5PEpE1I007997 for ; Wed, 25 Jun 2008 14:51:14 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PEpEWA007995 for perforce@freebsd.org; Wed, 25 Jun 2008 14:51:14 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 14:51:14 GMT Message-Id: <200806251451.m5PEpEWA007995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144098 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: Wed, 25 Jun 2008 14:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=144098 Change 144098 by gabor@gabor_server on 2008/06/25 14:50:37 - Reimplement --color and -o Obtained from: NetBSD Project Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#29 edit .. //depot/projects/soc2008/gabor_textproc/grep/queue.c#5 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#43 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#29 (text+ko) ==== @@ -101,7 +101,7 @@ void *grep_malloc(size_t size); void *grep_calloc(size_t nmemb, size_t size); void *grep_realloc(void *ptr, size_t size); -void printline(struct str *line, int sep); +void printline(struct str *line, int sep, regmatch_t *matches, int m); /* queue.c */ void initqueue(void); ==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#5 (text+ko) ==== @@ -116,7 +116,7 @@ struct queue *item; while ((item = dequeue()) != NULL) { - printline(&item->data, '-'); + printline(&item->data, '-', (regmatch_t *)NULL, 0); free_item(item); } } ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#43 (text+ko) ==== @@ -214,8 +214,6 @@ pmatch.rm_eo = l->len; for (i = 0; i < patterns; i++) { - pmatch.rm_so = 0; - pmatch.rm_eo = l->len; r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); if (r == REG_NOMATCH && t == 0) continue; @@ -259,9 +257,9 @@ printqueue(); } linesqueued = 0; - printline(l, ':'); + printline(l, ':', matches, m); } else { - printline(l, '-'); + printline(l, '-', matches, m); tail--; } } @@ -305,9 +303,10 @@ } void -printline(struct str *line, int sep) +printline(struct str *line, int sep, regmatch_t *matches, int m) { - int n = 0; + int i, n = 0; + size_t a = 0; if (!hflag) { if (nullflag == 0) @@ -332,6 +331,28 @@ } if (n) putchar(sep); - fwrite(line->dat, line->len, 1, stdout); - putchar('\n'); + if ((oflag || color) && m > 0) { + for (i = 0; i < m; i++) { + if (!oflag) + fwrite(line->dat + a, matches[i].rm_so - a, 1, stdout); + if (color) + fprintf(stdout, "\33[%sm", color); + fwrite(line->dat + matches[i].rm_so, + matches[i].rm_eo - matches[i].rm_so, 1, stdout); + if (color) + fprintf(stdout, "\33[00m"); + a = matches[i].rm_eo; + if (oflag) + putchar('\n'); + } + if (!oflag) { + if (line->len - a > 0) + fwrite(line->dat + a, line->len - a, 1, stdout); + putchar('\n'); + } + } else { + fwrite(line->dat, line->len, 1, stdout); + putchar('\n'); + } + } From owner-p4-projects@FreeBSD.ORG Wed Jun 25 15:19:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845B51065670; Wed, 25 Jun 2008 15:19:43 +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 4562A1065673 for ; Wed, 25 Jun 2008 15:19:43 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3DA8FC23 for ; Wed, 25 Jun 2008 15:19:43 +0000 (UTC) (envelope-from gabor@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 m5PFJh5V011336 for ; Wed, 25 Jun 2008 15:19:43 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PFJhLa011334 for perforce@freebsd.org; Wed, 25 Jun 2008 15:19:43 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 15:19:43 GMT Message-Id: <200806251519.m5PFJhLa011334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144099 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: Wed, 25 Jun 2008 15:19:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=144099 Change 144099 by gabor@gabor_server on 2008/06/25 15:19:25 - Reimplement -w - Fixes for --color Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#44 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#44 (text+ko) ==== @@ -220,6 +220,9 @@ if (r == 0 && xflag) if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; + if (r == 0 && wflag) + if (pmatch.rm_so != 0 || !isspace(l->dat[pmatch.rm_so - 1])) + r = REG_NOMATCH; if (r == t) { if (m == 0) c++; @@ -336,11 +339,11 @@ if (!oflag) fwrite(line->dat + a, matches[i].rm_so - a, 1, stdout); if (color) - fprintf(stdout, "\33[%sm", color); + fprintf(stdout, "\33[%sm\33[K", color); fwrite(line->dat + matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so, 1, stdout); if (color) - fprintf(stdout, "\33[00m"); + fprintf(stdout, "\33[00m\33[K"); a = matches[i].rm_eo; if (oflag) putchar('\n'); @@ -354,5 +357,4 @@ fwrite(line->dat, line->len, 1, stdout); putchar('\n'); } - } From owner-p4-projects@FreeBSD.ORG Wed Jun 25 15:40:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CF751065670; Wed, 25 Jun 2008 15:40:04 +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 0D7A6106566B for ; Wed, 25 Jun 2008 15:40:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01B1B8FC0A for ; Wed, 25 Jun 2008 15:40:04 +0000 (UTC) (envelope-from gabor@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 m5PFe3nI013081 for ; Wed, 25 Jun 2008 15:40:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PFe3tD013079 for perforce@freebsd.org; Wed, 25 Jun 2008 15:40:03 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 15:40:03 GMT Message-Id: <200806251540.m5PFe3tD013079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144100 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: Wed, 25 Jun 2008 15:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144100 Change 144100 by gabor@gabor_server on 2008/06/25 15:39:53 - Restore compatibility of status codes Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#51 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#45 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#51 (text+ko) ==== @@ -607,12 +607,13 @@ hflag = 1; if (argc == 0) - exit(!procfile(NULL)); + exit(!procfile("-")); if (dirbehave == DIR_RECURSE) c = grep_tree(argv); - else - c+= procfile(*argv); + else + for (c = 0; argc--; ++argv) + c+= procfile(*argv); #ifndef WITHOUT_NLS catclose(catalog); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#45 (text+ko) ==== @@ -114,16 +114,14 @@ if (mflag && (mcount <= 0)) return (0); - if (fn == NULL || (strcmp(fn, "-") == 0)) { + if (strcmp(fn, "-") == 0) { if (label != NULL) fn = label; else fn = getstr(1); f = grep_stdin_open(); } else { - if (stat(fn, &sb)) - err(2, NULL); - else { + if (!stat(fn, &sb)) { s = sb.st_mode & S_IFMT; if (s == S_IFDIR && dirbehave == DIR_SKIP) return (0); From owner-p4-projects@FreeBSD.ORG Wed Jun 25 20:51:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8077B1065676; Wed, 25 Jun 2008 20:51:20 +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 42AD0106566B for ; Wed, 25 Jun 2008 20:51:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C3E08FC1A for ; Wed, 25 Jun 2008 20:51:20 +0000 (UTC) (envelope-from gabor@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 m5PKpJSv062073 for ; Wed, 25 Jun 2008 20:51:19 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PKpJ3D062071 for perforce@freebsd.org; Wed, 25 Jun 2008 20:51:19 GMT (envelope-from gabor@freebsd.org) Date: Wed, 25 Jun 2008 20:51:19 GMT Message-Id: <200806252051.m5PKpJ3D062071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144107 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: Wed, 25 Jun 2008 20:51:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=144107 Change 144107 by gabor@gabor_server on 2008/06/25 20:50:31 - Fix WITHOUT_GNU_COMPAT Reported by: Pedro F. Giffuni Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#9 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#9 (text+ko) ==== @@ -32,7 +32,7 @@ .endif .if defined(WITHOUT_GNU_COMPAT) -CFLAGS+= -DWITH_OUT_GNU_COMPAT +CFLAGS+= -DWITHOUT_GNU_COMPAT .endif .include From owner-p4-projects@FreeBSD.ORG Wed Jun 25 22:10:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D84C0106567D; Wed, 25 Jun 2008 22:10:43 +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 9A9FC106567B for ; Wed, 25 Jun 2008 22:10:43 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D4918FC1B for ; Wed, 25 Jun 2008 22:10:43 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5PMAgnX074664 for ; Wed, 25 Jun 2008 22:10:42 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PMAeXR074660 for perforce@freebsd.org; Wed, 25 Jun 2008 22:10:40 GMT (envelope-from wsalamon@computer.org) Date: Wed, 25 Jun 2008 22:10:40 GMT Message-Id: <200806252210.m5PMAeXR074660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 144112 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: Wed, 25 Jun 2008 22:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=144112 Change 144112 by wsalamon@vh2 on 2008/06/25 22:09:51 The thread audit record must be set to NULL after freeing the record; when the thread struct is recycled, we don't have a record pointer referencing garbage. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#8 (text) ==== @@ -584,6 +584,7 @@ else if (ret == MAC_AUDIT_NO) { audit_free(td->td_ar); /* Nobody gets the record, not even pipes or other listeners */ + td->td_ar = NULL; return; } } while (0); From owner-p4-projects@FreeBSD.ORG Thu Jun 26 05:45:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BED71065677; Thu, 26 Jun 2008 05:45:22 +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 468AC106564A for ; Thu, 26 Jun 2008 05:45:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A4DA8FC1E for ; Thu, 26 Jun 2008 05:45:22 +0000 (UTC) (envelope-from julian@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 m5Q5jMkS039305 for ; Thu, 26 Jun 2008 05:45:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q5jMJW039303 for perforce@freebsd.org; Thu, 26 Jun 2008 05:45:22 GMT (envelope-from julian@freebsd.org) Date: Thu, 26 Jun 2008 05:45:22 GMT Message-Id: <200806260545.m5Q5jMJW039303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144120 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: Thu, 26 Jun 2008 05:45:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=144120 Change 144120 by julian@julian_trafmon1 on 2008/06/26 05:44:23 Another (!) branch fro me to experiment with this allows me to experiment with the vimage-commit2 branch without screwing it up :-) Affected files ... .. //depot/projects/vimage-commit3/src/sys/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/float.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/param.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/vimage-commit3/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/support.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/CRB#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/HL200#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/_types.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/asm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/bus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/clock.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/elf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/endian.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/exec.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/float.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/fp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/frame.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/intr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/limits.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/param.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/proc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/profile.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/psl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/pte.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/resource.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/runq.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/signal.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/smp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/stack.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/swi.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/trap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/README#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/boot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/commands.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/console.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/help.common#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/interp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/loader.8#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/ls.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/misc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/module.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/panic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/README#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/vimage-commit3/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/vimage-commit3/src/sys/bsm/audit.h#1 branch .. //depot/projects/vimage-commit3/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/vimage-commit3/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/vimage-commit3/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/README.quirks#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 26 08:01:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6792A106566C; Thu, 26 Jun 2008 08:01:40 +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 27FA6106567D for ; Thu, 26 Jun 2008 08:01:40 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D6648FC16 for ; Thu, 26 Jun 2008 08:01:40 +0000 (UTC) (envelope-from julian@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 m5Q81esg052712 for ; Thu, 26 Jun 2008 08:01:40 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q81eFS052710 for perforce@freebsd.org; Thu, 26 Jun 2008 08:01:40 GMT (envelope-from julian@freebsd.org) Date: Thu, 26 Jun 2008 08:01:40 GMT Message-Id: <200806260801.m5Q81eFS052710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144126 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: Thu, 26 Jun 2008 08:01:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=144126 Change 144126 by julian@julian_trafmon1 on 2008/06/26 08:01:34 distribute teh variabels around a bit Affected files ... .. //depot/projects/vimage-commit3/src/sys/net/if.h#2 edit .. //depot/projects/vimage-commit3/src/sys/net/if_gif.h#2 edit .. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#2 edit .. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#2 edit .. //depot/projects/vimage-commit3/src/sys/netinet/in.h#2 edit .. //depot/projects/vimage-commit3/src/sys/netinet/ip6.h#2 edit .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw.h#2 edit .. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#2 edit .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#2 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/net/if.h#2 (text+ko) ==== @@ -457,4 +457,22 @@ #include #endif +#define INIT_VNET_NET(_xXX) int vnet_net ; + +#define VNET_NET(sym) VSYM(vnet_net, sym) + +#define V_if_index VNET_NET(if_index) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifnet VNET_NET(ifnet) +#define V_ifg_head VNET_NET(ifg_head) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_ifklist VNET_NET(ifklist) +#define V_rtstat VNET_NET(rtstat) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rttrash VNET_NET(rttrash) +#define V_loif VNET_NET(loif) +#define V_lo_list VNET_NET(lo_list) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_ether_ipfw VNET_NET(ether_ipfw) + #endif /* !_NET_IF_H_ */ ==== //depot/projects/vimage-commit3/src/sys/net/if_gif.h#2 (text+ko) ==== @@ -110,6 +110,28 @@ void gif_delete_tunnel(struct ifnet *); int gif_encapcheck(const struct mbuf *, int, int, void *); +/* + * Virtualization support + */ + +#define INIT_VNET_GIF(vnet) int vnet_gif; + +#define VNET_GIF(sym) VSYM(vnet_gif, sym) + +struct vnet_gif { + LIST_HEAD(, gif_softc) _gif_softc_list; + int _max_gif_nesting; + int _parallel_tunnels; + int _ip_gif_ttl; + int _ip6_gif_hlim; +}; + +#define V_gif_softc_list VNET_GIF(gif_softc_list) +#define V_max_gif_nesting VNET_GIF(max_gif_nesting) +#define V_parallel_tunnels VNET_GIF(parallel_tunnels) +#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) +#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) + #endif /* _KERNEL */ #endif /* _NET_IF_GIF_H_ */ ==== //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#include #include /* ==== //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#2 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF); ==== //depot/projects/vimage-commit3/src/sys/netinet/in.h#2 (text+ko) ==== @@ -743,4 +743,133 @@ #undef __KAME_NETINET_IN_H_INCLUDED_ #endif + +#define INIT_VNET_INET(vnet) int vnet_inet; + +#define VNET_INET(sym) VSYM(vnet_inet, sym) + +#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) +#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) +#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) +#define V_in_multihead VNET_INET(in_multihead) + +#define V_llinfo_arp VNET_INET(llinfo_arp) +#define V_arpt_prune VNET_INET(arpt_prune) +#define V_arpt_keep VNET_INET(arpt_keep) +#define V_arp_maxtries VNET_INET(arp_maxtries) +#define V_useloopback VNET_INET(useloopback) +#define V_arp_proxyall VNET_INET(arp_proxyall) +#define V_subnetsarelocal VNET_INET(subnetsarelocal) +#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) + +#define V_ipforwarding VNET_INET(ipforwarding) +#define V_ipfastforward_active VNET_INET(ipfastforward_active) +#define V_ipsendredirects VNET_INET(ipsendredirects) +#define V_ip_defttl VNET_INET(ip_defttl) +#define V_ip_keepfaith VNET_INET(ip_keepfaith) +#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) +#define V_ip_id VNET_INET(ip_id) +#define V_ip_do_randomid VNET_INET(ip_do_randomid) +#define V_ip_checkinterface VNET_INET(ip_checkinterface) + +#define V_ipq VNET_INET(ipq) +#define V_ipq_zone VNET_INET(ipq_zone) +#define V_nipq VNET_INET(nipq) +#define V_maxnipq VNET_INET(maxnipq) +#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) + +#define V_tcb VNET_INET(tcb) +#define V_tcbinfo VNET_INET(tcbinfo) +#define V_tcpstat VNET_INET(tcpstat) +#define V_twq_2msl VNET_INET(twq_2msl) +#define V_tcp_hostcache VNET_INET(tcp_hostcache) +#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) +#define V_tcp_syncache VNET_INET(tcp_syncache) +#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) + +#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) +#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) +#define V_tcp_minmss VNET_INET(tcp_minmss) +#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) +#define V_icmp_may_rst VNET_INET(icmp_may_rst) +#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) +#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) +#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) +#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) +#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) +#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) +#define V_nolocaltimewait VNET_INET(nolocaltimewait) +#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) +#define V_ss_fltsz VNET_INET(ss_fltsz) +#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) +#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) +#define V_tcp_do_tso VNET_INET(tcp_do_tso) +#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) +#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) +#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) +#define V_tcp_do_sack VNET_INET(tcp_do_sack) +#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) +#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) +#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) +#define V_blackhole VNET_INET(blackhole) +#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) +#define V_drop_synfin VNET_INET(drop_synfin) +#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) +#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) +#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) +#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) +#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) +#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) +#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) +#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) +#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) +#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) + +#define V_isn_secret VNET_INET(isn_secret) +#define V_isn_last_reseed VNET_INET(isn_last_reseed) +#define V_isn_offset VNET_INET(isn_offset) +#define V_isn_offset_old VNET_INET(isn_offset_old) +#define V_isn_ctx VNET_INET(isn_ctx) + +#define V_udb VNET_INET(udb) +#define V_udbinfo VNET_INET(udbinfo) +#define V_udpstat VNET_INET(udpstat) + +#define V_ripcb VNET_INET(ripcb) +#define V_ripcbinfo VNET_INET(ripcbinfo) +#define V_ip_mrouter VNET_INET(ip_mrouter) + +#define V_rsvp_on VNET_INET(rsvp_on) +#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) +#define V_ip_rsvpd VNET_INET(ip_rsvpd) + +#define V_icmpstat VNET_INET(icmpstat) +#define V_ipstat VNET_INET(ipstat) +#define V_igmpstat VNET_INET(igmpstat) + +#define V_router_info_head VNET_INET(router_info_head) + +#define V_rtq_timeout VNET_INET(rtq_timeout) +#define V_rtq_reallyold VNET_INET(rtq_reallyold) +#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) +#define V_rtq_toomany VNET_INET(rtq_toomany) +#define V_rtq_timer VNET_INET(rtq_timer) + +#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto) +#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto) +#define V_ipport_firstauto VNET_INET(ipport_firstauto) +#define V_ipport_lastauto VNET_INET(ipport_lastauto) +#define V_ipport_hifirstauto VNET_INET(ipport_hifirstauto) +#define V_ipport_hilastauto VNET_INET(ipport_hilastauto) +#define V_ipport_reservedhigh VNET_INET(ipport_reservedhigh) +#define V_ipport_reservedlow VNET_INET(ipport_reservedlow) +#define V_ipport_randomized VNET_INET(ipport_randomized) +#define V_ipport_randomcps VNET_INET(ipport_randomcps) +#define V_ipport_randomtime VNET_INET(ipport_randomtime) +#define V_ipport_stoprandom VNET_INET(ipport_stoprandom) +#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs) +#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount) + +#define V_divcb VNET_INET(divcb) +#define V_divcbinfo VNET_INET(divcbinfo) #endif /* !_NETINET_IN_H_*/ ==== //depot/projects/vimage-commit3/src/sys/netinet/ip6.h#2 (text+ko) ==== @@ -346,6 +346,118 @@ } \ } \ } while (/*CONSTCOND*/ 0) + +#define INIT_VNET_INET6(vnet) int vnet_inet6; + +#define VNET_INET6(sym) VSYM(vnet_inet6, sym) + +/* + * Symbol translation macros + */ +#define V_in6_ifaddr VNET_INET6(in6_ifaddr) + +#define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets) +#define V_frag6_nfrags VNET_INET6(frag6_nfrags) +#define V_ip6q VNET_INET6(ip6q) + +#define V_ip6_forward_rt VNET_INET6(ip6_forward_rt) + +#define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy) +#define V_addrsel_policytab VNET_INET6(addrsel_policytab) +#define V_in6_maxmtu VNET_INET6(in6_maxmtu) +#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal) + +#define V_ip6stat VNET_INET6(ip6stat) +#define V_rip6stat VNET_INET6(rip6stat) +#define V_icmp6stat VNET_INET6(icmp6stat) + +#define V_rtq_timeout6 VNET_INET6(rtq_timeout6) +#define V_rtq_timer6 VNET_INET6(rtq_timer6) +#define V_rtq_mtutimer VNET_INET6(rtq_mtutimer) +#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch) +#define V_nd6_timer_ch VNET_INET6(nd6_timer_ch) +#define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch) + +#define V_nd6_inuse VNET_INET6(nd6_inuse) +#define V_nd6_allocated VNET_INET6(nd6_allocated) +#define V_llinfo_nd6 VNET_INET6(llinfo_nd6) +#define V_nd_defrouter VNET_INET6(nd_defrouter) +#define V_nd_prefix VNET_INET6(nd_prefix) +#define V_nd6_defifp VNET_INET6(nd6_defifp) +#define V_nd6_defifindex VNET_INET6(nd6_defifindex) + +#define V_sid_default VNET_INET6(sid_default) + +#define V_dadq VNET_INET6(dadq) +#define V_dad_init VNET_INET6(dad_init) + +//#define V_icmp6errppslim VNET_INET6(icmp6errppslim) +#define V_icmp6errpps_count VNET_INET6(icmp6errpps_count) +//#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) + +#define V_ip6_forwarding VNET_INET6(ip6_forwarding) +#define V_ip6_sendredirects VNET_INET6(ip6_sendredirects) +#define V_ip6_defhlim VNET_INET6(ip6_defhlim) +#define V_ip6_defmcasthlim VNET_INET6(ip6_defmcasthlim) +#define V_ip6_accept_rtadv VNET_INET6(ip6_accept_rtadv) +#define V_ip6_maxfragpackets VNET_INET6(ip6_maxfragpackets) +#define V_ip6_maxfrags VNET_INET6(ip6_maxfrags) +#define V_ip6_log_interval VNET_INET6(ip6_log_interval) +#define V_ip6_hdrnestlimit VNET_INET6(ip6_hdrnestlimit) +#define V_ip6_dad_count VNET_INET6(ip6_dad_count) +#define V_ip6_auto_flowlabel VNET_INET6(ip6_auto_flowlabel) +#define V_ip6_use_deprecated VNET_INET6(ip6_use_deprecated) +#define V_ip6_rr_prune VNET_INET6(ip6_rr_prune) +#define V_ip6_mcast_pmtu VNET_INET6(ip6_mcast_pmtu) +#define V_ip6_v6only VNET_INET6(ip6_v6only) +#define V_ip6_keepfaith VNET_INET6(ip6_keepfaith) +#define V_ip6stealth VNET_INET6(ip6stealth) +#define V_ip6_log_time VNET_INET6(ip6_log_time) + +#define V_pmtu_expire VNET_INET6(pmtu_expire) +#define V_pmtu_probe VNET_INET6(pmtu_probe) +#define V_rip6_sendspace VNET_INET6(rip6_sendspace) +#define V_rip6_recvspace VNET_INET6(rip6_recvspace) +#define V_icmp6_rediraccept VNET_INET6(icmp6_rediraccept) +#define V_icmp6_redirtimeout VNET_INET6(icmp6_redirtimeout) +#define V_icmp6errppslim VNET_INET6(icmp6errppslim) +#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) +#define V_udp6_sendspace VNET_INET6(udp6_sendspace) +#define V_udp6_recvspace VNET_INET6(udp6_recvspace) +#define V_icmp6errppslim_last VNET_INET6(icmp6errppslim_last) +#define V_ip6_prefer_tempaddr VNET_INET6(ip6_prefer_tempaddr) +#define V_ip6qmaxlen VNET_INET6(ip6qmaxlen) +#define V_ip6_forward_srcrt VNET_INET6(ip6_forward_srcrt) +#define V_ip6_sourcecheck VNET_INET6(ip6_sourcecheck) +#define V_ip6_sourcecheck_interval VNET_INET6(ip6_sourcecheck_interval) +#define V_ip6_ours_check_algorithm VNET_INET6(ip6_ours_check_algorithm) +#define V_nd6_prune VNET_INET6(nd6_prune) +#define V_nd6_delay VNET_INET6(nd6_delay) +#define V_nd6_umaxtries VNET_INET6(nd6_umaxtries) +#define V_nd6_mmaxtries VNET_INET6(nd6_mmaxtries) +#define V_nd6_useloopback VNET_INET6(nd6_useloopback) +#define V_nd6_gctimer VNET_INET6(nd6_gctimer) +#define V_nd6_maxndopt VNET_INET6(nd6_maxndopt) +#define V_nd6_maxnudhint VNET_INET6(nd6_maxnudhint) +#define V_nd6_maxqueuelen VNET_INET6(nd6_maxqueuelen) +#define V_nd6_debug VNET_INET6(nd6_debug) +#define V_nd6_recalc_reachtm_interval VNET_INET6(nd6_recalc_reachtm_interval) +#define V_dad_ignore_ns VNET_INET6(dad_ignore_ns) +#define V_dad_maxtry VNET_INET6(dad_maxtry) +#define V_ip6_use_tempaddr VNET_INET6(ip6_use_tempaddr) +#define V_ip6_desync_factor VNET_INET6(ip6_desync_factor) +#define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime) +#define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime) + +#define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver) +#define V_pim6 VNET_INET6(pim6) +#define V_mrt6debug VNET_INET6(mrt6debug) +#define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance) + +#define V_ip6_use_defzone VNET_INET6(ip6_use_defzone) + +#define V_ip6_opts VNET_INET6(ip6_opts) + #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_fw.h#2 (text+ko) ==== @@ -662,5 +662,48 @@ typedef int ipfw_nat_cfg_t(struct sockopt *); #endif +/* + * Symbol translation macros + */ + +#define INIT_VNET_IPFW(vnet) int vnet_ipfw; + +#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym) + +#define V_fw_one_pass VNET_IPFW(fw_one_pass) +#define V_fw_enable VNET_IPFW(fw_enable) +#define V_fw6_enable VNET_IPFW(fw6_enable) + +#define V_set_disable VNET_IPFW(set_disable) +#define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs) +#define V_fw_verbose VNET_IPFW(fw_verbose) +#define V_verbose_limit VNET_IPFW(verbose_limit) + +#define V_fw_debug VNET_IPFW(fw_debug) +#define V_autoinc_step VNET_IPFW(autoinc_step) + +#define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_layer3_chain VNET_IPFW(layer3_chain) +#define V_dyn_buckets VNET_IPFW(dyn_buckets) +#define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) + +#define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime) +#define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime) +#define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime) +#define V_dyn_rst_lifetime VNET_IPFW(dyn_rst_lifetime) +#define V_dyn_udp_lifetime VNET_IPFW(dyn_udp_lifetime) +#define V_dyn_short_lifetime VNET_IPFW(dyn_short_lifetime) +#define V_dyn_keepalive_interval VNET_IPFW(dyn_keepalive_interval) +#define V_dyn_keepalive_period VNET_IPFW(dyn_keepalive_period) +#define V_dyn_keepalive VNET_IPFW(dyn_keepalive) +#define V_static_count VNET_IPFW(static_count) +#define V_static_len VNET_IPFW(static_len) +#define V_dyn_count VNET_IPFW(dyn_count) +#define V_dyn_max VNET_IPFW(dyn_max) + +#define V_norule_counter VNET_IPFW(norule_counter) +#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) +#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) + #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#2 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include #include ==== //depot/projects/vimage-commit3/src/sys/sys/vimage.h#2 (text+ko) ==== @@ -1,308 +1,499 @@ -#define V_hostname hostname -#define G_hostname hostname -#define V_domainname domainname -#define V_acq_seq acq_seq -#define V_acqtree acqtree -#define V_addrsel_policytab addrsel_policytab -#define V_ah_cleartos ah_cleartos -#define V_ah_enable ah_enable -#define V_ahstat ahstat -#define V_arp_maxtries arp_maxtries -#define V_arp_proxyall arp_proxyall -#define V_arpt_keep arpt_keep -#define V_arpt_prune arpt_prune -#define V_autoinc_step autoinc_step -#define V_blackhole blackhole -#define V_crypto_support crypto_support -#define V_curr_dyn_buckets curr_dyn_buckets -#define V_dad_ignore_ns dad_ignore_ns -#define V_dad_init dad_init -#define V_dad_maxtry dad_maxtry -#define V_dadq dadq -#define V_defaultaddrpolicy defaultaddrpolicy -#define V_divcb divcb -#define V_divcbinfo divcbinfo -#define V_drop_synfin drop_synfin -#define V_dyn_ack_lifetime dyn_ack_lifetime -#define V_dyn_buckets dyn_buckets -#define V_dyn_count dyn_count -#define V_dyn_fin_lifetime dyn_fin_lifetime -#define V_dyn_keepalive dyn_keepalive -#define V_dyn_keepalive_interval dyn_keepalive_interval -#define V_dyn_keepalive_period dyn_keepalive_period -#define V_dyn_max dyn_max -#define V_dyn_rst_lifetime dyn_rst_lifetime -#define V_dyn_short_lifetime dyn_short_lifetime -#define V_dyn_syn_lifetime dyn_syn_lifetime -#define V_dyn_udp_lifetime dyn_udp_lifetime -#define V_esp_enable esp_enable -#define V_esp_max_ivlen esp_max_ivlen -#define V_espstat espstat -#define V_ether_ipfw ether_ipfw -#define V_frag6_nfragpackets frag6_nfragpackets -#define V_frag6_nfrags frag6_nfrags -#define V_fw6_enable fw6_enable -#define V_fw_debug fw_debug -#define V_fw_deny_unknown_exthdrs fw_deny_unknown_exthdrs -#define V_fw_enable fw_enable -#define V_fw_one_pass fw_one_pass -#define V_fw_verbose fw_verbose -#define V_gif_softc_list gif_softc_list -#define V_icmp6_nodeinfo icmp6_nodeinfo -#define V_icmp6_rediraccept icmp6_rediraccept -#define V_icmp6_redirtimeout icmp6_redirtimeout -#define V_icmp6errpps_count icmp6errpps_count -#define V_icmp6errppslim icmp6errppslim -#define V_icmp6errppslim_last icmp6errppslim_last -#define V_icmp6stat icmp6stat -#define V_icmp_may_rst icmp_may_rst -#define V_icmpstat icmpstat -#define V_if_index if_index -#define V_if_indexlim if_indexlim -#define V_ifaddr_event_tag ifaddr_event_tag -#define V_ifg_head ifg_head -#define V_ifindex_table ifindex_table -#define V_ifklist ifklist -#define V_ifnet ifnet -#define V_igmpstat igmpstat -#define V_in6_ifaddr in6_ifaddr -#define V_in6_maxmtu in6_maxmtu -#define V_in6_tmpaddrtimer_ch in6_tmpaddrtimer_ch -#define V_in_ifaddrhashtbl in_ifaddrhashtbl -#define V_in_ifaddrhead in_ifaddrhead -#define V_in_ifaddrhmask in_ifaddrhmask -#define V_in_multihead in_multihead -#define V_ip4_ah_net_deflev ip4_ah_net_deflev -#define V_ip4_ah_offsetmask ip4_ah_offsetmask -#define V_ip4_ah_trans_deflev ip4_ah_trans_deflev -#define V_ip4_def_policy ip4_def_policy -#define V_ip4_esp_net_deflev ip4_esp_net_deflev -#define V_ip4_esp_randpad ip4_esp_randpad -#define V_ip4_esp_trans_deflev ip4_esp_trans_deflev -#define V_ip4_ipsec_dfbit ip4_ipsec_dfbit -#define V_ip4_ipsec_ecn ip4_ipsec_ecn -#define V_ip6_accept_rtadv ip6_accept_rtadv -#define V_ip6_ah_net_deflev ip6_ah_net_deflev -#define V_ip6_ah_trans_deflev ip6_ah_trans_deflev -#define V_ip6_auto_flowlabel ip6_auto_flowlabel -#define V_ip6_auto_linklocal ip6_auto_linklocal -#define V_ip6_dad_count ip6_dad_count -#define V_ip6_defhlim ip6_defhlim -#define V_ip6_defmcasthlim ip6_defmcasthlim -#define V_ip6_desync_factor ip6_desync_factor -#define V_ip6_esp_net_deflev ip6_esp_net_deflev -#define V_ip6_esp_randpad ip6_esp_randpad -#define V_ip6_esp_trans_deflev ip6_esp_trans_deflev -#define V_ip6_forward_rt ip6_forward_rt -#define V_ip6_forward_srcrt ip6_forward_srcrt -#define V_ip6_forwarding ip6_forwarding -#define V_ip6_gif_hlim ip6_gif_hlim -#define V_ip6_hdrnestlimit ip6_hdrnestlimit -#define V_ip6_ipsec_ecn ip6_ipsec_ecn -#define V_ip6_keepfaith ip6_keepfaith -#define V_ip6_log_interval ip6_log_interval -#define V_ip6_log_time ip6_log_time -#define V_ip6_maxfragpackets ip6_maxfragpackets -#define V_ip6_maxfrags ip6_maxfrags -#define V_ip6_mcast_pmtu ip6_mcast_pmtu -#define V_ip6_mrouter_ver ip6_mrouter_ver -#define V_ip6_opts ip6_opts -#define V_ip6_ours_check_algorithm ip6_ours_check_algorithm -#define V_ip6_prefer_tempaddr ip6_prefer_tempaddr -#define V_ip6_rr_prune ip6_rr_prune -#define V_ip6_sendredirects ip6_sendredirects -#define V_ip6_sourcecheck ip6_sourcecheck -#define V_ip6_sourcecheck_interval ip6_sourcecheck_interval -#define V_ip6_temp_preferred_lifetime ip6_temp_preferred_lifetime -#define V_ip6_temp_regen_advance ip6_temp_regen_advance -#define V_ip6_temp_valid_lifetime ip6_temp_valid_lifetime -#define V_ip6_use_defzone ip6_use_defzone -#define V_ip6_use_deprecated ip6_use_deprecated -#define V_ip6_use_tempaddr ip6_use_tempaddr -#define V_ip6_v6only ip6_v6only -#define V_ip6q ip6q -#define V_ip6qmaxlen ip6qmaxlen -#define V_ip6stat ip6stat -#define V_ip6stealth ip6stealth -#define V_ip_checkinterface ip_checkinterface -#define V_ip_defttl ip_defttl -#define V_ip_do_randomid ip_do_randomid -#define V_ip_gif_ttl ip_gif_ttl -#define V_ip_keepfaith ip_keepfaith -#define V_ip_mrouter ip_mrouter -#define V_ip_rsvp_on ip_rsvp_on -#define V_ip_rsvpd ip_rsvpd -#define V_ip_sendsourcequench ip_sendsourcequench -#define V_ipcomp_enable ipcomp_enable -#define V_ipcompstat ipcompstat -#define V_ipfastforward_active ipfastforward_active -#define V_ipforwarding ipforwarding -#define V_ipfw_dyn_v ipfw_dyn_v -#define V_ipfw_timeout ipfw_timeout -#define V_ipip_allow ipip_allow -#define V_ipipstat ipipstat -#define V_ipport_firstauto ipport_firstauto -#define V_ipport_hifirstauto ipport_hifirstauto -#define V_ipport_hilastauto ipport_hilastauto -#define V_ipport_lastauto ipport_lastauto -#define V_ipport_lowfirstauto ipport_lowfirstauto -#define V_ipport_lowlastauto ipport_lowlastauto -#define V_ipport_randomcps ipport_randomcps -#define V_ipport_randomized ipport_randomized -#define V_ipport_randomtime ipport_randomtime -#define V_ipport_reservedhigh ipport_reservedhigh -#define V_ipport_reservedlow ipport_reservedlow -#define V_ipport_stoprandom ipport_stoprandom -#define V_ipport_tcpallocs ipport_tcpallocs -#define V_ipport_tcplastcount ipport_tcplastcount -#define V_ipq ipq -#define V_ipq_zone ipq_zone -#define V_ipsec4stat ipsec4stat -#define V_ipsec6stat ipsec6stat -#define V_ipsec_ah_keymin ipsec_ah_keymin -#define V_ipsec_debug ipsec_debug -#define V_ipsec_esp_auth ipsec_esp_auth -#define V_ipsec_esp_keymin ipsec_esp_keymin -#define V_ipsec_integrity ipsec_integrity -#define V_ipsec_replay ipsec_replay -#define V_ipsendredirects ipsendredirects -#define V_ipstat ipstat -#define V_ipstealth ipstealth -#define V_isn_ctx isn_ctx -#define V_isn_last_reseed isn_last_reseed -#define V_isn_offset isn_offset -#define V_isn_offset_old isn_offset_old -#define V_isn_secret isn_secret -#define V_key_blockacq_count key_blockacq_count -#define V_key_blockacq_lifetime key_blockacq_lifetime -#define V_key_cb key_cb -#define V_key_debug_level key_debug_level -#define V_key_dst key_dst -#define V_key_int_random key_int_random -#define V_key_larval_lifetime key_larval_lifetime -#define V_key_preferred_oldsa key_preferred_oldsa -#define V_key_spi_maxval key_spi_maxval -#define V_key_spi_minval key_spi_minval -#define V_key_spi_trycnt key_spi_trycnt -#define V_key_src key_src -#define V_layer3_chain layer3_chain -#define V_llinfo_arp llinfo_arp -#define V_llinfo_nd6 llinfo_nd6 -#define V_lo_list lo_list -#define V_loif loif -#define V_max_gif_nesting max_gif_nesting -#define V_maxfragsperpacket maxfragsperpacket -#define V_maxnipq maxnipq -#define V_mrt6debug mrt6debug -#define V_nd6_allocated nd6_allocated -#define V_nd6_debug nd6_debug -#define V_nd6_defifindex nd6_defifindex -#define V_nd6_defifp nd6_defifp -#define V_nd6_delay nd6_delay -#define V_nd6_gctimer nd6_gctimer -#define V_nd6_inuse nd6_inuse -#define V_nd6_maxndopt nd6_maxndopt -#define V_nd6_maxnudhint nd6_maxnudhint -#define V_nd6_maxqueuelen nd6_maxqueuelen -#define V_nd6_mmaxtries nd6_mmaxtries -#define V_nd6_prune nd6_prune -#define V_nd6_recalc_reachtm_interval nd6_recalc_reachtm_interval -#define V_nd6_slowtimo_ch nd6_slowtimo_ch -#define V_nd6_timer_ch nd6_timer_ch -#define V_nd6_umaxtries nd6_umaxtries -#define V_nd6_useloopback nd6_useloopback -#define V_nd_defrouter nd_defrouter -#define V_nd_prefix nd_prefix -#define V_nextID nextID -#define V_ng_ID_hash ng_ID_hash -#define V_ng_eiface_unit ng_eiface_unit -#define V_ng_iface_unit ng_iface_unit -#define V_ng_name_hash ng_name_hash -#define V_ng_nodelist ng_nodelist -#define V_nipq nipq -#define V_nolocaltimewait nolocaltimewait -#define V_norule_counter norule_counter -#define V_parallel_tunnels parallel_tunnels -#define V_path_mtu_discovery path_mtu_discovery -#define V_pfkeystat pfkeystat -#define V_pim6 pim6 -#define V_pmtu_expire pmtu_expire -#define V_pmtu_probe pmtu_probe -#define V_policy_id policy_id -#define V_rawcb_list rawcb_list -#define V_regtree regtree -#define V_rip6_recvspace rip6_recvspace -#define V_rip6_sendspace rip6_sendspace -#define V_rip6stat rip6stat -#define V_ripcb ripcb -#define V_ripcbinfo ripcbinfo -#define V_router_info_head router_info_head -#define V_rsvp_on rsvp_on -#define V_rt_tables rt_tables -#define V_rtq_minreallyold rtq_minreallyold -#define V_rtq_mtutimer rtq_mtutimer -#define V_rtq_reallyold rtq_reallyold -#define V_rtq_timeout rtq_timeout -#define V_rtq_timeout6 rtq_timeout6 -#define V_rtq_timer rtq_timer -#define V_rtq_timer6 rtq_timer6 -#define V_rtq_toomany rtq_toomany -#define V_rtstat rtstat -#define V_rttrash rttrash -#define V_sahtree sahtree -#define V_sameprefixcarponly sameprefixcarponly -#define V_saorder_state_alive saorder_state_alive -#define V_saorder_state_any saorder_state_any -#define V_set_disable set_disable -#define V_sid_default sid_default -#define V_spacqtree spacqtree -#define V_sptree sptree -#define V_ss_fltsz ss_fltsz -#define V_ss_fltsz_local ss_fltsz_local -#define V_static_count static_count -#define V_subnetsarelocal subnetsarelocal -#define V_tcb tcb -#define V_tcbinfo tcbinfo -#define V_tcp_autorcvbuf_inc tcp_autorcvbuf_inc -#define V_tcp_autorcvbuf_max tcp_autorcvbuf_max -#define V_tcp_autosndbuf_inc tcp_autosndbuf_inc -#define V_tcp_autosndbuf_max tcp_autosndbuf_max -#define V_tcp_delack_enabled tcp_delack_enabled -#define V_tcp_do_autorcvbuf tcp_do_autorcvbuf -#define V_tcp_do_autosndbuf tcp_do_autosndbuf -#define V_tcp_do_newreno tcp_do_newreno -#define V_tcp_do_rfc1323 tcp_do_rfc1323 -#define V_tcp_do_rfc3042 tcp_do_rfc3042 -#define V_tcp_do_rfc3390 tcp_do_rfc3390 -#define V_tcp_do_sack tcp_do_sack -#define V_tcp_do_tso tcp_do_tso -#define V_tcp_hc_callout tcp_hc_callout -#define V_tcp_hostcache tcp_hostcache -#define V_tcp_inflight_enable tcp_inflight_enable -#define V_tcp_inflight_max tcp_inflight_max -#define V_tcp_inflight_min tcp_inflight_min -#define V_tcp_inflight_rttthresh tcp_inflight_rttthresh -#define V_tcp_inflight_stab tcp_inflight_stab -#define V_tcp_insecure_rst tcp_insecure_rst -#define V_tcp_isn_reseed_interval tcp_isn_reseed_interval -#define V_tcp_minmss tcp_minmss -#define V_tcp_mssdflt tcp_mssdflt -#define V_tcp_reass_maxqlen tcp_reass_maxqlen -#define V_tcp_reass_maxseg tcp_reass_maxseg -#define V_tcp_reass_overflows tcp_reass_overflows -#define V_tcp_reass_qsize tcp_reass_qsize -#define V_tcp_sack_globalholes tcp_sack_globalholes -#define V_tcp_sack_globalmaxholes tcp_sack_globalmaxholes -#define V_tcp_sack_maxholes tcp_sack_maxholes -#define V_tcp_sc_rst_sock_fail tcp_sc_rst_sock_fail -#define V_tcp_syncache tcp_syncache -#define V_tcp_v6mssdflt tcp_v6mssdflt -#define V_tcpstat tcpstat -#define V_twq_2msl twq_2msl -#define V_udb udb -#define V_udbinfo udbinfo -#define V_udp6_recvspace udp6_recvspace -#define V_udp6_sendspace udp6_sendspace -#define V_udpstat udpstat -#define V_useloopback useloopback -#define V_verbose_limit verbose_limit +/*- + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation + * + * This software was developed by the University of Zagreb and the + * FreeBSD Foundation under sponsorship by the Stichting NLnet and the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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 + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * 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. + */ + +#ifndef _NET_VIMAGE_H_ +#define _NET_VIMAGE_H_ + +#include +#include +#include +#include + +#ifdef INVARIANTS +#define VNET_DEBUG +#endif + +struct vimage; +struct vprocg; +struct vnet; +struct vi_req; +struct kld_sym_lookup; + +struct ifnet; /* XXX must go away */ + +#define curvnet curthread->td_vnet + +#define basevnet thread0.td_ucred->cr_vimage->v_vnet +#define basevprocg thread0.td_ucred->cr_vimage->v_procg +#define basevcpu thread0.td_ucred->cr_vimage->v_cpu + +typedef int vnet_attach_fn(const void *); +typedef int vnet_detach_fn(const void *); + + +#ifdef VIMAGE + +#define V_GLOBAL 0 +#define V_NET 1 +#define V_PROCG 2 +#define V_CPU 3 + +#define VNET_MOD_NONE -1 +/*statefull modules */ +#define VNET_MOD_NET 0 +#define VNET_MOD_NETGRAPH 1 +#define VNET_MOD_INET 2 +#define VNET_MOD_INET6 3 +#define VNET_MOD_IPSEC 4 +#define VNET_MOD_IPFW 5 +#define VNET_MOD_DUMMYNET 6 +#define VNET_MOD_PF 7 +#define VNET_MOD_ALTQ 8 +#define VNET_MOD_IPX 9 +#define VNET_MOD_ATALK 10 +/* stateless modules */ +#define VNET_MOD_NG_WORMHOLE 19 +#define VNET_MOD_NG_ETHER 20 +#define VNET_MOD_NG_IFACE 21 +#define VNET_MOD_NG_EIFACE 22 +#define VNET_MOD_ESP 23 +#define VNET_MOD_IPIP 24 +#define VNET_MOD_AH 25 +#define VNET_MOD_IPCOMP 26 +#define VNET_MOD_GIF 27 +#define VNET_MOD_ARP 28 +#define VNET_MOD_RTABLE 29 +#define VNET_MOD_LOIF 30 +#define VNET_MOD_DOMAIN 31 +#define VNET_MOD_DYNAMIC_START 32 +#define VNET_MOD_MAX 64 + +/* Needed for ugly sysctl virtualization macros */ +#define V_MOD_vnet_net VNET_MOD_NET +#define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH +#define V_MOD_vnet_inet VNET_MOD_INET +#define V_MOD_vnet_inet6 VNET_MOD_INET6 +#define V_MOD_vnet_ipfw VNET_MOD_IPFW +#define V_MOD_vnet_pf VNET_MOD_PF +#define V_MOD_vnet_gif VNET_MOD_GIF +#define V_MOD_vnet_ipsec VNET_MOD_IPSEC + +#define V_MOD_vprocg 0 +#define V_MOD_vcpu 0 + +struct vnet { + void *mod_data[VNET_MOD_MAX]; + + u_int vnet_ref; /* reference count */ + LIST_ENTRY(vnet) vnet_le; /* all vnets list */ + u_int vnet_id; /* ID num */ + + u_int ifccnt; + u_int sockcnt; + + u_int vnet_magic_n; +}; + +struct vnet_symmap { + char *name; + size_t offset; + size_t size; +}; + +struct vnet_modinfo { + u_int vmi_id; + u_int vmi_dependson; + char *vmi_name; + vnet_attach_fn *vmi_iattach; + vnet_detach_fn *vmi_idetach; + size_t vmi_struct_size; + struct vnet_symmap *vmi_symmap; +}; + +struct vnet_modlink { + TAILQ_ENTRY(vnet_modlink) vml_mod_le; + const struct vnet_modinfo *vml_modinfo; + const void *vml_iarg; + const char *vml_iname; +}; + +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach, \ + .vmi_struct_size = \ + sizeof(struct vnet_##m_name_lc), \ + .vmi_symmap = m_symmap \ +}; + +#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach \ +}; + +#define VSYM(base, sym) ((base)->_##sym) + +#define VNET_SYMMAP(mod, name) \ + { #name, offsetof(struct vnet_##mod, _##name), \ + sizeof(((struct vnet_##mod *) curthread)->_##name) } + +#define VNET_SYMMAP_END \ + { NULL, 0 } + +#define VNET_MAGIC_N 0x3e0d8f29 + + +#ifdef VNET_DEBUG + +#define VNET_ASSERT(condition) \ + if (!(condition)) { \ + printf("VNET_ASSERT @ %s:%d %s():\n", \ + __FILE__, __LINE__, __FUNCTION__); \ + panic(#condition); \ + } + +#define CURVNET_SET_QUIET(arg) \ + VNET_ASSERT((arg)->vnet_magic_n == VNET_MAGIC_N); \ + struct vnet *saved_vnet = curvnet; \ + const char *saved_vnet_lpush = curthread->td_vnet_lpush; \ + curvnet = arg; \ + curthread->td_vnet_lpush = __FUNCTION__; + +#define CURVNET_SET_VERBOSE(arg) \ + CURVNET_SET_QUIET(arg) \ + if (saved_vnet) \ + printf("curvnet_set(%p) in %s() on cpu %d, prev %p in %s()\n", \ + curvnet, curthread->td_vnet_lpush, curcpu, \ + saved_vnet, saved_vnet_lpush); + +#define CURVNET_SET(arg) CURVNET_SET_VERBOSE(arg) + +#define CURVNET_RESTORE() \ + VNET_ASSERT(saved_vnet == NULL || \ + saved_vnet->vnet_magic_n == VNET_MAGIC_N); \ + curvnet = saved_vnet; \ + curthread->td_vnet_lpush = saved_vnet_lpush; + +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + if (vnet != curvnet) \ + panic("in %s:%d %s()\n vnet=%p curvnet=%p", \ + __FILE__, __LINE__, __FUNCTION__, \ + vnet, curvnet); \ + modtype *sym = (vnet)->mod_data[modindex]; + +#define VNET_ITERLOOP_BEGIN() \ + struct vnet *vnet_iter; \ + VNET_LIST_REF(); \ + LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ + CURVNET_SET(vnet_iter); + +#define VNET_ITERLOOP_BEGIN_QUIET() \ + struct vnet *vnet_iter; \ + VNET_LIST_REF(); \ + LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ + CURVNET_SET_QUIET(vnet_iter); + +#define VNET_ITERLOOP_END() \ + CURVNET_RESTORE(); \ + } \ + VNET_LIST_UNREF(); + +#else /* !VNET_DEBUG */ + +#define VNET_ASSERT(condition) + +#define CURVNET_SET(arg) \ + struct vnet *saved_vnet = curvnet; \ + curvnet = arg; + +#define CURVNET_SET_VERBOSE(arg) CURVNET_SET(arg) +#define CURVNET_SET_QUIET(arg) CURVNET_SET(arg) + +#define CURVNET_RESTORE() \ + curvnet = saved_vnet; + +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + modtype *sym = (vnet)->mod_data[modindex]; + +#define VNET_ITERLOOP_BEGIN() \ + struct vnet *vnet_iter; \ + VNET_LIST_REF(); \ + LIST_FOREACH(vnet_iter, &vnet_head, vnet_le) { \ + CURVNET_SET(vnet_iter); + +#define VNET_ITERLOOP_BEGIN_QUIET() VNET_ITERLOOP_BEGIN() + +#define VNET_ITERLOOP_END() \ + CURVNET_RESTORE(); \ + } \ + VNET_LIST_UNREF(); + +#endif /* !VNET_DEBUG */ + +#define INIT_VPROCG(arg) struct vprocg *vprocg = (arg); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 26 08:13:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E678A106566C; Thu, 26 Jun 2008 08:13:52 +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 A8E9E1065686 for ; Thu, 26 Jun 2008 08:13:52 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F4108FC1A for ; Thu, 26 Jun 2008 08:13:52 +0000 (UTC) (envelope-from andrew@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 m5Q8DqL6055058 for ; Thu, 26 Jun 2008 08:13:52 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q8DqY5055056 for perforce@freebsd.org; Thu, 26 Jun 2008 08:13:52 GMT (envelope-from andrew@freebsd.org) Date: Thu, 26 Jun 2008 08:13:52 GMT Message-Id: <200806260813.m5Q8DqY5055056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144128 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: Thu, 26 Jun 2008 08:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=144128 Change 144128 by andrew@andrew_bender on 2008/06/26 08:12:57 Allow access to all UART registers Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#3 (text+ko) ==== @@ -137,15 +137,18 @@ extern vm_offset_t s3c2410_uart_vaddr; +#define _A(a) ((a) & ~L1_S_OFFSET) +#define _S(s) (((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1)) + /* Static device mappings. */ static const struct pmap_devmap neo1973_devmap[] = { { /* * Map the UART to VA == PA */ - S3C2410_UART0_BASE, - S3C2410_UART0_BASE, - 0x100000, + _A(S3C2410_UART0_BASE), + _A(S3C2410_UART0_BASE), + _S(S3C2410_UART_BASE(3) - S3C2410_UART0_BASE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, @@ -158,6 +161,9 @@ } }; +#undef _A +#undef _S + #ifdef DDB extern vm_offset_t ksym_start, ksym_end; #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 26 08:55:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FB01106567D; Thu, 26 Jun 2008 08:55:35 +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 E5CAB106564A for ; Thu, 26 Jun 2008 08:55:34 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC40D8FC0A for ; Thu, 26 Jun 2008 08:55:34 +0000 (UTC) (envelope-from andrew@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 m5Q8tYGT067618 for ; Thu, 26 Jun 2008 08:55:34 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q8tY6n067616 for perforce@freebsd.org; Thu, 26 Jun 2008 08:55:34 GMT (envelope-from andrew@freebsd.org) Date: Thu, 26 Jun 2008 08:55:34 GMT Message-Id: <200806260855.m5Q8tY6n067616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144131 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: Thu, 26 Jun 2008 08:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=144131 Change 144131 by andrew@andrew_bender on 2008/06/26 08:55:28 Add enough support for IRQ's to be able to call the uart interrupt handler Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#12 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#4 (text+ko) ==== @@ -164,6 +164,8 @@ #undef _A #undef _S +#define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v)) + #ifdef DDB extern vm_offset_t ksym_start, ksym_end; #endif @@ -328,6 +330,7 @@ cpu_idcache_wbinv_all(); /* Disable all peripheral interrupts */ + ioreg_write32(S3C2410_INTCTL_BASE + INTCTL_INTMSK, ~0); s3c2410_uart_vaddr = S3C2410_UART0_BASE; cninit(); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#12 (text+ko) ==== @@ -119,21 +119,15 @@ struct resource *ires, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { - int saved_cpsr; int error; - if (flags & INTR_TYPE_CLK) { - if (rman_get_start(ires) == 0) - rman_set_start(ires, 26); - else - rman_set_start(ires, 27); - } - saved_cpsr = SetCPSR(I32_bit, I32_bit); - SetCPSR(I32_bit, saved_cpsr & I32_bit); - error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); - return (error); + if (error != 0) + return (error); + + arm_unmask_irq(rman_get_start(ires)); + return (0); } static struct resource * @@ -262,12 +256,15 @@ s3c2xx0_softc->s3c2xx0_irq_rman.rm_type = RMAN_ARRAY; s3c2xx0_softc->s3c2xx0_irq_rman.rm_descr = "S3C2410 IRQs"; if (rman_init(&s3c2xx0_softc->s3c2xx0_irq_rman) != 0 || - rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, 32) != 0) + rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, + S3C2410_SUBIRQ_MAX - 1) != 0) panic("s3c2410_attach: failed to set up IRQ rman"); - device_add_child(dev, "timer", 0); - device_add_child(dev, "nand", 0); + s3c2410_add_child(dev, 0, "nand", 0); + s3c2410_add_child(dev, 0, "timer", 0); + /* Add the uart and set it's irq */ child = s3c2410_add_child(dev, 0, "uart", 0); + bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_TXD0, 1); bus_generic_probe(dev); bus_generic_attach(dev); @@ -357,7 +354,7 @@ if (irq == 0) return (-1); - irq = ffs(irq) - 1; + irq = ffs(irq); /* Clear the sub irq pending bit */ bus_space_write_4(&s3c2xx0_bs_tag, ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#5 (text+ko) ==== @@ -59,6 +59,10 @@ struct rman s3c2xx0_irq_rman; }; +struct s3c2xx0_ivar { + struct resource_list resources; +}; + typedef void *s3c2xx0_chipset_tag_t; extern struct bus_space s3c2xx0_bs_tag; From owner-p4-projects@FreeBSD.ORG Thu Jun 26 08:58:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A47F10656CD; Thu, 26 Jun 2008 08:58:38 +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 2422C106566B for ; Thu, 26 Jun 2008 08:58:38 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0AE118FC13 for ; Thu, 26 Jun 2008 08:58:38 +0000 (UTC) (envelope-from andrew@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 m5Q8wbU5067821 for ; Thu, 26 Jun 2008 08:58:37 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q8wbmb067819 for perforce@freebsd.org; Thu, 26 Jun 2008 08:58:37 GMT (envelope-from andrew@freebsd.org) Date: Thu, 26 Jun 2008 08:58:37 GMT Message-Id: <200806260858.m5Q8wbmb067819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144132 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: Thu, 26 Jun 2008 08:58:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=144132 Change 144132 by andrew@andrew_bender on 2008/06/26 08:58:02 Implement the transmit side of uart's uart_ipend and uart_transmit With this (and some other workarounds) I'm able to get init writing out to the uart on the NEO 1973 emulator Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#4 (text+ko) ==== @@ -190,6 +190,11 @@ static int s3c2410_bus_transmit(struct uart_softc *sc) { + sc->sc_txbusy = 1; + for (int i = 0; i < sc->sc_txdatasz; i++) { + s3c2410_putc(&sc->sc_bas, sc->sc_txbuf[i]); + uart_barrier(&sc->sc_bas); + } return (0); } @@ -214,7 +219,16 @@ static int s3c2410_bus_ipend(struct uart_softc *sc) { - return (0); + int ipend = 0; + int sr; + + sr = uart_getreg(&sc->sc_bas, SSCOM_UTRSTAT); + + if (sr & UTRSTAT_TXEMPTY && sc->sc_txbusy) { + ipend |= SER_INT_TXIDLE; + } + + return (ipend); } static int s3c2410_bus_flush(struct uart_softc *sc, int what) From owner-p4-projects@FreeBSD.ORG Thu Jun 26 09:02:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99D8E1065676; Thu, 26 Jun 2008 09:02:42 +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 5B43F1065671 for ; Thu, 26 Jun 2008 09:02:42 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 41F5B8FC25 for ; Thu, 26 Jun 2008 09:02:42 +0000 (UTC) (envelope-from andrew@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 m5Q92gMA068203 for ; Thu, 26 Jun 2008 09:02:42 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5Q92gMG068201 for perforce@freebsd.org; Thu, 26 Jun 2008 09:02:42 GMT (envelope-from andrew@freebsd.org) Date: Thu, 26 Jun 2008 09:02:42 GMT Message-Id: <200806260902.m5Q92gMG068201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144133 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: Thu, 26 Jun 2008 09:02:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=144133 Change 144133 by andrew@andrew_bender on 2008/06/26 09:02:25 I forhot to add the IRQ Controller mapping in change 144131 Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#5 (text+ko) ==== @@ -144,6 +144,16 @@ static const struct pmap_devmap neo1973_devmap[] = { { /* + * Map the IRQ Controller + */ + _A(S3C2410_INTCTL_BASE), + _A(S3C2410_INTCTL_BASE), + _S(S3C2410_INTCTL_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + /* * Map the UART to VA == PA */ _A(S3C2410_UART0_BASE), From owner-p4-projects@FreeBSD.ORG Thu Jun 26 10:40:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DDCA1065674; Thu, 26 Jun 2008 10:40:25 +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 2709E106564A for ; Thu, 26 Jun 2008 10:40:25 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CAD98FC14 for ; Thu, 26 Jun 2008 10:40:25 +0000 (UTC) (envelope-from andenore@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 m5QAeP0L078510 for ; Thu, 26 Jun 2008 10:40:25 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5QAePTV078507 for perforce@freebsd.org; Thu, 26 Jun 2008 10:40:25 GMT (envelope-from andenore@FreeBSD.org) Date: Thu, 26 Jun 2008 10:40:25 GMT Message-Id: <200806261040.m5QAePTV078507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 144138 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: Thu, 26 Jun 2008 10:40:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=144138 Change 144138 by andenore@andenore_laptop on 2008/06/26 10:40:03 Added support for environment variable PKG_DBCACHE_FILE that can be used to specify the location of the cache file. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/convert.h#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.h#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/main.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/pkg_convert.1#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/main.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/main.c#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#6 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/main.c#4 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#4 (text+ko) ==== @@ -24,6 +24,8 @@ - Added global variable 'database' of type DB* (the database object) - Added database helper functions - Added function to cache a Packagelist (cache_plist()) + - The environment variable PKG_DBCAHE_FILE can be set to make the file + location different than the default /var/db/pkg/pkgcache.db Create: - The -O option has been modified to cache information when installing ports ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#3 (text+ko) ==== @@ -111,7 +111,7 @@ if(cacheExists()) { printf("add.main(): cacheExists()\n"); - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); } start = argv; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#3 (text+ko) ==== @@ -535,7 +535,7 @@ */ /* make sure we've opened the database */ - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); /* save package name (fast lookup in isinstalledpkg) */ printf("Saving package: %s Plist.name\n", Plist.name); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/main.c#2 (text+ko) ==== @@ -1,15 +1,19 @@ #include #include -static char Options[] = "v"; -static void usage(); +static char Options[] = "vthepk:"; + +char *Key = NULL; +Boolean CheckExists = FALSE; +Boolean Print = FALSE; +Boolean Textual = TRUE; int main(int argc, char **argv) { char **pkgs; /* null terminated array of installed pkgnames */ int retval, ch; - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); atexit(closeDatabase); signal(SIGHUP, cleanup); @@ -20,6 +24,20 @@ case 'v': Verbose++; break; + case 'e': + CheckExists = TRUE; + break; + case 't': + Textual = FALSE; + break; + case 'p': + Print = TRUE; + break; + case '?': + case 'k': + Key = optarg; + break; + case 'h': default: usage(); break; @@ -36,11 +54,15 @@ } else { printf("No packages to convert\n"); } + + return 0; } -static void +void usage() { - fprintf(stderr, "usage: pkg_convert [-v]\n"); + fprintf(stderr, "usage:\t%s\n\t%s\n", + "pkg_convert [-vtep] [-k key]", + "pkg_convert"); exit(1); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#4 (text+ko) ==== @@ -5,6 +5,7 @@ #include #include "lib.h" +#include "convert.h" static int pkg_do(char *); @@ -13,8 +14,44 @@ { int i, error; error = 0; + DBT data; + + if (CheckExists) { + if (!Key) { + warnx("You must specify a key with -k\n"); + usage(); + exit(1); + } + Boolean exists = dbKeyExists(Key, &data); + if (Textual) { + if (Verbose) + printf("%s exists:\t", Key); + printf("%s\n", exists ? "TRUE" : "FALSE"); + } else { + printf("%s\n", exists ? "1" : "0"); + } + + return 0; + } + + if (Print) { + if (Key != NULL) { + if (dbKeyExists(Key, &data)) + printf("%s -> %s\n", Key, (char *)data.data); + else + printf("%s: does not exist\n", Key); + } else { + DBT key; + while (dbscan(database, &key, &data) == 0) { + printf("%s -> %s\n", (char *)key.data, (char *)data.data); + } + } + + return 0; + } + for (i=0; pkgs[i] != NULL; i++) { - pkg_do(pkgs[i]); + error += pkg_do(pkgs[i]); } return error; @@ -30,17 +67,13 @@ pkg_do(char *pkgname) { char tmp[PATH_MAX]; - DBT key, data; - + FILE *fp; + Package pkg; + /* * Add Which indexing i.e. index files installed by package and they point * to the installed package (alot of redundant data) */ - FILE *fp; - Package pkg; - PackingList itr; - char *cwd = NULL; - Boolean skip = FALSE; pkg.head = pkg.tail = NULL; pkg.name = pkg.origin = NULL; @@ -56,53 +89,11 @@ fclose(fp); if (pkg.name == NULL || pkg.origin == NULL) { - warnx("%s does not appear to be a valid package!", pkg); + warnx("%s does not appear to be a valid package!", pkg.name); return 1; } return cache_plist(&pkg, Verbose); - - -// key.size = strlen(pkg.name) + 1; -// key.data = pkg.name; -// data.size = strlen(pkg.origin) + 1; -// data.data = pkg.origin; -// -// if(!Quiet) -// printf("Saving package: %s\n", key.data); -// dbsave(&key, &data); -// -// for (itr = pkg.head; itr != pkg.tail; itr = itr->next) { -// if (itr->type == PLIST_CWD && skip == FALSE) { -// cwd = itr->name; -// } -// else if (itr->type == PLIST_IGNORE) { -// skip = TRUE; -// if(Verbose && itr->next) -// printf("\tIgnored: %s\n", itr->next->name); -// -// continue; -// } -// else if (itr->type == PLIST_FILE && skip == FALSE) { -// /* Save abspath of file installed in key, and pkgname in data */ -// char *entry = NULL; -// asprintf(&entry, "%s/%s", cwd, itr->name); -// -// key.size = strlen(entry) + 1; -// key.data = entry; -// data.size = strlen(pkgname) + 1; -// data.data = pkgname; -// -// if(Verbose) -// printf("\tSaving entry %s -> %s\n", key.data, data.data); -// dbsave(&key, &data); -// free(entry); -// } -// skip = FALSE; -// } -// free_plist(&pkg); - - return 0; } @@ -119,3 +110,4 @@ } } + ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/pkg_convert.1#3 (text+ko) ==== @@ -34,6 +34,10 @@ .Bl -tag -width indent .It Fl v Turn on verbose output. +.It Fl e Ar key +Checks if key is in database. +.It Fl t +Turns off textual output for key-check (outputs 1 if key exists 0 if not). .El .Sh FILES .Bl -tag -width /var/db/pkg -compact ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#3 (text+ko) ==== @@ -50,10 +50,10 @@ const char *suf; /* Preliminary setup */ - if (InstalledPkg == NULL) - sanity_check(); - if (Verbose && !PlistOnly) - printf("Creating package %s\n", pkg); + if (InstalledPkg == NULL) + sanity_check(); + if (Verbose && !PlistOnly) + printf("Creating package %s\n", pkg); /* chop suffix off if already specified, remembering if we want to compress */ len = strlen(pkg); @@ -240,7 +240,7 @@ * See /usr/ports/Mk/bsd.port.mk (in the fake-pkg target) */ if (PlistOnly) { - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); check_list(home, &plist); int retval = cache_plist(&plist, FALSE); @@ -257,92 +257,100 @@ /* Make first "real contents" pass over it */ check_list(home, &plist); - (void) umask(022); /* - * Make sure gen'ed directories, files don't have - * group or other write bits. - */ - /* copy_plist(home, &plist); */ - /* mark_plist(&plist); */ + (void) umask(022); + /* + * Make sure gen'ed directories, files don't have + * group or other write bits. + */ + + /* copy_plist(home, &plist); */ + /* mark_plist(&plist); */ - /* Now put the release specific items in */ - add_plist(&plist, PLIST_CWD, "."); - write_file(COMMENT_FNAME, Comment); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, COMMENT_FNAME); - add_cksum(&plist, plist.tail, COMMENT_FNAME); - write_file(DESC_FNAME, Desc); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DESC_FNAME); - add_cksum(&plist, plist.tail, DESC_FNAME); - - if (Install) { - copy_file(home, Install, INSTALL_FNAME); + /* Now put the release specific items in */ + add_plist(&plist, PLIST_CWD, "."); + write_file(COMMENT_FNAME, Comment); add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, INSTALL_FNAME); - add_cksum(&plist, plist.tail, INSTALL_FNAME); - } - if (PostInstall) { - copy_file(home, PostInstall, POST_INSTALL_FNAME); + add_plist(&plist, PLIST_FILE, COMMENT_FNAME); + add_cksum(&plist, plist.tail, COMMENT_FNAME); + write_file(DESC_FNAME, Desc); add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME); - add_cksum(&plist, plist.tail, POST_INSTALL_FNAME); - } - if (DeInstall) { - copy_file(home, DeInstall, DEINSTALL_FNAME); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME); - add_cksum(&plist, plist.tail, DEINSTALL_FNAME); - } - if (PostDeInstall) { - copy_file(home, PostDeInstall, POST_DEINSTALL_FNAME); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME); - add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME); - } - if (Require) { - copy_file(home, Require, REQUIRE_FNAME); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, REQUIRE_FNAME); - add_cksum(&plist, plist.tail, REQUIRE_FNAME); - } - if (Display) { - copy_file(home, Display, DISPLAY_FNAME); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DISPLAY_FNAME); - add_cksum(&plist, plist.tail, DISPLAY_FNAME); - add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME); - } - if (Mtree) { - copy_file(home, Mtree, MTREE_FNAME); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, MTREE_FNAME); - add_cksum(&plist, plist.tail, MTREE_FNAME); - add_plist(&plist, PLIST_MTREE, MTREE_FNAME); - } + add_plist(&plist, PLIST_FILE, DESC_FNAME); + add_cksum(&plist, plist.tail, DESC_FNAME); + + if (Install) { + copy_file(home, Install, INSTALL_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, INSTALL_FNAME); + add_cksum(&plist, plist.tail, INSTALL_FNAME); + } + + if (PostInstall) { + copy_file(home, PostInstall, POST_INSTALL_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME); + add_cksum(&plist, plist.tail, POST_INSTALL_FNAME); + } + + if (DeInstall) { + copy_file(home, DeInstall, DEINSTALL_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME); + add_cksum(&plist, plist.tail, DEINSTALL_FNAME); + } + + if (PostDeInstall) { + copy_file(home, PostDeInstall, POST_DEINSTALL_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME); + add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME); + } + + if (Require) { + copy_file(home, Require, REQUIRE_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, REQUIRE_FNAME); + add_cksum(&plist, plist.tail, REQUIRE_FNAME); + } + + if (Display) { + copy_file(home, Display, DISPLAY_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, DISPLAY_FNAME); + add_cksum(&plist, plist.tail, DISPLAY_FNAME); + add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME); + } + + if (Mtree) { + copy_file(home, Mtree, MTREE_FNAME); + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, MTREE_FNAME); + add_cksum(&plist, plist.tail, MTREE_FNAME); + add_plist(&plist, PLIST_MTREE, MTREE_FNAME); + } - /* Finally, write out the packing list */ - fp = fopen(CONTENTS_FNAME, "w"); - if (!fp) { - cleanup(0); - errx(2, "%s: can't open file %s for writing", - __func__, CONTENTS_FNAME); - } - write_plist(&plist, fp); - if (fclose(fp)) { - cleanup(0); - errx(2, "%s: error while closing %s", - __func__, CONTENTS_FNAME); - } + /* Finally, write out the packing list */ + fp = fopen(CONTENTS_FNAME, "w"); + if (!fp) { + cleanup(0); + errx(2, "%s: can't open file %s for writing", + __func__, CONTENTS_FNAME); + } + write_plist(&plist, fp); + if (fclose(fp)) { + cleanup(0); + errx(2, "%s: error while closing %s", + __func__, CONTENTS_FNAME); + } - /* And stick it into a tar ball */ - make_dist(home, pkg, suf, &plist); + /* And stick it into a tar ball */ + make_dist(home, pkg, suf, &plist); - /* Cleanup */ - free(Comment); - free(Desc); - free_plist(&plist); - leave_playpen(); - return TRUE; /* Success */ + /* Cleanup */ + free(Comment); + free(Desc); + free_plist(&plist); + leave_playpen(); + return TRUE; /* Success */ } static void ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/main.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ struct stat stat_s; if(cacheExists()) { - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); atexit(closeDatabase); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#3 (text+ko) ==== ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/main.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ /* If cache exists, open it */ if(cacheExists() == TRUE) { - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); atexit(closeDatabase); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * TODO: Check if the database is corrupt? Up-to-date? */ Boolean cacheExists() { - if(isfile(PKG_DBCACHE_FILE)) { + if(isfile(DBCACHE_FILE)) { CacheExists = TRUE; return TRUE; } @@ -44,19 +44,27 @@ /* * Opens/creates database file given the filename with read/write permission for user/group */ -DB *opendb(const char *filename) { +DB * +opendb(const char *filename) +{ return dbopen(filename, O_CREAT | O_RDWR, 0666, DB_BTREE, &btinfo); } /* * TODO: Add warnings, verbose check and such + * return 0 on success. */ -void openDatabase(const char *filename) { +int +openDatabase() +{ + printf("Opendatabase: %s\n", DBCACHE_FILE); // DEBUG("openDatabase()\n"); - if(database == NULL) - database = opendb(filename); + if(database == NULL) + database = opendb(DBCACHE_FILE); else DEBUG("openDatabase(): database already open\n"); + + return ( database == NULL ); } /* ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#6 (text+ko) ==== @@ -71,8 +71,13 @@ #define PKG_DBDIR "PKG_DBDIR" /* macro to get name of directory where we put logging information */ #define LOG_DIR (getenv(PKG_DBDIR) ? getenv(PKG_DBDIR) : DEF_LOG_DIR) -/* Path to the BDB cache file */ -#define PKG_DBCACHE_FILE "/usr/home/duckjen/projects/soc2008/src/usr.sbin/pkg_install/pkgcache.db" + +/* Default location of the BDB cache file */ +#define DEF_DBCACHE_FILE "/var/db/pkg/pkgcache.db" +/* just in case we change the environment variable name */ +#define PKG_DBCACHE_FILE "PKG_DBCACHE_FILE" +/* macro to get location of cache file where we index information */ +#define DBCACHE_FILE (getenv(PKG_DBCACHE_FILE) ? getenv(PKG_DBCACHE_FILE) : DEF_DBCACHE_FILE) /* The names of our "special" files */ #define CONTENTS_FNAME "+CONTENTS" @@ -248,7 +253,7 @@ /* Database */ Boolean cacheExists(); DB *opendb(const char *filename); -void openDatabase(const char *filename); +int openDatabase(); int dbsave(const DBT *key, const DBT *data); int dbAddPackage(const char *pkgname, const char *pkgdata); int dbget(const DB *db, DBT *key, DBT *data); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/main.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ int ch, cmp = 0; if(cacheExists()) { - openDatabase(PKG_DBCACHE_FILE); + openDatabase(); atexit(closeDatabase); } From owner-p4-projects@FreeBSD.ORG Thu Jun 26 10:43:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 942811065675; Thu, 26 Jun 2008 10:43:28 +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 56511106566B for ; Thu, 26 Jun 2008 10:43:28 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DB218FC28 for ; Thu, 26 Jun 2008 10:43:28 +0000 (UTC) (envelope-from andenore@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 m5QAhSI9078760 for ; Thu, 26 Jun 2008 10:43:28 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5QAhScC078758 for perforce@freebsd.org; Thu, 26 Jun 2008 10:43:28 GMT (envelope-from andenore@FreeBSD.org) Date: Thu, 26 Jun 2008 10:43:28 GMT Message-Id: <200806261043.m5QAhScC078758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 144139 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: Thu, 26 Jun 2008 10:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144139 Change 144139 by andenore@andenore_laptop on 2008/06/26 10:43:03 Fixed filenames Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/convert.h#2 delete .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.h#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#5 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.h#2 (text+ko) ==== @@ -1,0 +1,9 @@ +#ifndef _INST_CONVERTER_H +#define _INST_CONVERTER_H + +extern Boolean CheckExists; +extern Boolean Textual; +extern Boolean Print; +extern char * Key; + +#endif /* _INST_CONVERTER_H */ ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#5 (text+ko) ==== @@ -5,7 +5,7 @@ #include #include "lib.h" -#include "convert.h" +#include "converter.h" static int pkg_do(char *); From owner-p4-projects@FreeBSD.ORG Thu Jun 26 17:20:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E11F106567D; Thu, 26 Jun 2008 17:20:13 +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 CDECB1065672 for ; Thu, 26 Jun 2008 17:20:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B23A68FC24 for ; Thu, 26 Jun 2008 17:20:12 +0000 (UTC) (envelope-from trasz@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 m5QHKCs0036748 for ; Thu, 26 Jun 2008 17:20:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5QHK9hf036733 for perforce@freebsd.org; Thu, 26 Jun 2008 17:20:09 GMT (envelope-from trasz@freebsd.org) Date: Thu, 26 Jun 2008 17:20:09 GMT Message-Id: <200806261720.m5QHK9hf036733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144156 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: Thu, 26 Jun 2008 17:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=144156 Change 144156 by trasz@trasz_traszkan on 2008/06/26 17:19:41 IFC Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/LOCKS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/MAINTAINERS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ln/ln.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ln/ln.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/coff-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/cpu-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/elf32-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/elf64-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/mipsbsd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/pe-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/include/opcode/mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/top.X#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/top.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/bluetooth.device.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/answer#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/holidays.D#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rates.A#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rates.D#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rates.F#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rates.L#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rates.UK.BT#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdnd.rc.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdntel.alias.sample#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/isdntel.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/record#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/tell#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/tell-record#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/isdn/unknown_incoming#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/netstart#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/pccard_ether#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/abi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/archdep#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/bgfsck#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/cleartmp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/dumpon#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/fsck#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostid#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/isdnd#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ldconfig#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/local#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/localpkg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/lockd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/motd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mountlate#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/moused#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/newsyslog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/power_profile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ppp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/quota#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/statd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/swap1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/sysctl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.firewall#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/morse/morse.6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/morse/morse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libssp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/pthread.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/sgtty.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/spawn.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/kerberos5/tools/slc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_strmode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/cpio.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/tar.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_link_resolver.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar_empty_filename.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_large.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_ustar_filenames.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_tar_ustar.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/atm_addr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/cache_key.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/ioctl_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/ip_addr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/ip_checksum.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/libatm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libatm/timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/exec.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/namespace.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/fcntl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/uthread/uthread_fcntl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcompat/4.1/gtty.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcompat/4.1/stty.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcompat/4.1/stty.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libcompat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/pthread.map#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_clean.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/Symbol.map#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/man/fmod.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_fmodl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/build/picobsd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/src-install.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/rescue/librescue/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/rescue/rescue/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_fore200.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_inet.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_print.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_set.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_show.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atm/atm_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/fore_dnld/COPYRIGHT#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/fore_dnld/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/fore_dnld/fore_dnld.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/fore_dnld/fore_dnld.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/fore_dnld/pca200e.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/ilmid/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/ilmid/ilmid.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/ilmid/ilmid.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/core/geom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/natd/natd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/natd/natd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/natd/natd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/swapon.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/swapon.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/NOTES#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/Startup#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/atm-config.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/atm-sockets.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/cpcs-design.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/fore-microcode.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/sscf-design.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/atm/sscop-design.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/FAQ#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/KERNEL#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/Overview#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/ROADMAP#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/ReleaseNotes#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/Resources#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/SupportedCards#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/ThankYou#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/anleitung.ppp#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/answer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/answer.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/convert.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/hplay.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/i4b-ppp-newbie.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/isdnctl#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/isdnd_acct#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/isdnd_acct.pl#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/isdntelmux.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/contrib/mrtg-isp0.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/i4brunppp/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/i4brunppp/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/i4brunppp/i4brunppp.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/i4brunppp/i4brunppp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/v21/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/v21/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/isdn/v21/v21modem.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/ppp/isdnd.rc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/ppp/ppp.conf.isdn#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/ppp/ppp.conf.sample#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/0.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/1.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/2.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/3.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/4.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/5.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/6.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/7.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/8.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/9.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/beep.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/isdn/msg.al.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/age.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/altq.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ciss.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/crypto.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/gre.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ixgbe.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/jme.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/miibus.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/netgraph.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_atmpif.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sppp.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ubsa.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/uplcom.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vlan.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/src.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/hier.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/zone.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-ports.dot#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.own.mk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/sendmail/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/colemak.iso15.acc.kbd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/iodev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/memdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/stack.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/intr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/memdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/efi/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ia64/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ia64/common/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ofw/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/Makefile.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.arm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.i386#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.pc98#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bmreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bmvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/et/if_et.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe_cbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/harp/if_harp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_aali.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_buffer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_command.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_globals.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_include.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_init.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_intr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_output.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_receive.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_slave.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_stats.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_stats.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_transmit.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/fore_vcm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/hfa_eisa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/hfa_freebsd.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/hfa_freebsd.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/hfa_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hfa/hfa_sbus.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/idt/idt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/idt/idt_harp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/idt/idt_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/idt/idtreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/idt/idtvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/io/iodev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/tcp_lro.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/tcp_lro.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jmereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jmevar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/led/led.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/jmphy.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/jmphyreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/smcphy.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/truephy.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/smc/if_smc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/smc/if_smcreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/smc/if_smcvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/if_sncreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xe/if_xevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/iodev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/memdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/capi.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/capi_l4if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/capi_llif.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/capi_msgs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/capi_msgs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/iavc/iavc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/iavc/iavc_card.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/iavc/iavc_isa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/iavc/iavc_lli.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/capi/iavc/iavc_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_ctl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_ing.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_ipr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_isppp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_rbch.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_tel.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/driver/i4b_trace.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_cause.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_debug.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_global.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_isdnq931.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_l1l2.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_l2l3.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_l3l4.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_mbuf.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/include/i4b_trace.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/i4b_hdlc.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/i4b_hdlc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/i4b_l1.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/i4b_l1dmux.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/i4b_l1lib.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_avm_a1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_bchan.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_diva.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_dynalink.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_hscx.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_hscx.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_ipac.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isac.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isic.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isic.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isic_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isic_isa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_l1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_l1fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_sws.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_tel_s016.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_tel_s08.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/isic/i4b_usr_sti.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_hdlc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_itjc_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_ext.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer1/iwic/i4b_w6692.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_iframe.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_l2.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_l2.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_l2fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_l2fsm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_l2timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_lme.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_mbuf.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_sframe.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_tei.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_uframe.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer2/i4b_util.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l2if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l3.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l3fsm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l3fsm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l3timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_l4if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_q931.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_q931.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_q932fac.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer3/i4b_q932fac.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer4/i4b_i4bdrv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer4/i4b_l4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer4/i4b_l4.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer4/i4b_l4mgmt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i4b/layer4/i4b_l4timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/memdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_clist.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_subr.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_tty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/iodev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/memdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/pte.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/trap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/bm/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cnw/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/et/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/harp/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/Makefile.inc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/eisa/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/hfa/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/pci/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hfa/sbus/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/idt/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/jme/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mii/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/atm/atmpif/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gre.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gre.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/radix_mpath.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/radix_mpath.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_aal5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_cm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_cm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_device.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_if.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_ioctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_pcb.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_proto.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_sap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_sigmgr.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_signal.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_socket.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_stack.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_sys.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_usrreq.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/atm_vc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_event.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_input.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_load.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_output.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_serv.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_usrreq.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/ipatm/ipatm_vcm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/port.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/queue.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/sigpvc/sigpvc_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/sigpvc/sigpvc_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/sigpvc/sigpvc_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_arp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_cls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_cls.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_kxdr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_kxdr.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_msg.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_print.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_proto.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_util.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/spans/spans_xdr.x#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/q2110_sigaa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/q2110_sigcpcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/q2110_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/qsaal1_sigaa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/qsaal1_sigcpcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/qsaal1_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscf_uni.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscf_uni.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscf_uni_lower.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscf_uni_upper.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscf_uni_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_lower.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_misc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_pdu.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_pdu.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_sigaa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_sigcpcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_upper.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/sscop_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uni.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uni_load.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp_cache.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp_input.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp_output.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp_timer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniarp_vcm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniip.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/uniip_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_decode.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_decode.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_encode.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_if.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_mbuf.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_mbuf.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_msg.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_msg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_print.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_print.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_proto.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_sigmgr_state.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_util.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netatm/uni/unisig_vc_state.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/atmpif/ng_atmpif.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/atmpif/ng_atmpif_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/ng_atmpif.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfsmount.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 26 17:37:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4E881065670; Thu, 26 Jun 2008 17:37:30 +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 7CADD106567B for ; Thu, 26 Jun 2008 17:37:30 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6252E8FC28 for ; Thu, 26 Jun 2008 17:37:30 +0000 (UTC) (envelope-from rpaulo@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 m5QHbUFR038133 for ; Thu, 26 Jun 2008 17:37:30 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5QHbUD8038131 for perforce@freebsd.org; Thu, 26 Jun 2008 17:37:30 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 26 Jun 2008 17:37:30 GMT Message-Id: <200806261737.m5QHbUD8038131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 144157 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: Thu, 26 Jun 2008 17:37:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=144157 Change 144157 by rpaulo@rpaulo_epsilon on 2008/06/26 17:36:41 Implement SEQ/ACK analysis for RST. Autocreate dump files. Kill print_packet() function. tcpdump does a much better job. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/Makefile#9 edit .. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#7 edit .. //depot/projects/soc2008/rpaulo-tcpad/dumper.h#5 edit .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#13 edit .. //depot/projects/soc2008/rpaulo-tcpad/helper.c#2 edit .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#9 edit .. //depot/projects/soc2008/rpaulo-tcpad/timer.c#3 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/Makefile#9 (text+ko) ==== @@ -1,8 +1,9 @@ -# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#8 $ +# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#9 $ PROG=tcpad SRCS=main.c device.c linkhdr.c handler.c helper.c dumper.c timer.c CFLAGS+=-DDEBUG -ggdb +CFLAGS+=-DDUMPER_PATH=\"dumpfiles/\" WARNS=5 LDADD=-lpcap ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#7 (text+ko) ==== @@ -23,13 +23,14 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#6 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#7 $ */ #include #include #include #include +#include #include #include @@ -60,10 +61,24 @@ * An error occured. Dump the packet list to a file. */ void -dumper_error(pcap_t *p, const char *path, struct dumppkth *head) +dumper_error(pcap_t *p, struct dumppkth *head) { + int i; pcap_dumper_t *pd; struct dumppkt *dp; + char path[128]; + + for (i = 0; i < 3000; i++) { + + snprintf(path, sizeof(path), "%s/dump%d.cap", DUMPER_PATH, + i); + if (access(path, W_OK) != 0) + break; + } + if (i == 3000) { + fprintf(stderr, "%s, %s is full!\n", __func__, DUMPER_PATH); + return; + } pd = pcap_dump_open(p, path); if (pd == NULL) { ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.h#4 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.h#5 $ */ #ifndef _DUMPER_H_ @@ -41,7 +41,7 @@ void dumper_addpkt(struct dumppkth *head, const struct pcap_pkthdr *ph, const unsigned char *headers); -void dumper_error(pcap_t *, const char *path, struct dumppkth *head); +void dumper_error(pcap_t *, struct dumppkth *head); void dumper_free(struct dumppkth *head); ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#12 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#13 $ */ #include @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -48,8 +49,6 @@ #include "debug.h" -static void print_packet(const unsigned char *bytes, const int linkhlen); - void tcpad_pcaphandler(unsigned char *user, const struct pcap_pkthdr *ph, const unsigned char *bytes) @@ -74,7 +73,6 @@ if ((tcp->th_flags & TH_FLAGS) == TH_SYN) { if (cp) { DPRINTF("connection already being tracked!\n"); - print_packet(bytes, linkhlen); LIST_REMOVE(cp, entries); free(cp); } @@ -83,13 +81,13 @@ cp->dport = tcp->th_dport; cp->sport = tcp->th_sport; cp->isv6 = 0; + cp->iss = tcp->th_seq; memcpy(&cp->sv4addr, &ip->ip_src, sizeof(struct in_addr)); memcpy(&cp->dv4addr, &ip->ip_dst, sizeof(struct in_addr)); DPRINTF("tracking (syn) connection between %s and ", inet_ntoa(cp->sv4addr)); DPRINTF("%s\n",inet_ntoa(cp->dv4addr)); LIST_INSERT_HEAD(&tcpchead, cp, entries); - print_packet(bytes, linkhlen); /* * Packet list. Only one per connection. @@ -106,7 +104,6 @@ } if (cp) { DPRINTF("connection already being tracked!\n"); - print_packet(bytes, linkhlen); LIST_REMOVE(cp, entries); free(cp); } @@ -115,13 +112,13 @@ cp->dport = tcp->th_dport; cp->sport = tcp->th_sport; cp->isv6 = 0; + cp->irs = tcp->th_seq; memcpy(&cp->sv4addr, &ip->ip_src, sizeof(struct in_addr)); memcpy(&cp->dv4addr, &ip->ip_dst, sizeof(struct in_addr)); DPRINTF("tracking (syn/ack) connection between %s and ", inet_ntoa(cp->sv4addr)); DPRINTF("%s\n",inet_ntoa(cp->dv4addr)); LIST_INSERT_HEAD(&tcpchead, cp, entries); - print_packet(bytes, linkhlen); /* rcp->pktshead should have been already malloc'ed and initted */ @@ -137,7 +134,6 @@ cp->t_state = TCPS_ESTABLISHED; rcp->t_state = TCPS_ESTABLISHED; DPRINTF("established\n"); - print_packet(bytes, linkhlen); } if (cp->t_state == TCPS_ESTABLISHED && rcp->t_state == TCPS_FIN_WAIT_1) { @@ -160,7 +156,6 @@ if (cp->t_state == TCPS_ESTABLISHED) { cp->t_state = TCPS_FIN_WAIT_1; DPRINTF("fin_wait_1\n"); - print_packet(bytes, linkhlen); } if (cp->t_state == TCPS_CLOSE_WAIT && rcp->t_state == TCPS_FIN_WAIT_2) { @@ -174,46 +169,19 @@ } } else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) { if (rcp && rcp->t_state == TCPS_SYN_SENT) { - DPRINTF("stopped tracking connection (rst) between" - " %s and ", inet_ntoa(rcp->sv4addr)); - DPRINTF("%s\n",inet_ntoa(rcp->dv4addr)); - print_packet(bytes, linkhlen); - LIST_REMOVE(rcp, entries); - free(rcp); - } - } -} -static void -print_packet(const unsigned char *bytes, const int linkhlen) -{ - const struct ip *ip; - const struct tcphdr *tcp; + dumper_addpkt(rcp->pktshead, ph, bytes); - return; - - ip = (const struct ip *)linkhdr_remove(bytes, linkhlen); - tcp = (const struct tcphdr *)linkhdr_remove(bytes, - linkhlen + sizeof(struct ip)); + if (SEQ_GEQ(tcp->th_seq, rcp->irs) && + SEQ_LEQ(tcp->th_seq, rcp->irs + rcp->rcv_wnd)) { - printf("IP %s.%d > ", inet_ntoa(ip->ip_src), - ntohs(tcp->th_sport)); - printf("%s.%d: ", inet_ntoa(ip->ip_dst), - ntohs(tcp->th_dport)); - - if (tcp->th_flags & TH_FIN) - printf("F"); - if (tcp->th_flags & TH_SYN) - printf("S"); - if (tcp->th_flags & TH_RST) - printf("R"); - if (tcp->th_flags & TH_ACK) - printf("."); - if (tcp->th_flags & TH_URG) - printf("U"); - if (tcp->th_flags & TH_PUSH) - printf("P"); - if (tcp->th_flags & TH_ECE) - printf("E"); - printf("\n"); + DPRINTF("stopped tracking connection (rst) between" + " %s and ", inet_ntoa(rcp->sv4addr)); + DPRINTF("%s\n",inet_ntoa(rcp->dv4addr)); + LIST_REMOVE(rcp, entries); + free(rcp); + } else + dumper_error(p, rcp->pktshead); + } + } } ==== //depot/projects/soc2008/rpaulo-tcpad/helper.c#2 (text+ko) ==== @@ -23,13 +23,14 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/helper.c#1 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/helper.c#2 $ */ #include #include #include #include +#include #include #include "helper.h" ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#9 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#8 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#9 $ */ #ifndef _TCPAD_H_ #define _TCPAD_H_ #include +#include +#include pcap_t *p; @@ -39,12 +41,23 @@ struct in_addr dv4addr; unsigned short dport; unsigned short sport; + + /* TCP internal variables, from tcpcb */ int t_state; /* TCP FSM state */ + tcp_seq snd_una; + tcp_seq snd_max; + tcp_seq snd_nxt; + tcp_seq snd_up; + tcp_seq iss; + tcp_seq irs; + tcp_seq snd_wnd; + tcp_seq rcv_wnd; + int isv6; struct dumppkth *pktshead; struct tcpc *rcp; + }; LIST_HEAD(tcpchead, tcpc) tcpchead; - #endif /* _TCPAD_H_ */ ==== //depot/projects/soc2008/rpaulo-tcpad/timer.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#2 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#3 $ */ #include @@ -33,6 +33,7 @@ #include #include #include +#include #include "debug.h" #include "tcpad.h" From owner-p4-projects@FreeBSD.ORG Thu Jun 26 22:22:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D237D1065689; Thu, 26 Jun 2008 22:22:22 +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 7929E1065673 for ; Thu, 26 Jun 2008 22:22:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6200D8FC12 for ; Thu, 26 Jun 2008 22:22:22 +0000 (UTC) (envelope-from julian@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 m5QMMMnw076415 for ; Thu, 26 Jun 2008 22:22:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5QMMML0076413 for perforce@freebsd.org; Thu, 26 Jun 2008 22:22:22 GMT (envelope-from julian@freebsd.org) Date: Thu, 26 Jun 2008 22:22:22 GMT Message-Id: <200806262222.m5QMMML0076413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144166 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: Thu, 26 Jun 2008 22:22:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=144166 Change 144166 by julian@julian_trafmon1 on 2008/06/26 22:22:02 Make lint compile with the new vimage.h Affected files ... .. //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#2 edit .. //depot/projects/vimage-commit3/src/sys/netinet/in.h#3 edit .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#2 edit .. //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#2 edit Differences ... ==== //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#2 (text+ko) ==== @@ -1181,4 +1181,17 @@ #define NGI_GET_META(i,m) #define ng_copy_meta(meta) NULL +#define INIT_VNET_NETGRAPH(vnet) int vnet_nergraph; + +#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) + +/* Symbol translation macros */ +#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) +#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) +#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) +#define V_nextID VNET_NETGRAPH(nextID) +#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) +#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) +#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) + #endif /* _NETGRAPH_NETGRAPH_H_ */ ==== //depot/projects/vimage-commit3/src/sys/netinet/in.h#3 (text+ko) ==== @@ -769,6 +769,7 @@ #define V_ip_keepfaith VNET_INET(ip_keepfaith) #define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) #define V_ip_id VNET_INET(ip_id) +#define V_ipstealth VNET_INET(ipstealth) #define V_ip_do_randomid VNET_INET(ip_do_randomid) #define V_ip_checkinterface VNET_INET(ip_checkinterface) ==== //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#2 (text+ko) ==== @@ -433,6 +433,70 @@ extern char *ipsec_dump_policy __P((caddr_t, char *)); extern const char *ipsec_strerror __P((void)); -#endif /* !_KERNEL */ +#endif /* ! KERNEL */ + +/* + * Symbol translation macros + */ +#define INIT_VNET_IPSEC(vnet) int vnet_ipsec; + +#define VNET_IPSEC(sym) VSYM(vnet_ipsec, sym) + +#define V_ipsec_debug VNET_IPSEC(ipsec_debug) +#define V_ipsec4stat VNET_IPSEC(ipsec4stat) +#define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) +#define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) +#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) +#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) +#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) +#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) +#define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) +#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) +#define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) +#define V_ipsec_replay VNET_IPSEC(ipsec_replay) +#define V_ipsec_integrity VNET_IPSEC(ipsec_integrity) +#define V_crypto_support VNET_IPSEC(crypto_support) +#define V_key_debug_level VNET_IPSEC(key_debug_level) +#define V_key_spi_trycnt VNET_IPSEC(key_spi_trycnt) +#define V_key_spi_minval VNET_IPSEC(key_spi_minval) +#define V_key_spi_maxval VNET_IPSEC(key_spi_maxval) +#define V_policy_id VNET_IPSEC(policy_id) +#define V_key_int_random VNET_IPSEC(key_int_random) +#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime) +#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count) +#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime) +#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa) +#define V_acq_seq VNET_IPSEC(acq_seq) +#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) +#define V_saorder_state_any VNET_IPSEC(saorder_state_any) +#define V_esp_enable VNET_IPSEC(esp_enable) +#define V_espstat VNET_IPSEC(espstat) +#define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) +#define V_ipsec_esp_keymin VNET_IPSEC(ipsec_esp_keymin) +#define V_ipsec_esp_auth VNET_IPSEC(ipsec_esp_auth) +#define V_ipsec_ah_keymin VNET_IPSEC(ipsec_ah_keymin) +#define V_ipip_allow VNET_IPSEC(ipip_allow) +#define V_ipipstat VNET_IPSEC(ipipstat) +#define V_ipsec6stat VNET_IPSEC(ipsec6stat) +#define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev) +#define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) +#define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) +#define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) +#define V_ip6_ipsec_ecn VNET_IPSEC(ip6_ipsec_ecn) +#define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad) +#define V_ah_enable VNET_IPSEC(ah_enable) +#define V_ah_cleartos VNET_IPSEC(ah_cleartos) +#define V_ahstat VNET_IPSEC(ahstat) +#define V_ipcomp_enable VNET_IPSEC(ipcomp_enable) +#define V_ipcompstat VNET_IPSEC(ipcompstat) +#define V_pfkeystat VNET_IPSEC(pfkeystat) +#define V_key_cb VNET_IPSEC(key_cb) +#define V_key_dst VNET_IPSEC(key_dst) +#define V_key_src VNET_IPSEC(key_src) +#define V_sptree VNET_IPSEC(sptree) +#define V_sahtree VNET_IPSEC(sahtree) +#define V_regtree VNET_IPSEC(regtree) +#define V_acqtree VNET_IPSEC(acqtree) +#define V_spacqtree VNET_IPSEC(spacqtree) #endif /* _NETIPSEC_IPSEC_H_ */ ==== //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#2 (text+ko) ==== @@ -53,13 +53,17 @@ #include #include +#include #include #include +#include + #include #include #include #include +#include #include From owner-p4-projects@FreeBSD.ORG Fri Jun 27 14:25:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D99B61065677; Fri, 27 Jun 2008 14:25:00 +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 985A81065670 for ; Fri, 27 Jun 2008 14:25:00 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93D3A8FC0A for ; Fri, 27 Jun 2008 14:25:00 +0000 (UTC) (envelope-from gabor@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 m5REP06s035728 for ; Fri, 27 Jun 2008 14:25:00 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5REP0mg035726 for perforce@freebsd.org; Fri, 27 Jun 2008 14:25:00 GMT (envelope-from gabor@freebsd.org) Date: Fri, 27 Jun 2008 14:25:00 GMT Message-Id: <200806271425.m5REP0mg035726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144191 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: Fri, 27 Jun 2008 14:25:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=144191 Change 144191 by gabor@gabor_server on 2008/06/27 14:24:02 - Restore compatibility of empty regexp Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#52 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#52 (text+ko) ==== @@ -343,7 +343,7 @@ int main(int argc, char *argv[]) { - int c, lastc, prevoptind, newarg, i; + int c, lastc, prevoptind, newarg, i, needpattern; char *ep; unsigned long long l; @@ -382,6 +382,7 @@ lastc = '\0'; newarg = 1; prevoptind = 1; + needpattern = 1; while ((c = getopt_long(argc, argv, optstr, long_options, NULL)) != -1) { switch (c) { @@ -439,6 +440,7 @@ break; case 'e': add_pattern(optarg, strlen(optarg)); + needpattern = 0; break; case 'F': Eflag = Gflag = 0; @@ -446,6 +448,7 @@ break; case 'f': read_patterns(optarg); + needpattern = 0; break; case 'G': Eflag = Fflag = 0; @@ -575,10 +578,10 @@ argc -= optind; argv += optind; - if (argc == 0 && patterns == 0) + if (argc == 0 && needpattern) usage(); - if (patterns == 0) { + if (argc != 0 && needpattern) { add_pattern(*argv, strlen(*argv)); --argc; ++argv; From owner-p4-projects@FreeBSD.ORG Fri Jun 27 14:39:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B0A8106566C; Fri, 27 Jun 2008 14:39:15 +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 43FDC106564A for ; Fri, 27 Jun 2008 14:39:15 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2705C8FC20 for ; Fri, 27 Jun 2008 14:39:15 +0000 (UTC) (envelope-from thompsa@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 m5REdEOp036998 for ; Fri, 27 Jun 2008 14:39:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5REdEeq036996 for perforce@freebsd.org; Fri, 27 Jun 2008 14:39:14 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 27 Jun 2008 14:39:14 GMT Message-Id: <200806271439.m5REdEeq036996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 144193 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: Fri, 27 Jun 2008 14:39:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=144193 Change 144193 by thompsa@thompsa_burger on 2008/06/27 14:38:41 ugencom shouldnt have slipped in there. Affected files ... .. //depot/projects/vap/sys/modules/Makefile#31 edit Differences ... ==== //depot/projects/vap/sys/modules/Makefile#31 (text+ko) ==== @@ -294,7 +294,6 @@ ufoma \ uftdi \ ugen \ - ugencom \ uhid \ ukbd \ ulpt \ From owner-p4-projects@FreeBSD.ORG Fri Jun 27 14:40:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE3321065690; Fri, 27 Jun 2008 14:40:16 +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 6E5411065686 for ; Fri, 27 Jun 2008 14:40:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 513248FC18 for ; Fri, 27 Jun 2008 14:40:16 +0000 (UTC) (envelope-from thompsa@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 m5REeGDh037138 for ; Fri, 27 Jun 2008 14:40:16 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5REeGda037136 for perforce@freebsd.org; Fri, 27 Jun 2008 14:40:16 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 27 Jun 2008 14:40:16 GMT Message-Id: <200806271440.m5REeGda037136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 144194 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: Fri, 27 Jun 2008 14:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144194 Change 144194 by thompsa@thompsa_burger on 2008/06/27 14:39:18 malo was listed twice. Affected files ... .. //depot/projects/vap/sys/modules/Makefile#32 edit Differences ... ==== //depot/projects/vap/sys/modules/Makefile#32 (text+ko) ==== @@ -187,7 +187,6 @@ msdosfs_iconv \ ${_mse} \ msk \ - malo \ mwl \ mxge \ my \ From owner-p4-projects@FreeBSD.ORG Fri Jun 27 14:53:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DE501065679; Fri, 27 Jun 2008 14:53:30 +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 D41701065678 for ; Fri, 27 Jun 2008 14:53:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D08598FC1A for ; Fri, 27 Jun 2008 14:53:29 +0000 (UTC) (envelope-from gabor@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 m5RErTBJ038114 for ; Fri, 27 Jun 2008 14:53:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5RErT1l038112 for perforce@freebsd.org; Fri, 27 Jun 2008 14:53:29 GMT (envelope-from gabor@freebsd.org) Date: Fri, 27 Jun 2008 14:53:29 GMT Message-Id: <200806271453.m5RErT1l038112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144196 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: Fri, 27 Jun 2008 14:53:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=144196 Change 144196 by gabor@gabor_server on 2008/06/27 14:52:45 - Fix -w Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#46 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#46 (text+ko) ==== @@ -196,6 +196,8 @@ return (c); } +#define isword(x) (isalnum((unsigned char)(x)) || (x) == '_') + static int procline(struct str *l, int nottext) { @@ -219,7 +221,8 @@ if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; if (r == 0 && wflag) - if (pmatch.rm_so != 0 || !isspace(l->dat[pmatch.rm_so - 1])) + if ((pmatch.rm_so != 0 && isword((unsigned char)l->dat[pmatch.rm_so - 1])) + || (pmatch.rm_eo != l->len && isword((unsigned char)l->dat[pmatch.rm_eo]))) r = REG_NOMATCH; if (r == t) { if (m == 0) From owner-p4-projects@FreeBSD.ORG Fri Jun 27 23:23:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71F90106567E; Fri, 27 Jun 2008 23:23:04 +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 310F4106567B for ; Fri, 27 Jun 2008 23:23:04 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 276838FC1C for ; Fri, 27 Jun 2008 23:23:04 +0000 (UTC) (envelope-from andrew@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 m5RNN4g3012792 for ; Fri, 27 Jun 2008 23:23:04 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5RNN4wX012790 for perforce@freebsd.org; Fri, 27 Jun 2008 23:23:04 GMT (envelope-from andrew@freebsd.org) Date: Fri, 27 Jun 2008 23:23:04 GMT Message-Id: <200806272323.m5RNN4wX012790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144215 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: Fri, 27 Jun 2008 23:23:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144215 Change 144215 by andrew@andrew_bender on 2008/06/27 23:22:58 Use the uart FIFO status register rather than the TX/RX status register as it is the recomended method of getting the status of the uart when in FIFO mode Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#5 (text+ko) ==== @@ -222,12 +222,11 @@ int ipend = 0; int sr; - sr = uart_getreg(&sc->sc_bas, SSCOM_UTRSTAT); + sr = uart_getreg(&sc->sc_bas, SSCOM_UFSTAT); - if (sr & UTRSTAT_TXEMPTY && sc->sc_txbusy) { + if ((sr & UFSTAT_TXCOUNT) == 0 && sc->sc_txbusy) { ipend |= SER_INT_TXIDLE; } - return (ipend); } static int From owner-p4-projects@FreeBSD.ORG Fri Jun 27 23:39:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EFB0106567C; Fri, 27 Jun 2008 23:39:21 +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 E31131065677 for ; Fri, 27 Jun 2008 23:39:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D579E8FC1D for ; Fri, 27 Jun 2008 23:39:20 +0000 (UTC) (envelope-from pgj@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 m5RNdKWs014232 for ; Fri, 27 Jun 2008 23:39:20 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5RNdKXi014230 for perforce@freebsd.org; Fri, 27 Jun 2008 23:39:20 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 27 Jun 2008 23:39:20 GMT Message-Id: <200806272339.m5RNdKXi014230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144217 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: Fri, 27 Jun 2008 23:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=144217 Change 144217 by pgj@disznohal on 2008/06/27 23:38:32 MFen: 1.184 -> 1.185 books/handbook/eresources/chapter.sgml 1.58 -> 1.59 share/sgml/mailing-lists.ent 1.4 -> 1.5 share/sgml/transtable.xml 1.2 -> 1.5 slides/common/freebsd-dev-model.xml 1.1 -> 1.2 slides/common/freebsd-linux-license.xml 1.1 slides/common/freebsd-more-information.xml (NEW) 1.1 -> 1.2 slides/common/freebsd-organization.xml 1.1 -> 1.3 slides/common/freebsd-recent-releases.xml 1.1 -> 1.2 slides/common/freebsd-release-process.xml 1.1 -> 1.4 slides/common/freebsd-users.xml 1.1 -> 1.2 slides/common/what-is-freebsd.xml 1.3 -> 1.4 slides/freebsd-general/slides.xml MFP4 after: 3 days Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-more-information.xml#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-recent-releases.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-release-process.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-users.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/what-is-freebsd.xml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/freebsd-general/slides.xml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -653,6 +653,14 @@ + &a.virtualization.name; + A &os; részérõl + támogatott különbözõ + virtualizációs technológiák + tárgyalása + + + &a.vuxml.name; A VuXML infrastruktúra tárgyalása @@ -1977,6 +1985,32 @@ + + &a.virtualization.name; + + + A &os; részérõl + támogatott különbözõ + virtualizációs + technológiák + + Ezen a levelezési listán elsõsorban + a &os; által támogatott + virtualizációs megoldásokat vitatjuk + meg. Ennek keretében egyrészt az ehhez + kapcsolódó alapvetõ funkciók + megvalósítása valamint további + újítások kerülnek a + középpontba, másrészt a + felhasználók számára ezzel + létrehoztunk egy fórumot a + felmerülõ problémák + megoldására és az alkalmazási + lehetõségek + megbeszelésére. + + +     ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#5 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -429,6 +429,10 @@ FreeBSD vendors pre-release coordination levelezési lista"> freebsd-vendors"> + +Discussion of various virtualization techniques supported by FreeBSD levelezési lista"> +freebsd-virtualization"> + FreeBSD VuXML levelezési lista"> freebsd-vuxml"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#4 (text+ko) ==== @@ -18,7 +18,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#3 (text+ko) ==== @@ -3,13 +3,14 @@ - A FreeBSD fejlesztési model + A FreeBSD fejlesztési model - + Áttekintés A FreeBSD fejlesztése két párhuzamos @@ -29,15 +30,16 @@ + - - A FreeBSD fejlesztési model + A FreeBSD fejlesztési model - A csapat Fejlesztõk ezrei világszerte @@ -47,29 +49,34 @@ Csak a committerek rendelkeznek írási joggal a CVS repository-hoz. - 324 committer összesen (beleértve a + 353 committer összesen (beleértve a forrás, dokumentáció és ports jogokat) - 212 aktív committer az src/ területen + 181 aktív committer az src/ területen az elmúlt 12 hónapban - 165 aktív committer az src/sys/ területen + 147 aktív committer az src/sys/ területen az elmúlt 12 hónapban - A FreeBSD fejlesztési model + A FreeBSD fejlesztési model - A hibák + kezelése - A felhasználók és külsõ - fejlesztõk a GNATS rendszeren keresztül küldhetnek - hibajavításokat, fejlesztéseket, vagy - probléma-jelentéseket. + A felhasználók és a + külsõ, közvetlen CVS + hozzáféréssel nem rendelkezõ + fejlesztõk a GNATS rendszerén keresztül + küldhetnek hibajavításokat, + fejlesztési javaslatokat vagy + hibajelentéseket. - Online form az elküldéshez, send-pr parancs - alapértelmetetten a FreeBSD rendszereken, ... + Formái: interneten keresztül, a FreeBSD + rendszereken alapból elérhetõ + send-pr paranccsal stb. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#3 (text+ko) ==== @@ -3,7 +3,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#3 (text+ko) ==== @@ -3,7 +3,7 @@ @@ -16,13 +16,43 @@ hogy a projekt pozitív irányban fejlõdjön tovább. + A FreeBSD Port Management Team + felelõs a FreeBSD Portgyûjtemény + mûködõképességének, + frissességének és + sokszínûségének + megõrzéséért. Emellett felügyeli + a rajta dolgozó committerek és fejlesztõk + munkáját. + + A FreeBSD Documentation Engineering + Team felelõs a Dokumentációs + Projektben dolgozó committerek számára + kitûzött célok + meghatározásáért és + felügyeletéért. + A FreeBSD Core Team egy 9 fejlesztõbõl álló csoport, amelyet a committerek választanak 2 évre. - A FreeBSD Release Engineering - Team fejlesztõk egy kisebb csoportja, amely - a kiadási folyamat szervezéséért - felel. + A FreeBSD Release Engineering Team + fejlesztõk egy kisebb csoportja, amely a kiadási + folyamat szervezéséért felel. + + A FreeBSD Security Team tagjai + felelõsek azért, hogy felhívják a + közösség figyelmét a FreeBSD src + és portok forrásait érintõ + hibákra, biztonsági résekre és + veszélyekre, illetve a FreeBSD rendszerek + biztonságos üzemeltetésével + kapcsolatos információkat gyûjtik össze + és közvetítik. Emellett még a FreeBSD + biztonságosságát fenyegetõ + hibák elhárításáért + és biztonsági figyelmeztetések + összeállításáért + felelnek. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-recent-releases.xml#3 (text+ko) ==== @@ -3,31 +3,34 @@ Újabb kiadások - + - A FreeBSD 4.X-STABLE továbbra is fejlõdik - funkcionalitásában, teljesítményében - és stabilitásában. + A FreeBSD 6.X-STABLE + továbbra is fejlõdik funkcionalitásában, + teljesítményében és + stabilitásában. - FreeBSD 4.9 (2003. október) - FreeBSD 4.10 (2004. május) + FreeBSD 6.1 (2006. május) + FreeBSD 6.2 (2007. január) - A FreeBSD 5.X-CURRENT kockázatosabb fejlesztésen - megy keresztül, a -STABLE állapot közelében - jár. - - FreeBSD 5.0 (2003. január) - FreeBSD 5.1 (2003. június) - FreeBSD 5.2 (2004. január) - FreeBSD 5.2.1 (2004. február) + A FreeBSD 7.X-STABLE a + legfrissebb stabil fejlesztési ág, rengeteg izgalmas + tesztelnivaló újítással. + + FreeBSD 7.0 (2008. január) + + A FreeBSD 8.X-CURRENT + kockázatosabb fejlesztésen megy keresztül, a + -STABLE állapot közelében + jár. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-release-process.xml#3 (text+ko) ==== @@ -3,29 +3,19 @@ A FreeBSD kiadási folyamata - A Stable kiadások a -STABLE - fejlesztõi ágból készülnek - hozzávetõlegesen 4 hónaponként. + A Stabil kiadások 4 havonta a + -STABLE fejlesztési ágból + készülnek. - A fõbb új verziók (3.0, 4.0, 5.0, ...) - sokkal hosszabb idõközönként jelennek meg, - amikor az adott kiadás fejlesztési céljai - már mind elkészültek. - - - 3.0 - 1998. október - 4.0 - 2000. március - 5.0 - 2003. január - - - + A nagyobb verziók (6.0, 7.0 stb.) 18 havonta + jelennek meg. Az átmeneti idõszakban az elõzõ fõ verziói alverziói továbbra is megjelennek, ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/freebsd-users.xml#3 (text+ko) ==== @@ -3,7 +3,7 @@ @@ -21,14 +21,15 @@ Az Apple a Linux-szal szemben a FreeBSD-t választotta a Mac OS X rendszer Unix magjának. - A Netcraft szerint közel 2,5 millió aktív - oldal használ FreeBSD-t hálózati - kiszolgálóként -- körülbelül egy - millióan többen, mint Red Hat Linuxot - - . + A Netcraft szerint közel 2,5 millió + aktív oldal használ FreeBSD-t hálózati + kiszolgálóként -- körülbelül + egy millióan többen, mint Red Hat + Linuxot + + . Csak az elõzõ évben körülbelül egy millió új FreeBSD kiszolgálót ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/common/what-is-freebsd.xml#3 (text+ko) ==== @@ -3,7 +3,7 @@ @@ -26,7 +26,7 @@ felhasználást a nyílt- és zárt forrású termékekben. - i386, ia64, amd64, sparc64, alpha + amd64, i386, ia64, pc98, powerpc, sparc64 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/slides/freebsd-general/slides.xml#3 (text+ko) ==== @@ -5,7 +5,7 @@ + ]> - + @@ -37,19 +39,26 @@ - KövesdánGáborgabor@FreeBSD.org - 2004. szeptember 9., csütörtök - 2004 FreeBSD Mall, Inc. + + Kövesdán + Gábor + gabor@FreeBSD.org + 2008. január 3., csütörtök + + 2004-2008 + FreeBSD Mall, Inc. + -Kivonat + + Kivonat + Mi az a FreeBSD? Ki használ FreeBSD-t? A FreeBSD fejlesztési model FreeBSD kiadások / elágazások terminológiája Újabb FreeBSD kiadások - FreeBSD 5.3 @@ -58,6 +67,7 @@ + &slides.what-is-freebsd; @@ -65,26 +75,12 @@ &slides.freebsd-dev-model; +&slides.freebsd-organization; + &slides.freebsd-release-process; - - &slides.freebsd-recent-releases; - - -&slides.freebsd-organization; - - - -&slides.freebsd-5.3; - -Bõvebb információ - - - FreeBSD Kézikönyv - FreeBSD Mall, Inc. - - +&slides.freebsd-more-information; From owner-p4-projects@FreeBSD.ORG Fri Jun 27 23:58:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84D24106568C; Fri, 27 Jun 2008 23:58:40 +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 453F6106567B for ; Fri, 27 Jun 2008 23:58:40 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3530F8FC0C for ; Fri, 27 Jun 2008 23:58:40 +0000 (UTC) (envelope-from andrew@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 m5RNwewl015686 for ; Fri, 27 Jun 2008 23:58:40 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5RNwefr015684 for perforce@freebsd.org; Fri, 27 Jun 2008 23:58:40 GMT (envelope-from andrew@freebsd.org) Date: Fri, 27 Jun 2008 23:58:40 GMT Message-Id: <200806272358.m5RNwefr015684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144218 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: Fri, 27 Jun 2008 23:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=144218 Change 144218 by andrew@andrew_bender on 2008/06/27 23:58:03 Add support for allocating sub-irq's rather than the requested irq. This allows us to allocate the UART sub-irq's by asking for the main uart irq Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#13 (text+ko) ==== @@ -119,14 +119,16 @@ struct resource *ires, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { - int error; + int error, irq; error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); if (error != 0) return (error); - arm_unmask_irq(rman_get_start(ires)); + for (irq = rman_get_start(ires); irq <= rman_get_end(ires); irq++) { + arm_unmask_irq(irq); + } return (0); } @@ -154,6 +156,35 @@ count = ulmax(count, rle->count); end = ulmax(rle->end, start + count - 1); } + /* + * When allocating an irq with children irq's really + * allocate the children as it is those we are interested + * in receiving, not the parent. + */ + if (type == SYS_RES_IRQ && start == end) { + switch (start) { + case S3C24X0_INT_ADCTC: + start = S3C2410_INT_TC; + end = S3C2410_INT_ADC; + break; + case S3C2410_INT_UART0: + start = S3C2410_INT_RXD0; + end = S3C2410_INT_ERR0; + break; + case S3C2410_INT_UART1: + start = S3C2410_INT_RXD1; + end = S3C2410_INT_ERR1; + break; + case S3C2410_INT_UART2: + start = S3C2410_INT_RXD2; + end = S3C2410_INT_ERR2; + break; + default: + break; + } + if (start != end) + count = end - start + 1; + } } switch (type) { @@ -264,7 +295,7 @@ /* Add the uart and set it's irq */ child = s3c2410_add_child(dev, 0, "uart", 0); - bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_TXD0, 1); + bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_UART0, 1); bus_generic_probe(dev); bus_generic_attach(dev); @@ -349,8 +380,8 @@ irq = 0x7ff; irq &= bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_SUBSRCPND); - irq &= bus_space_read_4(&s3c2xx0_bs_tag, - s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); + irq &= ~(bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK)); if (irq == 0) return (-1); From owner-p4-projects@FreeBSD.ORG Sat Jun 28 00:05:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3B391065679; Sat, 28 Jun 2008 00:05:47 +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 961A81065677 for ; Sat, 28 Jun 2008 00:05:47 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8596D8FC13 for ; Sat, 28 Jun 2008 00:05:47 +0000 (UTC) (envelope-from andrew@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 m5S05lA1017475 for ; Sat, 28 Jun 2008 00:05:47 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5S05ld6017473 for perforce@freebsd.org; Sat, 28 Jun 2008 00:05:47 GMT (envelope-from andrew@freebsd.org) Date: Sat, 28 Jun 2008 00:05:47 GMT Message-Id: <200806280005.m5S05ld6017473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144219 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, 28 Jun 2008 00:05:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=144219 Change 144219 by andrew@andrew_bender on 2008/06/28 00:04:59 Add support to receive data through the uart driver Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#6 (text+ko) ==== @@ -109,7 +109,7 @@ brd = sscomspeed(baudrate, bas->rclk); uart_setreg(bas, SSCOM_UBRDIV, brd); /* Enable UART. */ - uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT|UCON_RXMODE_INT); + uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT|UCON_RXMODE_INT|UCON_TOINT); uart_setreg(bas, SSCOM_UMCON, UMCON_RTS); } @@ -207,6 +207,7 @@ s3c2410_bus_receive(struct uart_softc *sc) { + uart_rx_put(sc, uart_getreg(&sc->sc_bas, SSCOM_URXH)); return (0); } static int @@ -227,6 +228,10 @@ if ((sr & UFSTAT_TXCOUNT) == 0 && sc->sc_txbusy) { ipend |= SER_INT_TXIDLE; } + if ((sr & UFSTAT_RXCOUNT) != 0) { + ipend |= SER_INT_RXREADY; + } + return (ipend); } static int From owner-p4-projects@FreeBSD.ORG Sat Jun 28 20:37:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D80F1065673; Sat, 28 Jun 2008 20:37:50 +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 D38E2106566C for ; Sat, 28 Jun 2008 20:37:49 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFE9A8FC15 for ; Sat, 28 Jun 2008 20:37:49 +0000 (UTC) (envelope-from gk@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 m5SKbnlY001232 for ; Sat, 28 Jun 2008 20:37:49 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKbnCX001230 for perforce@freebsd.org; Sat, 28 Jun 2008 20:37:49 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 28 Jun 2008 20:37:49 GMT Message-Id: <200806282037.m5SKbnCX001230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 144238 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, 28 Jun 2008 20:37:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144238 Change 144238 by gk@gk_h1 on 2008/06/28 20:37:47 Include opt_ipfw.h before checking IPFIREWALL define. Without this fix previous revision was nop. Remove stale XXX comment. Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#7 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#7 (text+ko) ==== @@ -79,6 +79,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipfw.h" #include "opt_carp.h" #include @@ -2951,7 +2952,6 @@ if (((bifp ? bifp->if_flags : 0) | (ifp ? ifp->if_flags : 0)) & IFF_L2TAG) { mtag_ether_header = m_tag_locate(*mp, MTAG_ETHER, MTAG_ETHER_HEADER, NULL); - /* XXX ??? can packet be tagged by another interface */ if (mtag_ether_header == NULL) { mtag_ether_header = m_tag_alloc(MTAG_ETHER, MTAG_ETHER_HEADER, ETHER_HDR_LEN, M_NOWAIT); From owner-p4-projects@FreeBSD.ORG Sat Jun 28 20:42:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE51106567B; Sat, 28 Jun 2008 20:42:55 +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 519C3106568A for ; Sat, 28 Jun 2008 20:42:55 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2B28FC18 for ; Sat, 28 Jun 2008 20:42:55 +0000 (UTC) (envelope-from gk@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 m5SKgsGr001620 for ; Sat, 28 Jun 2008 20:42:54 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKgs1b001618 for perforce@freebsd.org; Sat, 28 Jun 2008 20:42:54 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 28 Jun 2008 20:42:54 GMT Message-Id: <200806282042.m5SKgs1b001618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 144239 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, 28 Jun 2008 20:42:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=144239 Change 144239 by gk@gk_h1 on 2008/06/28 20:42:31 Fix creation of dynamic rules with ether address specified in table Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#10 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#10 (text+ko) ==== @@ -1904,7 +1904,7 @@ static int lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, - struct ether_addr *ea, uint32_t *val) + struct ether_addr *ea, ipfw_ether_addr *val_ea, uint32_t *val) { struct radix_node_head *rnh; struct table_entry *ent; @@ -1918,7 +1918,9 @@ ent = (struct table_entry *)(rnh->rnh_lookup(&sa, NULL, rnh)); if (ent != NULL) { if (ea && !ether_addr_allow(&ent->ether_addr, ea)) - return (0); + return (0); + /* use address to create dynamic rule */ + *val_ea = ent->ether_addr; *val = ent->value; return (1); } @@ -2709,12 +2711,15 @@ uint32_t v; if (args->eh) { - ea = (struct ether_addr*)((cmd->opcode == O_IP_DST_LOOKUP) ? - args->eh->ether_dhost : - args->eh->ether_shost); + ea = (struct ether_addr*)((cmd->opcode == O_IP_DST_LOOKUP) ? + args->eh->ether_dhost : + args->eh->ether_shost); } match = lookup_table(chain, cmd->arg1, a, - ea, &v); + ea, (cmd->opcode == O_IP_DST_LOOKUP ? + &args->f_id.dst_ether : + &args->f_id.src_ether), + &v); if (!match) break; if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) From owner-p4-projects@FreeBSD.ORG Sat Jun 28 20:48:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 923861065671; Sat, 28 Jun 2008 20:48:00 +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 540E11065670 for ; Sat, 28 Jun 2008 20:48:00 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 408D38FC12 for ; Sat, 28 Jun 2008 20:48:00 +0000 (UTC) (envelope-from gk@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 m5SKm0td011278 for ; Sat, 28 Jun 2008 20:48:00 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKm0Z7011276 for perforce@freebsd.org; Sat, 28 Jun 2008 20:48:00 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 28 Jun 2008 20:48:00 GMT Message-Id: <200806282048.m5SKm0Z7011276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 144240 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, 28 Jun 2008 20:48:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=144240 Change 144240 by gk@gk_h1 on 2008/06/28 20:47:23 Check for tag in ipfw_check_out also. There is no longer need to store ethernet header in stack before passing it into ipfw_chk. And it's better to be avoided anyway. Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#7 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#7 (text+ko) ==== @@ -96,7 +96,6 @@ struct ng_ipfw_tag *ng_tag; struct m_tag *tag_ether_hdr; struct m_tag *dn_tag; - struct ether_header eh; int ipfw = 0; int divert; int tee; @@ -119,10 +118,8 @@ tag_ether_hdr = m_tag_locate(*m0, MTAG_ETHER, MTAG_ETHER_HEADER, NULL); - if (tag_ether_hdr != NULL) { - eh = *(struct ether_header *)(tag_ether_hdr + 1); - args.eh = &eh; - } + if (tag_ether_hdr != NULL) + args.eh = (struct ether_header *)(tag_ether_hdr + 1); again: dn_tag = m_tag_find(*m0, PACKET_TAG_DUMMYNET, NULL); @@ -225,6 +222,7 @@ { struct ip_fw_args args; struct ng_ipfw_tag *ng_tag; + struct m_tag *tag_ether_hdr; struct m_tag *dn_tag; int ipfw = 0; int divert; @@ -246,6 +244,11 @@ m_tag_delete(*m0, (struct m_tag *)ng_tag); } + tag_ether_hdr = m_tag_locate(*m0, MTAG_ETHER, MTAG_ETHER_HEADER, + NULL); + if (tag_ether_hdr != NULL) + args.eh = (struct ether_header *)(tag_ether_hdr + 1); + again: dn_tag = m_tag_find(*m0, PACKET_TAG_DUMMYNET, NULL); if (dn_tag != NULL) { From owner-p4-projects@FreeBSD.ORG Sat Jun 28 20:52:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 125731065682; Sat, 28 Jun 2008 20:52:05 +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 C8274106567E for ; Sat, 28 Jun 2008 20:52:04 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B46668FC16 for ; Sat, 28 Jun 2008 20:52:04 +0000 (UTC) (envelope-from gk@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 m5SKq4q2011611 for ; Sat, 28 Jun 2008 20:52:04 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SKq484011609 for perforce@freebsd.org; Sat, 28 Jun 2008 20:52:04 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 28 Jun 2008 20:52:04 GMT Message-Id: <200806282052.m5SKq484011609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 144241 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, 28 Jun 2008 20:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=144241 Change 144241 by gk@gk_h1 on 2008/06/28 20:51:50 s/IP_FW_EA_*/IPFW_EA_*/ (appropriate struct has been renamed for a while already) Rename IPFW_EA_INIT into much more meaningful IPFW_EA_FLOW Fix dynamic rule creation. Right after creation of dynamic rule install_state calls lookup_dyn_rule_locked but ether_addr_allow_dyn expects ifpw_flow_id to contain real ethernet addresses but not the addresses created by the rule. Note. ifpw_flow_id is used to store src-ether and dst-ether to create appropriate dynamic rule. Additional fields are not added not to enlarge the struct by another 16 bytes which are going to be used just in a few code paths. Affected files ... .. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#7 edit .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#9 edit .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#11 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#7 (text+ko) ==== @@ -1141,9 +1141,9 @@ static void print_ether(ipfw_ether_addr *addr) { - if ((addr->flags & IP_FW_EA_CHECK) == 0) { + if ((addr->flags & IPFW_EA_CHECK) == 0) { printf(" any"); - } else if (addr->flags & IP_FW_EA_MULTICAST) { + } else if (addr->flags & IPFW_EA_MULTICAST) { printf(" multicast"); } else { u_char *ea = addr->octet; @@ -4467,7 +4467,7 @@ return; } if (strcmp(p, "multicast") == 0) { - addr->flags = IP_FW_EA_CHECK | IP_FW_EA_MULTICAST; + addr->flags = IPFW_EA_CHECK | IPFW_EA_MULTICAST; return; } @@ -4476,7 +4476,7 @@ errx(EX_DATAERR, "Incorrect ethernet (MAC) address"); memcpy(addr->octet, ether, ETHER_ADDR_LEN); - addr->flags = IP_FW_EA_CHECK; + addr->flags = IPFW_EA_CHECK; } /* @@ -5976,7 +5976,7 @@ } else { snprintf(tval_buf, sizeof(tval_buf), "%u", tval); } - if (tbl->ent[a].ether_addr.flags & IP_FW_EA_CHECK) { + if (tbl->ent[a].ether_addr.flags & IPFW_EA_CHECK) { uint8_t *x = (uint8_t *)&tbl->ent[a].ether_addr; snprintf(tether_buf, sizeof(tether_buf), "ether %02x:%02x:%02x:%02x:%02x:%02x ", x[0], x[1], x[2], x[3], x[4], x[5]); ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#9 (text+ko) ==== @@ -264,9 +264,9 @@ * This is used for ethernet (MAC) addr-mask pairs. */ -#define IP_FW_EA_INIT 0x01 -#define IP_FW_EA_CHECK 0x02 -#define IP_FW_EA_MULTICAST 0x04 +#define IPFW_EA_CHECK 0x01 +#define IPFW_EA_MULTICAST 0x02 +#define IPFW_EA_FLOW 0x04 typedef struct _ipfw_ether_addr { u_char octet[6]; ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#11 (text+ko) ==== @@ -157,9 +157,9 @@ .octet = { 0xff, 0xff, 0xff, 0xff, 0xff,0xff }, .flags = 0 }; - if ((want->flags & IP_FW_EA_CHECK) == 0) + if ((want->flags & IPFW_EA_CHECK) == 0) return (1); - if (want->flags & IP_FW_EA_MULTICAST) { + if (want->flags & IPFW_EA_MULTICAST) { return (ETHER_IS_MULTICAST(ea->octet)); } @@ -170,8 +170,15 @@ static __inline int ether_addr_allow_dyn(ipfw_ether_addr *want, ipfw_ether_addr *a) { - if ((a->flags & IP_FW_EA_INIT) == 0) + if (a->flags & IPFW_EA_CHECK) { + /* dynamic rule is being added. check is performed already */ + return (1); + } + if ((a->flags & IPFW_EA_FLOW) == 0) { + if (want->flags & IPFW_EA_CHECK) + printf("ipfw: no tag: %6D (want %6D)\n", a->octet, ":", want->octet, ":"); return (1); + } return (ether_addr_allow(want, (struct ether_addr *)a->octet)); } @@ -2275,10 +2282,10 @@ etype = ntohs(args->eh->ether_type); memcpy(args->f_id.src_ether.octet, args->eh->ether_shost, ETHER_ADDR_LEN); - args->f_id.src_ether.flags = IP_FW_EA_INIT; + args->f_id.src_ether.flags = IPFW_EA_FLOW; memcpy(args->f_id.dst_ether.octet, args->eh->ether_dhost, ETHER_ADDR_LEN); - args->f_id.dst_ether.flags = IP_FW_EA_INIT; + args->f_id.dst_ether.flags = IPFW_EA_FLOW; } else { args->f_id.src_ether.flags = 0; args->f_id.dst_ether.flags = 0; From owner-p4-projects@FreeBSD.ORG Sat Jun 28 21:52:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1274106567D; Sat, 28 Jun 2008 21:52:05 +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 4FF88106567F for ; Sat, 28 Jun 2008 21:52:05 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D6D88FC18 for ; Sat, 28 Jun 2008 21:52:05 +0000 (UTC) (envelope-from andrew@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 m5SLq4fs017573 for ; Sat, 28 Jun 2008 21:52:04 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SLq439017571 for perforce@freebsd.org; Sat, 28 Jun 2008 21:52:04 GMT (envelope-from andrew@freebsd.org) Date: Sat, 28 Jun 2008 21:52:04 GMT Message-Id: <200806282152.m5SLq439017571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144242 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, 28 Jun 2008 21:52:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=144242 Change 144242 by andrew@andrew_bender on 2008/06/28 21:51:56 Add memory and ioport resource allocation to s3c2410_alloc_resource and set the uart ioport Implement bus_release_resource Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#14 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#14 (text+ko) ==== @@ -66,6 +66,8 @@ u_long, u_long, u_long, u_int); static int s3c2410_activate_resource(device_t, device_t, int, int, struct resource *); +static int s3c2410_release_resource(device_t, device_t, int, int, + struct resource *); static struct resource_list *s3c2410_get_resource_list(device_t, device_t); static device_method_t s3c2410_methods[] = { @@ -75,6 +77,7 @@ DEVMETHOD(bus_setup_intr, s3c2410_setup_intr), DEVMETHOD(bus_alloc_resource, s3c2410_alloc_resource), DEVMETHOD(bus_activate_resource, s3c2410_activate_resource), + DEVMETHOD(bus_release_resource, s3c2410_release_resource), DEVMETHOD(bus_get_resource_list,s3c2410_get_resource_list), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), @@ -193,6 +196,15 @@ &s3c2xx0_softc->s3c2xx0_irq_rman, start, end, count, flags, child); break; + + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + res = rman_reserve_resource( + &s3c2xx0_softc->s3c2xx0_mem_rman, + start, end, count, flags, child); + rman_set_bustag(res, &s3c2xx0_bs_tag); + rman_set_bushandle(res, start); + break; } if (res != NULL) { @@ -211,6 +223,27 @@ return (0); } +static int +s3c2410_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + struct s3c2xx0_ivar *ivar = device_get_ivars(child); + struct resource_list *rl = &ivar->resources; + struct resource_list_entry *rle; + + if (rl == NULL) + return (EINVAL); + + rle = resource_list_find(rl, type, rid); + if (rle == NULL) + return (EINVAL); + + rman_release_resource(r); + rle->res = NULL; + + return 0; +} + static struct resource_list * s3c2410_get_resource_list(device_t dev, device_t child) { @@ -286,16 +319,26 @@ */ s3c2xx0_softc->s3c2xx0_irq_rman.rm_type = RMAN_ARRAY; s3c2xx0_softc->s3c2xx0_irq_rman.rm_descr = "S3C2410 IRQs"; + s3c2xx0_softc->s3c2xx0_mem_rman.rm_type = RMAN_ARRAY; + s3c2xx0_softc->s3c2xx0_mem_rman.rm_descr = "S3C2410 Memory"; if (rman_init(&s3c2xx0_softc->s3c2xx0_irq_rman) != 0 || rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, S3C2410_SUBIRQ_MAX - 1) != 0) panic("s3c2410_attach: failed to set up IRQ rman"); + /* Manage the registor memoty space */ + if (rman_init(&s3c2xx0_softc->s3c2xx0_mem_rman) != 0 || + rman_manage_region(&s3c2xx0_softc->s3c2xx0_mem_rman, S3C2410_REG_BASE, + S3C2410_REG_BASE + S3C2410_REG_SIZE) != 0) + panic("s3c2410_attach: failed to set up register rman"); + s3c2410_add_child(dev, 0, "nand", 0); s3c2410_add_child(dev, 0, "timer", 0); - /* Add the uart and set it's irq */ + /* Add the uart and set it's irq and registers */ child = s3c2410_add_child(dev, 0, "uart", 0); bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_UART0, 1); + bus_set_resource(child, SYS_RES_IOPORT, 0, S3C2410_UART0_BASE, + S3C2410_UART_BASE(1) - S3C2410_UART0_BASE); bus_generic_probe(dev); bus_generic_attach(dev); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#3 (text+ko) ==== @@ -80,6 +80,9 @@ #define S3C2410_SDI_BASE 0x5a000000 /* SD Interface */ #define S3C2410_SDI_SIZE 0x44 +#define S3C2410_REG_BASE 0x48000000 +#define S3C2410_REG_SIZE 0x13000000 + /* interrupt control (additional defs for 2410) */ #define ICU_LEN (32+11) ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#6 (text+ko) ==== @@ -57,6 +57,7 @@ int sc_pclk; /* peripheral clock */ struct rman s3c2xx0_irq_rman; + struct rman s3c2xx0_mem_rman; }; struct s3c2xx0_ivar { From owner-p4-projects@FreeBSD.ORG Sat Jun 28 22:03:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE51D106567C; Sat, 28 Jun 2008 22:03:16 +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 882431065679 for ; Sat, 28 Jun 2008 22:03:16 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D1E18FC12 for ; Sat, 28 Jun 2008 22:03:16 +0000 (UTC) (envelope-from andrew@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 m5SM3G5X019513 for ; Sat, 28 Jun 2008 22:03:16 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5SM3Gj7019511 for perforce@freebsd.org; Sat, 28 Jun 2008 22:03:16 GMT (envelope-from andrew@freebsd.org) Date: Sat, 28 Jun 2008 22:03:16 GMT Message-Id: <200806282203.m5SM3Gj7019511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 144243 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, 28 Jun 2008 22:03:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144243 Change 144243 by andrew@andrew_bender on 2008/06/28 22:02:15 Boot to single user mode for now Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#6 (text+ko) ==== @@ -208,6 +208,8 @@ i = 0; + boothowto = RB_SINGLE; + set_cpufuncs(); lastaddr = fake_preload_metadata(); @@ -389,6 +391,7 @@ init_param1(); init_param2(physmem); kdb_init(); + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); }