From owner-p4-projects@FreeBSD.ORG Sun May 30 01:57:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 449291065678; Sun, 30 May 2010 01:57: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 090981065676 for ; Sun, 30 May 2010 01:57:38 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA8118FC12 for ; Sun, 30 May 2010 01:57:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4U1vbEs051837 for ; Sun, 30 May 2010 01:57:37 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4U1vbnm051835 for perforce@freebsd.org; Sun, 30 May 2010 01:57:37 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Sun, 30 May 2010 01:57:37 GMT Message-Id: <201005300157.o4U1vbnm051835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 01:57:38 -0000 http://p4web.freebsd.org/@@178963?ac=10 Change 178963 by jlaffaye@gsoc on 2010/05/30 01:57:14 Plans and thoughts for complete packages support. Affected files ... .. //depot/projects/soc2010/pkg_complete/Milestones#2 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/Milestones#2 (text+ko) ==== @@ -1,0 +1,26 @@ +pkg_create: + The options of pkg_create are useless for creating a complete package. +Should we add support for complete package in pkg_create or into a new tool? +The tool for creating a complete package would take for first argument the meta +(traditionnal) package. Then the tool read the plist to look for @pkgdep and +repeat the operation for each dependency. +After ordering the dependencies, the tool tar'up all the traditionnal packages +(without compression as the packages are already bz'ed). +This step would require factorisation of the code in pkg_info into a libpkg +function, with libarchive support for efficiency. + +ports tree: + Add a "complete-package" target which depends on package-recursive and +call the tool of step 1. + +pkg_add: + Add simple routine to test if the package is a traditionnal or complete package. +If the package is complete, loop over the traditionnal packages in it, +call the function to install a traditionnal package (this function may work +with streams). If the package is tradionnal, pass directly the stream to the +function. +As a side effect, remove playpen and embrace libarchive. + +pkg_info: + Show if the package is complete (list of contained packages) or the +info of the traditionnal package. From owner-p4-projects@FreeBSD.ORG Sun May 30 03:55:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16D501065672; Sun, 30 May 2010 03:55: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 B77AB106566C for ; Sun, 30 May 2010 03:55:17 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 694C98FC08 for ; Sun, 30 May 2010 03:55:16 +0000 (UTC) Received: by iwn5 with SMTP id 5so320799iwn.13 for ; Sat, 29 May 2010 20:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=svLRpTXFujfA/Tes3PndCnMAoALWbx2ONntko6pH0+Q=; b=K5YijNZHUhJ8ibk0z5+82zL9IKRvDY60qPU2srDjMwtle0yiemeKGeABwtalbZctjp BqvXFSlgP4QMmCicwi6/2TeU++DBgCTkrxxaV+gg3wvYTDJhiC3PKdFx8vbMn+iSexgH FWxgfMXY9kLrKR5Bu+a1K6L30v309AoeayjA8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=u2UTTEujA9sxYhH/WiZE/GmBLfGpeeqQmymBX6E6fY44S4FmvfyHbmx/qS9SURtXFt B20wQE+7XqoFk4r9wqQ98hr0B5mDvvGKZ+8J+CQTG8asSAoJ5EG/R63CgrnMsMhXnpHx G3ufFLGHpkBuyZ2u7rtXo3Sm6LzvSVHpsnqLM= MIME-Version: 1.0 Received: by 10.231.157.4 with SMTP id z4mr3361564ibw.32.1275191716085; Sat, 29 May 2010 20:55:16 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.70.16 with HTTP; Sat, 29 May 2010 20:55:16 -0700 (PDT) In-Reply-To: <201005300157.o4U1vbnm051835@repoman.freebsd.org> References: <201005300157.o4U1vbnm051835@repoman.freebsd.org> Date: Sat, 29 May 2010 20:55:16 -0700 X-Google-Sender-Auth: 2qmxqx7CE7EkbxFcaszxhoEjno0 Message-ID: From: Garrett Cooper To: Julien Laffaye Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 178963 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, 30 May 2010 03:55:18 -0000 On Sat, May 29, 2010 at 6:57 PM, Julien Laffaye wrot= e: > http://p4web.freebsd.org/@@178963?ac=3D10 > > Change 178963 by jlaffaye@gsoc on 2010/05/30 01:57:14 > > =A0 =A0 =A0 =A0Plans and thoughts for complete packages support. > > Affected files ... > > .. //depot/projects/soc2010/pkg_complete/Milestones#2 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/Milestones#2 (text+ko)= =3D=3D=3D=3D > > @@ -1,0 +1,26 @@ > +pkg_create: > + =A0 =A0 =A0 The options of pkg_create are useless for creating a comple= te package. > +Should we add support for complete package in pkg_create or into a new t= ool? > +The tool for creating a complete package would take for first argument t= he meta > +(traditionnal) package. Then the tool read the plist to look for @pkgdep= and > +repeat the operation for each dependency. > +After ordering the dependencies, the tool tar'up all the traditionnal pa= ckages > +(without compression as the packages are already bz'ed). > +This step would require factorisation of the code in pkg_info into a lib= pkg > +function, with libarchive support for efficiency. > + > +ports tree: > + =A0 =A0 =A0 Add a "complete-package" target which depends on package-re= cursive and > +call the tool of step 1. Check with portmgr (at least flz), but it would probably be better to stick with the package- prefixed target status quo. FWIW though this will require rewriting bits of package-noinstall, or similar targets, as ports currently doesn't use pkg_install except to register the install of all of the bits from ${WRKDIR} (/usr/ports/.../work if not specified otherwise) into ${PREFIX}. > +pkg_add: > + =A0 =A0 =A0 Add simple routine to test if the package is a traditionnal= or complete package. > +If the package is complete, loop over the traditionnal packages in it, > +call the function to install a traditionnal package (this function may w= ork > +with streams). If the package is tradionnal, pass directly the stream to= the > +function. > + > +As a side effect, remove playpen and embrace libarchive. Yes... this will be a good thing, as several people have agreed, but requires a ton of tests (including negative ones), and there's some forethought that needs to be done and potential rewriting that's required as whether or not the installed bits exist in the right spots, and the permissions are sane will need to be properly evaluated beforehand. You can't completely remove libarchive unless you properly use the mktemp(3) family of functions though because there are some files (like +CONTENTS) which need to be generated on the fly. > +pkg_info: > + =A0 =A0 =A0 Show if the package is complete (list of contained packages= ) or the > +info of the traditionnal package. s/traditionnal/traditional/ Thanks! -Garrett From owner-p4-projects@FreeBSD.ORG Sun May 30 04:00:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17515106567B; Sun, 30 May 2010 04:00: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 CF390106566C; Sun, 30 May 2010 04:00:05 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 5D3C78FC19; Sun, 30 May 2010 04:00:05 +0000 (UTC) Received: by gyh20 with SMTP id 20so2579459gyh.13 for ; Sat, 29 May 2010 21:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=b1ioW60iaC2pariK8Z/1kpWqit/zz3AzpidWNV+ZO8U=; b=X1gXTp3N6rpNGzIE5THQ6S8+9pa5ci0RyBbRUuwf6WqucCZqGpY3O4jKRZqpcTd9X1 Vh0F2fZ7/Sr8CRqLGc77Ek5gtAj0EH9xY4+4zvcJSWQ3qqBJiCR7Vl4NSiKdE/tXEjdl md8YmO9zgjlx7pZ1t3kqMUg9iqHdnIm/PKDhM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=jwfX6CPTAonWfd3Ut+xS1zT4hDl3xlypSH1vbeWUodJr0po8iww3OjWLAshjjf+kkH /eNPHN7tjKqODsf9ZyIKwZP6rG07H0GHtIT8UeyGfg603/p9Onetk6+cyKyjQpWnw0GJ ze+Rfbl857EQFiwfqCfVkvu6auARv/tmzqLoY= MIME-Version: 1.0 Received: by 10.231.146.140 with SMTP id h12mr3332592ibv.58.1275192004020; Sat, 29 May 2010 21:00:04 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.70.16 with HTTP; Sat, 29 May 2010 21:00:03 -0700 (PDT) In-Reply-To: References: <201005300157.o4U1vbnm051835@repoman.freebsd.org> Date: Sat, 29 May 2010 21:00:03 -0700 X-Google-Sender-Auth: hy6zsyGE6-0oV_VjEPaBtIsmaFQ Message-ID: From: Garrett Cooper To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews , Julien Laffaye Subject: Re: PERFORCE change 178963 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, 30 May 2010 04:00:06 -0000 On Sat, May 29, 2010 at 8:55 PM, Garrett Cooper wrote= : > On Sat, May 29, 2010 at 6:57 PM, Julien Laffaye wr= ote: >> http://p4web.freebsd.org/@@178963?ac=3D10 >> >> Change 178963 by jlaffaye@gsoc on 2010/05/30 01:57:14 >> >> =A0 =A0 =A0 =A0Plans and thoughts for complete packages support. >> >> Affected files ... >> >> .. //depot/projects/soc2010/pkg_complete/Milestones#2 edit >> >> Differences ... >> >> =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/Milestones#2 (text+ko= ) =3D=3D=3D=3D >> >> @@ -1,0 +1,26 @@ >> +pkg_create: >> + =A0 =A0 =A0 The options of pkg_create are useless for creating a compl= ete package. >> +Should we add support for complete package in pkg_create or into a new = tool? >> +The tool for creating a complete package would take for first argument = the meta >> +(traditionnal) package. Then the tool read the plist to look for @pkgde= p and >> +repeat the operation for each dependency. >> +After ordering the dependencies, the tool tar'up all the traditionnal p= ackages >> +(without compression as the packages are already bz'ed). >> +This step would require factorisation of the code in pkg_info into a li= bpkg >> +function, with libarchive support for efficiency. Sorry... some more thoughts. >From a design perspective, what you're referring to (by some) is a package bundle where you have a means of specifying the metadata in the bundle of packages, and you have the payloads themselves. Some things to think about: a. What happens if one of the packages fails to install out of the bundles, but some packages have already been installed? b. What happens if one of the packages is already installed on the system: i. with the same version? ii. with a different version? >> +ports tree: >> + =A0 =A0 =A0 Add a "complete-package" target which depends on package-r= ecursive and >> +call the tool of step 1. > > Check with portmgr (at least flz), but it would probably be better to > stick with the package- prefixed target status quo. > > FWIW though this will require rewriting bits of package-noinstall, or > similar targets, as ports currently doesn't use pkg_install except to > register the install of all of the bits from ${WRKDIR} > (/usr/ports/.../work if not specified otherwise) into ${PREFIX}. > >> +pkg_add: >> + =A0 =A0 =A0 Add simple routine to test if the package is a traditionna= l or complete package. >> +If the package is complete, loop over the traditionnal packages in it, >> +call the function to install a traditionnal package (this function may = work >> +with streams). If the package is tradionnal, pass directly the stream t= o the >> +function. >> + >> +As a side effect, remove playpen and embrace libarchive. > > Yes... this will be a good thing, as several people have agreed, but > requires a ton of tests (including negative ones), and there's some > forethought that needs to be done and potential rewriting that's > required as whether or not the installed bits exist in the right > spots, and the permissions are sane will need to be properly evaluated > beforehand. > > You can't completely remove libarchive unless you properly use the > mktemp(3) family of functions though because there are some files > (like +CONTENTS) which need to be generated on the fly. > >> +pkg_info: >> + =A0 =A0 =A0 Show if the package is complete (list of contained package= s) or the >> +info of the traditionnal package. > > s/traditionnal/traditional/ Thanks! -Garrett From owner-p4-projects@FreeBSD.ORG Sun May 30 05:00:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4684B1065678; Sun, 30 May 2010 05:00:59 +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 0B1451065676 for ; Sun, 30 May 2010 05:00:59 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D35E28FC14 for ; Sun, 30 May 2010 05:00:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4U50w6U079185 for ; Sun, 30 May 2010 05:00:58 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4U50wEs079183 for perforce@freebsd.org; Sun, 30 May 2010 05:00:58 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Sun, 30 May 2010 05:00:58 GMT Message-Id: <201005300500.o4U50wEs079183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 05:00:59 -0000 http://p4web.freebsd.org/@@178966?ac=10 Change 178966 by jlaffaye@gsoc on 2010/05/30 05:00:52 Change complete-package -> package-complete. Some spelling fixes. Affected files ... .. //depot/projects/soc2010/pkg_complete/Milestones#3 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/Milestones#3 (text+ko) ==== @@ -2,25 +2,25 @@ The options of pkg_create are useless for creating a complete package. Should we add support for complete package in pkg_create or into a new tool? The tool for creating a complete package would take for first argument the meta -(traditionnal) package. Then the tool read the plist to look for @pkgdep and +(traditional) package. Then the tool read the plist to look for @pkgdep and repeat the operation for each dependency. -After ordering the dependencies, the tool tar'up all the traditionnal packages +After ordering the dependencies, the tool tar'up all the traditional packages (without compression as the packages are already bz'ed). This step would require factorisation of the code in pkg_info into a libpkg function, with libarchive support for efficiency. ports tree: - Add a "complete-package" target which depends on package-recursive and + Add a "package-complete" target which depends on package-recursive and call the tool of step 1. pkg_add: - Add simple routine to test if the package is a traditionnal or complete package. -If the package is complete, loop over the traditionnal packages in it, -call the function to install a traditionnal package (this function may work -with streams). If the package is tradionnal, pass directly the stream to the + Add simple routine to test if the package is a traditional or complete package. +If the package is complete, loop over the traditional packages in it, +call the function to install a traditional package (this function may work +with streams). If the package is tradional, pass directly the stream to the function. As a side effect, remove playpen and embrace libarchive. pkg_info: Show if the package is complete (list of contained packages) or the -info of the traditionnal package. +info of the traditional package. From owner-p4-projects@FreeBSD.ORG Sun May 30 08:35:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B14451065678; Sun, 30 May 2010 08:35: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 731F41065676 for ; Sun, 30 May 2010 08:35:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 603DA8FC17 for ; Sun, 30 May 2010 08:35:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4U8ZtDh098889 for ; Sun, 30 May 2010 08:35:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4U8ZtZp098887 for perforce@freebsd.org; Sun, 30 May 2010 08:35:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 May 2010 08:35:55 GMT Message-Id: <201005300835.o4U8ZtZp098887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 08:35:55 -0000 http://p4web.freebsd.org/@@178968?ac=10 Change 178968 by hselasky@hselasky_laptop001 on 2010/05/30 08:35:47 USB quirks: - Add new mass storage quirk. PR: usb/147196 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#126 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#32 (text+ko) ==== @@ -450,6 +450,7 @@ UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ASUS, GMSC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(UNKNOWN4, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(UNKNOWN5, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), }; #undef USB_QUIRK_VP #undef USB_QUIRK ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#126 (text+ko) ==== @@ -400,6 +400,7 @@ vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN 0x07ef STSN vendor CENTURY 0x07f7 Century Corp +vendor UNKNOWN5 0x07ff Unknown vendor ZOOM 0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -3044,6 +3045,9 @@ /* Unknown vendors */ product UNKNOWN4 USBMEMSTICK 0x6025 Flash Disk CBM +/* Unknown vendors */ +product UNKNOWN5 USB2IDEBRIDGE 0x00ff USB 2.0 ATA/SATA Bridge + /* U.S. Robotics products */ product USR USR5422 0x0118 USR5422 WLAN product USR USR5423 0x0121 USR5423 WLAN From owner-p4-projects@FreeBSD.ORG Sun May 30 10:15:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB0101065672; Sun, 30 May 2010 10:15: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 AE920106566B for ; Sun, 30 May 2010 10:15:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 999648FC1C for ; Sun, 30 May 2010 10:15:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4UAFi0i018796 for ; Sun, 30 May 2010 10:15:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4UAFi0o018794 for perforce@freebsd.org; Sun, 30 May 2010 10:15:44 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 30 May 2010 10:15:44 GMT Message-Id: <201005301015.o4UAFi0o018794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 10:15:45 -0000 http://p4web.freebsd.org/@@178971?ac=10 Change 178971 by rene@rene_acer on 2010/05/30 10:15:42 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#23 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#28 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#47 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#10 integrate .. //depot/projects/docproj_nl/share/pgpkeys/remko.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#4 integrate .. //depot/projects/docproj_nl/share/sgml/trademarks.ent#6 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#14 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#31 integrate .. //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/platforms/sparc.sgml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#80 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#23 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.55 2010/05/23 04:11:34 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.57 2010/05/25 00:45:09 linimon Exp $ 2003 @@ -226,7 +226,10 @@ dopackages.wrapper. These scripts take a number of arguments. For example: - dopackages.6 ${arch} [-options] + dopackages.6 ${arch} ${buildid} [-options] + + Most often, you will be using latest for + the value of buildid. [-options] may be zero or more of the following: @@ -385,6 +388,15 @@ + Unless you specify -restart, + -continue, or -finish, + the symlinks for the existing builds will be rotated. i.e, + the existing symlink for previous will + be deleted; the most recent build will have its symlink changed + to previous/; and a new build will be + created and symlinked into latest/. + + If the last build finished cleanly you do not need to delete anything. If it was interrupted, or you selected -nocleanup, you need to clean up clients by running ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -804,6 +804,14 @@ to format and create partitions on the USB drive if needed. + + Allowing untrusted users to mount arbitrary media, + e.g. by enabling vfs.usermount as + described below, should not be considered safe from a + security point of view. Most file systems in &os; were not + built to safeguard against malicious devices. + + To make this device mountable as a normal user, certain steps have to be taken. First, the devices that are created when a USB storage device is connected need to be accessible ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -483,6 +483,12 @@ + CVS Tutorial from California + Polytechnic State University. + + + CVS Home, the CVS development and support community. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#16 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -941,6 +941,16 @@ indien nodig hulp bij het formatteren en aanmaken van partities op de USB-drive. + + Door het toestaan dat gewone gebruikers verschillende + media kunnen koppelen door b.v. het aanzetten van + vfs.usermount zoals hieronder beschreven, + zou niet als veilig beschoud moeten worden uit een + beveiligings oogpunt. Veel bestandssystemen in &os; zijn + niet geschreven om beveiliging te bieden tegen kwaadaardige + apparaten. + + Om het apparaat koppelbaar te maken voor de gewone gebruiker moeten er een aantal stappen ondernomen worden. Als eerste moeten de apparaten die gecreeerd worden wanneer het USB opslag- ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#47 (text+ko) ==== @@ -1,11 +1,11 @@ @@ -515,9 +515,8 @@ CVS - Tutorial van California Polytechnic State - University. + url="http://users.csc.calpoly.edu/~gfisher/classes/308/handouts/cvs-basics.html">CVS Tutorial + van California Polytechnic State University. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#10 (text+ko) ==== @@ -9,9 +9,9 @@ Houd dit bestand alstublieft gesorteerd. - $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.5 2010/01/12 20:20:43 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.6 2010/05/30 08:07:26 remko Exp $ %SOURCE% share/sgml/trademarks.ent - %SRCID% 1.47 + %SRCID% 1.48 --> 3Com en HomeConnect zijn geregistreerde @@ -135,6 +135,16 @@ &os; is een geregistreerd handelsmerk van de &os; Foundation."> + +Fujitsu, the Fujitsu logo, LifeBook, + Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE, + ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer, + SystemWalker, and Interstage are trademarks or registered trademarks + of Fujitsu Limited in the United States and other countries."> +Fujitsu"> +PRIMEPOWER"> + + Heidelberg, Helvetica, Palatino, en Times Roman zijn òfwel geregistreerde @@ -322,14 +332,14 @@ Slackware is een geregistreerd handelsmerk van Patrick Volkerding en Slackware Linux, Inc."> -Sparc, Sparc64, SPARCEngine, en - UltraSPARC zijn handelsmerken van SPARC International, Inc in de - Verenigde Staten en andere landen. Producten die handelsmerken van - SPARC dragen zijn gebaseerd op de architectuur ontwikkeld door Sun - Microsystems, Inc."> -Sparc"> -Sparc64"> -SPARCEngine"> + +SPARC, SPARC64, SPARCengine, and + States and other countries. SPARC International, Inc owns all of the + SPARC trademarks and under licensing agreements allows the proper use + of these trademarks by its members."> +SPARC"> +SPARC64"> +SPARCengine"> UltraSPARC"> ==== //depot/projects/docproj_nl/share/pgpkeys/remko.key#2 (text+ko) ==== @@ -1,45 +1,42 @@ - + -uid Remko Lodder (my FreeBSD.org uid) -sub 2048g/6BF55109 2006-02-25 [expires: 2008-02-25] +pub 2048R/6EB8C8C8 2010-05-28 [expires: 2012-05-27] + Key fingerprint = D692 91F9 F4EF D363 7F3F 4D17 9C75 DF7B 6EB8 C8C8 +uid Remko Lodder (Remko Lodder's Key) +sub 2048R/011C6AA0 2010-05-28 [expires: 2012-05-27] ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#4 (text+ko) ==== @@ -1,717 +1,58 @@ - + uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe (FreeBSD Ports Committer) -sub 2048g/16752D82 2005-07-06 -sub 1024g/8CF958AB 2009-11-05 -sub 1024R/985365A2 2009-11-05 +uid Thomas Abthorpe +sub 2048R/8CA60EE0 2010-05-28 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 30 14:44:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE2431065674; Sun, 30 May 2010 14:44: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 5A44A106564A for ; Sun, 30 May 2010 14:44:40 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 483288FC0A for ; Sun, 30 May 2010 14:44:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4UEie6K057498 for ; Sun, 30 May 2010 14:44:40 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4UEidHb057496 for perforce@freebsd.org; Sun, 30 May 2010 14:44:39 GMT (envelope-from zec@fer.hr) Date: Sun, 30 May 2010 14:44:39 GMT Message-Id: <201005301444.o4UEidHb057496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 14:44:40 -0000 http://p4web.freebsd.org/@@178978?ac=10 Change 178978 by zec@zec_tpx32 on 2010/05/30 14:43:53 Attempt to reduce the diff against head a bit further and improve style, though Ivor hasn't left much here to be done... Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.c#12 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.c#12 (text+ko) ==== @@ -169,7 +169,7 @@ * we want the virtualized global variable space to be page-sized, we may * have more space than that in practice. */ -#define VNET_MODMIN (8192<<2) +#define VNET_MODMIN 32768 #define VNET_SIZE roundup2(VNET_BYTES, PAGE_SIZE) #define VNET_MODSIZE (VNET_SIZE - (VNET_BYTES - VNET_MODMIN)) ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 (text+ko) ==== @@ -159,9 +159,9 @@ ((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr) & V_mfchash) #define MFCHASHSIZE 256 -static VNET_DEFINE(u_char*, nexpire); +static u_long mfchashsize; /* Hash size */ +static VNET_DEFINE(u_char *, nexpire); /* 0..mfchashsize-1 */ #define V_nexpire VNET(nexpire) -static u_long mfchashsize; /* Hash size */ static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); #define V_mfchashtbl VNET(mfchashtbl) @@ -218,7 +218,7 @@ */ static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); #define V_bw_upcalls VNET(bw_upcalls) -static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ +static VNET_DEFINE(u_int, bw_upcalls_n) = 0; /* # of pending upcalls */ #define V_bw_upcalls_n VNET(bw_upcalls_n) static VNET_DEFINE(struct callout, bw_upcalls_ch); #define V_bw_upcalls_ch VNET(bw_upcalls_ch) @@ -367,9 +367,9 @@ MRT_MFC_FLAGS_BORDER_VIF | MRT_MFC_RP | MRT_MFC_BW_UPCALL); -static VNET_DEFINE(uint32_t, mrt_api_config); +static VNET_DEFINE(uint32_t, mrt_api_config) = 0; #define V_mrt_api_config VNET(mrt_api_config) -static VNET_DEFINE(int, pim_assert_enabled); +static VNET_DEFINE(int, pim_assert_enabled) = 0; #define V_pim_assert_enabled VNET(pim_assert_enabled) static struct timeval pim_assert_interval = { 3, 0 }; /* Rate limit */ @@ -663,7 +663,7 @@ return EOPNOTSUPP; if (version != 1) - return (ENOPROTOOPT); + return ENOPROTOOPT; MROUTER_LOCK(); @@ -677,7 +677,8 @@ return EADDRINUSE; } - V_mfchashtbl = hashinit_flags(mfchashsize, M_MRTABLE, &V_mfchash, HASH_NOWAIT); + V_mfchashtbl = hashinit_flags(mfchashsize, M_MRTABLE, &V_mfchash, + HASH_NOWAIT); callout_reset(&V_expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, curvnet); @@ -722,7 +723,7 @@ V_mrt_api_config = 0; VIF_LOCK(); - + /* * For each phyint in use, disable promiscuous reception of all IP * multicasts. @@ -1534,7 +1535,8 @@ PIMSTAT_INC(pims_rcv_registers_wrongiif); /* Get vifi for the incoming packet */ - for (vifi=0; vifi < V_numvifs && V_viftable[vifi].v_ifp != ifp; vifi++) + for (vifi = 0; vifi < V_numvifs && V_viftable[vifi].v_ifp != ifp; + vifi++) ; if (vifi >= V_numvifs) return 0; /* The iif is not found: ignore the packet. */ @@ -2814,13 +2816,8 @@ { MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO); - V_pim_assert_enabled = 0; - V_mrt_api_config = 0; - + bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); - - V_bw_upcalls_n = 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); } From owner-p4-projects@FreeBSD.ORG Sun May 30 17:41:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F32331065675; Sun, 30 May 2010 17:41: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 9F084106566B for ; Sun, 30 May 2010 17:41:54 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 566AF8FC14 for ; Sun, 30 May 2010 17:41:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4UHfs7f085349 for ; Sun, 30 May 2010 17:41:54 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4UHfrQd085347 for perforce@freebsd.org; Sun, 30 May 2010 17:41:53 GMT (envelope-from gpf@FreeBSD.org) Date: Sun, 30 May 2010 17:41:53 GMT Message-Id: <201005301741.o4UHfrQd085347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 17:41:55 -0000 http://p4web.freebsd.org/@@178979?ac=10 Change 178979 by gpf@gpf_desktop on 2010/05/30 17:41:08 - for the current nfs implementation: Keep track of the vap->va_mode attribute when a new file is created via VOP_create/mknod/symlink/mkdir Also, keep track of the flags for VOP_read/write - forgot to ad the new argument to the usage() function of praudit, done. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/bin/praudit/praudit.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#13 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#9 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/bin/praudit/praudit.c#4 (text) ==== @@ -59,7 +59,7 @@ usage(void) { - fprintf(stderr, "usage: praudit [-lpx] [-r | -s] [-d del] " + fprintf(stderr, "usage: praudit [-lpxc] [-r | -s] [-d del] " "[file ...]\n"); exit(1); } ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#13 (text+ko) ==== @@ -1359,6 +1359,7 @@ uiop->uio_segflg = UIO_SYSSPACE; uiop->uio_td = NULL; uiop->uio_offset = off; + AUDIT_ARG_FFLAGS(ioflags); error = VOP_WRITE(vp, uiop, ioflags, cred); /* Unlocked write. */ nfsrvstats.srvvop_writes++; @@ -1554,6 +1555,7 @@ break; }; } + AUDIT_ARG_MODE(vap->va_mode); /* * Iff doesn't exist, create it @@ -1808,7 +1810,8 @@ minor = fxdr_unsigned(u_int32_t, *tl); vap->va_rdev = makedev(major, minor); } - + AUDIT_ARG_MODE(vap->va_mode); + /* * Iff doesn't exist, create it. */ @@ -1821,7 +1824,7 @@ vap->va_mode = 0; if (vtyp == VSOCK) { vrele(nd.ni_startdir); - nd.ni_startdir = NULL; + nd.ni_startdir = NULL; error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); AUDIT_vp = nd.ni_vp; @@ -2563,7 +2566,7 @@ if (pathcp != NULL) AUDIT_ARG_UPATH2(curthread, pathcp); - + AUDIT_ARG_MODE(vap->va_mode); /* * issue symlink op. SAVESTART is set so the underlying path component * is only freed by the VOP if an error occurs. @@ -2757,6 +2760,7 @@ error = EEXIST; goto out; } + AUDIT_ARG_MODE(vap->va_mode); /* * Issue mkdir op. Since SAVESTART is not set, the pathname ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#9 (text) ==== @@ -1580,11 +1580,16 @@ tok = au_to_arg32(0, "prev mask", ar->ar_retval); kau_write(rec, tok); break; - + case AUE_NFS_CREATE: - case AUE_NFS_READ: - case AUE_NFS_WRITE: case AUE_NFS_MKDIR: + case AUE_NFS_MKNODE: + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } + /* FALLTHROUGH */ + case AUE_NFS_READDIR: case AUE_NFS_READDIR_PLUS: case AUE_NFS_READLINK: @@ -1594,22 +1599,30 @@ case AUE_NFS_SETATTR: case AUE_NFS_ACCESS: case AUE_NFS_LOOKUP: - case AUE_NFS_MKNODE: case AUE_NFS_COMMIT: case AUE_NFS_PATHCONF: case AUE_NFS_STATFS: case AUE_NFS_FSINFO: - if (ARG_IS_VALID(kar, ARG_MODE)) { - tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); + } + break; + + case AUE_NFS_READ: + case AUE_NFS_WRITE: + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); kau_write(rec, tok); - } + } UPATH1_VNODE1_TOKENS; if (ARG_IS_VALID(kar, ARG_TEXT)) { tok = au_to_text(ar->ar_arg_text); kau_write(rec, tok); } break; - + case AUE_NFS_NOOP: case AUE_NFS_NULL: if (ARG_IS_VALID(kar, ARG_TEXT)) { @@ -1618,14 +1631,16 @@ } break; - case AUE_NFS_SYMLINK: - case AUE_NFS_LINK: - case AUE_NFS_RENAME: - UPATH1_VNODE1_TOKENS; + case AUE_NFS_SYMLINK: if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(3, "mode", ar->ar_arg_mode); kau_write(rec, tok); } + /* FALLTHROUGH */ + + case AUE_NFS_LINK: + case AUE_NFS_RENAME: + UPATH1_VNODE1_TOKENS; UPATH2_TOKENS; if (ARG_IS_VALID(kar, ARG_TEXT)) { tok = au_to_text(ar->ar_arg_text); From owner-p4-projects@FreeBSD.ORG Sun May 30 18:59:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15530106567A; Sun, 30 May 2010 18:59: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 CDCAC1065678 for ; Sun, 30 May 2010 18:59:34 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 86A318FC19 for ; Sun, 30 May 2010 18:59:34 +0000 (UTC) Received: by gyh20 with SMTP id 20so2908895gyh.13 for ; Sun, 30 May 2010 11:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=i6grQJkgwYlJ4AlQ5NRCSXsu2w8ZnYCAY+kduiFNPHU=; b=OAc0hNZFZQChJeMQkzk4xSCDHSkAyWwIFyrL8k+N+80Bp/VOjg6B/IjlRsbmG6NMpF X5fZLGayADS5xEADu+s58W5SStr+JD0FoGJytjFS6idsphVQBARd6N9oJGW3WAUtjfPC NJ/zo4ZfuzRERsmEsaUdcIgioiKvTcwAV3COc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=SYhad3xY1mlMXx45FjMPjhkRleUQy4QelI2CM4jhBkvjKLH3yQuXgV9cRjnFypyixM np2ojNVgVuNQXby2RSlh86RJCGnTV0IFEVMWe6PUZdWJbTpy/JRHbdT92IBUktgeRSdJ qZLjR1gjAGumNxO3A/uN6nKetDoBCV6NpA3N4= MIME-Version: 1.0 Received: by 10.231.184.73 with SMTP id cj9mr4461606ibb.1.1275245973477; Sun, 30 May 2010 11:59:33 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.70.16 with HTTP; Sun, 30 May 2010 11:59:33 -0700 (PDT) In-Reply-To: <201005301444.o4UEidHb057496@repoman.freebsd.org> References: <201005301444.o4UEidHb057496@repoman.freebsd.org> Date: Sun, 30 May 2010 11:59:33 -0700 X-Google-Sender-Auth: xBYrupF8TBwvbM99oc9MNC_2RRI Message-ID: From: Garrett Cooper To: Marko Zec Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 178978 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, 30 May 2010 18:59:35 -0000 On Sun, May 30, 2010 at 7:44 AM, Marko Zec wrote: > http://p4web.freebsd.org/@@178978?ac=3D10 > > Change 178978 by zec@zec_tpx32 on 2010/05/30 14:43:53 > > =A0 =A0 =A0 =A0Attempt to reduce the diff against head a bit further and > =A0 =A0 =A0 =A0improve style, though Ivor hasn't left much here to be don= e... > > Affected files ... > > .. //depot/projects/vimage/src/sys/net/vnet.c#12 edit > .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/net/vnet.c#12 (text+ko) =3D= =3D=3D=3D > > @@ -169,7 +169,7 @@ > =A0* we want the virtualized global variable space to be page-sized, we m= ay > =A0* have more space than that in practice. > =A0*/ > -#define =A0 =A0 =A0 =A0VNET_MODMIN =A0 =A0 (8192<<2) > +#define =A0 =A0 =A0 =A0VNET_MODMIN =A0 =A0 32768 > =A0#define =A0 =A0 =A0 =A0VNET_SIZE =A0 =A0 =A0 roundup2(VNET_BYTES, PAGE= _SIZE) > =A0#define =A0 =A0 =A0 =A0VNET_MODSIZE =A0 =A0(VNET_SIZE - (VNET_BYTES - = VNET_MODMIN)) > > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 (text= +ko) =3D=3D=3D=3D > > @@ -159,9 +159,9 @@ > =A0 =A0 =A0 =A0 =A0((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr) = & V_mfchash) > =A0#define =A0 =A0 =A0 =A0MFCHASHSIZE =A0 =A0 256 > > -static VNET_DEFINE(u_char*, nexpire); > +static u_long mfchashsize; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Ha= sh size */ > +static VNET_DEFINE(u_char *, nexpire); =A0 =A0 =A0 =A0 /* 0..mfchashsize= -1 */ > =A0#define =A0 =A0 =A0 =A0V_nexpire =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(nexp= ire) > -static u_long mfchashsize; =A0 =A0 /* Hash size */ > =A0static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); > =A0#define =A0 =A0 =A0 =A0V_mfchashtbl =A0 =A0 =A0 =A0 =A0 =A0VNET(mfchas= htbl) > > @@ -218,7 +218,7 @@ > =A0*/ > =A0static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls =A0 =A0 =A0 =A0 =A0 =A0VNET(bw_upc= alls) > -static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ > +static VNET_DEFINE(u_int, bw_upcalls_n) =3D 0; /* # of pending upcalls *= / > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_n =A0 =A0 =A0 =A0 =A0VNET(bw_upcal= ls_n) > =A0static VNET_DEFINE(struct callout, bw_upcalls_ch); > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_ch =A0 =A0 =A0 =A0 VNET(bw_upcalls= _ch) > @@ -367,9 +367,9 @@ > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_FLAGS_BORDER_VIF | > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_RP | > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_BW_UPCALL); > -static VNET_DEFINE(uint32_t, mrt_api_config); > +static VNET_DEFINE(uint32_t, mrt_api_config) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_mrt_api_config =A0 =A0 =A0 =A0VNET(mrt_api_co= nfig) > -static VNET_DEFINE(int, pim_assert_enabled); > +static VNET_DEFINE(int, pim_assert_enabled) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_pim_assert_enabled =A0 =A0VNET(pim_assert_ena= bled) > =A0static struct timeval pim_assert_interval =3D { 3, 0 }; =A0/* Rate lim= it */ > > @@ -663,7 +663,7 @@ > =A0 =A0 =A0 =A0return EOPNOTSUPP; > > =A0 =A0 if (version !=3D 1) > - =A0 =A0 =A0 return (ENOPROTOOPT); > + =A0 =A0 =A0 return ENOPROTOOPT; That's actually a style regression (along with any other return calls without parentheses). > =A0 =A0 MROUTER_LOCK(); > [...] Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Sun May 30 19:03:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F15161065672; Sun, 30 May 2010 19:03:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5683106564A for ; Sun, 30 May 2010 19:03:51 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe08.swip.net [212.247.154.225]) by mx1.freebsd.org (Postfix) with ESMTP id 42B6C8FC13 for ; Sun, 30 May 2010 19:03:50 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=69Y28RYJ0wkA:10 a=ADBQPqJMlbwA:10 a=8nJEP1OIZ-IA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=640_ClquSogFsllnLYQA:9 a=FmyafZfeApoW0v_TfYiKQ1TKOz4A:4 a=wPNLvfGTeEIA:10 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 1362462525; Sun, 30 May 2010 21:03:48 +0200 From: Hans Petter Selasky To: Garrett Cooper Date: Sun, 30 May 2010 21:01:02 +0200 User-Agent: KMail/1.12.4 (FreeBSD/8.0-STABLE; KDE/4.3.4; amd64; ; ) References: <201005301444.o4UEidHb057496@repoman.freebsd.org> In-Reply-To: X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'( =?iso-8859-1?q?=3B=5FIjlA=3A=0A=09hGE=2E=2EEw?=, =?iso-8859-1?q?XAQ*o=23=5C/M=7ESC=3DS1-f9=7BEzRfT=27=7CHhll5Q=5Dha5Bt-s=7Co?= =?iso-8859-1?q?TlKMusi=3A1e=5BwJl=7Dkd=7DGR=0A=09Z0adGx-x=5F0zGbZj=27e?=(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201005302101.02794.hselasky@c2i.net> Cc: Perforce Change Reviews , Marko Zec Subject: Re: PERFORCE change 178978 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, 30 May 2010 19:03:52 -0000 On Sunday 30 May 2010 20:59:33 Garrett Cooper wrote: > > if (version != 1) > > - return (ENOPROTOOPT); > > + return ENOPROTOOPT; > > That's actually a style regression (along with any other return calls > without parentheses). > FYI: Linux style mandatates return values without parentheses. And FreeBSD style mandates that opposite! --HPS From owner-p4-projects@FreeBSD.ORG Sun May 30 19:31:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 922A11065673; Sun, 30 May 2010 19:31: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 364E0106564A; Sun, 30 May 2010 19:31:25 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from munja.zvne.fer.hr (munja.zvne.fer.hr [161.53.66.248]) by mx1.freebsd.org (Postfix) with ESMTP id B81368FC0A; Sun, 30 May 2010 19:31:24 +0000 (UTC) Received: from sluga.fer.hr ([161.53.66.244]) by munja.zvne.fer.hr with Microsoft SMTPSVC(6.0.3790.4675); Sun, 30 May 2010 21:19:18 +0200 Received: from localhost ([161.53.19.8]) by sluga.fer.hr over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sun, 30 May 2010 21:19:17 +0200 From: Marko Zec To: Garrett Cooper Date: Sun, 30 May 2010 21:18:56 +0200 User-Agent: KMail/1.9.10 References: <201005301444.o4UEidHb057496@repoman.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <201005302118.57240.zec@freebsd.org> X-OriginalArrivalTime: 30 May 2010 19:19:18.0207 (UTC) FILETIME=[FFE6D4F0:01CB002C] Cc: Perforce Change Reviews Subject: Re: PERFORCE change 178978 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, 30 May 2010 19:31:25 -0000 On Sunday 30 May 2010 20:59:33 Garrett Cooper wrote: > On Sun, May 30, 2010 at 7:44 AM, Marko Zec wrote: > > http://p4web.freebsd.org/@@178978?ac=3D10 > > > > Change 178978 by zec@zec_tpx32 on 2010/05/30 14:43:53 > > > > =A0 =A0 =A0 =A0Attempt to reduce the diff against head a bit further and > > =A0 =A0 =A0 =A0improve style, though Ivor hasn't left much here to be d= one... > > > > Affected files ... > > > > .. //depot/projects/vimage/src/sys/net/vnet.c#12 edit > > .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 edit > > > > Differences ... > > > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/net/vnet.c#12 (text+ko) = =3D=3D=3D=3D > > > > @@ -169,7 +169,7 @@ > > =A0* we want the virtualized global variable space to be page-sized, we= may > > =A0* have more space than that in practice. > > =A0*/ > > -#define =A0 =A0 =A0 =A0VNET_MODMIN =A0 =A0 (8192<<2) > > +#define =A0 =A0 =A0 =A0VNET_MODMIN =A0 =A0 32768 > > =A0#define =A0 =A0 =A0 =A0VNET_SIZE =A0 =A0 =A0 roundup2(VNET_BYTES, PA= GE_SIZE) > > =A0#define =A0 =A0 =A0 =A0VNET_MODSIZE =A0 =A0(VNET_SIZE - (VNET_BYTES = =2D VNET_MODMIN)) > > > > > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/netinet/ip_mroute.c#42 (te= xt+ko) > > =3D=3D=3D=3D > > > > @@ -159,9 +159,9 @@ > > =A0 =A0 =A0 =A0 =A0((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr= ) & > > V_mfchash) #define =A0 =A0 =A0 =A0MFCHASHSIZE =A0 =A0 256 > > > > -static VNET_DEFINE(u_char*, nexpire); > > +static u_long mfchashsize; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* = Hash size */ > > +static VNET_DEFINE(u_char *, nexpire); =A0 =A0 =A0 =A0 /* 0..mfchashsi= ze-1 */ > > =A0#define =A0 =A0 =A0 =A0V_nexpire =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(ne= xpire) > > -static u_long mfchashsize; =A0 =A0 /* Hash size */ > > =A0static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); > > =A0#define =A0 =A0 =A0 =A0V_mfchashtbl =A0 =A0 =A0 =A0 =A0 =A0VNET(mfch= ashtbl) > > > > @@ -218,7 +218,7 @@ > > =A0*/ > > =A0static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); > > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls =A0 =A0 =A0 =A0 =A0 =A0VNET(bw_u= pcalls) > > -static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ > > +static VNET_DEFINE(u_int, bw_upcalls_n) =3D 0; /* # of pending upcalls= */ > > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_n =A0 =A0 =A0 =A0 =A0VNET(bw_upc= alls_n) > > =A0static VNET_DEFINE(struct callout, bw_upcalls_ch); > > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_ch =A0 =A0 =A0 =A0 VNET(bw_upcal= ls_ch) > > @@ -367,9 +367,9 @@ > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 MRT_MFC_FLAGS_BORDER_VIF | > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 MRT_MFC_RP | > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 MRT_MFC_BW_UPCALL); > > -static VNET_DEFINE(uint32_t, mrt_api_config); > > +static VNET_DEFINE(uint32_t, mrt_api_config) =3D 0; > > =A0#define =A0 =A0 =A0 =A0V_mrt_api_config =A0 =A0 =A0 =A0VNET(mrt_api_= config) > > -static VNET_DEFINE(int, pim_assert_enabled); > > +static VNET_DEFINE(int, pim_assert_enabled) =3D 0; > > =A0#define =A0 =A0 =A0 =A0V_pim_assert_enabled =A0 =A0VNET(pim_assert_e= nabled) > > =A0static struct timeval pim_assert_interval =3D { 3, 0 }; =A0/* Rate l= imit */ > > > > @@ -663,7 +663,7 @@ > > =A0 =A0 =A0 =A0return EOPNOTSUPP; > > > > =A0 =A0 if (version !=3D 1) > > - =A0 =A0 =A0 return (ENOPROTOOPT); > > + =A0 =A0 =A0 return ENOPROTOOPT; > > That's actually a style regression (along with any other return calls > without parentheses). Yup - technically you're right, but this particular change was intended to= =20 minimize the scope of the diff against head - if you'd throw a look at=20 ip_mroute.c in head you'd spot a ton of other style violations, including=20 this one. My intention is to do a functional (V_irtualization) change in o= ne=20 commit, and then we can do a no-op style sweep on ip_mroute.c later. Marko From owner-p4-projects@FreeBSD.ORG Sun May 30 23:35:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1C371065678; Sun, 30 May 2010 23:35: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 65A5C106564A for ; Sun, 30 May 2010 23:35:21 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51DC78FC1B for ; Sun, 30 May 2010 23:35:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4UNZLHv028793 for ; Sun, 30 May 2010 23:35:21 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4UNZLsl028791 for perforce@freebsd.org; Sun, 30 May 2010 23:35:21 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 30 May 2010 23:35:21 GMT Message-Id: <201005302335.o4UNZLsl028791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 23:35:22 -0000 http://p4web.freebsd.org/@@178984?ac=10 Change 178984 by ivoras@betelgeuse on 2010/05/30 23:34:24 Step 4: (not finished): Start creating the actual patch binary Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#5 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#8 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#8 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#6 (text+ko) ==== @@ -38,12 +38,15 @@ perform_mkpatch() { char fold[PATH_MAX], fnew[PATH_MAX], fpatch[PATH_MAX]; - char dold[PATH_MAX], dnew[PATH_MAX]; + char dold[PATH_MAX], dnew[PATH_MAX], dpatch[PATH_MAX]; + char tmp[PATH_MAX], tmp2[PATH_MAX]; struct pkgxjob xold, xnew; struct filelist_head flold, flnew; struct filelist_head fldiff_old_new, fldiff_new_old, flintersect; struct filelist_head flchanged; struct filelist *fl; + FILE *fp; + time_t tm; if (argc < 3) errx(1, "Expecting 3 arguments: old_package_file " @@ -70,6 +73,9 @@ sprintf(dnew, "%s/new", my_tmp); if (mkdir(dnew, 0700) != 0) err(1, "Cannot create directory: %s", dnew); + sprintf(dpatch, "%s/patch", my_tmp); + if (mkdir(dpatch, 0700) != 0) + err(1, "Cannot create directory: %s", dpatch); if (pkgxjob_start(&xold, dold, fold) != 0) err(1, "Cannot extract package %s to %s (start)", fold, dold); @@ -155,4 +161,59 @@ } if (verbose) printf("Found %d changed files.\n", filelist_count(&flchanged)); + + /* + * XXX: Possibly reimplement with libarchive. If I finally get how it + * stores directories. + */ + sprintf(tmp, "%s/%s", dpatch, PKGPATCH_FNAME); + fp = fopen(tmp, "w"); + if (fp == NULL) + err(1, "Cannot open file for writing: %s", tmp); + time(&tm); + fprintf(fp, "# FreeBSD package patch archive created on %s\n", + ctime(&tm)); + fprintf(fp, "@version %s\n", PKGPATCH_VERSION); + parse_package_name(fold, tmp, tmp2, NULL); + fprintf(fp, "@source %s-%s\n", tmp, tmp2); + parse_package_name(fnew, tmp, tmp2, NULL); + fprintf(fp, "@target %s-%s\n", tmp, tmp2); + SLIST_FOREACH(fl, &fldiff_new_old, linkage) + fprintf(fp, "@add %s\n", fl->filename); + SLIST_FOREACH(fl, &fldiff_old_new, linkage) + fprintf(fp, "@remove %s\n", fl->filename); + SLIST_FOREACH(fl, &flchanged, linkage) + fprintf(fp, "@patch [method=cp] %s\n", fl->filename); + if (fclose(fp) != 0) + err(1, "Cannot close %s", PKGPATCH_FNAME); + + /* Include all metadata files from the new package. */ + SLIST_FOREACH(fl, &flnew, linkage) { + if (fl->filename[0] == '+') { + sprintf(tmp, "%s/%s", dnew, fl->filename); + sprintf(tmp2, "%s/%s", dpatch, fl->filename); + if (copy_file_absolute(tmp, tmp2) != 0) + err(1, "Cannot copy file: %s to file: %s", + tmp, tmp2); + } + } + + /* Simply copy the directory hierarchy of the new package. */ + replicate_dirtree(dnew, dpatch); + + SLIST_FOREACH(fl, &flchanged, linkage) { + sprintf(tmp, "%s/%s", dnew, fl->filename); + sprintf(tmp2, "%s/%s", dpatch, fl->filename); + if (copy_file_absolute(tmp, tmp2) != 0) + err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); + } + + sprintf(tmp, "%s -c -j -C %s -f %s *", _PATH_TAR, dpatch, fpatch); + fp = popen(tmp, "r+"); + if (fp == NULL) + err(1, "Final tar execution failed for: %s", fpatch); + rm_rf(dold); + rm_rf(dnew); + if (pclose(fp) != 0) + err(1, "pclose() failed"); } ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#6 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#6 (text+ko) ==== @@ -24,6 +24,9 @@ #define _PATH_TAR "/usr/bin/tar" #endif +#define PKGPATCH_FNAME "+PKGPATCH" +#define PKGPATCH_VERSION "1.0" + enum PP_OP { PP_NONE, PP_MKPATCH }; struct pkgxjob { @@ -57,5 +60,9 @@ int filelist_intersect(struct filelist_head *fl1, struct filelist_head *fl2, struct filelist_head *flisect); unsigned int filelist_count(struct filelist_head *flist); +void parse_package_name(char *pkgfile, char *basename, char *version, + char *suffix); +int copy_file_absolute(char *from, char *to); +int replicate_dirtree(char *from, char *to); #endif ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#5 (text+ko) ==== @@ -26,9 +26,12 @@ #include #include #include +#include #include +#include #include #include +#include #include #include "pkg_patch.h" @@ -163,3 +166,109 @@ count++; return (count); } + + +/* + * For a given binary package archive filename, extract its base package name + * (e.g. "apache-ant"), its version (e.g. "1.7.1") and its suffix (e.g. ".tbz"). + * Any of the component pointers / arguments can be NULL. The package filname + * might contain path information (slashes), which will be discarded. + */ +void +parse_package_name(char *pkgfile, char *basename, char *version, char *suff) +{ + char *tmp, *p; + + /* Strip directory path, if any */ + p = strrchr(pkgfile, '/'); + if (p != NULL) + tmp = strdup(p + 1); + else + tmp = strdup(pkgfile); + p = strrchr(tmp, '.'); + if (suff != NULL) + strcpy(suff, p); + *p = '\0'; + p = strrchr(tmp, '-'); + if (version != NULL) + strcpy(version, p + 1); + *p = '\0'; + if (basename != NULL) + strcpy(basename, tmp); + free(tmp); +} + + +/* + * File copy, preserving attributes: ownership, mtime, mode. Knows how to handle + * (re-create) symlinks. + */ +int +copy_file_absolute(char *from, char *to) +{ + char *buf; + const ssize_t bufsize = 256*1024; + ssize_t bs; + int fdfrom, fdto; + struct stat st; + struct timeval tv; + + if (lstat(from, &st) != 0) + return (errno); + + if (S_ISLNK(st.st_mode)) { + char tmp[PATH_MAX]; + + if (readlink(from, tmp, PATH_MAX) < 0) + return (errno); + if (symlink(tmp, to) < 0) + return (errno); + return (0); + } + + fdfrom = open(from, O_RDONLY); + if (fdfrom < 0) + return (errno); + fdto = open(to, O_CREAT | O_WRONLY | O_TRUNC); + if (fdto < 0) + return (errno); + buf = malloc(bufsize); + if (buf == NULL) + return (ENOMEM); + while (1) { + bs = read(fdfrom, buf, bufsize); + if (bs < 0) + err(1, "read() failure"); + else if (bs > 0) + if (write(fdto, buf, bs) != bs) + err(1, "write() failure"); + if (bs == 0) + break; + } + free(buf); + close(fdto); + close(fdfrom); + + if (chown(to, st.st_uid, st.st_gid) < 0) + return (errno); + tv.tv_usec = 0; + tv.tv_sec = st.st_mtime; + if (lutimes(to, &tv) < 0) + return (errno); + if (lchmod(to, st.st_mode) < 0) + return (errno); + return (0); +} + + +/* + * Replicates / re-creates a directory tree in the destination to contain + * all directories from the source, including their properties: ownership, + * mode, mtime. + */ +int +replicate_dirtree(char __unused *from, char __unused *to) +{ + /* XXX: todo */ + return (0); +} From owner-p4-projects@FreeBSD.ORG Sun May 30 23:53:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA0861065757; Sun, 30 May 2010 23:53:41 +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 7DF271065768 for ; Sun, 30 May 2010 23:53:41 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61E9F8FC14 for ; Sun, 30 May 2010 23:53:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4UNrfFv031101 for ; Sun, 30 May 2010 23:53:41 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4UNrfMu031099 for perforce@freebsd.org; Sun, 30 May 2010 23:53:41 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 May 2010 23:53:41 GMT Message-Id: <201005302353.o4UNrfMu031099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 23:53:42 -0000 http://p4web.freebsd.org/@@178985?ac=10 Change 178985 by gcooper@gcooper-bayonetta on 2010/05/30 23:53:38 Purely style(9) fixes. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#18 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/global.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/match.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#6 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/url.c#3 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#18 (text+ko) ==== @@ -381,7 +381,7 @@ errno = serrno; } - return buf; + return (buf); } @@ -563,7 +563,7 @@ if (0 <= archive_fd) close(archive_fd); - return fd; + return (fd); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/global.c#3 (text+ko) ==== @@ -28,4 +28,4 @@ Boolean Quiet = FALSE; Boolean Fake = FALSE; Boolean Force = FALSE; -int Verbose = 0; /* Allow multiple levels of verbose. */ +int Verbose = 0; /* Allow multiple levels of verbose. */ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/match.c#3 (text+ko) ==== @@ -57,136 +57,154 @@ char ** matchinstalled(match_t MatchType, char **patterns, int *retval) { - int i, errcode, len; - char *matched; - const char *paths[2] = {LOG_DIR, NULL}; - static struct store *store = NULL; - FTS *ftsp; - FTSENT *f; - Boolean *lmatched = NULL; + static struct store *store = NULL; + FTS *ftsp; + FTSENT *f; + char *matched; + const char *paths[2] = {LOG_DIR, NULL}; + int i; + int errcode; + int len; + Boolean *lmatched = NULL; + + store = storecreate(store); + if (store == NULL) { + if (retval != NULL) + *retval = 1; + return (NULL); + } - store = storecreate(store); - if (store == NULL) { if (retval != NULL) - *retval = 1; - return NULL; - } + *retval = 0; + + if (!isdir(paths[0])) { + if (retval != NULL) + *retval = 1; + return (NULL); + } + + /* Count number of patterns */ + if (patterns != NULL) { - if (retval != NULL) - *retval = 0; + for (len = 0; patterns[len]; len++) ; - if (!isdir(paths[0])) { - if (retval != NULL) - *retval = 1; - return NULL; - /* Not reached */ - } + lmatched = alloca(sizeof(*lmatched) * len); + if (lmatched == NULL) { + warn("%s(): alloca() failed", __func__); + if (retval != NULL) + *retval = 1; + return (NULL); + } - /* Count number of patterns */ - if (patterns != NULL) { - for (len = 0; patterns[len]; len++) {} - lmatched = alloca(sizeof(*lmatched) * len); - if (lmatched == NULL) { - warnx("%s(): alloca() failed", __func__); - if (retval != NULL) - *retval = 1; - return NULL; - } - } else - len = 0; + } else + len = 0; - for (i = 0; i < len; i++) - lmatched[i] = FALSE; + for (i = 0; i < len; i++) + lmatched[i] = FALSE; + + ftsp = fts_open((char * const *)(uintptr_t)paths, + FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp); + + if (ftsp != NULL) { + + while ((f = fts_read(ftsp)) != NULL) { + + if (f->fts_info == FTS_D && f->fts_level == 1) { + + fts_set(ftsp, f, FTS_SKIP); + matched = NULL; + errcode = 0; + + if (MatchType == MATCH_ALL) + matched = f->fts_name; + else + for (i = 0; patterns[i]; i++) { + errcode = pattern_match( + MatchType, patterns[i], + f->fts_name); + if (errcode == 1) { + matched = f->fts_name; + lmatched[i] = TRUE; + errcode = 0; + } + if (matched != NULL || + errcode != 0) + break; + } + + if (errcode == 0 && matched != NULL) + errcode = storeappend(store, matched); + if (errcode != 0) { + if (retval != NULL) + *retval = 1; + return (NULL); + } - ftsp = fts_open((char * const *)(uintptr_t)paths, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp); - if (ftsp != NULL) { - while ((f = fts_read(ftsp)) != NULL) { - if (f->fts_info == FTS_D && f->fts_level == 1) { - fts_set(ftsp, f, FTS_SKIP); - matched = NULL; - errcode = 0; - if (MatchType == MATCH_ALL) - matched = f->fts_name; - else - for (i = 0; patterns[i]; i++) { - errcode = pattern_match(MatchType, patterns[i], f->fts_name); - if (errcode == 1) { - matched = f->fts_name; - lmatched[i] = TRUE; - errcode = 0; } - if (matched != NULL || errcode != 0) - break; - } - if (errcode == 0 && matched != NULL) - errcode = storeappend(store, matched); - if (errcode != 0) { - if (retval != NULL) - *retval = 1; - return NULL; - /* Not reached */ + } - } + + fts_close(ftsp); + } - fts_close(ftsp); - } - if (MatchType == MATCH_GLOB) { - for (i = 0; i < len; i++) - if (lmatched[i] == FALSE) - storeappend(store, patterns[i]); - } + /* XXX (gcooper): check for return code from storeappend here? */ + if (MatchType == MATCH_GLOB) + for (i = 0; i < len; i++) + if (lmatched[i] == FALSE) + storeappend(store, patterns[i]); - if (store->used == 0) - return NULL; - else - return store->store; + if (store->used == 0) + return (NULL); + else + return (store->store); } int pattern_match(match_t MatchType, char *pattern, const char *pkgname) { - int errcode = 0; - const char *fname = pkgname; - char basefname[PATH_MAX]; - char condchar = '\0'; - char *condition; + char basefname[PATH_MAX]; + char condchar = '\0'; + char *condition; + const char *ch; + const char *fname = pkgname; + int errcode = 0; - /* do we have an appended condition? */ - condition = strpbrk(pattern, "<>="); - if (condition) { - const char *ch; - /* yes, isolate the pattern from the condition ... */ - if (condition > pattern && condition[-1] == '!') - condition--; - condchar = *condition; - *condition = '\0'; - /* ... and compare the name without version */ - ch = strrchr(fname, '-'); - if (ch && ch - fname < PATH_MAX) { - strlcpy(basefname, fname, ch - fname + 1); - fname = basefname; + /* do we have an appended condition? */ + condition = strpbrk(pattern, "<>="); + if (condition) { + /* yes, isolate the pattern from the condition ... */ + if (condition > pattern && condition[-1] == '!') + condition--; + condchar = *condition; + *condition = '\0'; + /* ... and compare the name without version */ + ch = strrchr(fname, '-'); + if (ch != NULL && ch - fname < PATH_MAX) { + strlcpy(basefname, fname, ch - fname + 1); + fname = basefname; + } } - } - switch (MatchType) { - case MATCH_EREGEX: - case MATCH_REGEX: - errcode = rex_match(pattern, fname, MatchType == MATCH_EREGEX ? 1 : 0); - break; - case MATCH_NGLOB: - case MATCH_GLOB: - errcode = (csh_match(pattern, fname, 0) == 0) ? 1 : 0; - break; - case MATCH_EXACT: - errcode = (strcmp(pattern, fname) == 0) ? 1 : 0; - break; - case MATCH_ALL: - errcode = 1; - break; - default: - break; - } + switch (MatchType) { + case MATCH_EREGEX: + case MATCH_REGEX: + errcode = rex_match(pattern, fname, + MatchType == MATCH_EREGEX ? 1 : 0); + break; + case MATCH_NGLOB: + case MATCH_GLOB: + errcode = (csh_match(pattern, fname, 0) == 0) ? 1 : 0; + break; + case MATCH_EXACT: + errcode = (strcmp(pattern, fname) == 0) ? 1 : 0; + break; + case MATCH_ALL: + errcode = 1; + break; + default: + break; + } /* loop over all appended conditions */ while (condition) { @@ -366,53 +384,53 @@ int isinstalledpkg(const char *name) { - int result; - char *buf, *buf2; - struct iip_memo *memo; + struct iip_memo *memo; + int result; + char *buf, *buf2; + + LIST_FOREACH(memo, &iip_memo, iip_link) { + if (strcmp(memo->iip_name, name) == 0) + return (memo->iip_result); + } - LIST_FOREACH(memo, &iip_memo, iip_link) { - if (strcmp(memo->iip_name, name) == 0) - return memo->iip_result; - } - - buf2 = NULL; - asprintf(&buf, "%s/%s", LOG_DIR, name); - if (buf == NULL) - goto errout; - if (!isdir(buf) || access(buf, R_OK) == -1) { - result = 0; - } else { - asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME); - if (buf2 == NULL) - goto errout; + buf2 = NULL; + asprintf(&buf, "%s/%s", LOG_DIR, name); + if (buf == NULL) + goto errout; + if (!isdir(buf) || access(buf, R_OK) == -1) + result = 0; + else { + asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME); + if (buf2 == NULL) + goto errout; - if (!isfile(buf2) || access(buf2, R_OK) == -1) - result = -1; - else - result = 1; - } + if (!isfile(buf2) || access(buf2, R_OK) == -1) + result = -1; + else + result = 1; + } - free(buf); - buf = strdup(name); - if (buf == NULL) - goto errout; - free(buf2); - buf2 = NULL; + free(buf); + buf = strdup(name); + if (buf == NULL) + goto errout; + free(buf2); + buf2 = NULL; - memo = malloc(sizeof *memo); - if (memo == NULL) - goto errout; - memo->iip_name = buf; - memo->iip_result = result; - LIST_INSERT_HEAD(&iip_memo, memo, iip_link); - return result; + memo = malloc(sizeof *memo); + if (memo == NULL) + goto errout; + memo->iip_name = buf; + memo->iip_result = result; + LIST_INSERT_HEAD(&iip_memo, memo, iip_link); + return (result); errout: - if (buf != NULL) - free(buf); - if (buf2 != NULL) - free(buf2); - return -1; + if (buf != NULL) + free(buf); + if (buf2 != NULL) + free(buf2); + return (-1); } /* @@ -423,28 +441,30 @@ static int rex_match(const char *pattern, const char *pkgname, int extended) { - char errbuf[128]; - int errcode; - int retval; - regex_t rex; + char errbuf[128]; + int errcode; + int retval; + regex_t rex; + + retval = 0; - retval = 0; + errcode = regcomp(&rex, pattern, + (extended ? REG_EXTENDED : REG_BASIC) | REG_NOSUB); + if (errcode == 0) + errcode = regexec(&rex, pkgname, 0, NULL, 0); - errcode = regcomp(&rex, pattern, (extended ? REG_EXTENDED : REG_BASIC) | REG_NOSUB); - if (errcode == 0) - errcode = regexec(&rex, pkgname, 0, NULL, 0); + if (errcode == 0) + retval = 1; + else if (errcode != REG_NOMATCH) { + regerror(errcode, &rex, errbuf, sizeof(errbuf)); + warnx("%s: %s", pattern, errbuf); + retval = -1; + } - if (errcode == 0) { - retval = 1; - } else if (errcode != REG_NOMATCH) { - regerror(errcode, &rex, errbuf, sizeof(errbuf)); - warnx("%s: %s", pattern, errbuf); - retval = -1; - } + regfree(&rex); - regfree(&rex); + return (retval); - return retval; } /* @@ -455,89 +475,106 @@ static int csh_match(const char *pattern, const char *string, int flags) { - int ret = FNM_NOMATCH; + + Boolean quoted; + + const char *current = NULL; + const char *eb; + const char *nextchoice = pattern; + const char *pos; + const char *postfix; + char buf[FILENAME_MAX]; + + int prefixlen = -1; + int currentlen = 0; + int level = 0; + int ret = FNM_NOMATCH; + + do { + + pos = nextchoice; + postfix = NULL; + + quoted = FALSE; + + nextchoice = NULL; + + do { + + if (*pos == '\0') + postfix = pos; + else if (quoted == TRUE) + quoted = FALSE; + else { + + switch (*pos) { + case '{': + ++level; + if (level == 1) { + current = pos + 1; + prefixlen = pos - pattern; + } + break; + case ',': + if (level == 1 && !nextchoice) { + nextchoice = pos + 1; + currentlen = pos - current; + } + break; + case '}': + if (level == 1) { + postfix = pos+1; + if (!nextchoice) { + currentlen = + pos - current; + } + } + level--; + break; + case '[': + eb = pos + 1; + if (*eb == '!' || *eb == '^') + eb++; + if (*eb == ']') + eb++; + while (*eb && *eb != ']') + eb++; + if (*eb) + pos = eb; + break; + case '\\': + quoted = TRUE; + break; + default: + break; + } + + } + pos++; - const char *nextchoice = pattern; - const char *current = NULL; + } while (postfix == NULL); - int prefixlen = -1; - int currentlen = 0; + if (current) { - int level = 0; + snprintf(buf, sizeof(buf), "%.*s%.*s%s", + prefixlen, pattern, currentlen, current, postfix); - do { - const char *pos = nextchoice; - const char *postfix = NULL; + ret = csh_match(buf, string, flags); - Boolean quoted = FALSE; + if (ret) { + current = nextchoice; + level = 1; + } else + current = NULL; - nextchoice = NULL; + } else + ret = fnmatch(pattern, string, flags); - do { - const char *eb; - if (!*pos) { - postfix = pos; - } else if (quoted) { - quoted = FALSE; - } else { - switch (*pos) { - case '{': - ++level; - if (level == 1) { - current = pos+1; - prefixlen = pos-pattern; - } - break; - case ',': - if (level == 1 && !nextchoice) { - nextchoice = pos+1; - currentlen = pos-current; - } - break; - case '}': - if (level == 1) { - postfix = pos+1; - if (!nextchoice) - currentlen = pos-current; - } - level--; - break; - case '[': - eb = pos+1; - if (*eb == '!' || *eb == '^') - eb++; - if (*eb == ']') - eb++; - while(*eb && *eb != ']') - eb++; - if (*eb) - pos=eb; - break; - case '\\': - quoted = TRUE; - break; - default: - ; - } - } - pos++; - } while (!postfix); + } while (current); - if (current) { - char buf[FILENAME_MAX]; - snprintf(buf, sizeof(buf), "%.*s%.*s%s", prefixlen, pattern, currentlen, current, postfix); - ret = csh_match(buf, string, flags); - if (ret) { - current = nextchoice; - level = 1; - } else - current = NULL; - } else - ret = fnmatch(pattern, string, flags); - } while (current); + return (ret); - return ret; } /* @@ -547,57 +584,74 @@ struct store * storecreate(struct store *store) { - int i; + int i; - if (store == NULL) { - store = malloc(sizeof *store); if (store == NULL) { - warnx("%s(): malloc() failed", __func__); - return NULL; + store = malloc(sizeof *store); + if (store == NULL) { + warn("%s(): malloc() failed", __func__); + return (NULL); + } + store->currlen = 0; + store->store = NULL; + } else if (store->store != NULL) { + /* Free previously allocated memory */ + for (i = 0; store->store[i] != NULL; i++) + free(store->store[i]); + store->store[0] = NULL; } - store->currlen = 0; - store->store = NULL; - } else if (store->store != NULL) { - /* Free previously allocated memory */ - for (i = 0; store->store[i] != NULL; i++) - free(store->store[i]); - store->store[0] = NULL; - } - store->used = 0; + store->used = 0; - return store; + return (store); } /* * Append specified element to the provided store. + * + * Return 0 on success, return 1 on error. */ static int storeappend(struct store *store, const char *item) { - if (store->used + 2 > store->currlen) { - store->currlen += 16; - store->store = reallocf(store->store, - store->currlen * sizeof(*(store->store))); - if (store->store == NULL) { - store->currlen = 0; - warnx("%s(): reallocf() failed", __func__); - return 1; + int retcode = 0; + + if (store->used + 2 > store->currlen) { + + store->currlen += 16; + store->store = reallocf(store->store, + store->currlen * sizeof(*(store->store))); + + if (store->store == NULL) { + store->currlen = 0; + warn("%s(): reallocf() failed", __func__); + retcode = -1; + } + + } + + if (retcode == 0) { + + asprintf(&(store->store[store->used]), "%s", item); + /* + * XXX (gcooper): should the entire store be invalidated here, + * i.e. free store->store? + */ + if (store->store[store->used] == NULL) { + warn("%s(): malloc() failed", __func__); + retcode = -1; + } else { + store->used++; + store->store[store->used] = NULL; + } + } - } - asprintf(&(store->store[store->used]), "%s", item); - if (store->store[store->used] == NULL) { - warnx("%s(): malloc() failed", __func__); - return 1; - } - store->used++; - store->store[store->used] = NULL; + return (retcode); - return 0; } static int fname_cmp(const FTSENT * const *a, const FTSENT * const *b) { - return strcmp((*a)->fts_name, (*b)->fts_name); + return (strcmp((*a)->fts_name, (*b)->fts_name)); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ char * where_playpen(void) { - return PenLocation; + return (PenLocation); } /* Find a good place to play. */ @@ -49,7 +49,7 @@ if (pen[0] != '\0' && isdir(dirname(pen)) == TRUE && (min_free(dirname(pen)) >= sz)) - return pen; + return (pen); else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) == 0 && (min_free(cp) >= sz)) sprintf(pen, "%s/instmp.XXXXXX", cp); @@ -65,9 +65,9 @@ strcpy(pen, "/usr/tmp/instmp.XXXXXX"); else { errno = ENOSPC; - return NULL; + return (NULL); } - return pen; + return (pen); } #define MAX_STACK 20 @@ -81,7 +81,7 @@ errx(2, "%s: stack overflow.\n", __func__); pstack[pdepth] = strdup(pen); - return pstack[pdepth]; + return (pstack[pdepth]); } static void @@ -118,7 +118,7 @@ } - return pen_location; + return (pen_location); } @@ -155,7 +155,7 @@ } - return rc; + return (rc); } @@ -166,7 +166,7 @@ if (statfs(tmpdir, &buf) != 0) { warn("statfs"); - return -1; + return (-1); } - return (off_t)buf.f_bavail * (off_t)buf.f_bsize; + return ((off_t)buf.f_bavail * (off_t)buf.f_bsize); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/url.c#3 (text+ko) ==== @@ -21,12 +21,13 @@ #include __FBSDID("$FreeBSD: src/lib/libpkg/url.c,v 1.1 2010/04/23 11:07:43 flz Exp $"); -#include "pkg.h" +#include +#include #include -#include #include -#include #include +#include /* NOTE: stdio must come before fetch. */ +#include "pkg.h" /* * Try and fetch a file by URL, returning the directory name for where @@ -75,7 +76,7 @@ strcat(cp, ".tbz"); } else - return NULL; + return (NULL); } else if (hint != NULL) { /* @@ -88,7 +89,7 @@ } else - return NULL; + return (NULL); } else @@ -104,7 +105,7 @@ if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) { warn("Error: Unable to open %s", pkg); - return NULL; + return (NULL); } } @@ -118,7 +119,7 @@ warnx("failed to remove partially fetched package: %s", pkg); } - return NULL; + return (NULL); } if (isatty(0) || Verbose) { @@ -178,6 +179,6 @@ if (0 < pkgfd) close(pkgfd); - return rp; + return (rp); } From owner-p4-projects@FreeBSD.ORG Mon May 31 00:28:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E630106567A; Mon, 31 May 2010 00:28:19 +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 0FD8A1065676; Mon, 31 May 2010 00:28:19 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id A6B058FC08; Mon, 31 May 2010 00:28:18 +0000 (UTC) Received: by gwj23 with SMTP id 23so2489995gwj.13 for ; Sun, 30 May 2010 17:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=Z3+9j8EdxaPWbQ5rwalFew7xIn0fncxRwGRxVOsfyAQ=; b=OGUplM/4epnAU07pnDHfCZwuzXf/MBSPEhx3vqVkwNTx3YoURHi3qLX2AgOhHc1lVS FCkG82gd4P9GKwWNX/+2QZR1WCU3MNZm5om7Dk7raK3fgRpg1DdX3scM2LvI6NYFNehP Nyuk19fuXyOy0zEuz59I2l+XSB22UJeO5Bpqw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=IpmP1nF8Bh1/aQ1tvpn5cSdxUHMbLHXqLIZ49+wg2G1G8FX1LXSMvOLrLI65daDQtQ TC4CO8Z3+yt5GwZ74Btfhncud+ZBA+3nSLsmZMXuSdFhkbJAObhW5PDa8LaGgcuc1mlb cJ4EDhrMTv6Y+wjVe8Z/h4i7D3VBBkvIrk0eU= MIME-Version: 1.0 Received: by 10.231.120.37 with SMTP id b37mr4745296ibr.81.1275265697611; Sun, 30 May 2010 17:28:17 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.70.16 with HTTP; Sun, 30 May 2010 17:28:17 -0700 (PDT) In-Reply-To: <201005302335.o4UNZLsl028791@repoman.freebsd.org> References: <201005302335.o4UNZLsl028791@repoman.freebsd.org> Date: Sun, 30 May 2010 17:28:17 -0700 X-Google-Sender-Auth: XwEDuqi6oYO3gjj7Pt7NCwFkeeE Message-ID: From: Garrett Cooper To: Ivan Voras Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 178984 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, 31 May 2010 00:28:19 -0000 On Sun, May 30, 2010 at 4:35 PM, Ivan Voras wrote: > http://p4web.freebsd.org/@@178984?ac=3D10 > > Change 178984 by ivoras@betelgeuse on 2010/05/30 23:34:24 > > =A0 =A0 =A0 =A0Step 4: (not finished): Start creating the actual patch bi= nary > > Affected files ... > > .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#8 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#7 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#7 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#8 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#6 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#6 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#6 edit > .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#5 edit > [...] > + > + =A0 =A0 =A0 /* > + =A0 =A0 =A0 =A0* XXX: Possibly reimplement with libarchive. If I finall= y get how it > + =A0 =A0 =A0 =A0* stores directories. > + =A0 =A0 =A0 =A0*/ > + =A0 =A0 =A0 sprintf(tmp, "%s/%s", dpatch, PKGPATCH_FNAME); snprintf ? This will still be an issue because you have to use archive_entry_copy_pathname anyhow for just files anyways. > + =A0 =A0 =A0 fp =3D fopen(tmp, "w"); > + =A0 =A0 =A0 if (fp =3D=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "Cannot open file for writing: %s", = tmp); > + =A0 =A0 =A0 time(&tm); from time(3): DESCRIPTION The time() function returns the value of time in seconds since 0 hours= , 0 minutes, 0 seconds, January 1, 1970, Coordinated Universal Time. If a= n error occurs, time() returns the value (time_t)-1. The return value is also stored in *tloc, provided that tloc is non-nu= ll. ERRORS The time() function may fail for any of the reasons described in gettimeofday(2). > + =A0 =A0 =A0 fprintf(fp, "# FreeBSD package patch archive created on %s\= n", > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 ctime(&tm)); > + =A0 =A0 =A0 fprintf(fp, "@version %s\n", PKGPATCH_VERSION); > + =A0 =A0 =A0 parse_package_name(fold, tmp, tmp2, NULL); > + =A0 =A0 =A0 fprintf(fp, "@source %s-%s\n", tmp, tmp2); > + =A0 =A0 =A0 parse_package_name(fnew, tmp, tmp2, NULL); > + =A0 =A0 =A0 fprintf(fp, "@target %s-%s\n", tmp, tmp2); > + =A0 =A0 =A0 SLIST_FOREACH(fl, &fldiff_new_old, linkage) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fprintf(fp, "@add %s\n", fl->filename); > + =A0 =A0 =A0 SLIST_FOREACH(fl, &fldiff_old_new, linkage) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fprintf(fp, "@remove %s\n", fl->filename); > + =A0 =A0 =A0 SLIST_FOREACH(fl, &flchanged, linkage) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fprintf(fp, "@patch [method=3Dcp] %s\n", fl= ->filename); > + =A0 =A0 =A0 if (fclose(fp) !=3D 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "Cannot close %s", PKGPATCH_FNAME); > + > + =A0 =A0 =A0 /* Include all metadata files from the new package. */ > + =A0 =A0 =A0 SLIST_FOREACH(fl, &flnew, linkage) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (fl->filename[0] =3D=3D '+') { I talked to kientzle about this in the past and while he and I both agree that + prefixed files are a package metadata, the problem is that it's not a widely held standard and non-conforming packages could definitely cause minor performance and functional problems in this area if someone upstream creates a package with filenames prefixed in the `+'. With the current mess trying to integrate archive(5) support into pkg_create, I have deeply considered creating a directory within each package called .fpkg-metadata/ where the metadata files will live. That way it would make the purpose of said files easy, and would make it easy to extract the files and inspect them. It would require a trivial amount of rework within pkg_install. My only concern would be with existing tools outside of pkg_install that might depend on +CONTENTS existing within the package at a particular location. > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 sprintf(tmp, "%s/%s", dnew,= fl->filename); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 sprintf(tmp2, "%s/%s", dpat= ch, fl->filename); snprintf (x2) ? > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (copy_file_absolute(tmp,= tmp2) !=3D 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "Can= not copy file: %s to file: %s", > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0tmp,= tmp2); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 /* Simply copy the directory hierarchy of the new package. = */ > + =A0 =A0 =A0 replicate_dirtree(dnew, dpatch); > + > + =A0 =A0 =A0 SLIST_FOREACH(fl, &flchanged, linkage) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 sprintf(tmp, "%s/%s", dnew, fl->filename); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 sprintf(tmp2, "%s/%s", dpatch, fl->filename= ); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (copy_file_absolute(tmp, tmp2) !=3D 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "Cannot copy file: %= s to file: %s", tmp, tmp2); > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 sprintf(tmp, "%s -c -j -C %s -f %s *", _PATH_TAR, dpatch, f= patch); > + =A0 =A0 =A0 fp =3D popen(tmp, "r+"); > + =A0 =A0 =A0 if (fp =3D=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "Final tar execution failed for: %s"= , fpatch); > + =A0 =A0 =A0 rm_rf(dold); > + =A0 =A0 =A0 rm_rf(dnew); There's existing code in pkg_delete that matches this purpose. [...] > +void > +parse_package_name(char *pkgfile, char *basename, char *version, char *s= uff) > +{ > + =A0 =A0 =A0 char *tmp, *p; > + > + =A0 =A0 =A0 /* Strip directory path, if any */ > + =A0 =A0 =A0 p =3D strrchr(pkgfile, '/'); > + =A0 =A0 =A0 if (p !=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tmp =3D strdup(p + 1); > + =A0 =A0 =A0 else > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tmp =3D strdup(pkgfile); This could be done using basename(3) (and to that effect you could drop tmp, maybe...). I would look at the functions implemented through pkg_version as there might be some code in there that can be leveraged for what you're doing here. > + =A0 =A0 =A0 p =3D strrchr(tmp, '.'); > + =A0 =A0 =A0 if (suff !=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(suff, p); > + =A0 =A0 =A0 *p =3D '\0'; > + =A0 =A0 =A0 p =3D strrchr(tmp, '-'); > + =A0 =A0 =A0 if (version !=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(version, p + 1); > + =A0 =A0 =A0 *p =3D '\0'; > + =A0 =A0 =A0 if (basename !=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(basename, tmp); > + =A0 =A0 =A0 free(tmp); > +} > + > +/* > + * File copy, preserving attributes: ownership, mtime, mode. Knows how t= o handle > + * (re-create) symlinks. > + */ This doesn't handle POSIX extended attributes nor ACLs. > +int > +copy_file_absolute(char *from, char *to) > +{ > + =A0 =A0 =A0 char *buf; > + =A0 =A0 =A0 const ssize_t bufsize =3D 256*1024; > + =A0 =A0 =A0 ssize_t bs; > + =A0 =A0 =A0 int fdfrom, fdto; > + =A0 =A0 =A0 struct stat st; > + =A0 =A0 =A0 struct timeval tv; > + > + =A0 =A0 =A0 if (lstat(from, &st) !=3D 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + > + =A0 =A0 =A0 if (S_ISLNK(st.st_mode)) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 char tmp[PATH_MAX]; > + > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (readlink(from, tmp, PATH_MAX) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (symlink(tmp, to) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (0); > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 fdfrom =3D open(from, O_RDONLY); > + =A0 =A0 =A0 if (fdfrom < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 fdto =3D open(to, O_CREAT | O_WRONLY | O_TRUNC); > + =A0 =A0 =A0 if (fdto < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 buf =3D malloc(bufsize); > + =A0 =A0 =A0 if (buf =3D=3D NULL) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (ENOMEM); > + =A0 =A0 =A0 while (1) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 bs =3D read(fdfrom, buf, bufsize); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bs < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "read() failure"); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 else if (bs > 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (write(fdto, buf, bs) != =3D bs) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 err(1, "wri= te() failure"); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bs =3D=3D 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; > + =A0 =A0 =A0 } > + =A0 =A0 =A0 free(buf); > + =A0 =A0 =A0 close(fdto); > + =A0 =A0 =A0 close(fdfrom); > + > + =A0 =A0 =A0 if (chown(to, st.st_uid, st.st_gid) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 tv.tv_usec =3D 0; > + =A0 =A0 =A0 tv.tv_sec =3D st.st_mtime; > + =A0 =A0 =A0 if (lutimes(to, &tv) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 if (lchmod(to, st.st_mode) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (errno); > + =A0 =A0 =A0 return (0); > +} Thanks! -Garrett From owner-p4-projects@FreeBSD.ORG Mon May 31 00:59:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED98E1065673; Mon, 31 May 2010 00:59: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 B17F1106566B for ; Mon, 31 May 2010 00:59:54 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D2908FC16 for ; Mon, 31 May 2010 00:59:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V0xs3R050264 for ; Mon, 31 May 2010 00:59:54 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V0xs5q050262 for perforce@freebsd.org; Mon, 31 May 2010 00:59:54 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 00:59:54 GMT Message-Id: <201005310059.o4V0xs5q050262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 00:59:55 -0000 http://p4web.freebsd.org/@@178990?ac=10 Change 178990 by gcooper@gcooper-bayonetta on 2010/05/31 00:59:14 1. Properly check for result from new_plist_entry instead of assuming it will always pass. 2. Use for-loops instead of while-loops wherever easily acceptable. 3. Use explicit branch test values. 4. Avoid a NULL pointer deref in new_plist_entry if the malloc(3) fails. 5. delete_hierarchy: i. Unify return code mechanism. ii. Avoid some NULL pointer derefs in the nukedirs loop. iii. Don't leak memory between each time that dir is strdup(3)'ed. 5. style(9)-ize code. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#8 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#8 (text+ko) ==== @@ -38,96 +38,102 @@ void add_plist(Package *p, plist_t type, const char *arg) { - PackingList tmp; + PackingList tmp; + + tmp = new_plist_entry(); + + if (tmp != NULL) { + + tmp->name = copy_string(arg); + tmp->type = type; + + if (!p->head) + p->head = p->tail = tmp; + else { + tmp->prev = p->tail; + p->tail->next = tmp; + p->tail = tmp; + } + switch (type) { + case PLIST_NAME: + p->name = tmp->name; + break; - tmp = new_plist_entry(); - tmp->name = copy_string(arg); - tmp->type = type; + case PLIST_ORIGIN: + p->origin = tmp->name; + break; - if (!p->head) - p->head = p->tail = tmp; - else { - tmp->prev = p->tail; - p->tail->next = tmp; - p->tail = tmp; - } - switch (type) { - case PLIST_NAME: - p->name = tmp->name; - break; + default: + break; + } - case PLIST_ORIGIN: - p->origin = tmp->name; - break; + } - default: - break; - } } void add_plist_top(Package *p, plist_t type, const char *arg) { - PackingList tmp; + PackingList tmp; + + tmp = new_plist_entry(); + + if (tmp != NULL) { + + tmp->name = copy_string(arg); + tmp->type = type; + + if (!p->head) + p->head = p->tail = tmp; + else { + tmp->next = p->head; + p->head->prev = tmp; + p->head = tmp; + } - tmp = new_plist_entry(); - tmp->name = copy_string(arg); - tmp->type = type; + } - if (!p->head) - p->head = p->tail = tmp; - else { - tmp->next = p->head; - p->head->prev = tmp; - p->head = tmp; - } } /* Return the last (most recent) entry in a packing list */ PackingList last_plist(Package *p) { - return p->tail; + return (p->tail); } /* Mark all items in a packing list to prevent iteration over them */ void mark_plist(Package *pkg) { - PackingList p = pkg->head; + PackingList p; - while (p) { - p->marked = TRUE; - p = p->next; - } + for (p = pkg->head; p != NULL; p = p->next) + p->marked = TRUE; } /* Find a given item in a packing list and, if so, return it (else NULL) */ PackingList find_plist(Package *pkg, plist_t type) { - PackingList p = pkg->head; + PackingList p; - while (p) { - if (p->type == type) - return p; - p = p->next; - } - return NULL; + for (p = pkg->head; p != NULL; p = p->next) + if (p->type == type) + return (p); + return (NULL); } /* Look for a specific boolean option argument in the list */ char * find_plist_option(Package *pkg, const char *name) { - PackingList p = pkg->head; + PackingList p; - while (p) { - if (p->type == PLIST_OPTION && !strcmp(p->name, name)) - return p->name; - p = p->next; - } - return NULL; + for (p = pkg->head; p != NULL; p = p->next) + if (p->type == PLIST_OPTION && !strcmp(p->name, name)) + return (p->name); + return (NULL); } /* @@ -137,56 +143,66 @@ void delete_plist(Package *pkg, Boolean all, plist_t type, const char *name) { - PackingList p = pkg->head; + PackingList p = pkg->head; + + while (p != NULL) { + + PackingList pnext = p->next; + + if (p->type == type && (!name || !strcmp(name, p->name))) { + + free(p->name); + + if (p->prev) + p->prev->next = pnext; + else + pkg->head = pnext; + if (pnext != NULL) + pnext->prev = p->prev; + else + pkg->tail = p->prev; + free(p); + + if (all == FALSE) + return; + p = pnext; - while (p) { - PackingList pnext = p->next; + } else + p = p->next; - if (p->type == type && (!name || !strcmp(name, p->name))) { - free(p->name); - if (p->prev) - p->prev->next = pnext; - else - pkg->head = pnext; - if (pnext) - pnext->prev = p->prev; - else - pkg->tail = p->prev; - free(p); - if (!all) - return; - p = pnext; } - else - p = p->next; - } + } /* Allocate a new packing list entry */ PackingList new_plist_entry(void) { - PackingList ret; + PackingList ret; - ret = (PackingList)malloc(sizeof(struct _plist)); - bzero(ret, sizeof(struct _plist)); - return ret; + ret = (PackingList)malloc(sizeof(struct _plist)); + if (ret != NULL) + bzero(ret, sizeof(struct _plist)); + return (ret); } /* Free an entire packing list */ void free_plist(Package *pkg) { - PackingList p = pkg->head; + PackingList p; + + for (p = pkg->head; p != NULL; ) { + + PackingList p1 = p->next; + + free(p->name); + free(p); + p = p1; + } - while (p) { - PackingList p1 = p->next; + pkg->head = pkg->tail = NULL; - free(p->name); - free(p); - p = p1; - } - pkg->head = pkg->tail = NULL; } /* @@ -196,82 +212,86 @@ int plist_cmd(const char *s, char **arg) { - /* XXX (gcooper): this can blow up really quickly with the recent - * modifications made to read_plist, provided a sufficiently large list. */ - char cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */ - char *cp; - const char *sp; + /* + * XXX (gcooper): this can blow up really quickly with the recent + * modifications made to read_plist, provided a sufficiently large + * list. + */ + char cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */ + char *cp; + const char *sp; - /* - * FIXME (gcooper): this should be dynamic according to whatever's passed - * in. - */ - if (strlcpy(cmd, s, sizeof(cmd)) >= sizeof(cmd)) { - warnx("%s: line '%s' exceeds set limits", __func__, s); - errno = EINVAL; - return -1; - } - str_lowercase(cmd); - cp = cmd; - sp = s; - while (*cp) { - if (isspace(*cp)) { - *cp = '\0'; - while (isspace(*sp)) /* Never sure if macro, increment later */ - ++sp; - break; + /* + * FIXME (gcooper): this should be dynamic according to whatever's + * passed in. + */ + if (strlcpy(cmd, s, sizeof(cmd)) >= sizeof(cmd)) { + warnx("%s: line '%s' exceeds set limits", __func__, s); + errno = EINVAL; + return (-1); } - ++cp, ++sp; - } - if (arg) - *arg = (char *)sp; - if (!strcmp(cmd, "cwd")) - return PLIST_CWD; - else if (!strcmp(cmd, "srcdir")) - return PLIST_SRC; - else if (!strcmp(cmd, "cd")) - return PLIST_CWD; - else if (!strcmp(cmd, "exec")) - return PLIST_CMD; - else if (!strcmp(cmd, "unexec")) - return PLIST_UNEXEC; - else if (!strcmp(cmd, "mode")) - return PLIST_CHMOD; - else if (!strcmp(cmd, "owner")) - return PLIST_CHOWN; - else if (!strcmp(cmd, "group")) - return PLIST_CHGRP; - else if (!strcmp(cmd, "noinst")) - return PLIST_NOINST; - else if (!strcmp(cmd, "comment")) { - if (!strncmp(*arg, "ORIGIN:", 7)) { - *arg += 7; - return PLIST_ORIGIN; - } else if (!strncmp(*arg, "DEPORIGIN:", 10)) { - *arg += 10; - return PLIST_DEPORIGIN; + str_lowercase(cmd); + cp = cmd; + sp = s; + while (*cp != '\0') { + if (isspace(*cp)) { + *cp = '\0'; + /* Never sure if macro, increment later */ + while (isspace(*sp++)) ; + break; + } + cp++; + sp++; } - return PLIST_COMMENT; - } else if (!strcmp(cmd, "ignore")) - return PLIST_IGNORE; - else if (!strcmp(cmd, "ignore_inst")) - return PLIST_IGNORE_INST; - else if (!strcmp(cmd, "name")) - return PLIST_NAME; - else if (!strcmp(cmd, "display")) - return PLIST_DISPLAY; - else if (!strcmp(cmd, "pkgdep")) - return PLIST_PKGDEP; - else if (!strcmp(cmd, "conflicts")) - return PLIST_CONFLICTS; - else if (!strcmp(cmd, "mtree")) - return PLIST_MTREE; - else if (!strcmp(cmd, "dirrm")) - return PLIST_DIR_RM; - else if (!strcmp(cmd, "option")) - return PLIST_OPTION; - else - return -1; + if (arg) + *arg = (char *)sp; + if (!strcmp(cmd, "cwd")) + return (PLIST_CWD); + else if (!strcmp(cmd, "srcdir")) + return (PLIST_SRC); + else if (!strcmp(cmd, "cd")) + return (PLIST_CWD); + else if (!strcmp(cmd, "exec")) + return (PLIST_CMD); + else if (!strcmp(cmd, "unexec")) + return (PLIST_UNEXEC); + else if (!strcmp(cmd, "mode")) + return (PLIST_CHMOD); + else if (!strcmp(cmd, "owner")) + return (PLIST_CHOWN); + else if (!strcmp(cmd, "group")) + return (PLIST_CHGRP); + else if (!strcmp(cmd, "noinst")) + return (PLIST_NOINST); + else if (!strcmp(cmd, "comment")) { + if (!strncmp(*arg, "ORIGIN:", 7)) { + *arg += 7; + return (PLIST_ORIGIN); + } else if (!strncmp(*arg, "DEPORIGIN:", 10)) { + *arg += 10; + return (PLIST_DEPORIGIN); + } + return (PLIST_COMMENT); + } else if (!strcmp(cmd, "ignore")) + return (PLIST_IGNORE); + else if (!strcmp(cmd, "ignore_inst")) + return (PLIST_IGNORE_INST); + else if (!strcmp(cmd, "name")) + return (PLIST_NAME); + else if (!strcmp(cmd, "display")) + return (PLIST_DISPLAY); + else if (!strcmp(cmd, "pkgdep")) + return (PLIST_PKGDEP); + else if (!strcmp(cmd, "conflicts")) + return (PLIST_CONFLICTS); + else if (!strcmp(cmd, "mtree")) + return (PLIST_MTREE); + else if (!strcmp(cmd, "dirrm")) + return (PLIST_DIR_RM); + else if (!strcmp(cmd, "option")) + return (PLIST_OPTION); + else + return (-1); } /* Read a packing list from a file */ @@ -288,7 +308,7 @@ int serrno; int major; int minor; - int rc = -1; + int retcode = -1; off_t end_off; size_t len; @@ -303,10 +323,10 @@ 0)) != NULL) { end_off = sb.st_size; - rc = 0; + retcode = 0; start = contents_map; - while (rc == 0 && 0 < end_off) { + while (retcode == 0 && 0 < end_off) { end = strchr(start, '\n'); /* No trailing newlines -- look for '\0'. */ @@ -324,7 +344,7 @@ cmd_buf = malloc(end-start+1); if (cmd_buf == NULL) - rc = -1; + retcode = -1; else { strlcpy(cmd_buf, start, end-start+1); @@ -339,14 +359,14 @@ /* Empty line. */ if (len == 0) { errno = EINVAL; - rc = -1; + retcode = -1; } else cp = cmd_buf; } /* A plist command directive */ - if (rc == 0 && *start == CMD_CHAR) { + if (retcode == 0 && *start == CMD_CHAR) { cmd = plist_cmd(cmd_buf+1, &cp); @@ -354,15 +374,16 @@ warnx("%s: unknown command '%s' " "(package tools out of date?)", __func__, start); - rc = -1; + retcode = -1; } else if (*cp == '\0') { cp = NULL; if (cmd == PLIST_PKGDEP) { - warnx("corrupted record (pkgdep line " - "without argument), ignoring"); + warnx("corrupted record " + "(pkgdep line without " + "argument), ignoring"); errno = EINVAL; - cmd = rc = -1; + cmd = retcode = -1; } } @@ -388,7 +409,7 @@ if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { errno = EINVAL; - rc = -1; + retcode = -1; } } @@ -397,14 +418,14 @@ } /* A file manifest item */ - else if (rc == 0) + else if (retcode == 0) cmd = PLIST_FILE; /* * Winner, winner, chicken dinner.. we have a working * command! */ - if (rc == 0) { + if (retcode == 0) { add_plist(pkg, cmd, cp); start = end; @@ -436,14 +457,14 @@ errno = serrno; } - if (rc == -1 && cmd_buf != NULL) { + if (retcode == -1 && cmd_buf != NULL) { serrno = errno; free(cmd_buf); if (serrno == 0) errno = serrno; } - return rc; + return (retcode); } @@ -451,8 +472,9 @@ int write_plist(Package *pkg, FILE *fp) { + PackingList plist; - int rc = 0; + int retcode = 0; for (plist = pkg->head; plist != NULL; plist = plist->next) { @@ -543,19 +565,20 @@ break; case PLIST_DEPORIGIN: - fprintf(fp, "%ccomment DEPORIGIN:%s\n", CMD_CHAR, plist->name); + fprintf(fp, "%ccomment DEPORIGIN:%s\n", CMD_CHAR, + plist->name); break; default: warnx("%s: unknown command type %d (%s)", __func__, plist->type, plist->name); - rc = -1; + retcode = -1; break; } } - return rc; + return (retcode); } @@ -568,121 +591,166 @@ int delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) { - PackingList p; - const char *Where = ".", *last_file = ""; - Boolean fail = FALSE; - Boolean preserve; - char tmp[FILENAME_MAX], *name = NULL; - char *prefix = NULL; + PackingList p; + Boolean fail = FALSE; + Boolean preserve; + char tmp[FILENAME_MAX]; + char *name = NULL; + char *prefix = NULL; + const char *Where = "."; + const char *last_file = ""; + + preserve = find_plist_option(pkg, "preserve") ? TRUE : FALSE; + + for (p = pkg->head; p != NULL; p = p->next) { + + switch (p->type) { + case PLIST_NAME: + name = p->name; + break; + + case PLIST_IGNORE: + p = p->next; + break; + + case PLIST_CWD: + if (prefix == NULL) + prefix = p->name; + Where = (p->name == NULL) ? prefix : p->name; + if (Verbose) + printf("Change working directory to %s\n", + Where); + break; + + case PLIST_UNEXEC: + format_cmd(tmp, FILENAME_MAX, p->name, Where, + last_file); + if (Verbose) + printf("Execute '%s'\n", tmp); + if (!Fake && system(tmp)) { + warnx("unexec command for '%s' failed", tmp); + fail = -1; + } + break; + + /* + * TODO: break up this logic into more easily digestable + * blocks, if not to improve indentation, at least to improve + * modularity and testability via whitebox tests. + */ + case PLIST_FILE: + last_file = p->name; + sprintf(tmp, "%s/%s", Where, p->name); + /* TODO: set EISDIR */ + if (isdir(tmp) && fexists(tmp) && !issymlink(tmp)) { + warnx("cannot delete specified file '%s' - it " + "is a directory!\nthis packing list is " + "incorrect - ignoring delete request", + tmp); + } else { + if (p->next && + p->next->type == PLIST_COMMENT && + strncmp(p->next->name, "MD5:", 4) == 0) { + char *cp = NULL, buf[33]; + + /* + * For packing lists whose version is + * 1.1 or greater, the md5 hash for a + * symlink is calculated on the string + * returned by readlink(). + */ + if (issymlink(tmp) && + verscmp(pkg, 1, 0) > 0) { + char linkbuf[PATHNAME_MAX]; + int len; + + if ((len = readlink(tmp, + linkbuf, sizeof(linkbuf))) > 0) + cp = MD5Data((unsigned char *)linkbuf, len, buf); + } else if (isfile(tmp) || + verscmp(pkg, 1, 1) < 0) + cp = MD5File(tmp, buf); + + if (cp != NULL) { + + /* Mismatch? */ + if (strcmp(cp, + p->next->name + 4) != 0) { + warnx("'%s' fails " + "original MD5 " + "checksum - %s", + tmp, + (Force ? + "deleted anyway." : + "not deleted.")); + if (!Force) { + fail = -1; + continue; + } + + } - preserve = find_plist_option(pkg, "preserve") ? TRUE : FALSE; - for (p = pkg->head; p; p = p->next) { - switch (p->type) { - case PLIST_NAME: - name = p->name; - break; + } - case PLIST_IGNORE: - p = p->next; - break; + } - case PLIST_CWD: - if (prefix == NULL) - prefix = p->name; - Where = (p->name == NULL) ? prefix : p->name; - if (Verbose) - printf("Change working directory to %s\n", Where); - break; + if (Verbose) + printf("Delete file %s\n", tmp); + if (!Fake) { + if (delete_hierarchy(tmp, ign_err, + nukedirs)) + fail = -1; + if (preserve && name) { + char tmp2[FILENAME_MAX]; + + if (make_preserve_name(tmp2, + sizeof(tmp2), name, tmp)) { - case PLIST_UNEXEC: - format_cmd(tmp, FILENAME_MAX, p->name, Where, last_file); - if (Verbose) - printf("Execute '%s'\n", tmp); - if (!Fake && system(tmp)) { - warnx("unexec command for '%s' failed", tmp); - fail = -1; - } - break; + if (fexists(tmp2)) { + if (rename(tmp2, tmp)) + warn("preserve: unable to restore %s as %s", tmp2, tmp); + } - case PLIST_FILE: - last_file = p->name; - sprintf(tmp, "%s/%s", Where, p->name); - if (isdir(tmp) && fexists(tmp) && !issymlink(tmp)) { - warnx("cannot delete specified file '%s' - it is a directory!\n" - "this packing list is incorrect - ignoring delete request", tmp); - } - else { - if (p->next && p->next->type == PLIST_COMMENT && !strncmp(p->next->name, "MD5:", 4)) { - char *cp = NULL, buf[33]; + } - /* - * For packing lists whose version is 1.1 or greater, the - * md5 hash for a symlink is calculated on the string - * returned by readlink(). - */ - if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) { - int len; - char linkbuf[FILENAME_MAX]; + } - if ((len = readlink(tmp, linkbuf, FILENAME_MAX)) > 0) - cp = MD5Data((unsigned char *)linkbuf, len, buf); - } else if (isfile(tmp) || verscmp(pkg, 1, 1) < 0) - cp = MD5File(tmp, buf); + } - if (cp != NULL) { - /* Mismatch? */ - if (strcmp(cp, p->next->name + 4)) { - warnx("'%s' fails original MD5 checksum - %s", - tmp, Force ? "deleted anyway." : "not deleted."); - if (!Force) { - fail = -1; - continue; - } } - } - } - if (Verbose) - printf("Delete file %s\n", tmp); - if (!Fake) { - if (delete_hierarchy(tmp, ign_err, nukedirs)) - fail = -1; - if (preserve && name) { - char tmp2[FILENAME_MAX]; - - if (make_preserve_name(tmp2, FILENAME_MAX, name, tmp)) { - if (fexists(tmp2)) { - if (rename(tmp2, tmp)) - warn("preserve: unable to restore %s as %s", - tmp2, tmp); - } + + break; + + case PLIST_DIR_RM: + sprintf(tmp, "%s/%s", Where, p->name); + + if (!isdir(tmp) && fexists(tmp)) { + warnx("cannot delete specified directory '%s' " + "- it is a file!\nthis packing list is " + "incorrect - ignoring delete request", + tmp); + } else { + if (Verbose) + printf("Deleting directory %s\n", tmp); + if (Fake == FALSE && + delete_hierarchy(tmp, ign_err, FALSE)) { + warnx("unable to completely remove " + "directory '%s'", tmp); + fail = -1; + } } - } - } - } - break; + + last_file = p->name; + break; - case PLIST_DIR_RM: - sprintf(tmp, "%s/%s", Where, p->name); - if (!isdir(tmp) && fexists(tmp)) { - warnx("cannot delete specified directory '%s' - it is a file!\n" - "this packing list is incorrect - ignoring delete request", tmp); - } - else { - if (Verbose) - printf("Delete directory %s\n", tmp); - if (!Fake && delete_hierarchy(tmp, ign_err, FALSE)) { - warnx("unable to completely remove directory '%s'", tmp); - fail = -1; + default: + break; } - } - last_file = p->name; - break; - default: - break; } - } - return fail; + + return (fail); + } #ifdef DEBUG @@ -697,45 +765,73 @@ int delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) { - char *cp1, *cp2; + + char *cp1, *cp2; + int retcode = 1; /* 1 -> retcode not touched. */ + + if (!fexists(dir) && !issymlink(dir)) { + if (ign_err == FALSE) { + warnx("%s '%s' doesn't exist", + isdir(dir) ? "directory" : "file", dir); + retcode = -1; + } + } else if (nukedirs) { + if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), + dir)) + retcode = -1; + } else if (isdir(dir) && !issymlink(dir)) + if (RMDIR(dir) && !ign_err) + retcode = -1; + else + if (REMOVE(dir, ign_err)) + retcode = -1; + + /* + * If we got this far, strdup the paths as is required directly + * below. + */ + if (retcode == 1) { - cp1 = cp2 = strdup(dir); - if (!fexists(dir) && !issymlink(dir)) { - if (!ign_err) - warnx("%s '%s' doesn't exist", - isdir(dir) ? "directory" : "file", dir); - return !ign_err; - } - else if (nukedirs) { - if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir)) - return 1; - } - else if (isdir(dir) && !issymlink(dir)) { - if (RMDIR(dir) && !ign_err) - return 1; - } - else { - if (REMOVE(dir, ign_err)) - return 1; - } + cp1 = cp2 = strdup(dir); + if (cp1 == NULL || cp2 == NULL) + retcode = -1; - if (!nukedirs) - return 0; - while (cp2) { - if ((cp2 = strrchr(cp1, '/')) != NULL) - *cp2 = '\0'; - if (!isemptydir(dir)) - return 0; - if (RMDIR(dir) && !ign_err) { - if (!fexists(dir)) - warnx("directory '%s' doesn't exist", dir); - else - return 1; } - /* back up the pathname one component */ - if (cp2) { - cp1 = strdup(dir); + + if (retcode == 1) { + + retcode = 0; + + if (nukedirs == TRUE) { + + while (cp2 != NULL && retcode == 0) { + + if ((cp2 = strrchr(cp1, '/')) != NULL) + *cp2 = '\0'; + if (!isemptydir(dir)) + retcode == 0; + if (RMDIR(dir) && !ign_err) { + + if (!fexists(dir)) + warnx("directory '%s' doesn't " + "exist", dir); + else + retcode = -1; + + } + + /* back up the pathname one component */ + if (cp2 != NULL) { + free(cp1); + cp1 = strdup(dir); + if (cp1 == NULL) + retcode = -1; + } + + } + } - } - return 0; + + return (retcode); + } From owner-p4-projects@FreeBSD.ORG Mon May 31 01:11:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B2B61065672; Mon, 31 May 2010 01:11:07 +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 1FD791065679 for ; Mon, 31 May 2010 01:11:07 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CB2C8FC14 for ; Mon, 31 May 2010 01:11:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V1B6Rt052611 for ; Mon, 31 May 2010 01:11:06 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V1B63P052609 for perforce@freebsd.org; Mon, 31 May 2010 01:11:06 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 01:11:06 GMT Message-Id: <201005310111.o4V1B63P052609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 01:11:07 -0000 http://p4web.freebsd.org/@@178991?ac=10 Change 178991 by gcooper@gcooper-bayonetta on 2010/05/31 01:10:16 Add warnings about QA issues with plist_add* Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#9 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#9 (text+ko) ==== @@ -34,7 +34,12 @@ #include "pkg.h" -/* Add an item to a packing list */ +/* + * Add an item to a packing list + * + * FIXME: this will `silently fail' until the next point when p is + * dereferenced. + */ void add_plist(Package *p, plist_t type, const char *arg) { @@ -71,6 +76,10 @@ } +/* + * FIXME: this will `silently fail' until the next point when p is + * dereferenced. + */ void add_plist_top(Package *p, plist_t type, const char *arg) { From owner-p4-projects@FreeBSD.ORG Mon May 31 01:24:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48C161065676; Mon, 31 May 2010 01:24: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 0D516106566B for ; Mon, 31 May 2010 01:24:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D451C8FC08 for ; Mon, 31 May 2010 01:24:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V1OLvY054017 for ; Mon, 31 May 2010 01:24:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V1OL6W054015 for perforce@freebsd.org; Mon, 31 May 2010 01:24:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 01:24:21 GMT Message-Id: <201005310124.o4V1OL6W054015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 01:24:22 -0000 http://p4web.freebsd.org/@@178992?ac=10 Change 178992 by gcooper@gcooper-bayonetta on 2010/05/31 01:23:45 Actually, instead of just adding useless warnings, let's fix the add_plist* APIs to use proper return codes when new_plist_entry fails. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#12 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#10 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#12 (text+ko) ==== @@ -193,8 +193,8 @@ void free_plist(Package *); void mark_plist(Package *); void csum_plist_entry(char *, PackingList); -void add_plist(Package *, plist_t, const char *); -void add_plist_top(Package *, plist_t, const char *); +int add_plist(Package *, plist_t, const char *); +int add_plist_top(Package *, plist_t, const char *); void delete_plist(Package *pkg, Boolean all, plist_t type, const char *name); int write_plist(Package *, FILE *); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#10 (text+ko) ==== @@ -35,19 +35,22 @@ #include "pkg.h" /* - * Add an item to a packing list + * Add an item to the tail of a packing list. * - * FIXME: this will `silently fail' until the next point when p is - * dereferenced. + * Returns 0 on success, -1 on failure (errno will be set appropriate to + * errors with malloc(3)). */ -void +int add_plist(Package *p, plist_t type, const char *arg) { PackingList tmp; + int retcode = 0; tmp = new_plist_entry(); - if (tmp != NULL) { + if (tmp == NULL) + retcode = -1; + else tmp->name = copy_string(arg); tmp->type = type; @@ -74,20 +77,27 @@ } + return retcode; + } /* - * FIXME: this will `silently fail' until the next point when p is - * dereferenced. + * Add an element to the top of the plist. + * + * Returns 0 on success, -1 on failure (errno will be set appropriate to + * errors with malloc(3)). */ -void +int add_plist_top(Package *p, plist_t type, const char *arg) { PackingList tmp; + int retcode = 0; tmp = new_plist_entry(); - if (tmp != NULL) { + if (tmp == NULL) + retcode = -1; + else tmp->name = copy_string(arg); tmp->type = type; @@ -102,6 +112,8 @@ } + return retcode; + } /* Return the last (most recent) entry in a packing list */ @@ -436,11 +448,19 @@ */ if (retcode == 0) { - add_plist(pkg, cmd, cp); - start = end; - /* We aren't at the end of the line, yet.. */ - if (start != '\0') - start++; + if (add_plist(pkg, cmd, cp) == -1) + retcode = -1; + else { + + start = end; + /* + * We aren't at the end of the line, + * yet.. + */ + if (start != '\0') + start++; + + } } From owner-p4-projects@FreeBSD.ORG Mon May 31 01:38:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A426D1065674; Mon, 31 May 2010 01:38: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 683E11065673 for ; Mon, 31 May 2010 01:38:37 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 530468FC19 for ; Mon, 31 May 2010 01:38:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V1cbuX055114 for ; Mon, 31 May 2010 01:38:37 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V1cb5A055112 for perforce@freebsd.org; Mon, 31 May 2010 01:38:37 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 01:38:37 GMT Message-Id: <201005310138.o4V1cb5A055112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 01:38:37 -0000 http://p4web.freebsd.org/@@178993?ac=10 Change 178993 by gcooper@gcooper-bayonetta on 2010/05/31 01:38:26 Chase @178992 by properly checking the return codes from add_plist*. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#16 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#30 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#10 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#16 (text+ko) ==== @@ -236,7 +236,8 @@ */ if (Prefix) { delete_plist(&Plist, FALSE, PLIST_CWD, NULL); - add_plist_top(&Plist, PLIST_CWD, Prefix); + if (add_plist_top(&Plist, PLIST_CWD, Prefix) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); } setenv(PKG_PREFIX_VNAME, (p = find_plist(&Plist, PLIST_CWD)) ? p->name : ".", 1); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#30 (text+ko) ==== @@ -172,7 +172,7 @@ deps = alloca(sizeof(*deps) * ndeps + 1); if (deps == NULL) errx(2, "%s: alloca() failed", __func__); - for (i = 0; Pkgdeps;) { + for (i = 0; Pkgdeps; ) { cp = strsep(&Pkgdeps, " \t\n"); if (*cp) { deps[i] = cp; @@ -187,9 +187,12 @@ deporigin = strchr(deps[i], ':'); if (deporigin != NULL) { *deporigin = '\0'; - add_plist_top(&plist, PLIST_DEPORIGIN, ++deporigin); + if (add_plist_top(&plist, PLIST_DEPORIGIN, ++deporigin) == + -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); } - add_plist_top(&plist, PLIST_PKGDEP, deps[i]); + if (add_plist_top(&plist, PLIST_PKGDEP, deps[i]) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); if (Verbose && !PlistOnly) printf(" %s", deps[i]); } @@ -206,7 +209,8 @@ while (Conflicts) { cp = strsep(&Conflicts, " \t\n"); if (*cp) { - add_plist(&plist, PLIST_CONFLICTS, cp); + if (add_plist(&plist, PLIST_CONFLICTS, cp) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); if (Verbose && !PlistOnly) printf(" %s", cp); } @@ -219,7 +223,8 @@ if (SrcDir) { if (Verbose && !PlistOnly) printf("Using SrcDir value of %s\n", SrcDir); - add_plist(&plist, PLIST_SRC, SrcDir); + if (add_plist(&plist, PLIST_SRC, SrcDir) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); } /* Slurp in the packing list */ @@ -230,25 +235,28 @@ /* Prefix should add an @cwd to the packing list */ if (Prefix) - add_plist_top(&plist, PLIST_CWD, Prefix); + if (add_plist_top(&plist, PLIST_CWD, Prefix) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); - /* Add the origin if asked, at the top */ if (Origin) - add_plist_top(&plist, PLIST_ORIGIN, Origin); + if (add_plist_top(&plist, PLIST_ORIGIN, Origin) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); /* * 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 (add_plist_top(&plist, PLIST_NAME, basename(pkg)) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); 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); + if (add_plist_top(&plist, PLIST_COMMENT, cp) == -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); free(cp); /* @@ -275,57 +283,78 @@ /* Now put the release specific items in */ if (Prefix == NULL) - add_plist(&plist, PLIST_CWD, "."); + if (add_plist(&plist, PLIST_CWD, ".") == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); if (write_file(COMMENT_FNAME, Comment) == 0) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, COMMENT_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, COMMENT_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, COMMENT_FNAME); } else err(EXIT_FAILURE, "failed to write comment file"); if (write_file(DESC_FNAME, Desc) == 0) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DESC_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, DESC_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, DESC_FNAME); } else err(EXIT_FAILURE, "failed to write description file"); if (Install != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, INSTALL_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, INSTALL_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, INSTALL_FNAME); } if (PostInstall != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, POST_INSTALL_FNAME); } if (DeInstall != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, DEINSTALL_FNAME); } if (PostDeInstall != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME); } if (Require != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, REQUIRE_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, REQUIRE_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, REQUIRE_FNAME); } if (Display != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DISPLAY_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, DISPLAY_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, DISPLAY_FNAME); - add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME); + if (add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); } if (Mtree != NULL) { - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, MTREE_FNAME); + if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); + if (add_plist(&plist, PLIST_FILE, MTREE_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); add_cksum(&plist, plist.tail, MTREE_FNAME); - add_plist(&plist, PLIST_MTREE, MTREE_FNAME); + if (add_plist(&plist, PLIST_MTREE, MTREE_FNAME) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); } /* Finally, write out the packing list */ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#10 (text+ko) ==== @@ -213,7 +213,8 @@ /* If we have a prefix, add it now */ if (Prefix) - add_plist(&Plist, PLIST_CWD, Prefix); + if (add_plist(&Plist, PLIST_CWD, Prefix) == -1) + err(EXIT_FAILURE, "%s: add_plist failed", __func__); rc = read_plist(&Plist, cfile); serrno = errno; (void) close(cfile); From owner-p4-projects@FreeBSD.ORG Mon May 31 01:54:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C24E21065674; Mon, 31 May 2010 01:54: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 86DEB1065672 for ; Mon, 31 May 2010 01:54:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 72FEE8FC16 for ; Mon, 31 May 2010 01:54:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V1stRe060211 for ; Mon, 31 May 2010 01:54:55 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V1stkv060209 for perforce@freebsd.org; Mon, 31 May 2010 01:54:55 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 01:54:55 GMT Message-Id: <201005310154.o4V1stkv060209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 01:54:56 -0000 http://p4web.freebsd.org/@@178995?ac=10 Change 178995 by gcooper@gcooper-bayonetta on 2010/05/31 01:54:48 Reword the cleanup exit handler message. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#17 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#31 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#11 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#17 (text+ko) ==== @@ -44,7 +44,7 @@ int err_cnt = 0; if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1) - err(EXIT_FAILURE, "failed to initialize exit handler"); + err(EXIT_FAILURE, "failed to initialize cleanup exit handler"); if (AddMode == SLAVE) err_cnt = pkg_do(NULL); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#31 (text+ko) ==== @@ -69,7 +69,7 @@ const char *suf; if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1) - err(EXIT_FAILURE, "failed to initialize exit handler"); + err(EXIT_FAILURE, "failed to initialize cleanup exit handler"); /* Preliminary setup */ if (InstalledPkg == NULL) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#11 (text+ko) ==== @@ -47,7 +47,7 @@ int i; if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1) - err(EXIT_FAILURE, "failed to initialize exit handler"); + err(EXIT_FAILURE, "failed to initialize cleanup exit handler"); /* Overriding action? */ if (Flags & SHOW_PKGNAME) From owner-p4-projects@FreeBSD.ORG Mon May 31 03:35:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 024841065678; Mon, 31 May 2010 03:35: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 BB0F61065675 for ; Mon, 31 May 2010 03:35:46 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A87038FC0C for ; Mon, 31 May 2010 03:35:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V3ZkkS094290 for ; Mon, 31 May 2010 03:35:46 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V3ZkmJ094288 for perforce@freebsd.org; Mon, 31 May 2010 03:35:46 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 03:35:46 GMT Message-Id: <201005310335.o4V3ZkmJ094288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 03:35:47 -0000 http://p4web.freebsd.org/@@178999?ac=10 Change 178999 by gcooper@gcooper-bayonetta on 2010/05/31 03:34:58 Fix typos. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 (text+ko) ==== @@ -50,7 +50,7 @@ if (tmp == NULL) retcode = -1; - else + else { tmp->name = copy_string(arg); tmp->type = type; @@ -97,7 +97,7 @@ if (tmp == NULL) retcode = -1; - else + else { tmp->name = copy_string(arg); tmp->type = type; @@ -690,7 +690,7 @@ */ if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) { - char linkbuf[PATHNAME_MAX]; + char linkbuf[PATH_MAX]; int len; if ((len = readlink(tmp, @@ -808,10 +808,10 @@ if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir)) retcode = -1; - } else if (isdir(dir) && !issymlink(dir)) + } else if (isdir(dir) && !issymlink(dir)) { if (RMDIR(dir) && !ign_err) retcode = -1; - else + } else if (REMOVE(dir, ign_err)) retcode = -1; @@ -831,14 +831,13 @@ retcode = 0; - if (nukedirs == TRUE) { - + if (nukedirs == TRUE) while (cp2 != NULL && retcode == 0) { if ((cp2 = strrchr(cp1, '/')) != NULL) *cp2 = '\0'; if (!isemptydir(dir)) - retcode == 0; + retcode = 0; if (RMDIR(dir) && !ign_err) { if (!fexists(dir)) From owner-p4-projects@FreeBSD.ORG Mon May 31 03:44:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B8FD1065677; Mon, 31 May 2010 03:44: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 272051065673 for ; Mon, 31 May 2010 03:44:57 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 143448FC17 for ; Mon, 31 May 2010 03:44:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V3iuZH095097 for ; Mon, 31 May 2010 03:44:56 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V3iuql095095 for perforce@freebsd.org; Mon, 31 May 2010 03:44:56 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 03:44:56 GMT Message-Id: <201005310344.o4V3iuql095095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 03:44:57 -0000 http://p4web.freebsd.org/@@179000?ac=10 Change 179000 by gcooper@gcooper-bayonetta on 2010/05/31 03:44:51 Make sure that unpack_to_buffer never lets data hit the disk by using archive_read_data(3). Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#19 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#19 (text+ko) ==== @@ -335,10 +335,8 @@ ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR) /* - * Unpack a single file, denoted by file, to a buffer; this call uses - * unpack_to_fd to first open the file, and once that has been completed - * it opens the file and proceeds to read it into the buffer which will - * need to be freed by the user at a later date. + * Unpack a single file, denoted by file, to a buffer. It proceeds to read it + * into the buffer which will need to be freed by the user at a later date. * * Returns an address to a buffer with the contents of *file if successful, or * returns NULL on failure. @@ -347,39 +345,98 @@ unpack_to_buffer(const char *pkg, const char *file) { - struct stat sb; + struct archive *archive; + struct archive_entry *archive_entry; + Boolean found_match = FALSE; + + int64_t buf_size; + char *buf = NULL; - int fd; - int serrno; + const char *entry_pathname = NULL; + const char *error = NULL; + int archive_fd = -1; + int r; + + errno = 0; + + if ((archive = archive_read_new()) != NULL) { + + if (archive_read_support_compression_all(archive) + != ARCHIVE_OK || + archive_read_support_format_tar(archive) != ARCHIVE_OK) + error = archive_error_string(archive); + /* + * Avoid potential race conditions with + * archive_read_open_filename(3), by opening the file + * beforehand. + */ + else if (pkg == NULL) + archive_fd = fileno(stdin); + else + archive_fd = open(pkg, O_RDONLY); + + } + + /* The initial open failed or archive(3) failed to open the file. */ + if (archive_fd == -1 || archive == NULL) ; + /* archive(3) failed to open the file descriptor. */ + else if (archive_read_open_fd(archive, archive_fd, + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) + error = archive_error_string(archive); + else + while (error == NULL && found_match == FALSE && + (r = archive_read_next_header(archive, &archive_entry)) == + ARCHIVE_OK) { + + entry_pathname = archive_entry_pathname(archive_entry); + + if (strncmp(file, entry_pathname, PATH_MAX) == 0) { + + /* + * Regardless of whether or not extract passes, + * we found our target file so let's exit + * quickly because the underlying issue is most + * likely unrecoverable. + */ + found_match = TRUE; + + buf_size = archive_entry_size(archive_entry); + + if (buf_size == 0) + errno = EINVAL; + else { + + buf = malloc(sizeof(char)*buf_size); + + if (buf == NULL) + error = strerror(errno); + else { - if ((fd = unpack_to_fd(pkg, file)) != -1) { + r = archive_read_data(archive, + buf, buf_size); - if (fstat(fd, &sb) == 0) { + if (r != ARCHIVE_OK) + error = archive_error_string(archive); - /* - * User either passed in a non-NULL value or we need - * to malloc on the fly and let the user deal with it - * later. - */ - buf = malloc(sb.st_size); - if (buf != NULL) { + } - if (read(fd, buf, sb.st_size) != sb.st_size) { - free(buf); - buf = NULL; } } } - } + +#if 0 + /* + * This should be stored in a global buffer or something similar that's + * retrievable via pkg_error or something of that flavor. + */ + if (errno != 0) + error = strerror(errno); +#endif - if (0 <= fd) { - serrno = errno; - close(fd); - if (serrno != 0) - errno = serrno; - } + if (archive != NULL) + archive_read_finish(archive); return (buf); @@ -402,7 +459,8 @@ Boolean extract_whole_archive = FALSE; const char *entry_pathname = NULL; const char *error = NULL; - int archive_fd = -1, r; + int archive_fd = -1; + int r; errno = 0; @@ -490,9 +548,8 @@ const char *entry_pathname = NULL; const char *error = NULL; + int archive_fd = -1, r; int fd = -1; - /* int fd = -1; */ - int archive_fd = -1, r; errno = 0; From owner-p4-projects@FreeBSD.ORG Mon May 31 05:37:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF4771065674; Mon, 31 May 2010 05:36:59 +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 96216106566B for ; Mon, 31 May 2010 05:36:59 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A1828FC0A for ; Mon, 31 May 2010 05:36:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V5axRX016174 for ; Mon, 31 May 2010 05:36:59 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V5axj6016172 for perforce@freebsd.org; Mon, 31 May 2010 05:36:59 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 05:36:59 GMT Message-Id: <201005310536.o4V5axj6016172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 05:37:00 -0000 http://p4web.freebsd.org/@@179001?ac=10 Change 179001 by gcooper@gcooper-bayonetta on 2010/05/31 05:36:19 size_t is unsigned; off_t isn't. Switch to off_t in write_file. Drop the buffered I/O through stdio. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#20 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#13 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#20 (text+ko) ==== @@ -269,32 +269,29 @@ * Return the number of bytes successfully written out to str or -1 on * failure. */ -size_t +off_t write_file(const char *name, const char *str) { - FILE *fp = NULL; + int fd = -1; + int serrno; off_t written_len = -1; size_t len; - int serrno; errno = 0; - fp = fopen(name, "w"); - if (fp != NULL) { + len = strlen(str); - len = strlen(str); - written_len = fwrite(str, 1, len, fp); + if ((fd = open(name, O_WRONLY | O_CREAT)) != -1) { - if (fp != NULL) { - serrno = errno; - (void) fclose(fp); - if (serrno != 0) - errno = serrno; - } + written_len = write(fd, str, len); + serrno = errno; + (void) close(fd); + if (serrno != 0) + errno = serrno; } - return (size_t) (errno == 0 && written_len > 0 ? written_len : -1); + return (off_t) (errno == 0 && written_len > 0 ? written_len : -1); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#13 (text+ko) ==== @@ -175,7 +175,7 @@ const char *fileGetURL(const char *, const char *, int); char *fileFindByPath(const char *, const char *); char *fileGetContents(const char *); -size_t write_file(const char *, const char *); +off_t write_file(const char *, const char *); int move_file(const char *, const char *, const char *); int delete_hierarchy(const char *, Boolean, Boolean); char* unpack_to_buffer(const char *, const char *); From owner-p4-projects@FreeBSD.ORG Mon May 31 06:01:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB701065688; Mon, 31 May 2010 06:01: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 C468E1065676; Mon, 31 May 2010 06:01:24 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id DBC908FC16; Mon, 31 May 2010 06:01:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o4V60m4c003720; Mon, 31 May 2010 00:00:49 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 31 May 2010 00:00:55 -0600 (MDT) Message-Id: <20100531.000055.923725949146439083.imp@bsdimp.com> To: hselasky@c2i.net From: "M. Warner Losh" In-Reply-To: <201005302101.02794.hselasky@c2i.net> References: <201005301444.o4UEidHb057496@repoman.freebsd.org> <201005302101.02794.hselasky@c2i.net> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org, zec@freebsd.org, gcooper@freebsd.org Subject: Re: PERFORCE change 178978 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, 31 May 2010 06:01:25 -0000 In message: <201005302101.02794.hselasky@c2i.net> Hans Petter Selasky writes: : On Sunday 30 May 2010 20:59:33 Garrett Cooper wrote: : > > if (version != 1) : > > - return (ENOPROTOOPT); : > > + return ENOPROTOOPT; : > : > That's actually a style regression (along with any other return calls : > without parentheses). : > : : FYI: : : Linux style mandatates return values without parentheses. And FreeBSD style : mandates that opposite! NetBSD style mandates their absence too... Warner From owner-p4-projects@FreeBSD.ORG Mon May 31 08:32:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96061065678; Mon, 31 May 2010 08:32:11 +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 8C6EF1065676 for ; Mon, 31 May 2010 08:32:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78C598FC13 for ; Mon, 31 May 2010 08:32:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V8WB7D032653 for ; Mon, 31 May 2010 08:32:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V8WB1f032651 for perforce@freebsd.org; Mon, 31 May 2010 08:32:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2010 08:32:11 GMT Message-Id: <201005310832.o4V8WB1f032651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 08:32:12 -0000 http://p4web.freebsd.org/@@179006?ac=10 Change 179006 by rwatson@rwatson_cinnamon on 2010/05/31 08:31:21 Fix a warning: no semantic change, just a variable use change. Reported by: clang static analyzer Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#20 $ */ #include @@ -210,7 +210,7 @@ #ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); #endif - return (u); + return (up); } } From owner-p4-projects@FreeBSD.ORG Mon May 31 08:33:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CAB81065676; Mon, 31 May 2010 08:33: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 C4DFB1065674 for ; Mon, 31 May 2010 08:33:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B15F88FC19 for ; Mon, 31 May 2010 08:33:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4V8XCi3032760 for ; Mon, 31 May 2010 08:33:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V8XCGU032758 for perforce@freebsd.org; Mon, 31 May 2010 08:33:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2010 08:33:12 GMT Message-Id: <201005310833.o4V8XCGU032758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 08:33:13 -0000 http://p4web.freebsd.org/@@179007?ac=10 Change 179007 by rwatson@rwatson_cinnamon on 2010/05/31 08:32:41 Don't dereference a NULL pointer if memory allocation fails in au_to_socket_sx(). Affects only the userspace BSM code, as kernel BSM allocates tokens using M_WAITOK. Reported by: clang static analyzer Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#94 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#94 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#93 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#94 $ */ #include @@ -968,6 +968,8 @@ errno = EINVAL; return (NULL); } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_SOCKET_EX); ADD_U_INT16(dptr, au_domain_to_bsm(so_domain)); From owner-p4-projects@FreeBSD.ORG Mon May 31 23:42:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BEEE106567E; Mon, 31 May 2010 23:42: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 C4647106566B for ; Mon, 31 May 2010 23:42:49 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B30988FC0C for ; Mon, 31 May 2010 23:42:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4VNgn09060349 for ; Mon, 31 May 2010 23:42:49 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4VNgnrY060347 for perforce@freebsd.org; Mon, 31 May 2010 23:42:49 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 31 May 2010 23:42:49 GMT Message-Id: <201005312342.o4VNgnrY060347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 23:42:50 -0000 http://p4web.freebsd.org/@@179027?ac=10 Change 179027 by gcooper@gcooper-bayonetta on 2010/05/31 23:42:31 Fix accidental regression. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#12 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#12 (text+ko) ==== @@ -258,7 +258,8 @@ if (isspace(*cp)) { *cp = '\0'; /* Never sure if macro, increment later */ - while (isspace(*sp++)) ; + while (isspace(*sp)) + sp++; break; } cp++; From owner-p4-projects@FreeBSD.ORG Tue Jun 1 00:24:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDED21065674; Tue, 1 Jun 2010 00:24: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 89835106567E for ; Tue, 1 Jun 2010 00:24:35 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76E148FC0A for ; Tue, 1 Jun 2010 00:24:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o510OZJL064660 for ; Tue, 1 Jun 2010 00:24:35 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o510OZsL064658 for perforce@freebsd.org; Tue, 1 Jun 2010 00:24:35 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Tue, 1 Jun 2010 00:24:35 GMT Message-Id: <201006010024.o510OZsL064658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 00:24:36 -0000 http://p4web.freebsd.org/@@179028?ac=10 Change 179028 by jlaffaye@gsoc on 2010/06/01 00:24:08 Integrate from gcooper's branch. Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/global.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/match.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pen.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/plist.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/create/perform.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/info/perform.c#2 integrate Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#2 (text+ko) ==== @@ -269,32 +269,29 @@ * Return the number of bytes successfully written out to str or -1 on * failure. */ -size_t +off_t write_file(const char *name, const char *str) { - FILE *fp = NULL; + int fd = -1; + int serrno; off_t written_len = -1; size_t len; - int serrno; errno = 0; - fp = fopen(name, "w"); - if (fp != NULL) { + len = strlen(str); - len = strlen(str); - written_len = fwrite(str, 1, len, fp); + if ((fd = open(name, O_WRONLY | O_CREAT)) != -1) { - if (fp != NULL) { - serrno = errno; - (void) fclose(fp); - if (serrno != 0) - errno = serrno; - } + written_len = write(fd, str, len); + serrno = errno; + (void) close(fd); + if (serrno != 0) + errno = serrno; } - return (size_t) (errno == 0 && written_len > 0 ? written_len : -1); + return (off_t) (errno == 0 && written_len > 0 ? written_len : -1); } @@ -335,10 +332,8 @@ ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR) /* - * Unpack a single file, denoted by file, to a buffer; this call uses - * unpack_to_fd to first open the file, and once that has been completed - * it opens the file and proceeds to read it into the buffer which will - * need to be freed by the user at a later date. + * Unpack a single file, denoted by file, to a buffer. It proceeds to read it + * into the buffer which will need to be freed by the user at a later date. * * Returns an address to a buffer with the contents of *file if successful, or * returns NULL on failure. @@ -347,41 +342,100 @@ unpack_to_buffer(const char *pkg, const char *file) { - struct stat sb; + struct archive *archive; + struct archive_entry *archive_entry; + Boolean found_match = FALSE; + + int64_t buf_size; + char *buf = NULL; - int fd; - int serrno; + const char *entry_pathname = NULL; + const char *error = NULL; + int archive_fd = -1; + int r; + + errno = 0; + + if ((archive = archive_read_new()) != NULL) { + + if (archive_read_support_compression_all(archive) + != ARCHIVE_OK || + archive_read_support_format_tar(archive) != ARCHIVE_OK) + error = archive_error_string(archive); + /* + * Avoid potential race conditions with + * archive_read_open_filename(3), by opening the file + * beforehand. + */ + else if (pkg == NULL) + archive_fd = fileno(stdin); + else + archive_fd = open(pkg, O_RDONLY); + + } + + /* The initial open failed or archive(3) failed to open the file. */ + if (archive_fd == -1 || archive == NULL) ; + /* archive(3) failed to open the file descriptor. */ + else if (archive_read_open_fd(archive, archive_fd, + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) + error = archive_error_string(archive); + else + while (error == NULL && found_match == FALSE && + (r = archive_read_next_header(archive, &archive_entry)) == + ARCHIVE_OK) { + + entry_pathname = archive_entry_pathname(archive_entry); + + if (strncmp(file, entry_pathname, PATH_MAX) == 0) { + + /* + * Regardless of whether or not extract passes, + * we found our target file so let's exit + * quickly because the underlying issue is most + * likely unrecoverable. + */ + found_match = TRUE; + + buf_size = archive_entry_size(archive_entry); + + if (buf_size == 0) + errno = EINVAL; + else { + + buf = malloc(sizeof(char)*buf_size); + + if (buf == NULL) + error = strerror(errno); + else { - if ((fd = unpack_to_fd(pkg, file)) != -1) { + r = archive_read_data(archive, + buf, buf_size); - if (fstat(fd, &sb) == 0) { + if (r != ARCHIVE_OK) + error = archive_error_string(archive); - /* - * User either passed in a non-NULL value or we need - * to malloc on the fly and let the user deal with it - * later. - */ - buf = malloc(sb.st_size); - if (buf != NULL) { + } - if (read(fd, buf, sb.st_size) != sb.st_size) { - free(buf); - buf = NULL; } } } - } + +#if 0 + /* + * This should be stored in a global buffer or something similar that's + * retrievable via pkg_error or something of that flavor. + */ + if (errno != 0) + error = strerror(errno); +#endif - if (0 <= fd) { - serrno = errno; - close(fd); - if (serrno != 0) - errno = serrno; - } + if (archive != NULL) + archive_read_finish(archive); - return buf; + return (buf); } @@ -402,7 +456,8 @@ Boolean extract_whole_archive = FALSE; const char *entry_pathname = NULL; const char *error = NULL; - int archive_fd = -1, r; + int archive_fd = -1; + int r; errno = 0; @@ -490,9 +545,8 @@ const char *entry_pathname = NULL; const char *error = NULL; + int archive_fd = -1, r; int fd = -1; - /* int fd = -1; */ - int archive_fd = -1, r; errno = 0; @@ -563,7 +617,7 @@ if (0 <= archive_fd) close(archive_fd); - return fd; + return (fd); } ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/global.c#2 (text+ko) ==== @@ -28,4 +28,4 @@ Boolean Quiet = FALSE; Boolean Fake = FALSE; Boolean Force = FALSE; -int Verbose = 0; /* Allow multiple levels of verbose. */ +int Verbose = 0; /* Allow multiple levels of verbose. */ ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/match.c#2 (text+ko) ==== @@ -57,136 +57,154 @@ char ** matchinstalled(match_t MatchType, char **patterns, int *retval) { - int i, errcode, len; - char *matched; - const char *paths[2] = {LOG_DIR, NULL}; - static struct store *store = NULL; - FTS *ftsp; - FTSENT *f; - Boolean *lmatched = NULL; + static struct store *store = NULL; + FTS *ftsp; + FTSENT *f; + char *matched; + const char *paths[2] = {LOG_DIR, NULL}; + int i; + int errcode; + int len; + Boolean *lmatched = NULL; + + store = storecreate(store); + if (store == NULL) { + if (retval != NULL) + *retval = 1; + return (NULL); + } - store = storecreate(store); - if (store == NULL) { if (retval != NULL) - *retval = 1; - return NULL; - } + *retval = 0; + + if (!isdir(paths[0])) { + if (retval != NULL) + *retval = 1; + return (NULL); + } + + /* Count number of patterns */ + if (patterns != NULL) { - if (retval != NULL) - *retval = 0; + for (len = 0; patterns[len]; len++) ; - if (!isdir(paths[0])) { - if (retval != NULL) - *retval = 1; - return NULL; - /* Not reached */ - } + lmatched = alloca(sizeof(*lmatched) * len); + if (lmatched == NULL) { + warn("%s(): alloca() failed", __func__); + if (retval != NULL) + *retval = 1; + return (NULL); + } - /* Count number of patterns */ - if (patterns != NULL) { - for (len = 0; patterns[len]; len++) {} - lmatched = alloca(sizeof(*lmatched) * len); - if (lmatched == NULL) { - warnx("%s(): alloca() failed", __func__); - if (retval != NULL) - *retval = 1; - return NULL; - } - } else - len = 0; + } else + len = 0; - for (i = 0; i < len; i++) - lmatched[i] = FALSE; + for (i = 0; i < len; i++) + lmatched[i] = FALSE; + + ftsp = fts_open((char * const *)(uintptr_t)paths, + FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp); + + if (ftsp != NULL) { + + while ((f = fts_read(ftsp)) != NULL) { + + if (f->fts_info == FTS_D && f->fts_level == 1) { + + fts_set(ftsp, f, FTS_SKIP); + matched = NULL; + errcode = 0; + + if (MatchType == MATCH_ALL) + matched = f->fts_name; + else + for (i = 0; patterns[i]; i++) { + errcode = pattern_match( + MatchType, patterns[i], + f->fts_name); + if (errcode == 1) { + matched = f->fts_name; + lmatched[i] = TRUE; + errcode = 0; + } + if (matched != NULL || + errcode != 0) + break; + } + + if (errcode == 0 && matched != NULL) + errcode = storeappend(store, matched); + if (errcode != 0) { + if (retval != NULL) + *retval = 1; + return (NULL); + } - ftsp = fts_open((char * const *)(uintptr_t)paths, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp); - if (ftsp != NULL) { - while ((f = fts_read(ftsp)) != NULL) { - if (f->fts_info == FTS_D && f->fts_level == 1) { - fts_set(ftsp, f, FTS_SKIP); - matched = NULL; - errcode = 0; - if (MatchType == MATCH_ALL) - matched = f->fts_name; - else - for (i = 0; patterns[i]; i++) { - errcode = pattern_match(MatchType, patterns[i], f->fts_name); - if (errcode == 1) { - matched = f->fts_name; - lmatched[i] = TRUE; - errcode = 0; } - if (matched != NULL || errcode != 0) - break; - } - if (errcode == 0 && matched != NULL) - errcode = storeappend(store, matched); - if (errcode != 0) { - if (retval != NULL) - *retval = 1; - return NULL; - /* Not reached */ + } - } + + fts_close(ftsp); + } - fts_close(ftsp); - } - if (MatchType == MATCH_GLOB) { - for (i = 0; i < len; i++) - if (lmatched[i] == FALSE) - storeappend(store, patterns[i]); - } + /* XXX (gcooper): check for return code from storeappend here? */ + if (MatchType == MATCH_GLOB) + for (i = 0; i < len; i++) + if (lmatched[i] == FALSE) + storeappend(store, patterns[i]); - if (store->used == 0) - return NULL; - else - return store->store; + if (store->used == 0) + return (NULL); + else + return (store->store); } int pattern_match(match_t MatchType, char *pattern, const char *pkgname) { - int errcode = 0; - const char *fname = pkgname; - char basefname[PATH_MAX]; - char condchar = '\0'; - char *condition; + char basefname[PATH_MAX]; + char condchar = '\0'; + char *condition; + const char *ch; + const char *fname = pkgname; + int errcode = 0; - /* do we have an appended condition? */ - condition = strpbrk(pattern, "<>="); - if (condition) { - const char *ch; - /* yes, isolate the pattern from the condition ... */ - if (condition > pattern && condition[-1] == '!') - condition--; - condchar = *condition; - *condition = '\0'; - /* ... and compare the name without version */ - ch = strrchr(fname, '-'); - if (ch && ch - fname < PATH_MAX) { - strlcpy(basefname, fname, ch - fname + 1); - fname = basefname; + /* do we have an appended condition? */ + condition = strpbrk(pattern, "<>="); + if (condition) { + /* yes, isolate the pattern from the condition ... */ + if (condition > pattern && condition[-1] == '!') + condition--; + condchar = *condition; + *condition = '\0'; + /* ... and compare the name without version */ + ch = strrchr(fname, '-'); + if (ch != NULL && ch - fname < PATH_MAX) { + strlcpy(basefname, fname, ch - fname + 1); + fname = basefname; + } } - } - switch (MatchType) { - case MATCH_EREGEX: - case MATCH_REGEX: - errcode = rex_match(pattern, fname, MatchType == MATCH_EREGEX ? 1 : 0); - break; - case MATCH_NGLOB: - case MATCH_GLOB: - errcode = (csh_match(pattern, fname, 0) == 0) ? 1 : 0; - break; - case MATCH_EXACT: - errcode = (strcmp(pattern, fname) == 0) ? 1 : 0; - break; - case MATCH_ALL: - errcode = 1; - break; - default: - break; - } + switch (MatchType) { + case MATCH_EREGEX: + case MATCH_REGEX: + errcode = rex_match(pattern, fname, + MatchType == MATCH_EREGEX ? 1 : 0); + break; + case MATCH_NGLOB: + case MATCH_GLOB: + errcode = (csh_match(pattern, fname, 0) == 0) ? 1 : 0; + break; + case MATCH_EXACT: + errcode = (strcmp(pattern, fname) == 0) ? 1 : 0; + break; + case MATCH_ALL: + errcode = 1; + break; + default: + break; + } /* loop over all appended conditions */ while (condition) { @@ -366,53 +384,53 @@ int isinstalledpkg(const char *name) { - int result; - char *buf, *buf2; - struct iip_memo *memo; + struct iip_memo *memo; + int result; + char *buf, *buf2; + + LIST_FOREACH(memo, &iip_memo, iip_link) { + if (strcmp(memo->iip_name, name) == 0) + return (memo->iip_result); + } - LIST_FOREACH(memo, &iip_memo, iip_link) { - if (strcmp(memo->iip_name, name) == 0) - return memo->iip_result; - } - - buf2 = NULL; - asprintf(&buf, "%s/%s", LOG_DIR, name); - if (buf == NULL) - goto errout; - if (!isdir(buf) || access(buf, R_OK) == -1) { - result = 0; - } else { - asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME); - if (buf2 == NULL) - goto errout; + buf2 = NULL; + asprintf(&buf, "%s/%s", LOG_DIR, name); + if (buf == NULL) + goto errout; + if (!isdir(buf) || access(buf, R_OK) == -1) + result = 0; + else { + asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME); + if (buf2 == NULL) + goto errout; - if (!isfile(buf2) || access(buf2, R_OK) == -1) - result = -1; - else - result = 1; - } + if (!isfile(buf2) || access(buf2, R_OK) == -1) + result = -1; + else + result = 1; + } - free(buf); - buf = strdup(name); - if (buf == NULL) - goto errout; - free(buf2); - buf2 = NULL; + free(buf); + buf = strdup(name); + if (buf == NULL) + goto errout; + free(buf2); + buf2 = NULL; - memo = malloc(sizeof *memo); - if (memo == NULL) - goto errout; - memo->iip_name = buf; - memo->iip_result = result; - LIST_INSERT_HEAD(&iip_memo, memo, iip_link); - return result; + memo = malloc(sizeof *memo); + if (memo == NULL) + goto errout; + memo->iip_name = buf; + memo->iip_result = result; + LIST_INSERT_HEAD(&iip_memo, memo, iip_link); + return (result); errout: - if (buf != NULL) - free(buf); - if (buf2 != NULL) - free(buf2); - return -1; + if (buf != NULL) + free(buf); + if (buf2 != NULL) + free(buf2); + return (-1); } /* @@ -423,28 +441,30 @@ static int rex_match(const char *pattern, const char *pkgname, int extended) { - char errbuf[128]; - int errcode; - int retval; - regex_t rex; + char errbuf[128]; + int errcode; + int retval; + regex_t rex; + + retval = 0; - retval = 0; + errcode = regcomp(&rex, pattern, + (extended ? REG_EXTENDED : REG_BASIC) | REG_NOSUB); + if (errcode == 0) + errcode = regexec(&rex, pkgname, 0, NULL, 0); - errcode = regcomp(&rex, pattern, (extended ? REG_EXTENDED : REG_BASIC) | REG_NOSUB); - if (errcode == 0) - errcode = regexec(&rex, pkgname, 0, NULL, 0); + if (errcode == 0) + retval = 1; + else if (errcode != REG_NOMATCH) { + regerror(errcode, &rex, errbuf, sizeof(errbuf)); + warnx("%s: %s", pattern, errbuf); + retval = -1; + } - if (errcode == 0) { - retval = 1; - } else if (errcode != REG_NOMATCH) { - regerror(errcode, &rex, errbuf, sizeof(errbuf)); - warnx("%s: %s", pattern, errbuf); - retval = -1; - } + regfree(&rex); - regfree(&rex); + return (retval); - return retval; } /* @@ -455,89 +475,106 @@ static int csh_match(const char *pattern, const char *string, int flags) { - int ret = FNM_NOMATCH; + + Boolean quoted; + + const char *current = NULL; + const char *eb; + const char *nextchoice = pattern; + const char *pos; + const char *postfix; + char buf[FILENAME_MAX]; + + int prefixlen = -1; + int currentlen = 0; + int level = 0; + int ret = FNM_NOMATCH; + + do { + + pos = nextchoice; + postfix = NULL; + + quoted = FALSE; + + nextchoice = NULL; + + do { + + if (*pos == '\0') + postfix = pos; + else if (quoted == TRUE) + quoted = FALSE; + else { + + switch (*pos) { + case '{': + ++level; + if (level == 1) { + current = pos + 1; + prefixlen = pos - pattern; + } + break; + case ',': + if (level == 1 && !nextchoice) { + nextchoice = pos + 1; + currentlen = pos - current; + } + break; + case '}': + if (level == 1) { + postfix = pos+1; + if (!nextchoice) { + currentlen = + pos - current; + } + } + level--; + break; + case '[': + eb = pos + 1; + if (*eb == '!' || *eb == '^') + eb++; + if (*eb == ']') + eb++; + while (*eb && *eb != ']') + eb++; + if (*eb) + pos = eb; + break; + case '\\': + quoted = TRUE; + break; + default: + break; + } + + } + pos++; - const char *nextchoice = pattern; - const char *current = NULL; + } while (postfix == NULL); - int prefixlen = -1; - int currentlen = 0; + if (current) { - int level = 0; + snprintf(buf, sizeof(buf), "%.*s%.*s%s", + prefixlen, pattern, currentlen, current, postfix); - do { - const char *pos = nextchoice; - const char *postfix = NULL; + ret = csh_match(buf, string, flags); - Boolean quoted = FALSE; + if (ret) { + current = nextchoice; + level = 1; + } else + current = NULL; - nextchoice = NULL; + } else + ret = fnmatch(pattern, string, flags); - do { - const char *eb; - if (!*pos) { - postfix = pos; - } else if (quoted) { - quoted = FALSE; - } else { - switch (*pos) { - case '{': - ++level; - if (level == 1) { - current = pos+1; - prefixlen = pos-pattern; - } - break; - case ',': - if (level == 1 && !nextchoice) { - nextchoice = pos+1; - currentlen = pos-current; - } - break; - case '}': - if (level == 1) { - postfix = pos+1; - if (!nextchoice) - currentlen = pos-current; - } - level--; - break; - case '[': - eb = pos+1; - if (*eb == '!' || *eb == '^') - eb++; - if (*eb == ']') - eb++; - while(*eb && *eb != ']') - eb++; - if (*eb) - pos=eb; - break; - case '\\': - quoted = TRUE; - break; - default: - ; - } - } - pos++; - } while (!postfix); + } while (current); - if (current) { - char buf[FILENAME_MAX]; - snprintf(buf, sizeof(buf), "%.*s%.*s%s", prefixlen, pattern, currentlen, current, postfix); - ret = csh_match(buf, string, flags); - if (ret) { - current = nextchoice; - level = 1; - } else - current = NULL; - } else - ret = fnmatch(pattern, string, flags); - } while (current); + return (ret); - return ret; } /* @@ -547,57 +584,74 @@ struct store * storecreate(struct store *store) { - int i; + int i; - if (store == NULL) { - store = malloc(sizeof *store); if (store == NULL) { - warnx("%s(): malloc() failed", __func__); - return NULL; + store = malloc(sizeof *store); + if (store == NULL) { + warn("%s(): malloc() failed", __func__); + return (NULL); + } + store->currlen = 0; + store->store = NULL; + } else if (store->store != NULL) { + /* Free previously allocated memory */ + for (i = 0; store->store[i] != NULL; i++) + free(store->store[i]); + store->store[0] = NULL; } - store->currlen = 0; - store->store = NULL; - } else if (store->store != NULL) { - /* Free previously allocated memory */ - for (i = 0; store->store[i] != NULL; i++) - free(store->store[i]); - store->store[0] = NULL; - } - store->used = 0; + store->used = 0; - return store; + return (store); } /* * Append specified element to the provided store. + * + * Return 0 on success, return 1 on error. */ static int storeappend(struct store *store, const char *item) { - if (store->used + 2 > store->currlen) { - store->currlen += 16; - store->store = reallocf(store->store, - store->currlen * sizeof(*(store->store))); - if (store->store == NULL) { - store->currlen = 0; - warnx("%s(): reallocf() failed", __func__); - return 1; + int retcode = 0; + + if (store->used + 2 > store->currlen) { + + store->currlen += 16; + store->store = reallocf(store->store, + store->currlen * sizeof(*(store->store))); + + if (store->store == NULL) { + store->currlen = 0; + warn("%s(): reallocf() failed", __func__); + retcode = -1; + } + + } + + if (retcode == 0) { + + asprintf(&(store->store[store->used]), "%s", item); + /* + * XXX (gcooper): should the entire store be invalidated here, + * i.e. free store->store? + */ + if (store->store[store->used] == NULL) { + warn("%s(): malloc() failed", __func__); + retcode = -1; + } else { + store->used++; + store->store[store->used] = NULL; + } + } - } - asprintf(&(store->store[store->used]), "%s", item); - if (store->store[store->used] == NULL) { - warnx("%s(): malloc() failed", __func__); - return 1; - } - store->used++; - store->store[store->used] = NULL; + return (retcode); - return 0; } static int fname_cmp(const FTSENT * const *a, const FTSENT * const *b) { - return strcmp((*a)->fts_name, (*b)->fts_name); + return (strcmp((*a)->fts_name, (*b)->fts_name)); } ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pen.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ char * where_playpen(void) { - return PenLocation; + return (PenLocation); } /* Find a good place to play. */ @@ -49,7 +49,7 @@ if (pen[0] != '\0' && isdir(dirname(pen)) == TRUE && (min_free(dirname(pen)) >= sz)) - return pen; + return (pen); else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) == 0 && (min_free(cp) >= sz)) sprintf(pen, "%s/instmp.XXXXXX", cp); @@ -65,9 +65,9 @@ strcpy(pen, "/usr/tmp/instmp.XXXXXX"); else { errno = ENOSPC; - return NULL; + return (NULL); } - return pen; + return (pen); } #define MAX_STACK 20 @@ -81,7 +81,7 @@ errx(2, "%s: stack overflow.\n", __func__); pstack[pdepth] = strdup(pen); - return pstack[pdepth]; + return (pstack[pdepth]); } static void @@ -118,7 +118,7 @@ } - return pen_location; + return (pen_location); } @@ -155,7 +155,7 @@ } - return rc; + return (rc); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 1 06:46:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1D21065678; Tue, 1 Jun 2010 06:46: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 129D91065672 for ; Tue, 1 Jun 2010 06:46:34 +0000 (UTC) (envelope-from gsilva@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2CBF8FC19 for ; Tue, 1 Jun 2010 06:46:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o516kXeV021194 for ; Tue, 1 Jun 2010 06:46:33 GMT (envelope-from gsilva@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o516kXTl021192 for perforce@freebsd.org; Tue, 1 Jun 2010 06:46:33 GMT (envelope-from gsilva@FreeBSD.org) Date: Tue, 1 Jun 2010 06:46:33 GMT Message-Id: <201006010646.o516kXTl021192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gsilva@FreeBSD.org using -f From: Gabriel Silva To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 06:46:34 -0000 http://p4web.freebsd.org/@@179034?ac=10 Change 179034 by gsilva@gsilva on 2010/06/01 06:46:03 Added support to read frames from wireless cards. Added the snarf80211.py script to test 802.11 sniffing, and the radiotap.py script to test frame injection (not supported yet). Affected files ... .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/__init__.py#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/ieee80211.py#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/radiotap.py#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/pcap/config.h#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/pcap/pcap.pyx#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/scripts/radiotap.py#1 add .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/scripts/snarf80211.py#1 add .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/setup.py#2 edit Differences ... ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/__init__.py#2 (text+ko) ==== @@ -70,6 +70,8 @@ import exceptions import itertools +DLT_IEEE802_11_RADIO = 127 + # import fast def attribreprlist(obj, attrs): @@ -1837,7 +1839,7 @@ """ def __init__(self, name=None, snaplen=65535, promisc=True, \ - timeout_ms=500): + timeout_ms=500, wireless=False): """initialize a PcapConnector object name - the name of a file or network interface to open @@ -1848,6 +1850,9 @@ super(PcapConnector, self).__init__() try: self.file = pcap.pcap(name, snaplen, promisc, timeout_ms) + + if wireless: + self.file.set_datalink(DLT_IEEE802_11_RADIO) except: raise @@ -1971,6 +1976,8 @@ return packets.ethernet.ethernet(packet, timestamp) elif dlink == pcap.DLT_NULL: return packets.localhost.localhost(packet, timestamp) +# elif dlink == pcap.DLT_IEEE802_11_RADIO: +# return packets.radiotap.radiotap(packet, timestamp) else: raise UnpackError, "Could not interpret packet" ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/ieee80211.py#2 (text+ko) ==== @@ -273,7 +273,7 @@ def is_control(self): return has_ctl_bit(self.fc0) - has_addr4_bit = staticmethod(has_addr4_bit) + has_addr4_bit = staticmethod(has_addr4_bits) has_ctl_bit = staticmethod(has_ctl_bit) has_data_bit = staticmethod(has_data_bit) has_mgmt_bit = staticmethod(has_mgmt_bit) ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/radiotap.py#2 (text+ko) ==== @@ -37,6 +37,7 @@ import pcs import pcs.packets.payload #import pcs.packets.ieee80211 #notyet +from pcs.packets import payload import inspect import struct @@ -117,8 +118,8 @@ assert isinstance(n, str) assert isinstance(x, tuple) ret = [] - ret += pcs.Field("chan_mhz", 8, default=x[0]) - ret += pcs.Field("chan_flags", 8, default=x[1]) + ret += [pcs.Field("chan_mhz", 8, default=x[0])] + ret += [pcs.Field("chan_flags", 8, default=x[1])] return ret def _xchannel(n, x): @@ -127,10 +128,10 @@ assert isinstance(n, str) assert isinstance(x, tuple) ret = [] - ret += pcs.Field("xchan_flags", 32, default=x[0]) - ret += pcs.Field("xchan_mhz", 16, default=x[1]) - ret += pcs.Field("xchan_num", 8, default=x[2]) - ret += pcs.Field("xchan_hdbm", 8, default=x[3]) + ret += [pcs.Field("xchan_flags", 32, default=x[0])] + ret += [pcs.Field("xchan_mhz", 16, default=x[1])] + ret += [pcs.Field("xchan_num", 8, default=x[2])] + ret += [pcs.Field("xchan_hdbm", 8, default=x[3])] return ret # @@ -155,7 +156,7 @@ lambda n, x: [pcs.Field(n, 8, default=x[0])] ), IEEE80211_RADIOTAP_DBM_ANTSIGNAL: \ ( "dbm_antsignal", 8, '= vbytes: - value = struct.unpack(vfmt, bytes[curr:vlen]) + value = struct.unpack_from(vfmt, bytes[curr:]) fields = vfunc(vname, value) for f in fields: tlvs._options.append(f) - curr += vlen - remaining -= vlen + curr += vbytes + remaining -= vbytes else: break # XXX TODO: always decode next header as a full 802.11 header. @@ -244,12 +245,16 @@ def __str__(self): """Walk the entire packet and pretty print the values of the fields.""" - s = self._descr[self.type] + "\n" + #s = self._descr[self.type] + "\n" + retval = "\nRadiotap:\n" for fn in self._layout: f = self._fieldnames[fn.name] if fn.name == "present": - bs = bsprintf(f.value, self._bits) + bs = pcs.bsprintf(f.value, self._bits) retval += "%s %s\n" % (fn.name, bs) + if fn.name == "length": + retval += "%s %s\n" % (fn.name, struct.unpack('!h', struct.pack('h', f.value))[0]) else: retval += "%s %s\n" % (fn.name, f.value) + print type(f.value) return retval ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/pcap/config.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ #define HAVE_PCAP_SETNONBLOCK 1 #define HAVE_PCAP_FILE 1 +#define HAVE_PCAP_SET_DATALINK 1 #define HAVE_PCAP_COMPILE_NOPCAP 1 ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/pcap/pcap.pyx#2 (text+ko) ==== @@ -70,6 +70,7 @@ unsigned char *arg) unsigned char *pcap_next(pcap_t *p, pcap_pkthdr *hdr) int pcap_datalink(pcap_t *p) + int pcap_set_datalink(pcap_t *p, int datalink) int pcap_snapshot(pcap_t *p) int pcap_stats(pcap_t *p, pcap_stat *ps) char *pcap_geterr(pcap_t *p) @@ -134,6 +135,7 @@ # XXX - OpenBSD DLT_PFLOG = 117 DLT_PFSYNC = 18 +DLT_IEEE802_11_RADIO = 127 if sys.platform.find('openbsd') != -1: DLT_LOOP = 12 DLT_RAW = 14 @@ -211,6 +213,8 @@ promisc, timeout_ms, self.__ebuf) + + if not self.__pcap: raise OSError, self.__ebuf @@ -317,7 +321,12 @@ def datalink(self): """Return datalink type (DLT_* values).""" return pcap_datalink(self.__pcap) - + + def set_datalink(self, datalink): + if pcap_set_datalink(self.__pcap, datalink) == -1: + raise OSError, "Error setting DLT_IEEE802_11_RADIO." + return 0 + def next(self): """Return the next (timestamp, packet) tuple, or None on error.""" cdef pcap_pkthdr hdr ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/setup.py#2 (text+ko) ==== @@ -66,6 +66,8 @@ d['HAVE_PCAP_COMPILE_NOPCAP'] = 1 if buf.find('pcap_setnonblock(') != -1: d['HAVE_PCAP_SETNONBLOCK'] = 1 + if buf.find('pcap_set_datalink') != -1: + d['HAVE_PCAP_SET_DATALINK'] = 1 f = open('pcs/pcap/config.h', 'w') for k, v in d.iteritems(): f.write('#define %s %s\n' % (k, v)) From owner-p4-projects@FreeBSD.ORG Tue Jun 1 15:37:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 693381065675; Tue, 1 Jun 2010 15:37: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 2961C1065670 for ; Tue, 1 Jun 2010 15:37:16 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6A178FC1E for ; Tue, 1 Jun 2010 15:37:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o51FbFsb092138 for ; Tue, 1 Jun 2010 15:37:15 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51FbFjN092136 for perforce@freebsd.org; Tue, 1 Jun 2010 15:37:15 GMT (envelope-from jona@FreeBSD.org) Date: Tue, 1 Jun 2010 15:37:15 GMT Message-Id: <201006011537.o51FbFjN092136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 15:37:16 -0000 http://p4web.freebsd.org/@@179048?ac=10 Change 179048 by jona@jona-capsicum-kent64 on 2010/06/01 15:37:15 Reverting an (accidental) previous change Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#9 (text+ko) ==== @@ -226,7 +226,6 @@ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ Objlist dagmembers; /* DAG has these members (%) */ - int fd; /* Object's file descriptor */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ void *priv; /* Platform-dependant */ From owner-p4-projects@FreeBSD.ORG Tue Jun 1 17:28:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C226106567B; Tue, 1 Jun 2010 17:28:19 +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 3095A1065672 for ; Tue, 1 Jun 2010 17:28:19 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E1538FC0C for ; Tue, 1 Jun 2010 17:28:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o51HSINx012816 for ; Tue, 1 Jun 2010 17:28:18 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51HSI4W012814 for perforce@freebsd.org; Tue, 1 Jun 2010 17:28:18 GMT (envelope-from gpf@FreeBSD.org) Date: Tue, 1 Jun 2010 17:28:18 GMT Message-Id: <201006011728.o51HSI4W012814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 17:28:19 -0000 http://p4web.freebsd.org/@@179052?ac=10 Change 179052 by gpf@gpf_desktop on 2010/06/01 17:28:11 The new nfs implementation gave me some trouble but I managed to make it work as both server and client. This is a minor change, now we're just keeping track of what rpcs are actually getting serviced and where they come from. This is for non-compound rpcs. Should probably check and see what happens when the reply is returned from the cache and we are actually executing the rpc. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 (text+ko) ==== @@ -268,6 +268,8 @@ }; #endif /* !APPLEKEXT */ +#include + /* * Static array that defines which nfs rpc's are nonidempotent */ @@ -428,8 +430,14 @@ * The group is indicated by the value in nfs_retfh[]. */ if (nd->nd_flag & ND_NFSV4) { + printf("compound rpc enter\n"); nfsrvd_compound(nd, isdgram, p); + printf("compound rpc exit\n"); } else { + printf("non compound rpc %d\n", nd->nd_procnum); + AUDIT_NFS_ENTER(nd->nd_procnum, nd->nd_cred, curthread); + if (nd->nd_nam != NULL) + AUDIT_ARG_SOCKADDR_IN((struct sockaddr_in *)nd->nd_nam); if (nfs_retfh[nd->nd_procnum] == 1) { if (vp) NFSVOPUNLOCK(vp, 0, p); @@ -442,6 +450,7 @@ error = (*(nfsrv3_procs0[nd->nd_procnum]))(nd, isdgram, vp, p, &nes); } + AUDIT_NFS_EXIT(error, curthread); if (mp) { if (nfs_writerpc[nd->nd_procnum]) NFS_ENDWRITE(mp); @@ -699,6 +708,8 @@ nd->nd_flag |= ND_SAVEREPLY; NFSINCRGLOBAL(newnfsstats.srvrpccnt[nd->nd_procnum]); switch (op) { + /* xxx gpf */ + printf("op = %d\n", op); case NFSV4OP_PUTFH: error = nfsrv_mtofh(nd, &fh); if (error) From owner-p4-projects@FreeBSD.ORG Tue Jun 1 17:38:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 791081065686; Tue, 1 Jun 2010 17:38: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 3D497106567D for ; Tue, 1 Jun 2010 17:38:04 +0000 (UTC) (envelope-from gpf.kira@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id C84608FC08 for ; Tue, 1 Jun 2010 17:38:03 +0000 (UTC) Received: by wyb36 with SMTP id 36so1410008wyb.13 for ; Tue, 01 Jun 2010 10:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=HOodnOWCvd5me4TwY9G3FlzWD+MJZMTZQfZTdMoh8OM=; b=wiQs8DWhv3OQFHqHDwYBQdMbtTAtv2S+wl5OyhdypRXGoh/Az1PkLd+z01FHQJnFuE FPsyK4nsyLfPeOsWgSAXlbyXmLUrdDx1Ff2mL0f76C3qZssDEsj8B6MCL+Huz747AnvS 24B119aEPp2YuCwnix4ZYzUK9ymqxEgfTfWSU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=qsZMDKm0BWvkgIWZgC7Prfa+lbZ4lYxLKUyVZTgd69V1JpBywZtVhr155iBH+58CbK b0xHFEdhqoAdxg+tF3q2mv8Cymxqx9tfDx8J6iMVaCkFeH1/N6ExyA5yhZBe0abiV9UB dUsTntv2I9jPSp6wIoscKkNOp05dIQC1hxDCc= MIME-Version: 1.0 Received: by 10.227.145.141 with SMTP id d13mr6352285wbv.40.1275413882477; Tue, 01 Jun 2010 10:38:02 -0700 (PDT) Received: by 10.216.1.145 with HTTP; Tue, 1 Jun 2010 10:38:02 -0700 (PDT) In-Reply-To: <201006011728.o51HSI4W012814@repoman.freebsd.org> References: <201006011728.o51HSI4W012814@repoman.freebsd.org> Date: Tue, 1 Jun 2010 20:38:02 +0300 Message-ID: From: Efstratios Karatzas To: perforce@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Subject: Re: PERFORCE change 179052 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, 01 Jun 2010 17:38:04 -0000 > =C2=A0 =C2=A0 =C2=A0 =C2=A0This is for non-compound rpcs. Should probably= check and see what > =C2=A0 =C2=A0 =C2=A0 =C2=A0happens when the reply is returned from the ca= che and we are actually > =C2=A0 =C2=A0 =C2=A0 =C2=A0executing the rpc. grrr I actually meant to write "what happens when the reply is returned from the cache and we are *NOT* executing the rpc. Oh, and don't mind the debuging printf()s. Cheers, --=20 Efstratios "GPF" Karatzas From owner-p4-projects@FreeBSD.ORG Tue Jun 1 20:12:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55F1B10656C8; Tue, 1 Jun 2010 20:12: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 187CD10656C1 for ; Tue, 1 Jun 2010 20:12:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02E298FC1C for ; Tue, 1 Jun 2010 20:12:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o51KCPP3027968 for ; Tue, 1 Jun 2010 20:12:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51KCIMn027962 for perforce@freebsd.org; Tue, 1 Jun 2010 20:12:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Jun 2010 20:12:18 GMT Message-Id: <201006012012.o51KCIMn027962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 20:12:26 -0000 http://p4web.freebsd.org/@@179060?ac=10 Change 179060 by jhb@jhb_jhbbsd on 2010/06/01 20:12:02 IFC @179058 Affected files ... .. //depot/projects/smpng/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate .. //depot/projects/smpng/share/man/man9/alq.9#2 integrate .. //depot/projects/smpng/share/man/man9/atomic.9#4 integrate .. //depot/projects/smpng/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/smpng/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/smpng/share/man/man9/fail.9#4 integrate .. //depot/projects/smpng/share/man/man9/ieee80211.9#5 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_node.9#5 integrate .. //depot/projects/smpng/share/man/man9/make_dev.9#3 integrate .. //depot/projects/smpng/share/man/man9/mbpool.9#2 integrate .. //depot/projects/smpng/share/man/man9/namei.9#4 integrate .. //depot/projects/smpng/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/smpng/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/smpng/share/man/man9/prison_check.9#3 integrate .. //depot/projects/smpng/share/man/man9/uio.9#4 integrate .. //depot/projects/smpng/share/man/man9/usbdi.9#5 integrate .. //depot/projects/smpng/share/man/man9/watchdog.9#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.h#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#28 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#39 integrate .. //depot/projects/smpng/sys/amd64/amd64/io.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#49 delete .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#91 integrate .. //depot/projects/smpng/sys/amd64/amd64/mca.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#61 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#105 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#73 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#89 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#27 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#27 integrate .. //depot/projects/smpng/sys/amd64/include/apicreg.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#27 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#34 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#14 integrate .. //depot/projects/smpng/sys/amd64/include/iodev.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/mca.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#14 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#34 integrate .. //depot/projects/smpng/sys/amd64/include/proc.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#26 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#14 integrate .. //depot/projects/smpng/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#45 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#23 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#58 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#32 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#26 integrate .. //depot/projects/smpng/sys/arm/conf/DB-78XXX#7 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#7 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#7 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#12 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#20 integrate .. //depot/projects/smpng/sys/arm/conf/LN2410SBC#2 integrate .. //depot/projects/smpng/sys/arm/conf/SHEEVAPLUG#2 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#11 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/arm/include/disassem.h#3 integrate .. //depot/projects/smpng/sys/arm/include/md_var.h#8 integrate .. //depot/projects/smpng/sys/arm/include/metadata.h#4 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#29 integrate .. //depot/projects/smpng/sys/arm/include/proc.h#7 integrate .. //depot/projects/smpng/sys/arm/mv/files.mv#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#16 integrate .. //depot/projects/smpng/sys/boot/Makefile#33 integrate .. //depot/projects/smpng/sys/boot/arm/uboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/arm/uboot/version#3 integrate .. //depot/projects/smpng/sys/boot/common/module.c#11 integrate .. //depot/projects/smpng/sys/boot/fdt/Makefile#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/bindings-gpio.txt#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/bindings-mpp.txt#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/db78100.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/db88f5182.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/db88f5281.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/db88f6281.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/mpc8555cds.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/mpc8572ds.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/sheevaplug.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/fdt_loader_cmd.c#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf#68 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#14 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.c#7 integrate .. //depot/projects/smpng/sys/boot/powerpc/uboot/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/powerpc/uboot/version#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#31 integrate .. //depot/projects/smpng/sys/boot/uboot/common/main.c#5 integrate .. //depot/projects/smpng/sys/boot/uboot/common/metadata.c#3 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#6 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#7 integrate .. //depot/projects/smpng/sys/boot/zfs/zfs.c#6 integrate .. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#8 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#7 integrate .. //depot/projects/smpng/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#7 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#17 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#66 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#5 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/zfsimpl.h#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dnlc.h#3 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#6 integrate .. //depot/projects/smpng/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/smpng/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/systrace/systrace.c#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#67 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#6 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#28 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#70 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#31 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/smpng/sys/conf/NOTES#184 integrate .. //depot/projects/smpng/sys/conf/files#259 integrate .. //depot/projects/smpng/sys/conf/files.amd64#75 integrate .. //depot/projects/smpng/sys/conf/files.i386#133 integrate .. //depot/projects/smpng/sys/conf/files.mips#8 integrate .. //depot/projects/smpng/sys/conf/files.pc98#103 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#57 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#77 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#11 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#66 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#76 integrate .. //depot/projects/smpng/sys/conf/options#182 integrate .. //depot/projects/smpng/sys/conf/options.arm#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslpredef.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbdisply.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpe.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeblk.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconfig.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg1.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exsystem.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acevents.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acinterp.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbxface.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utcopy.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uttrack.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#19 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#44 integrate .. //depot/projects/smpng/sys/ddb/db_command.h#6 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#23 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#11 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#28 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#121 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#75 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#8 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#11 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#10 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#12 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#7 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#7 integrate .. //depot/projects/smpng/sys/dev/amdsbwd/amdsbwd.c#2 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#59 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#103 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#75 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#77 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#71 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#51 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-serverworks.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#86 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#6 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdcreg.h#2 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#36 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#22 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#114 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#7 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#4 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#5 integrate .. //depot/projects/smpng/sys/dev/cas/if_casreg.h#2 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#16 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#67 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#19 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#27 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#22 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#29 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#35 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#20 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#30 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#26 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#29 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#19 integrate .. //depot/projects/smpng/sys/dev/drm/drm_hashtab.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_mm.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sman.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#17 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_dma.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/mga_warp.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/r600_blit.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/r600_cp.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#27 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cs.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#21 integrate .. //depot/projects/smpng/sys/dev/drm/savage_bci.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/via_dma.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/via_dmablit.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/via_map.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/via_mm.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/via_video.c#2 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#18 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#20 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#47 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#34 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#14 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#25 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#7 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#11 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#28 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#96 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#13 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#22 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#9 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#35 integrate .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#10 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#19 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#21 integrate .. //depot/projects/smpng/sys/dev/io/iodev.c#5 integrate .. //depot/projects/smpng/sys/dev/io/iodev.h#1 branch .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#24 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#10 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#66 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#61 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#33 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#42 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#35 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#14 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#16 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#9 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#6 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo.c#9 integrate .. //depot/projects/smpng/sys/dev/md/md.c#92 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#51 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#24 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#41 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#14 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#28 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#28 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#34 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#37 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#26 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#15 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs.c#1 branch .. //depot/projects/smpng/sys/dev/mvs/mvs.h#1 branch .. //depot/projects/smpng/sys/dev/mvs/mvs_if.m#1 branch .. //depot/projects/smpng/sys/dev/mvs/mvs_pci.c#1 branch .. //depot/projects/smpng/sys/dev/mvs/mvs_soc.c#1 branch .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#8 integrate .. //depot/projects/smpng/sys/dev/mxge/eth_z8e.h#8 integrate .. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.h#8 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#39 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#21 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#8 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#8 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#33 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#20 integrate .. //depot/projects/smpng/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#4 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#4 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_fdt.c#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#7 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#16 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#12 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#117 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#17 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#26 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#52 integrate .. //depot/projects/smpng/sys/dev/quicc/quicc_bfe.h#2 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#19 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#14 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#82 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#25 integrate .. //depot/projects/smpng/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/smpng/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/smpng/sys/dev/siis/siis.c#8 integrate .. //depot/projects/smpng/sys/dev/siis/siis.h#4 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#7 integrate .. //depot/projects/smpng/sys/dev/smc/if_smc.c#4 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#31 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#16 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#37 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#36 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#77 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#26 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/uep.c#1 branch .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_debug.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#152 integrate .. //depot/projects/smpng/sys/dev/usb/usbhid.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runreg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runvar.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#16 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#26 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#97 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#34 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#15 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#30 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#14 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#34 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_int.h#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#85 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#51 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonkrpc.c#5 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonport.c#7 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#8 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsclstate.h#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#11 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs.h#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#9 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#7 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clsubs.c#5 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#9 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#13 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#8 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#43 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#27 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#27 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#63 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#35 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#51 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#27 integrate .. //depot/projects/smpng/sys/geom/geom.h#57 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#63 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#19 integrate .. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#7 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#26 integrate .. //depot/projects/smpng/sys/geom/part/g_part_apm.c#9 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#14 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#15 integrate .. //depot/projects/smpng/sys/geom/part/g_part_if.m#6 integrate .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#8 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#8 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#23 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#16 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_events.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#14 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#5 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#12 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#120 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#14 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#26 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.h#6 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#69 integrate .. //depot/projects/smpng/sys/i386/i386/io.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#71 delete .. //depot/projects/smpng/sys/i386/i386/machdep.c#152 integrate .. //depot/projects/smpng/sys/i386/i386/mca.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#124 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#144 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#123 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#13 integrate .. //depot/projects/smpng/sys/i386/include/apicreg.h#6 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#39 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#53 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#21 integrate .. //depot/projects/smpng/sys/i386/include/iodev.h#4 integrate .. //depot/projects/smpng/sys/i386/include/mca.h#4 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#23 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#49 integrate .. //depot/projects/smpng/sys/i386/include/proc.h#19 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#30 integrate .. //depot/projects/smpng/sys/i386/include/xen/xenfunc.h#4 integrate .. //depot/projects/smpng/sys/i386/include/xen/xenvar.h#4 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#73 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#14 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#72 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#21 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_machdep.c#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#29 integrate .. //depot/projects/smpng/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#98 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#98 integrate .. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#16 integrate .. //depot/projects/smpng/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#29 integrate .. //depot/projects/smpng/sys/ia64/include/proc.h#13 integrate .. //depot/projects/smpng/sys/ia64/include/runq.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/sal.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#18 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#15 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#34 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#72 integrate .. //depot/projects/smpng/sys/kern/init_main.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#132 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#128 integrate .. //depot/projects/smpng/sys/kern/kern_gzio.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#159 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#156 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#117 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#92 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#100 integrate .. //depot/projects/smpng/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#89 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#59 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#42 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#95 integrate .. //depot/projects/smpng/sys/kern/subr_uio.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#183 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#65 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#69 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#70 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#64 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#137 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#127 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#127 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#68 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#177 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#104 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#46 integrate .. //depot/projects/smpng/sys/mips/adm5120/if_admsw.c#8 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/smpng/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 delete .. //depot/projects/smpng/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_mp.c#1 branch .. //depot/projects/smpng/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/uart_dev_oct16550.c#2 integrate .. //depot/projects/smpng/sys/mips/conf/AR71XX#4 integrate .. //depot/projects/smpng/sys/mips/conf/SENTRY5#8 integrate .. //depot/projects/smpng/sys/mips/conf/SWARM#2 integrate .. //depot/projects/smpng/sys/mips/conf/XLR#2 integrate .. //depot/projects/smpng/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_limits.h#2 integrate .. //depot/projects/smpng/sys/mips/include/archtype.h#2 delete .. //depot/projects/smpng/sys/mips/include/asm.h#3 integrate .. //depot/projects/smpng/sys/mips/include/cpu.h#3 integrate .. //depot/projects/smpng/sys/mips/include/cpufunc.h#4 integrate .. //depot/projects/smpng/sys/mips/include/cpuregs.h#4 integrate .. //depot/projects/smpng/sys/mips/include/db_machdep.h#4 integrate .. //depot/projects/smpng/sys/mips/include/defs.h#2 delete .. //depot/projects/smpng/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/smpng/sys/mips/include/locore.h#3 integrate .. //depot/projects/smpng/sys/mips/include/param.h#9 integrate .. //depot/projects/smpng/sys/mips/include/pcb.h#4 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#9 integrate .. //depot/projects/smpng/sys/mips/include/proc.h#3 integrate .. //depot/projects/smpng/sys/mips/include/profile.h#3 integrate .. //depot/projects/smpng/sys/mips/include/psl.h#3 delete .. //depot/projects/smpng/sys/mips/include/pte.h#3 integrate .. //depot/projects/smpng/sys/mips/include/queue.h#2 delete .. //depot/projects/smpng/sys/mips/include/regnum.h#3 integrate .. //depot/projects/smpng/sys/mips/include/rm7000.h#2 delete .. //depot/projects/smpng/sys/mips/include/segments.h#2 delete .. //depot/projects/smpng/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/mips/include/smp.h#6 integrate .. //depot/projects/smpng/sys/mips/include/trap.h#4 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#7 integrate .. //depot/projects/smpng/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/copystr.S#3 delete .. //depot/projects/smpng/sys/mips/mips/cpu.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/elf64_machdep.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#10 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#4 integrate .. //depot/projects/smpng/sys/mips/mips/fp.S#3 integrate .. //depot/projects/smpng/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/locore.S#3 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#10 integrate .. //depot/projects/smpng/sys/mips/mips/mem.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#8 integrate .. //depot/projects/smpng/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/smpng/sys/mips/mips/nexus.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#17 integrate .. //depot/projects/smpng/sys/mips/mips/psraccess.S#3 integrate .. //depot/projects/smpng/sys/mips/mips/support.S#5 integrate .. //depot/projects/smpng/sys/mips/mips/swtch.S#4 integrate .. //depot/projects/smpng/sys/mips/mips/tick.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/tlb.S#3 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#6 integrate .. //depot/projects/smpng/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/ehcireg.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/ehcivar.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/smpng/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/smpng/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/pcibus.c#2 delete .. //depot/projects/smpng/sys/mips/rmi/perfmon.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/perfmon_kern.c#2 delete .. //depot/projects/smpng/sys/mips/rmi/perfmon_percpu.c#2 delete .. //depot/projects/smpng/sys/mips/rmi/perfmon_utils.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/perfmon_xlrconfig.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_boot1_console.c#2 delete .. //depot/projects/smpng/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/smpng/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/smpng/sys/modules/Makefile#172 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#23 integrate .. //depot/projects/smpng/sys/modules/ata/atadisk/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#15 integrate .. //depot/projects/smpng/sys/modules/cas/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cyclic/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/iwnfw/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#27 integrate .. //depot/projects/smpng/sys/modules/mvs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/uart/Makefile#13 integrate .. //depot/projects/smpng/sys/modules/usb/uep/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/usb/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#13 integrate .. //depot/projects/smpng/sys/net/bpf.c#96 integrate .. //depot/projects/smpng/sys/net/bpf_zerocopy.c#6 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#23 integrate .. //depot/projects/smpng/sys/net/flowtable.c#13 integrate .. //depot/projects/smpng/sys/net/flowtable.h#10 integrate .. //depot/projects/smpng/sys/net/if.c#133 integrate .. //depot/projects/smpng/sys/net/if_ef.c#36 integrate .. //depot/projects/smpng/sys/net/if_gif.c#56 integrate .. //depot/projects/smpng/sys/net/if_gif.h#21 integrate .. //depot/projects/smpng/sys/net/if_gre.c#44 integrate .. //depot/projects/smpng/sys/net/if_stf.c#53 integrate .. //depot/projects/smpng/sys/net/if_var.h#76 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#74 integrate .. //depot/projects/smpng/sys/net/route.c#56 integrate .. //depot/projects/smpng/sys/net/rtsock.c#81 integrate .. //depot/projects/smpng/sys/net/vnet.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#51 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hwmp.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#52 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#54 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_rssadapt.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#46 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#70 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#40 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_hub.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#37 integrate .. //depot/projects/smpng/sys/netgraph/ng_pipe.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#50 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#24 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#18 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#82 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#38 integrate .. //depot/projects/smpng/sys/netinet/in.c#67 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#105 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#39 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#30 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#56 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#111 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#120 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#47 integrate .. //depot/projects/smpng/sys/netinet/ipfw/dn_sched.h#3 integrate .. //depot/projects/smpng/sys/netinet/ipfw/dn_sched_rr.c#2 integrate .. //depot/projects/smpng/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_private.h#4 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#10 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_pfil.c#10 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_private.h#5 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#92 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#19 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#25 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#33 integrate .. //depot/projects/smpng/sys/netinet/sctp_lock_bsd.h#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#38 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#37 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#31 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#38 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#135 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#66 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#34 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#122 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#77 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#19 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#76 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#99 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#18 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#27 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#64 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#71 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#26 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#45 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#36 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#26 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#48 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#27 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#74 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#44 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#72 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#33 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#66 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#20 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#40 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#41 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#66 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#19 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#62 integrate .. //depot/projects/smpng/sys/netipsec/ah_var.h#4 integrate .. //depot/projects/smpng/sys/netipsec/esp_var.h#4 integrate .. //depot/projects/smpng/sys/netipsec/ipcomp_var.h#5 integrate .. //depot/projects/smpng/sys/netipsec/ipip_var.h#5 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#41 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#22 integrate .. //depot/projects/smpng/sys/netipsec/ipsec6.h#10 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#24 integrate .. //depot/projects/smpng/sys/netipsec/key.c#47 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#64 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#78 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#98 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#16 integrate .. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#7 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#91 integrate .. //depot/projects/smpng/sys/pc98/include/md_var.h#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#37 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.c#9 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#79 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#11 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#8 integrate .. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#8 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#17 integrate .. //depot/projects/smpng/sys/powerpc/booke/trap.c#5 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#67 integrate .. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#12 integrate .. //depot/projects/smpng/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#11 integrate .. //depot/projects/smpng/sys/powerpc/include/metadata.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#26 integrate .. //depot/projects/smpng/sys/powerpc/include/proc.h#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/smpng/sys/powerpc/powermac/smu.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/uninorthvar.h#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#17 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#17 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#20 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#104 integrate .. //depot/projects/smpng/sys/sparc64/include/asi.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/cache.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/mcntl.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/md_var.h#17 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#36 integrate .. //depot/projects/smpng/sys/sparc64/include/proc.h#13 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#22 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizoreg.h#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizovar.h#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ata_machdep.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#101 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#40 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#23 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#85 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#87 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/zeus.c#1 branch .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#22 integrate .. //depot/projects/smpng/sys/sun4v/include/ofw_machdep.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/pmap.h#6 integrate .. //depot/projects/smpng/sys/sun4v/include/proc.h#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#19 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#13 integrate .. //depot/projects/smpng/sys/sys/_task.h#8 integrate .. //depot/projects/smpng/sys/sys/alq.h#5 integrate .. //depot/projects/smpng/sys/sys/buf.h#56 integrate .. //depot/projects/smpng/sys/sys/buf_ring.h#5 integrate .. //depot/projects/smpng/sys/sys/conf.h#64 integrate .. //depot/projects/smpng/sys/sys/dtrace_bsd.h#4 integrate .. //depot/projects/smpng/sys/sys/endian.h#4 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#34 integrate .. //depot/projects/smpng/sys/sys/kernel.h#48 integrate .. //depot/projects/smpng/sys/sys/kthread.h#7 integrate .. //depot/projects/smpng/sys/sys/lock.h#56 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#85 integrate .. //depot/projects/smpng/sys/sys/mount.h#79 integrate .. //depot/projects/smpng/sys/sys/param.h#161 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#32 integrate .. //depot/projects/smpng/sys/sys/proc.h#206 integrate .. //depot/projects/smpng/sys/sys/ptrace.h#19 integrate .. //depot/projects/smpng/sys/sys/resource.h#21 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#31 integrate .. //depot/projects/smpng/sys/sys/sysent.h#36 integrate .. //depot/projects/smpng/sys/sys/systm.h#99 integrate .. //depot/projects/smpng/sys/sys/taskqueue.h#16 integrate .. //depot/projects/smpng/sys/sys/thr.h#13 integrate .. //depot/projects/smpng/sys/sys/user.h#39 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#10 integrate .. //depot/projects/smpng/sys/sys/vnode.h#108 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#53 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#22 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#33 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#75 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#78 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#12 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#119 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#67 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#35 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#39 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#43 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#83 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#19 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#31 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#20 integrate .. //depot/projects/smpng/sys/vm/pmap.h#39 integrate .. //depot/projects/smpng/sys/vm/sg_pager.c#3 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#84 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#79 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#82 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#72 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#46 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#107 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#47 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#84 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#115 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#111 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#48 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#77 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_param.h#10 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#77 integrate .. //depot/projects/smpng/sys/x86/isa/clock.c#3 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#1 branch Differences ... ==== //depot/projects/smpng/share/man/man9/BUS_DESCRIBE_INTR.9#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/BUS_DESCRIBE_INTR.9,v 1.2 2009/10/16 12:32:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/BUS_DESCRIBE_INTR.9,v 1.3 2010/05/24 11:14:40 uqs Exp $ .\" .Dd October 14, 2009 .Dt BUS_DESCRIBE_INTR 9 @@ -98,7 +98,7 @@ method and .Fn bus_describe_intr functions first appeared in -.Fx 9.0 . +.Fx 8.1 . .Sh BUGS It is not currently possible to remove a description from an active interrupt handler. ==== //depot/projects/smpng/share/man/man9/alq.9#2 (text+ko) ==== @@ -1,7 +1,13 @@ .\" .\" Copyright (c) 2003 Hiten Pandya +.\" Copyright (c) 2009-2010 The FreeBSD Foundation .\" All rights reserved. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 1 20:13:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2FF9106566B; Tue, 1 Jun 2010 20:13: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 66F2A1065678 for ; Tue, 1 Jun 2010 20:13:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A5EE8FC1E for ; Tue, 1 Jun 2010 20:13:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o51KDREd028033 for ; Tue, 1 Jun 2010 20:13:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51KDRCr028031 for perforce@freebsd.org; Tue, 1 Jun 2010 20:13:27 GMT (envelope-from jhb@freebsd.org) Date: Tue, 1 Jun 2010 20:13:27 GMT Message-Id: <201006012013.o51KDRCr028031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 20:13:27 -0000 http://p4web.freebsd.org/@@179061?ac=10 Change 179061 by jhb@jhb_jhbbsd on 2010/06/01 20:13:08 Sync this file. Affected files ... .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/taskq.h#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 1 20:28:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 762E71065679; Tue, 1 Jun 2010 20:28: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 3A24B1065676 for ; Tue, 1 Jun 2010 20:28:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 258AE8FC22 for ; Tue, 1 Jun 2010 20:28:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o51KSiP7029271 for ; Tue, 1 Jun 2010 20:28:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51KSiNd029269 for perforce@freebsd.org; Tue, 1 Jun 2010 20:28:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Jun 2010 20:28:44 GMT Message-Id: <201006012028.o51KSiNd029269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 20:28:44 -0000 http://p4web.freebsd.org/@@179063?ac=10 Change 179063 by rwatson@rwatson_cinnamon on 2010/06/01 20:27:48 179048 removed an 'fd' to Obj_Entry that had been added in error, that field later became depended on, so re-add. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#10 (text+ko) ==== @@ -226,6 +226,7 @@ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ Objlist dagmembers; /* DAG has these members (%) */ + int fd; /* Object's file descriptor */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ void *priv; /* Platform-dependant */ From owner-p4-projects@FreeBSD.ORG Wed Jun 2 07:56:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24A44106567D; Wed, 2 Jun 2010 07:56: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 CDEE81065674 for ; Wed, 2 Jun 2010 07:56:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC1188FC0A for ; Wed, 2 Jun 2010 07:56:25 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o527uPWJ027582 for ; Wed, 2 Jun 2010 07:56:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o527uPA2027580 for perforce@freebsd.org; Wed, 2 Jun 2010 07:56:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 2 Jun 2010 07:56:25 GMT Message-Id: <201006020756.o527uPA2027580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 07:56:26 -0000 http://p4web.freebsd.org/@@179074?ac=10 Change 179074 by gcooper@gcooper-bayonetta on 2010/06/02 07:56:01 kientzle is right. I should use ssize_t instead of off_t for the sake of semantic correctness. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#21 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#14 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#21 (text+ko) ==== @@ -269,13 +269,13 @@ * Return the number of bytes successfully written out to str or -1 on * failure. */ -off_t +ssize_t write_file(const char *name, const char *str) { int fd = -1; int serrno; - off_t written_len = -1; size_t len; + ssize_t written_len = -1; errno = 0; @@ -291,7 +291,7 @@ } - return (off_t) (errno == 0 && written_len > 0 ? written_len : -1); + return (errno == 0 && written_len > 0 ? written_len : -1); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#14 (text+ko) ==== @@ -175,7 +175,7 @@ const char *fileGetURL(const char *, const char *, int); char *fileFindByPath(const char *, const char *); char *fileGetContents(const char *); -off_t write_file(const char *, const char *); +ssize_t write_file(const char *, const char *); int move_file(const char *, const char *, const char *); int delete_hierarchy(const char *, Boolean, Boolean); char* unpack_to_buffer(const char *, const char *); From owner-p4-projects@FreeBSD.ORG Wed Jun 2 08:39:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53B821065676; Wed, 2 Jun 2010 08:39:14 +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 180F8106566C for ; Wed, 2 Jun 2010 08:39:14 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 064FB8FC08 for ; Wed, 2 Jun 2010 08:39:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o528dCuX031738 for ; Wed, 2 Jun 2010 08:39:12 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o528dCs1031736 for perforce@freebsd.org; Wed, 2 Jun 2010 08:39:12 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 2 Jun 2010 08:39:12 GMT Message-Id: <201006020839.o528dCs1031736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 08:39:14 -0000 http://p4web.freebsd.org/@@179076?ac=10 Change 179076 by gcooper@gcooper-bayonetta on 2010/06/02 08:38:13 Add a TODO for write_plist. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#13 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#13 (text+ko) ==== @@ -498,7 +498,11 @@ } -/* Write a packing list to a file, converting commands to ascii equivs */ +/* + * Write a packing list to a file, converting commands to ascii equivs + * + * TODO: Rewrite *fp as an int-style file descriptor. + */ int write_plist(Package *pkg, FILE *fp) { From owner-p4-projects@FreeBSD.ORG Wed Jun 2 09:52:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 682D81065678; Wed, 2 Jun 2010 09:52:33 +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 2C51D1065677 for ; Wed, 2 Jun 2010 09:52:33 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18C1A8FC19 for ; Wed, 2 Jun 2010 09:52:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o529qX1D049002 for ; Wed, 2 Jun 2010 09:52:33 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o529qXB9049000 for perforce@freebsd.org; Wed, 2 Jun 2010 09:52:33 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 2 Jun 2010 09:52:33 GMT Message-Id: <201006020952.o529qXB9049000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 09:52:33 -0000 http://p4web.freebsd.org/@@179079?ac=10 Change 179079 by gcooper@gcooper-bayonetta on 2010/06/02 09:51:53 Improve the overall flow of pkg_create as follows: 1. Only check for whether or not prefix is NULL once. 2. Add the prefix @cwd once in the application's lifetime instead of in two separate instances. 3. Don't add the metadata files to the plist. Why? Because a) they don't end up in any of the plists (installed from ports at least), and b) it causes functional issues and introduces unneeded complexity with the overall function of the package because one needs to keep track of what files are the metadata files, where they need to go (it's fluid because of the fact that one can specify $PKG_DBDIR). 4. Consolidate all of the make_dist macros at the top of the function. 5. Fix some style in perform.c's function headers and prototypes. 6. Add functionality to detect and properly install a file into if the path is absolute. 7. Make the token strcpy a strlcpy just to be safe (and to be sure that a NUL is tacked on the end). 8. Fix a bad [double-]free(3) call. This is untested code, but will be vetted soon. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#32 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#32 (text+ko) ==== @@ -21,8 +21,8 @@ #include __FBSDID("$FreeBSD$"); -/* XXX (gcooper): needs to come before sys/stat.h for stat(2). */ -#include + +#include /* needs to come before sys/stat.h for stat(2). */ /* Read comment below in add_file. */ #ifdef BROKEN_MMAP #include @@ -234,9 +234,9 @@ } /* Prefix should add an @cwd to the packing list */ - if (Prefix) - if (add_plist_top(&plist, PLIST_CWD, Prefix) == -1) - err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); + if (add_plist_top(&plist, PLIST_CWD, (Prefix == NULL ? "." : Prefix)) == + -1) + err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); /* Add the origin if asked, at the top */ if (Origin) @@ -252,7 +252,7 @@ err(EXIT_FAILURE, "%s: add_plist_top failed", __func__); if (asprintf(&cp, "PKG_FORMAT_REVISION:%d.%d", PLIST_FMT_VER_MAJOR, - PLIST_FMT_VER_MINOR) == -1) { + PLIST_FMT_VER_MINOR) == -1) { errx(2, "%s: asprintf() failed", __func__); } if (add_plist_top(&plist, PLIST_COMMENT, cp) == -1) @@ -263,7 +263,7 @@ * 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) { + if (PlistOnly == TRUE) { check_list(home, &plist); exit(write_plist(&plist, stdout) == 0 ? 0 : 1); } @@ -281,82 +281,12 @@ /* copy_plist(home, &plist); */ /* mark_plist(&plist); */ - /* Now put the release specific items in */ - if (Prefix == NULL) - if (add_plist(&plist, PLIST_CWD, ".") == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - - if (write_file(COMMENT_FNAME, Comment) == 0) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, COMMENT_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, COMMENT_FNAME); - } else + /* Write out required files */ + if (write_file(COMMENT_FNAME, Comment) == -1) err(EXIT_FAILURE, "failed to write comment file"); - if (write_file(DESC_FNAME, Desc) == 0) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, DESC_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, DESC_FNAME); - } else + if (write_file(DESC_FNAME, Desc) == -1) err(EXIT_FAILURE, "failed to write description file"); - if (Install != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, INSTALL_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, INSTALL_FNAME); - } - if (PostInstall != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, POST_INSTALL_FNAME); - } - if (DeInstall != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, DEINSTALL_FNAME); - } - if (PostDeInstall != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME); - } - if (Require != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, REQUIRE_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, REQUIRE_FNAME); - } - if (Display != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, DISPLAY_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, DISPLAY_FNAME); - if (add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - } - if (Mtree != NULL) { - if (add_plist(&plist, PLIST_IGNORE, NULL) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - if (add_plist(&plist, PLIST_FILE, MTREE_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - add_cksum(&plist, plist.tail, MTREE_FNAME); - if (add_plist(&plist, PLIST_MTREE, MTREE_FNAME) == -1) - err(EXIT_FAILURE, "%s: add_plist failed", __func__); - } - /* Finally, write out the packing list */ fp = fopen(CONTENTS_FNAME, "w"); if (!fp) @@ -378,7 +308,7 @@ return TRUE; /* Success */ } -static const char* +static const char* add_file(struct archive *archive, const char *srcfile, const char *destfile, const int archive_entry_open_flags) { @@ -469,16 +399,37 @@ } static void -make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) +make_dist(const char *homedir, const char *pkg, const char *suff, + Package *plist) { -#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS) \ - if (error == NULL) { \ - error = add_file(archive, SRCFILE, DESTFILE, \ +#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS) do { \ + if (error == NULL) { \ + error = add_file(archive, SRCFILE, \ + DESTFILE, OPEN_FLAGS); \ + } \ + } while (0) + +#define ADD_METADATA_FILE(METADATA_FILE, OPEN_FLAGS) do { \ + ADD_FILE(METADATA_FILE, METADATA_FILE, \ OPEN_FLAGS); \ - } + } while (0) + +#define ADD_TRAILING_SLASH(v, v_len) \ + do { \ + v_len = strlen(v); \ + if (v[v_len-1] != '/') { \ + if (v_len >= PATH_MAX) \ + error = strerror(ENAMETOOLONG); \ + else { \ + v[v_len] = '/'; \ + v[v_len+1] = '\0'; \ + } \ + } \ + } while (0) PackingList p; + char tball[PATH_MAX]; struct archive *archive = NULL; struct lafe_matching *match_patterns = NULL; char *destbase = NULL; @@ -486,15 +437,16 @@ char *prefix = NULL; char *srcbase = NULL; char *srcfile = NULL; - char tball[PATH_MAX]; const char *cname = NULL; const char *error = NULL; + int archive_fd = -1; int archive_open_flags; int archive_entry_open_flags; int archive_metadata_open_flags; - int destbase_len, srcbase_len; + int destbase_len; + int srcbase_len; if (*pkg == '/') snprintf(tball, sizeof(tball), "%s.%s", pkg, suff); @@ -577,11 +529,102 @@ } - if (error == NULL && - archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK) - error = archive_error_string(archive); + if (error == NULL) { + + if (archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK) + error = archive_error_string(archive); + else if ((p = find_plist(plist, PLIST_CWD)) != NULL && + p->name == NULL) { + + warnx("malformed plist (first @cwd is NULL)"); + error = strerror(EINVAL); + + } else { /* first @cwd -- wewt! */ + + if (strlen(p->name) > PATH_MAX) + error = strerror(ENAMETOOLONG); + else { + + /* + * We're relative to the starting prefix; + * dump the files here. + * + * This usecase only makes sense when + * installing packages directly to '/'. + * + * All metadata files will be installed into + * /var/db/ by pkg_add . + */ + if (strlen(p->name) == 1 && + p->name[0] == '.' && + getcwd(prefix, sizeof(prefix)) == NULL) + error = strerror(errno); + else if (strlcpy(prefix, p->name, + sizeof(prefix) >= sizeof(prefix))) + error = strerror(ENAMETOOLONG); + + } + + if (error == NULL) { + + /* Tack BaseDir on the front if defined. */ + if (BaseDir != NULL) { + if (strlcpy(srcbase, BaseDir, + PATH_MAX) > PATH_MAX) + error = strerror(ENAMETOOLONG); + } else + srcbase[0] = '\0'; + + } + + } + + /* + * Add all metadata files; these don't go in the plist for + * the sake of simplicity. + */ + ADD_METADATA_FILE(COMMENT_FNAME, + archive_entry_open_flags); + + ADD_METADATA_FILE(DESC_FNAME, + archive_entry_open_flags); + + if (Install != NULL) { + ADD_METADATA_FILE(INSTALL_FNAME, + archive_entry_open_flags); + } + if (PostInstall != NULL) { + ADD_METADATA_FILE(POST_INSTALL_FNAME, + archive_entry_open_flags); + } + if (DeInstall != NULL) { + ADD_METADATA_FILE(DEINSTALL_FNAME, + archive_entry_open_flags); + } + if (PostDeInstall != NULL) { + ADD_METADATA_FILE(POST_DEINSTALL_FNAME, + archive_entry_open_flags); + } + if (Require != NULL) { + ADD_METADATA_FILE(REQUIRE_FNAME, + archive_entry_open_flags); + } + if (Display != NULL) { + ADD_METADATA_FILE(DISPLAY_FNAME, + archive_entry_open_flags); + } + if (Mtree != NULL) { + ADD_METADATA_FILE(MTREE_FNAME, + archive_entry_open_flags); + } + + } + + /* Let's iterate from the first @cwd. */ + if (p == NULL) + p = plist->head; - for (p = plist->head; error == NULL && p != NULL; p = p->next) + for ( ; error == NULL && p != NULL; p = p->next) switch(p->type) { case PLIST_FILE: @@ -593,10 +636,12 @@ destfile[0] = srcfile[0] = '\0'; /* - * File is based off the current working directory if - * NULL. + * Don't prefix with destbase if: + * 1. File is absolute (starts with '/'). + * 2. destbase is NULL (file is based off the current + * working directory). */ - if (destbase != NULL) + if (*p->name != '/' && destbase != NULL) if (strlcat(destfile, destbase, PATH_MAX) > PATH_MAX) error = strerror(ENAMETOOLONG); @@ -629,20 +674,8 @@ /* Reset to / */ if (p->name == NULL) { - /* - * Broken plist; prefix must be defined before - * calling `@cwd' with variable following - * whitespace. - */ - assert(prefix != NULL); - /* - * NOTE (gcooper): strcpy is safe here so long - * as the buffers are of equal size, and also - * because the value has been sanitized below - * and because of the assert above. - */ - strcpy(destbase, prefix); + strlcpy(destbase, prefix, sizeof(destbase)); /* Reset srcbase */ /* Tack BaseDir on the front if defined. */ @@ -662,32 +695,6 @@ */ else { - /* First @cwd -- wewt! */ - if (prefix == NULL) { - - if (strlen(p->name) > PATH_MAX) - error = strerror(ENAMETOOLONG); - else { - - prefix = p->name; - - /* - * Tack BaseDir on the front if - * defined and this is the first - * run. - */ - if (BaseDir != NULL) { - if (strlcpy(srcbase, - BaseDir, PATH_MAX) > - PATH_MAX) - error = strerror(ENAMETOOLONG); - } else - srcbase[0] = '\0'; - - } - - } - if (strlcat(destbase, p->name, PATH_MAX) > PATH_MAX) error = strerror(ENAMETOOLONG); @@ -705,19 +712,6 @@ */ if (error == NULL) { -#define ADD_TRAILING_SLASH(v, v_len) \ - do { \ - v_len = strlen(v); \ - if (v[v_len-1] != '/') { \ - if (v_len >= PATH_MAX) \ - error = strerror(ENAMETOOLONG); \ - else { \ - v[v_len] = '/'; \ - v[v_len+1] = '\0'; \ - } \ - } \ - } while (0) - ADD_TRAILING_SLASH(destbase, destbase_len); ADD_TRAILING_SLASH(srcbase, srcbase_len); @@ -757,21 +751,22 @@ warnx("%s: unable to create the package '%s': %s", __func__, tball, error); if (0 <= archive_fd) { - close(archive_fd); + (void) close(archive_fd); if (error != NULL && unlink(tball) == -1) warn("%s: failed to remove incomplete package - '%s'", __func__, tball); } + free(destbase); free(destfile); + free(prefix); free(srcbase); free(srcfile); - free(destfile); } static void -sanity_check() +sanity_check(void) { if (!Comment) errx(2, "%s: required package comment string is missing (-c comment)", @@ -817,7 +812,7 @@ return rval; } rc = read_plist(&plist, fd); - close(fd); + (void) close(fd); if (rc == 0) { rval = TRUE; From owner-p4-projects@FreeBSD.ORG Wed Jun 2 12:18:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 396DB106566C; Wed, 2 Jun 2010 12:18: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 F0822106567B for ; Wed, 2 Jun 2010 12:18:14 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCA5D8FC1A for ; Wed, 2 Jun 2010 12:18:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52CIENj063394 for ; Wed, 2 Jun 2010 12:18:14 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52CIDKw063392 for perforce@freebsd.org; Wed, 2 Jun 2010 12:18:13 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 2 Jun 2010 12:18:13 GMT Message-Id: <201006021218.o52CIDKw063392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 12:18:15 -0000 http://p4web.freebsd.org/@@179090?ac=10 Change 179090 by gcooper@gcooper-bayonetta on 2010/06/02 12:17:32 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/chio/chio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/main.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/docs/help#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/ex/ex_cmd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/vi/v_ex.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/opie/libopie/readrec.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/moduli.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/scp.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sftp.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-pkcs11-helper.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/pom/pom.6#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/Makefile.inc#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/dtc/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libgssapi/gss_compare_name.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.ucf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/atan2.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/math.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/remainder.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rbootd/rbootd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount/mount.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/doc/legal/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/doc/legal/intel_iwn/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/acpi.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/dcons.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ddb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/io.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/lindev.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mpt.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/uep.4#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/devfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/atomic.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/make_dev.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mca.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/mca.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/metadata.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/bindings-gpio.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/bindings-mpp.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db78100.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f5182.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f5281.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f6281.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/mpc8555cds.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/mpc8572ds.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/sheevaplug.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/fdt_loader_cmd.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/NOTES#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_command.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_thread.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/amdsbwd/amdsbwd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v1.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_fdt.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/input/uep.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mca.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/mca.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/proc.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_resource.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_thread.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/posix4_mib.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/asm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/tick.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/uio_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/ehcireg.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/ehcivar.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/pcibus.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_kern.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_percpu.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_utils.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_xlrconfig.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_boot1_console.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/Makefile#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/iwnfw/Makefile.inc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/usb/uep/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/if.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/if_var.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/route.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/rtsock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/in.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ip_options.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea64.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/_task.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/param.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/pcpu.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/posix4.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/resourcevar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/sysent.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/taskqueue.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/user.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/pmap.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_map.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/build/options/WITH_FDT#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/dot1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/dot2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/exec1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/exec2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/return4.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc4.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc5.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc6.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/sockets/unix_close_race/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/sockets/unix_close_race/unix_close_race.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.rand1.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.rand2.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.stutter2.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/join/join.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/jot/jot.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/jot/jot.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/mail/util.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/newkey/newkey.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/dconschat/dconschat.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/fdcontrol/fdcontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/iostat/iostat.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nfsd/nfsv4.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/chio/chio.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.29 2010/06/02 09:34:41 uqs Exp $"); #include #include @@ -1072,6 +1072,7 @@ /* Read in the changer slots */ if (cp.cp_nslots > 0) { + (void) memset(&cesr, 0, sizeof(cesr)); cesr.cesr_element_type = CHET_ST; cesr.cesr_element_base = 0; cesr.cesr_element_count = cp.cp_nslots; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.28 2010/05/24 06:33:14 uqs Exp $"); #include #include @@ -76,7 +76,7 @@ #ifdef NET2_REGEX static int resub(regexp *, char *, char *, char *); #else -static int resub(regex_t *, regmatch_t *, char *, char *, char *); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); #endif /* @@ -929,7 +929,7 @@ # ifdef NET2_REGEX if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) { # else - if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt)) + if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt)) < 0) { # endif if (prnt) @@ -1071,7 +1071,7 @@ */ static int -resub(regex_t *rp, regmatch_t *pm, char *src, char *dest, +resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest, char *destend) { char *spt; @@ -1121,7 +1121,7 @@ */ if (len > (destend - dpt)) len = destend - dpt; - if (l_strncpy(dpt, src + pmpt->rm_so, len) != len) + if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len) return(-1); dpt += len; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.82 2010/05/08 14:00:01 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.83 2010/05/28 22:40:24 jilles Exp $"); #include #include @@ -1170,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.75 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.76 2010/05/24 10:35:57 jilles Exp $"); #include #include @@ -91,6 +91,7 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); STATIC void cmdputs(const char *); #if JOBS @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -1056,6 +1059,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/main.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.38 2010/04/17 14:35:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.39 2010/05/28 22:40:24 jilles Exp $"); #include #include @@ -314,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.78 2010/04/11 12:24:47 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); #include #include @@ -203,6 +203,7 @@ * which could happen if we add command substitution on PS1/PS2. */ parser_temp_free_all(); + heredoclist = NULL; tokpushback = 0; doprompt = interact; @@ -973,6 +974,8 @@ const int bq_startlinno = plinno; char *volatile ostr = NULL; struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; str = NULL; if (setjmp(jmploc.loc)) { @@ -981,6 +984,7 @@ ckfree(str); if (ostr) ckfree(ostr); + heredoclist = saveheredoclist; handler = savehandler; if (exception == EXERROR) { startlinno = bq_startlinno; @@ -995,6 +999,7 @@ memcpy(str, stackblock(), savelen); } handler = &jmploc; + heredoclist = NULL; INTON; if (oldstyle) { /* We must read until the closing backquote, giving special @@ -1091,21 +1096,26 @@ while (stackblocksize() <= savelen) growstackblock(); STARTSTACKSTR(out); + INTOFF; if (str) { memcpy(out, str, savelen); STADJUST(savelen, out); - INTOFF; ckfree(str); str = NULL; - INTON; } if (ostr) { - INTOFF; ckfree(ostr); ostr = NULL; - INTON; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; } handler = savehandler; + INTON; if (quoted) USTPUTC(CTLBACKQ | CTLQUOTE, out); else ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.141 2010/05/24 15:12:12 jilles Exp $ .\" -.Dd May 9, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -665,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -1040,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1113,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1166,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1491,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1538,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1549,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1567,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1601,7 +1675,7 @@ .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1760,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1807,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1838,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2309,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 (text+ko) ==== @@ -1791,7 +1791,6 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { case ZFS_PROP_DEVICES: - case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: case ZFS_PROP_ISCSIOPTIONS: case ZFS_PROP_XATTR: ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/archures.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* BFD library support routines for architectures. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003 + 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Hacked by John Gilmore and Steve Chamberlain of Cygnus Support. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "bfd.h" #include "sysdep.h" @@ -141,10 +141,12 @@ .#define bfd_mach_mips6000 6000 .#define bfd_mach_mips7000 7000 .#define bfd_mach_mips8000 8000 +.#define bfd_mach_mips9000 9000 .#define bfd_mach_mips10000 10000 .#define bfd_mach_mips12000 12000 .#define bfd_mach_mips16 16 .#define bfd_mach_mips5 5 +.#define bfd_mach_mips_octeon 6502 .#define bfd_mach_mips_sb1 12310201 {* octal 'SB', 01 *} .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/bfd-in2.h#2 (text+ko) ==== @@ -8,7 +8,8 @@ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -26,7 +27,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/cpu-mips.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 2 13:37:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59E7B1065673; Wed, 2 Jun 2010 13:37: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 1EAD8106564A for ; Wed, 2 Jun 2010 13:37:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B67E8FC24 for ; Wed, 2 Jun 2010 13:37:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52DbfUN081174 for ; Wed, 2 Jun 2010 13:37:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52DbfEq081172 for perforce@freebsd.org; Wed, 2 Jun 2010 13:37:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2010 13:37:41 GMT Message-Id: <201006021337.o52DbfEq081172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 13:37:42 -0000 http://p4web.freebsd.org/@@179093?ac=10 Change 179093 by rwatson@rwatson_cinnamon on 2010/06/02 13:37:12 Clarify last-close behavior. Discussed with: Edward Allcutt Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2009 Robert N. M. Watson +.\" Copyright (c) 2009-2010 Robert N. M. Watson .\" All rights reserved. .\" .\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -94,8 +94,9 @@ is defined, and will be raised when the process dies. .Pp .Xr close 2 -will close the process descriptor, and if the process is still alive, -terminate it with the signal +will close the process descriptor; if the process is still alive and this is +the last reference to the process descriptor, the process will be terminated +with the signal .Dv SIGKILL . .Sh RETURN VALUES .Sh ERRORS From owner-p4-projects@FreeBSD.ORG Wed Jun 2 14:55:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 152E81065675; Wed, 2 Jun 2010 14:55:07 +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 B903D1065673 for ; Wed, 2 Jun 2010 14:55:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A53918FC0C for ; Wed, 2 Jun 2010 14:55:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52Et6km088273 for ; Wed, 2 Jun 2010 14:55:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52Et6iF088271 for perforce@freebsd.org; Wed, 2 Jun 2010 14:55:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2010 14:55:06 GMT Message-Id: <201006021455.o52Et6iF088271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 14:55:07 -0000 http://p4web.freebsd.org/@@179094?ac=10 Change 179094 by rwatson@rwatson_fledge on 2010/06/02 14:54:54 Add Capsicum paper to the TrustedBSD web site as well as the main Computer Laboratory Capsicum site. Affected files ... .. //depot/projects/trustedbsd/www/2010usenix-security-capsicum-website.pdf#1 add .. //depot/projects/trustedbsd/www/Makefile#17 edit .. //depot/projects/trustedbsd/www/docs.bib#6 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#17 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#16 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#17 $ STYLESHEET= page.xsl @@ -85,6 +85,7 @@ DATA+= 20000809-trustedbsd-announcement.txt DATA+= robots.txt DATA+= 20060303-ukuug2006lisa-audit.pdf +DATA+= 2010usenix-security-capsicum-website.pdf GLOBAL_XML= sidebar.xml ==== //depot/projects/trustedbsd/www/docs.bib#6 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/docs.bib#5 $ + $P4: //depot/projects/trustedbsd/www/docs.bib#6 $ @@ -370,4 +370,44 @@ + + Capsicum: practical capabilities for UNIX + + + Robert N. M. Watson + University of Cambridge + + + + Jonathan Anderson + University of Cambridge + + + + Ben Laurie + Google UK Ltd. + + + + Kris Kennaway + Google UK Ltd. + + + + + + + Capsicum is a lightweight operating system capability and + sandbox framework planned for inclusion in FreeBSD 9. Capsicum extends, + rather than replaces, UNIX APIs, providing new kernel primitives + (sandboxed capability mode and capabilities) and a userspace sandbox + API. These tools support compartmentalisation of monolithic UNIX + applications into logical applications, an increasingly common goal + supported poorly by discretionary and mandatory access control. We + demonstrate our approach by adapting core FreeBSD utilities and + Google's Chromium web browser to use Capsicum primitives, and compare + the complexity and robustness of Capsicum with other sandboxing + techniques. + + From owner-p4-projects@FreeBSD.ORG Wed Jun 2 16:15:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBE78106567A; Wed, 2 Jun 2010 16:15: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 AF26C1065676 for ; Wed, 2 Jun 2010 16:15:40 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B6EE8FC13 for ; Wed, 2 Jun 2010 16:15:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52GFeqo097161 for ; Wed, 2 Jun 2010 16:15:40 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52GFZ6O097155 for perforce@freebsd.org; Wed, 2 Jun 2010 16:15:35 GMT (envelope-from zec@fer.hr) Date: Wed, 2 Jun 2010 16:15:35 GMT Message-Id: <201006021615.o52GFZ6O097155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 16:15:41 -0000 http://p4web.freebsd.org/@@179101?ac=10 Change 179101 by zec@zec_tpx32 on 2010/06/02 16:15:22 IFC @ 179100 Affected files ... .. //depot/projects/vimage/src/share/man/Makefile#2 integrate .. //depot/projects/vimage/src/share/man/man4/Makefile#21 integrate .. //depot/projects/vimage/src/share/man/man4/acpi.4#5 integrate .. //depot/projects/vimage/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/em.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/igb.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/io.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/ksyms.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/lindev.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/malo.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/md.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/mpt.4#6 integrate .. //depot/projects/vimage/src/share/man/man4/mvs.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/sbp_targ.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/smp.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/tx.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/u3g.4#7 integrate .. //depot/projects/vimage/src/share/man/man4/uath.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/uep.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb.4#6 integrate .. //depot/projects/vimage/src/share/man/man4/usb2_template.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/devfs.5#2 integrate .. //depot/projects/vimage/src/share/man/man5/src.conf.5#7 integrate .. //depot/projects/vimage/src/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/vimage/src/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/atomic.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/make_dev.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/prison_check.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/usbdi.9#5 integrate .. //depot/projects/vimage/src/share/man/man9/watchdog.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#27 delete .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#27 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mca.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#27 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#40 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_syscall.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/atomic.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/clock.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/mca.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#10 integrate .. //depot/projects/vimage/src/sys/amd64/include/proc.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#20 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#23 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#28 integrate .. //depot/projects/vimage/src/sys/arm/arm/trap.c#9 integrate .. //depot/projects/vimage/src/sys/arm/include/metadata.h#3 integrate .. //depot/projects/vimage/src/sys/boot/Makefile#10 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/version#3 integrate .. //depot/projects/vimage/src/sys/boot/fdt/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/bindings-gpio.txt#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/bindings-mpp.txt#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/db78100.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/db88f5182.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/db88f5281.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/db88f6281.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/mpc8555cds.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/mpc8572ds.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/dts/sheevaplug.dts#1 branch .. //depot/projects/vimage/src/sys/boot/fdt/fdt_loader_cmd.c#1 branch .. //depot/projects/vimage/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/version#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/main.c#6 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/metadata.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/disk.c#7 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#8 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfs.c#6 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#7 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/vimage/src/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/vimage/src/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#11 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#7 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#7 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#8 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#12 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#21 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#14 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#32 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#67 integrate .. //depot/projects/vimage/src/sys/conf/files#84 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#29 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#37 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#24 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#27 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#22 integrate .. //depot/projects/vimage/src/sys/conf/options#63 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.c#10 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.h#4 integrate .. //depot/projects/vimage/src/sys/ddb/db_thread.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#12 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/vimage/src/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/amdsbwd/amdsbwd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#15 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#15 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bwn/if_bwn.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#34 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#22 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#18 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#16 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.h#11 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#16 integrate .. //depot/projects/vimage/src/sys/dev/mvs/mvs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mvs/mvs_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mvs/mvs_soc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#9 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#9 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#24 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#7 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_bus_subr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_bus_subr.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_fdt.c#1 branch .. //depot/projects/vimage/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.h#5 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#29 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#15 integrate .. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/siis/siis.c#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#20 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uep.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#59 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#32 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label.c#6 integrate .. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#7 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#12 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_vtoc8.c#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/geode.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#27 delete .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/vimage/src/sys/i386/i386/mca.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#26 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#21 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate .. //depot/projects/vimage/src/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#15 integrate .. //depot/projects/vimage/src/sys/i386/include/atomic.h#8 integrate .. //depot/projects/vimage/src/sys/i386/include/clock.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/mca.h#4 integrate .. //depot/projects/vimage/src/sys/i386/include/pcpu.h#9 integrate .. //depot/projects/vimage/src/sys/i386/include/proc.h#6 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#20 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#17 integrate .. //depot/projects/vimage/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/db_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#20 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/vimage/src/sys/ia64/include/ia64_cpu.h#6 integrate .. //depot/projects/vimage/src/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/vimage/src/sys/ia64/include/proc.h#4 integrate .. //depot/projects/vimage/src/sys/ia64/include/runq.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/sal.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/vmparam.h#9 integrate .. //depot/projects/vimage/src/sys/isa/syscons_isa.c#5 integrate .. //depot/projects/vimage/src/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#33 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#25 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#31 integrate .. //depot/projects/vimage/src/sys/kern/kern_kthread.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#34 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#26 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#27 integrate .. //depot/projects/vimage/src/sys/kern/posix4_mib.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#28 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#34 integrate .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#13 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#19 integrate .. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#12 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#15 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#20 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#17 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#12 integrate .. //depot/projects/vimage/src/sys/kern/uipc_shm.c#10 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#47 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#31 integrate .. //depot/projects/vimage/src/sys/mips/conf/XLR#3 integrate .. //depot/projects/vimage/src/sys/mips/include/asm.h#4 integrate .. //depot/projects/vimage/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/vimage/src/sys/mips/include/param.h#9 integrate .. //depot/projects/vimage/src/sys/mips/include/smp.h#6 integrate .. //depot/projects/vimage/src/sys/mips/mips/cpu.c#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/db_trace.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/mips/mips/machdep.c#9 integrate .. //depot/projects/vimage/src/sys/mips/mips/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#21 integrate .. //depot/projects/vimage/src/sys/mips/mips/swtch.S#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/tick.c#6 integrate .. //depot/projects/vimage/src/sys/mips/mips/trap.c#7 integrate .. //depot/projects/vimage/src/sys/mips/mips/uio_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/ehcireg.h#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/ehcivar.h#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/vimage/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/pcibus.c#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/perfmon.h#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/perfmon_kern.c#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/perfmon_percpu.c#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/perfmon_utils.h#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/perfmon_xlrconfig.h#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/xlr_boot1_console.c#2 delete .. //depot/projects/vimage/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/vimage/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/vimage/src/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#61 integrate .. //depot/projects/vimage/src/sys/modules/ata/atadisk/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cam/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/iwnfw/Makefile.inc#2 integrate .. //depot/projects/vimage/src/sys/modules/linux/Makefile#10 integrate .. //depot/projects/vimage/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/usb/uep/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#14 integrate .. //depot/projects/vimage/src/sys/net/flowtable.c#14 integrate .. //depot/projects/vimage/src/sys/net/flowtable.h#10 integrate .. //depot/projects/vimage/src/sys/net/if.c#100 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#50 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#28 integrate .. //depot/projects/vimage/src/sys/net/route.c#61 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#48 integrate .. //depot/projects/vimage/src/sys/net/vnet.c#13 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#40 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hwmp.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#32 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#21 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#47 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#67 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#43 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/pim_var.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#32 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#26 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#45 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#50 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#68 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#25 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#34 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#43 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#13 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/vimage/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/pc98_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#14 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#19 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/trap.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/intr_machdep.h#8 integrate .. //depot/projects/vimage/src/sys/powerpc/include/metadata.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/vimage/src/sys/powerpc/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_kauai.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/vimage/src/sys/powerpc/powermac/smu.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#8 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/openpic.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#13 integrate .. //depot/projects/vimage/src/sys/sparc64/include/md_var.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizoreg.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizovar.h#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/ata_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/vimage/src/sys/sun4v/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#16 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#10 integrate .. //depot/projects/vimage/src/sys/sys/_task.h#4 integrate .. //depot/projects/vimage/src/sys/sys/endian.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#22 integrate .. //depot/projects/vimage/src/sys/sys/kthread.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#67 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#17 integrate .. //depot/projects/vimage/src/sys/sys/posix4.h#2 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#42 integrate .. //depot/projects/vimage/src/sys/sys/ptrace.h#4 integrate .. //depot/projects/vimage/src/sys/sys/resourcevar.h#7 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#13 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#24 integrate .. //depot/projects/vimage/src/sys/sys/taskqueue.h#6 integrate .. //depot/projects/vimage/src/sys/sys/user.h#16 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/vimage/src/sys/vm/pmap.h#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#25 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#26 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#26 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#31 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#30 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#25 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#22 integrate .. //depot/projects/vimage/src/sys/x86/isa/clock.c#4 integrate .. //depot/projects/vimage/src/sys/x86/x86/local_apic.c#1 branch Differences ... ==== //depot/projects/vimage/src/share/man/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/16/94 -# $FreeBSD: src/share/man/Makefile,v 1.19 2006/03/17 18:54:33 ru Exp $ +# $FreeBSD: src/share/man/Makefile,v 1.20 2010/05/19 23:56:26 jkim Exp $ .include @@ -9,10 +9,12 @@ MAKEWHATIS?= makewhatis makedb: +.if ${MK_MAN_UTILS} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/man .if ${MK_OPENSSL} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man .endif +.endif .include "${.CURDIR}/../Makefile.inc" .include ==== //depot/projects/vimage/src/share/man/man4/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.478 2010/05/02 19:28:30 mav Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.479 2010/05/25 21:20:56 glebius Exp $ MAN= aac.4 \ acpi.4 \ @@ -435,6 +435,7 @@ udav.4 \ udbp.4 \ udp.4 \ + uep.4 \ ufm.4 \ ufoma.4 \ uftdi.4 \ ==== //depot/projects/vimage/src/share/man/man4/acpi.4#5 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.64 2010/03/09 19:19:07 jkim Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.65 2010/06/02 08:43:18 mav Exp $ .\" -.Dd March 9, 2010 +.Dd June 2, 2010 .Dt ACPI 4 .Os .Sh NAME @@ -599,10 +599,8 @@ .Nm CPU idle power management drive conflicts with the local APIC (LAPIC) timer. -Disable APIC mode with -.Va hint.apic.0.disabled +Disable the local APIC timer with +.Va hint.apic.0.clock=0 or do not use the -.Li C2 -and .Li C3 -states if APIC mode is enabled. +and deeper states if the local APIC timer is enabled. ==== //depot/projects/vimage/src/share/man/man4/dcons.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.12 2008/01/26 06:50:14 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.13 2010/05/27 13:56:40 uqs Exp $ .\" .Dd January 26, 2008 .Dt DCONS 4 @@ -122,4 +122,4 @@ .An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org .Sh BUGS This driver is -.Ud . +.Ud ==== //depot/projects/vimage/src/share/man/man4/ddb.4#3 (text+ko) ==== @@ -58,9 +58,9 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.64 2010/03/12 10:01:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.66 2010/05/27 13:56:47 uqs Exp $ .\" -.Dd November 29, 2008 +.Dd May 24, 2010 .Dt DDB 4 .Os .Sh NAME @@ -964,7 +964,7 @@ Show all threads within the system. Output format is as follows: .Pp -.Bl -tag -width "PPID" -compact -offset indent -width "Second column" +.Bl -tag -compact -offset indent -width "Second column" .It Ic First column Thread identifier (TID) .It Ic Second column @@ -1092,9 +1092,13 @@ Note that the arguments are reversed relative to .Xr kill 2 . .Pp -.It Ic reboot -.It Ic reset +.It Ic reboot Op Ar seconds +.It Ic reset Op Ar seconds Hard reset the system. +If the optional argument +.Ar seconds +is given, the debugger will wait for this long, at most a week, +before rebooting. .Pp .It Ic help Print a short summary of the available commands and command ==== //depot/projects/vimage/src/share/man/man4/em.4#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/em.4,v 1.30 2008/10/06 21:55:53 simon Exp $ +.\" $FreeBSD: src/share/man/man4/em.4,v 1.31 2010/05/14 20:11:30 marius Exp $ .\" -.Dd October 6, 2008 +.Dd May 14, 2010 .Dt EM 4 .Os .Sh NAME @@ -62,6 +62,11 @@ and Jumbo Frames on all but 82542-based adapters. Furthermore it supports TCP segmentation offload (TSO) on all adapters but those based on the 82543, 82544 and 82547 controller chips. +The identification LEDs of the adapters supported by the +.Nm +driver can be controlled via the +.Xr led 4 +API for localization purposes. For further hardware information, see the .Pa README included with the driver. @@ -241,10 +246,25 @@ with a supported adapter, email the specific information related to the issue to .Aq freebsdnic@mailbox.intel.com . +.Sh FILES +.Bl -tag -width /dev/led/em* +.It Pa /dev/led/em* +identification LED device nodes +.El +.Sh EXAMPLES +Make the identification LED of em0 blink: +.Pp +.Dl "echo f2 > /dev/led/em0" +.Pp +Turn the identification LED of em0 off again: +.Pp +.Dl "echo 0 > /dev/led/em0" +.Pp .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , .Xr igb 4 , +.Xr led 4 , .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , ==== //depot/projects/vimage/src/share/man/man4/igb.4#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/igb.4,v 1.1 2008/10/06 21:38:55 simon Exp $ +.\" $FreeBSD: src/share/man/man4/igb.4,v 1.2 2010/05/14 20:11:30 marius Exp $ .\" -.Dd October 6, 2008 +.Dd May 14, 2010 .Dt IGB 4 .Os .Sh NAME @@ -60,6 +60,11 @@ Frames. Furthermore it supports TCP segmentation offload (TSO) on all adapters. +The identification LEDs of the adapters supported by the +.Nm +driver can be controlled via the +.Xr led 4 +API for localization purposes. .Pp For questions related to hardware requirements, refer to the documentation supplied with your Intel PRO/1000 adapter. @@ -175,10 +180,25 @@ with a supported adapter, email the specific information related to the issue to .Aq freebsdnic@mailbox.intel.com . +.Sh FILES +.Bl -tag -width /dev/led/igb* +.It Pa /dev/led/igb* +identification LED device nodes +.El +.Sh EXAMPLES +Make the identification LED of igb0 blink: +.Pp +.Dl "echo f2 > /dev/led/igb0" +.Pp +Turn the identification LED of igb0 off again: +.Pp +.Dl "echo 0 > /dev/led/igb0" +.Pp .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , .Xr em 4 , +.Xr led 4 , .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , ==== //depot/projects/vimage/src/share/man/man4/io.4#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (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/share/man/man4/io.4,v 1.2 2010/02/08 20:53:29 gavin Exp $ +.\" $FreeBSD: src/share/man/man4/io.4,v 1.3 2010/06/01 18:27:48 attilio Exp $ .\" -.Dd February 8, 2010 +.Dd June 01, 2010 .Dt IO 4 .Os .Sh NAME @@ -35,32 +35,89 @@ .Nd I/O privilege file .Sh SYNOPSIS .Cd "device io" +.Pp +.In sys/types.h +.In sys/ioctl.h +.In dev/io/iodev.h +.In machine/iodev.h +.Pp +.Bd -literal +struct iodev_pio_req { + u_int access; + u_int port; + u_int width; + u_int val; +}; .Sh DESCRIPTION The special file .Pa /dev/io is a controlled security hole that allows a process to gain I/O privileges (which are normally reserved for kernel-internal code). -Any process that holds a file descriptor on -.Pa /dev/io -open will get its -.Em IOPL -bits in the flag register set, thus allowing it to perform direct -I/O operations. This can be useful in order to write userland programs that handle some hardware directly. -Note that even read-only access will grant the full I/O privileges. +.Pp +The usual operations on the device are to open it via the +.Xr open 2 +interface and to send I/O requests to the file descriptor using the +.Xr ioctl 2 +syscall. +.Pp +The +.Xr ioctl 2 +requests available for +.Pa /dev/io +are mostly platform dependent, but there are also some in common between +all of them. +The +.Dv IODEV_PIO +is used by all the architectures in order to request that an I/O operation +be performed. It takes a 'struct iodev_pio_req' argument +that must be previously setup. +.Pp +The +.Fa access +member specifies the type of operation requested. It may be: +.Bl -tag -width IODEV_PIO_WRITE +.It Dv IODEV_PIO_READ +The operation is an "in" type. A value will be read from the specified port +(retrieved from the +.Fa port +member) and the result will be stored in the +.Fa val +member. +.It Dv IODEV_PIO_WRITE +The operation is a "out" type. The value will be fetched from the +.Fa val +member and will be written out to the specified port (defined as the +.Fa port +member). +.El +.Pp +Finally, the +.Fa width +member specifies the size of the operand to be read/written, expressed +in bytes. .Pp In addition to any file access permissions on .Pa /dev/io , the kernel enforces that only the super-user may open this device. -.Sh FILES -.Bl -tag -width Pa -compact -.It Pa /dev/io -.El +.Sh LEGACY +The +.Pa /dev/io +interface used to be very i386 specific and worked differently. The initial +implementation, in fact, simply raised the +.Em IOPL +of the current thread when +.Xr open 2 +was called on the file. This behaviour is retained in the current +implementation as legacy support for both i386 and amd64 architectures. .Sh SEE ALSO +.Xr close 2 , .Xr i386_get_ioperm 2 , .Xr i386_set_ioperm 2 , +.Xr ioctl 2 , +.Xr open 2 , .Xr mem 4 .Sh HISTORY The ==== //depot/projects/vimage/src/share/man/man4/ksyms.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008-2009 Stacey Son +.\" Copyright (c) 2008-2009 Stacey Son .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ksyms.4,v 1.2 2010/05/13 12:07:55 uqs Exp $ +.\" $FreeBSD: src/share/man/man4/ksyms.4,v 1.3 2010/05/19 08:57:53 uqs Exp $ .\" .Dd April 5, 2009 .Dt KSYMS 4 @@ -135,7 +135,7 @@ .Nm driver was written by .An Stacey Son -.Aq sson@freebsd.org . +.Aq sson@FreeBSD.org . .Sh BUGS Because files can be dynamically linked into the kernel at any time the symbol information can vary. When you open the ==== //depot/projects/vimage/src/share/man/man4/lindev.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/lindev.4,v 1.2 2009/10/09 10:03:41 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/lindev.4,v 1.3 2010/05/24 11:14:40 uqs Exp $ .\" .Dd September 26, 2009 .Dt LINDEV 4 @@ -70,4 +70,4 @@ The .Nm module first appeared in -.Fx 9.0 . +.Fx 8.1 . ==== //depot/projects/vimage/src/share/man/man4/malo.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Weongyo Jeong +.\" Copyright (c) 2008 Weongyo Jeong .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/malo.4,v 1.9 2009/10/21 09:22:40 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/malo.4,v 1.10 2010/05/19 08:57:53 uqs Exp $ .\"/ .Dd October 21, 2009 .Dt MALO 4 ==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#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. .\" -.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.2 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.3 2010/05/19 08:57:53 uqs Exp $ .\" .Dd July 3, 2008 .Dt BM 4 @@ -83,7 +83,7 @@ .Nm driver was written by .An Nathan Whitehorn -.Aq nwhitehorn@freebsd.org +.Aq nwhitehorn@FreeBSD.org based on work by .An Peter Grehan -.Aq grehan@freebsd.org . +.Aq grehan@FreeBSD.org . ==== //depot/projects/vimage/src/share/man/man4/md.4#3 (text+ko) ==== @@ -1,11 +1,11 @@ .\" ---------------------------------------------------------------------------- .\" "THE BEER-WARE LICENSE" (Revision 42): -.\" wrote this file. As long as you retain this notice you +.\" wrote this file. As long as you retain this notice you .\" can do whatever you want with this stuff. If we meet some day, and you think .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/share/man/man4/md.4,v 1.15 2009/05/17 12:21:11 trasz Exp $ +.\" $FreeBSD: src/share/man/man4/md.4,v 1.16 2010/05/19 08:57:53 uqs Exp $ .\" .Dd October 30, 2007 .Dt MD 4 ==== //depot/projects/vimage/src/share/man/man4/mpt.4#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.19 2010/05/14 01:10:20 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.20 2010/06/02 10:20:23 uqs Exp $ .\" .Dd May 13, 2010 .Dt MPT 4 @@ -183,4 +183,3 @@ and .An Scott Long Aq scottl@FreeBSD.org have made more substantial improvements. -.Sh BUGS ==== //depot/projects/vimage/src/share/man/man4/mvs.4#2 (text+ko) ==== @@ -23,7 +23,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/share/man/man4/mvs.4,v 1.1 2010/05/02 19:28:30 mav Exp $ +.\" $FreeBSD: src/share/man/man4/mvs.4,v 1.2 2010/05/23 14:11:27 mav Exp $ .\" .Dd April 27, 2010 .Dt MVS 4 @@ -171,6 +171,6 @@ The .Nm driver first appeared in -.Fx 9.0 . +.Fx 8.1 . .Sh AUTHORS .An Alexander Motin Aq mav@FreeBSD.org . ==== //depot/projects/vimage/src/share/man/man4/ng_ccatm.4#2 (text+ko) ==== @@ -6,7 +6,7 @@ .\" Hartmut Brandt. .\" All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_ccatm.4,v 1.4 2005/07/15 17:35:25 hrs Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ccatm.4,v 1.5 2010/05/19 08:57:53 uqs Exp $ .\" .Dd March 10, 2005 .Dt NG_CCATM 4 ==== //depot/projects/vimage/src/share/man/man4/sbp_targ.4#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sbp_targ.4,v 1.6 2009/10/15 11:32:05 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/sbp_targ.4,v 1.7 2010/05/27 13:56:40 uqs Exp $ .\" .Dd November 7, 2003 .Dt SBP_TARG 4 @@ -93,6 +93,6 @@ .An Hidetoshi Shimokawa . .Sh BUGS This driver is -.Ud . +.Ud It does not work correctly in multi-initiator environments or after the bus topology has been changed. ==== //depot/projects/vimage/src/share/man/man4/smp.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Copyright (c) 1997 -.\" Steve Passe . All rights reserved. +.\" Steve Passe . All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/smp.4,v 1.24 2009/05/09 20:18:20 ivoras Exp $ +.\" $FreeBSD: src/share/man/man4/smp.4,v 1.25 2010/05/19 08:57:53 uqs Exp $ .\" .Dd May 7, 2008 .Dt SMP 4 ==== //depot/projects/vimage/src/share/man/man4/snd_emu10kx.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.7 2008/07/03 16:48:35 danger Exp $ +.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.8 2010/05/19 08:57:53 uqs Exp $ .\" .Dd May 28, 2008 .Dt SND_EMU10KX 4 @@ -276,11 +276,11 @@ The PCM part of the driver is based on the .Xr snd_emu10k1 4 SB Live!\& driver by -.An "Cameron Grant" Aq cg@freebsd.org . +.An Cameron Grant Aq cg@FreeBSD.org . The MIDI interface is based on the .Xr snd_emu10k1 4 MIDI interface code by -.An "Mathew Kanner" Aq matk@freebsd.org . +.An Mathew Kanner Aq matk@FreeBSD.org . The .Nm device driver and this manual page were written by ==== //depot/projects/vimage/src/share/man/man4/tx.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998-2001 Semen Ustimenko (semenu@FreeBSD.org) +.\" Copyright (c) 1998-2001 Semen Ustimenko .\" .\" All rights reserved. .\" @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 2 18:01:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1FF81065670; Wed, 2 Jun 2010 18:01: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 6630A1065679 for ; Wed, 2 Jun 2010 18:01:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51D4E8FC12 for ; Wed, 2 Jun 2010 18:01:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52I1bfj019293 for ; Wed, 2 Jun 2010 18:01:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52I1bDR019291 for perforce@freebsd.org; Wed, 2 Jun 2010 18:01:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2010 18:01:37 GMT Message-Id: <201006021801.o52I1bDR019291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 18:01:37 -0000 http://p4web.freebsd.org/@@179110?ac=10 Change 179110 by rwatson@rwatson_cinnamon on 2010/06/02 18:01:07 Prefer style(9) in many spots, and in one case, prefer sandbox() to cap_main() in order to compile. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/cap_exec.c#9 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#10 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/ld_libdirs.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#14 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#9 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#16 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/cap_exec.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/cap_exec/main.c#5 (text+ko) ==== @@ -9,23 +9,25 @@ int sandbox(int argc, char *argv[]) { + printf("pid %d cap_main(%d, %p)\n", getpid(), argc, argv); - return 0; + return (0); } int main(int argc, char *argv[]) { - if (ld_insandbox()) return sandbox(argc, argv); + + if (ld_insandbox()) + return (sandbox(argc, argv)); printf("pid %d main(%d, %p)\n", getpid(), argc, argv); - if(opendir("./") == NULL) + if (opendir("./") == NULL) printf("Call to opendir() failed (good!) - errno %i (%s)\n", - errno, strerror(errno)); + errno, strerror(errno)); else fprintf(stderr, "Call to opendir() didn't fail!"); - return 0; + return (0); } - ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#11 (text+ko) ==== @@ -49,7 +49,7 @@ int ld_insandbox(void); int sandbox(void); -static void print_fdlist(struct lc_fdlist *lfp); +static void print_fdlist(struct lc_fdlist *lfp); /* @@ -61,7 +61,8 @@ struct lc_fdlist *lfp; int testfd; - if (ld_insandbox()) return sandbox(); + if (ld_insandbox()) + return (sandbox()); printf("fdlist: PID %d\n", getpid()); @@ -71,26 +72,25 @@ err(-1, "lc_fdlist_new()"); lc_fdlist_addcap(lfp, "org.freebsd.test.fdlist", "stdin", "", - 0, CAP_READ); + 0, CAP_READ); lc_fdlist_addcap(lfp, "org.freebsd.test.fdlist", "stdout", "", - 1, CAP_WRITE | CAP_SEEK); + 1, CAP_WRITE | CAP_SEEK); lc_fdlist_addcap(lfp, "org.freebsd.test.fdlist", "stderr", "", - 2, CAP_WRITE | CAP_SEEK); + 2, CAP_WRITE | CAP_SEEK); lc_fdlist_add(lfp, "org.freebsd.test.fdlist", "testfile", - "/etc/passwd", open("/etc/passwd", O_RDONLY)); + "/etc/passwd", open("/etc/passwd", O_RDONLY)); lc_fdlist_addcap(lfp, "org.freebsd.test.fdlist", "testfile", - "/etc/group", open("/etc/group", O_RDONLY), CAP_READ); + "/etc/group", open("/etc/group", O_RDONLY), CAP_READ); print_fdlist(lfp); char *name; if (lc_fdlist_lookup(lfp, "org.freebsd.test.fdlist", "stdin", - &name, &testfd, NULL) < 0) { + &name, &testfd, NULL) < 0) err(-1, "lc_fdlist_lookup: can't find stdin"); - } printf("Starting sandbox...\n"); @@ -103,23 +103,23 @@ struct lc_sandbox *sandbox; if (lch_startfd(me, "fdlist-sandbox", sargv, - LCH_PERMIT_STDOUT | LCH_PERMIT_STDERR, lfp, &sandbox)) - + LCH_PERMIT_STDOUT | LCH_PERMIT_STDERR, lfp, &sandbox)) err(-1, "Error starting sandbox"); sleep(1); - return 0; + return (0); } - - int -sandbox() +sandbox(void) { - printf("sandbox alive\n"); fflush(stdout); + + printf("sandbox alive\n"); + fflush(stdout); struct lc_fdlist *global_fdlist = lc_fdlist_global(); - printf("Received FD list:\n"); fflush(stdout); + printf("Received FD list:\n"); + fflush(stdout); int pos = 0; char *subsystem; @@ -128,13 +128,13 @@ int fd; while (lc_fdlist_getentry(global_fdlist, &subsystem, &class, - &name, &fd, &pos) >= 0) - printf("%d\t'%s'.'%s': '%s' (%d)\n", - pos, subsystem, class, name, fd); + &name, &fd, &pos) >= 0) + printf("%d\t'%s'.'%s': '%s' (%d)\n", pos, subsystem, class, + name, fd); printf("OK.\n"); - return 0; + return (0); } void @@ -147,8 +147,8 @@ int fd; while (lc_fdlist_getentry(lfp, &subsystem, &class, &name, &fd, &pos) - >= 0) { + >= 0) { printf("%d\t'%s'.'%s': '%s' (%d)\n", - pos, subsystem, class, name, fd); + pos, subsystem, class, name, fd); } } ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#10 (text+ko) ==== @@ -68,7 +68,8 @@ size_t len; char ch; - if (ld_insandbox()) return sandbox(); + if (ld_insandbox()) + return (sandbox()); if (argc != 1) errx(-1, "usage: fdrpc_host"); @@ -112,7 +113,7 @@ * descriptors to the host. */ int -sandbox() +sandbox(void) { int fd, fdcount; struct lc_host *lchp; ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ int ld_insandbox(void); int sandbox(void); - int main(int argc, char *argv[]) { @@ -60,7 +59,8 @@ int fdarray[2], fdcount; char ch; - if (ld_insandbox()) return sandbox(); + if (ld_insandbox()) + return (sandbox()); if (argc != 1) errx(-1, "usage: fdsendrecv_host"); @@ -92,7 +92,7 @@ } int -sandbox() +sandbox(void) { struct lc_host *lchp; ssize_t len; ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/ld_libdirs/ld_libdirs.c#3 (text+ko) ==== @@ -52,14 +52,14 @@ void print_fdlist(struct lc_fdlist*); - int main(int argc, char *argv[]) { struct lc_sandbox *lcsp; char *sandbox_argv[3] = { argv[1], "sandbox", NULL }; - if (ld_insandbox()) return sandbox(); + if (ld_insandbox()) + return (sandbox()); for (int i = 0; i < 200; i++) { int size = i; @@ -87,7 +87,7 @@ } int -sandbox() +sandbox(void) { struct lcs_host *host; @@ -136,12 +136,13 @@ break; } } - - return 0; + return (0); } -void print_fdlist(struct lc_fdlist *fds) { +void +print_fdlist(struct lc_fdlist *fds) +{ char *subsystem; char *classname; @@ -149,10 +150,8 @@ int fd, pos = 0; while(lc_fdlist_getentry(fds, &subsystem, &classname, &name, &fd, &pos) - >= 0) { - + >= 0) { printf("%d\t'%s'.'%s': %d ('%s')\n", pos, subsystem, classname, fd, name); } } - ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#14 (text+ko) ==== @@ -48,7 +48,7 @@ #define MYNAME "sandbox_echo" -int sandbox(int argc, char *argv[]); +int sandbox(int argc, char *argv[]); int main(int argc, char *argv[]) @@ -60,7 +60,8 @@ char ch; int i; - if(ld_insandbox()) return cap_main(argc, argv); + if (ld_insandbox()) + return (sandbox(argc, argv)); if (argc != 1) errx(-1, "usage: sandbox_echo"); ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#9 (text+ko) ==== @@ -68,7 +68,8 @@ size_t len; char ch; - if (ld_insandbox()) return sandbox(); + if (ld_insandbox()) + return (sandbox()); if (argc != 1) errx(-1, "usage: sandbox_world"); @@ -104,7 +105,7 @@ * Sandboxed process implementing a 'printf hello world' RPC. */ int -sandbox() +sandbox(void) { struct lc_host *lchp; u_int32_t opno, seqno; @@ -148,5 +149,5 @@ free(buffer); } - return 0; + return (0); } ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#11 (text+ko) ==== @@ -303,7 +303,8 @@ int ch; #ifndef NO_SANDBOX_SUPPORT - if (ld_insandbox()) return gzsandbox(); + if (ld_insandbox()) + return (gzsandbox()); #endif /* XXX set up signals */ ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#16 (text+ko) ==== @@ -327,7 +327,8 @@ /* * Main entry point for capability-mode */ -int gzsandbox(void) +int +gzsandbox(void) { int fdarray[2], fdcount; struct lc_host *lchp; From owner-p4-projects@FreeBSD.ORG Wed Jun 2 18:03:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE5521065676; Wed, 2 Jun 2010 18:03:56 +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 83CF21065675 for ; Wed, 2 Jun 2010 18:03:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E5548FC1E for ; Wed, 2 Jun 2010 18:03:56 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52I3uSs020462 for ; Wed, 2 Jun 2010 18:03:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52I3duF020443 for perforce@freebsd.org; Wed, 2 Jun 2010 18:03:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2010 18:03:39 GMT Message-Id: <201006021803.o52I3duF020443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 18:03:57 -0000 http://p4web.freebsd.org/@@179111?ac=10 Change 179111 by rwatson@rwatson_vimage_client on 2010/06/02 18:03:09 Integrate TrustedBSD Capabilities branch; merge as-yet untested. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/MAINTAINERS#7 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#13 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#14 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#14 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/chio/chio.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/cp.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/cp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/utils.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/csh/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/csh/config_p.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/date/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/date/date.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/date/date.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ed/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ed/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/kill/kill.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ln/ln.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ln/symlink.7#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/cmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/ls.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/ls.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/print.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/cpio.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/bin/pax/cpio.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/gen_subs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/getoldopt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/tar.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/bin/pax/tar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/extern.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/keyword.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/print.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/ps.1#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/ps.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pwait/pwait.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/rcp/rcp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/rmail/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/file.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/mask.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/merge.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/remove.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/util.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith.y#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith_lex.l#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/cd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/cd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/expand.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/jobs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/main.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mksyntax.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/options.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#9 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/var.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/test/test.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/drti/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libctf/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libdtrace/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libnvpair/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzpool/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ctfconvert/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ctfdump/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ctfmerge/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/sgsmsg/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/zinject/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ztest/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/dtrace/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/lockstat/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/zdb/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/AUTHORS#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/ChangeLog#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Examples/ckbook.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Examples/pi.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Examples/primes.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Examples/twins.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/FAQ#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/INSTALL#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Makefile.am#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/NEWS#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/README#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/BUG.bc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/array.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/arrayp.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/aryprm.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/atan.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/checklib.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/div.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/exp.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/fact.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/jn.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/ln.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/mul.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/raise.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/signum#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/sine.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/sqrt.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/sqrt1.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/sqrt2.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/testfn.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/Test/timetest#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/acconfig.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/aclocal.m4#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/Makefile.am#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/bc.y#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/bcdefs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/const.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/execute.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/fix-libmath_h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/global.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/global.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/libmath.b#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/libmath.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/load.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/main.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/proto.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/sbc.y#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/scan.l#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/storage.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/bc/util.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/config.h.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/configure#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/configure.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/Makefile.am#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/array.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/dc-proto.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/dc-regdef.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/dc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/dc.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/eval.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/misc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/numeric.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/stack.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/dc/string.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/bc.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/bc.texi#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/dc.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/doc/dc.texi#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/h/number.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/install-sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/lib/Makefile.am#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/lib/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/lib/number.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/lib/testmul.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/lib/vfprintf.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/missing#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bc/stamp-h.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/CHANGES#8 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/NSEC3-NOTES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/README#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssectool.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssectool.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/statschannel.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/config.h.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/configure.in#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dig.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.host.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkconf.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkzone.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc-confgen.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.conf.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.html#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/db.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_internal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_parse.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dnssec.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/journal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/ncache.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/result.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/types.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/dst.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/masterdump.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/ncache.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/nsec3.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rcode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdatalist.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/result.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/sdlz.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/base32.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/base64.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/httpd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/entropy.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/netscope.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/portset.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/sha2.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/util.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/random.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/sha2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccfg/aclconf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/version#8 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/config.bfd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/gas/config/tc-mips.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/ABOUT-NLS#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/AUTHORS#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/COPYING#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/ChangeLog#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/INSTALL#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/NEWS#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/README#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/THANKS#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/TODO#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/doc/cpio.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/doc/cpio.texi#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/doc/version.texi#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/alloca_.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-ba.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-eexst.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-fmtstream.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-fmtstream.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-fs-xinl.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-help.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-namefrob.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-parse.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-pin.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-pv.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-pvh.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp-xinl.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/argp.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/basename.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/dirname.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/dirname.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/error.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/error.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/exitfail.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/exitfail.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/fatal.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/full-write.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/full-write.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/getopt.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/getopt1.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/getopt_.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/getopt_int.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/gettext.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/hash.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/hash.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/intprops.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/inttostr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/inttostr.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/mempcpy.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/paxerror.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/paxexit.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/paxlib.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/paxnames.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/quote.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/quote.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/quotearg.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/quotearg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/rmt-command.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/rmt.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/rtapelib.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/safe-read.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/safe-read.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/safe-write.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/safe-write.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/savedir.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/savedir.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/strchrnul.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/stripslash.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/strndup.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/strnlen.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/system-ioctl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/system.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/umaxtostr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/unlocked-io.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/utimens.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/utimens.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/xalloc-die.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/xalloc.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/xmalloc.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/xstrndup.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/lib/xstrndup.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/copyin.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/copyout.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/copypass.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/cpio.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/cpiohdr.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/defer.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/defer.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/dstring.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/dstring.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/extern.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/filemode.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/filetypes.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/global.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/idcache.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/main.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/makepath.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/safe-stat.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/tar.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/tar.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/tarhdr.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/userspec.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/cpio/src/util.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/GNUmakefile#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/Makefile#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/README#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/TODO#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/attrstack.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/attrstack.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/config.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/config.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/csup.1#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/detailer.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/detailer.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/diff.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/diff.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr_bsd.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr_posix.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fixups.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fixups.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fnmatch.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fnmatch.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/globtree.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/globtree.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/idcache.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/idcache.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/keyword.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/keyword.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/lex.rcs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/lister.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/lister.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/main.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/main.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/misc.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/misc.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/mux.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/mux.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/parse.y#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/pathcomp.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/pathcomp.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/proto.c#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/proto.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/queue.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.c#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsparse.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsparse.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcstokenizer.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcstokenizer.l#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rsyncfile.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rsyncfile.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/status.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/status.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/stream.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/stream.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/threads.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/threads.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/token.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/token.l#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/updater.c#5 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/updater.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Documentation/dtc-paper.bib#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Documentation/dtc-paper.tex#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Documentation/dts-format.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Documentation/manual.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/GPL#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Makefile.convert-dtsv0#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/Makefile.ftdump#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/README.license#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/TODO#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/checks.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/convert-dtsv0-lexer.l#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/data.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/dtc-lexer.l#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/dtc-parser.y#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/dtc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/dtc.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/flattree.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/fstree.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/ftdump.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/Makefile.libfdt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/TODO#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt_ro.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt_rw.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt_strerror.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt_sw.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/fdt_wip.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/libfdt.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/libfdt_env.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/libfdt_internal.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/libfdt/version.lds#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/livetree.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/scripts/setlocalversion#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/srcpos.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/srcpos.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/treesource.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/dtc/util.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/freebsd.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/mips-tdep.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ipfilter/ipsend/sbpf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/inet.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-vendor#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/netcat.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/nvi/docs/help#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/nvi/ex/ex_cmd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/nvi/vi/v_ex.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/opie/libopie/getutmpentry.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/opie/libopie/insecure.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/opie/libopie/login.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/opie/libopie/readrec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/CACerts#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/LICENSE#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/m4/proto.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/contrib/smcontrol.pl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/sm/sem.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/example.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/worker.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsm/debug.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsm/mbdb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsmdb/smdb2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libsmutil/safefile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/praliases/praliases.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/conf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/daemon.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/envelope.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sfsasl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/util.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/externs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/network.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/terminal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/sys_term.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/top/utils.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/top/utils.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/asctime.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/ctime.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/difftime.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/localtime.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/time2posix.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/tzfile.5#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/stdtime/tzfile.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/Theory#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/ialloc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/scheck.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zdump.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zdump.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zdump/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zic.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zic.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzcode/zic/zic/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/africa#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/antarctica#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/asia#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/australasia#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/backward#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/etcetera#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/europe#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/factory#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/leapseconds#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/northamerica#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/pacificnew#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/southamerica#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/systemv#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/yearistype.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tzdata/zone.tab#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/AUTHORS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/COPYING#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/ChangeLog#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/THANKS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/TODO#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/po/LINGUAS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/po/Makevars#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/po/POTFILES.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/po/cs.po#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/mythread.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/sysdefs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_config.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_cpucores.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_cpucores.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_exit.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_exit.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_gettext.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_integer.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_open_stdxxx.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_open_stdxxx.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_physmem.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_physmem.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_progname.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/common/tuklib_progname.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/base.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/bcj.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/block.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/check.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/container.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/delta.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/filter.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/hardware.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/index.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/index_hash.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/lzma.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/stream_flags.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/subblock.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/version.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/api/lzma/vli.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/check.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/check.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_fast.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_small.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_table.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_table_be.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_table_le.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_tablegen.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc32_x86.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_fast.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_small.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_table.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_table_be.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_table_le.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_tablegen.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc64_x86.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/crc_macros.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/check/sha256.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/alone_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/alone_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/alone_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/auto_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_buffer_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_buffer_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_header_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_header_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/block_util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/chunk_size.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_buffer_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_decoder_memusage.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_encoder_memusage.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_preset.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/easy_preset.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_buffer_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_buffer_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_flags_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/filter_flags_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/hardware_physmem.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/index_hash.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_buffer_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_buffer_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_flags_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_flags_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_flags_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/stream_flags_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/vli_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/vli_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/common/vli_size.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/delta/delta_private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_encoder_hash.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lz/lz_encoder_mf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/fastpos.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/fastpos_table.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/price.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/price_table.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/price_tablegen.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/range_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/range_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/rangecoder/range_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/arm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/armthumb.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/ia64.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/powerpc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_coder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_coder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/simple_private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/sparc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/simple/x86.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_decoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_decoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_encoder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/liblzma/subblock/subblock_encoder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/lzmainfo/lzmainfo.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/lzmainfo/lzmainfo.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/args.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/args.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/coder.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/coder.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/file_io.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/file_io.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/hardware.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/hardware.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/list.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/list.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/main.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/main.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/message.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/message.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/options.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/options.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/private.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/signals.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/signals.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/suffix.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/suffix.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/util.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xz/xz.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xzdec/xzdec.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/xz/src/xzdec/xzdec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/INSTALL#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/PROTOCOL#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/PROTOCOL.agent#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/PROTOCOL.certkeys#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/PROTOCOL.mux#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.smartcard#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/addrmatch.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-krb5.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-options.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/authfd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/authfd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/authfile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/authfile.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/buffer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/buffer.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 2 22:24:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C90C1065673; Wed, 2 Jun 2010 22:24: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 490751065670 for ; Wed, 2 Jun 2010 22:24:44 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2EF0F8FC08 for ; Wed, 2 Jun 2010 22:24:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52MOhVH055791 for ; Wed, 2 Jun 2010 22:24:43 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52MOhPE055789 for perforce@freebsd.org; Wed, 2 Jun 2010 22:24:43 GMT (envelope-from zec@fer.hr) Date: Wed, 2 Jun 2010 22:24:43 GMT Message-Id: <201006022224.o52MOhPE055789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 22:24:45 -0000 http://p4web.freebsd.org/@@179119?ac=10 Change 179119 by zec@zec_tpx32 on 2010/06/02 22:24:22 Dynamically allocate memory for bw_meter_timers[] and bw_upcalls[] arrays, and do so only when a multicast routing socket gets opened in a vnet, instead of having those arrays statically declared. This should save us around 4 pages of memory per vnet, which was previously wasted in all vnet instances which didn't perform multicast routing. This should also allow us to kldload ip_mroute.ko at runtime without rebuilding the kernel with increased VNET_MODMIN spare buffers. Most importantly, this change is completely untested. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#44 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#44 (text+ko) ==== @@ -206,7 +206,7 @@ * expiration time. Periodically, the entries are analysed and processed. */ #define BW_METER_BUCKETS 1024 -static VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); +static VNET_DEFINE(struct bw_meter *, *bw_meter_timers); #define V_bw_meter_timers VNET(bw_meter_timers) static VNET_DEFINE(struct callout, bw_meter_ch); #define V_bw_meter_ch VNET(bw_meter_ch) @@ -216,7 +216,8 @@ * Pending upcalls are stored in a vector which is flushed when * full, or periodically */ -static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); +static MALLOC_DEFINE(M_BWUPCALL, "bwupcall", "multicast upcall vector"); +static VNET_DEFINE(struct bw_upcall, *bw_upcalls); #define V_bw_upcalls VNET(bw_upcalls) static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ #define V_bw_upcalls_n VNET(bw_upcalls_n) @@ -679,7 +680,30 @@ V_mfchashtbl = hashinit_flags(mfchashsize, M_MRTABLE, &V_mfchash, HASH_NOWAIT); + if (V_mfchashtbl == NULL) { + MROUTER_UNLOCK(); + return (ENOMEM); + } + + MALLOC(V_bw_upcalls, struct bw_upcall *, + BW_UPCALLS_MAX * sizeof(struct bw_upcall), M_BWUPCALL, + M_NOWAIT|M_ZERO); + if (V_bw_meter_timers == NULL) { + hashdestroy(V_mfchashtbl, M_MRTABLE, V_mfchash); + MROUTER_UNLOCK(); + return (ENOMEM); + } + MALLOC(V_bw_meter_timers, struct bw_meter **, + BW_METER_BUCKETS * sizeof(struct bw_meter *), M_BWMETER, + M_NOWAIT|M_ZERO); + if (V_bw_meter_timers == NULL) { + FREE(V_bw_upcalls, M_BWUPCALL); + hashdestroy(V_mfchashtbl, M_MRTABLE, V_mfchash); + MROUTER_UNLOCK(); + return (ENOMEM); + } + callout_reset(&V_expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, curvnet); callout_reset(&V_bw_upcalls_ch, BW_UPCALLS_PERIOD, expire_bw_upcalls_send, @@ -769,7 +793,10 @@ bzero(V_nexpire, sizeof(V_nexpire[0]) * mfchashsize); V_bw_upcalls_n = 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); + FREE(V_bw_meter_timers, M_BWMETER); + V_bw_meter_timers = NULL; + FREE(V_bw_upcalls, M_BWUPCALL); + V_bw_upcalls = NULL; MFC_UNLOCK(); @@ -2816,7 +2843,6 @@ { MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO); - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); From owner-p4-projects@FreeBSD.ORG Wed Jun 2 22:25:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B599A1065678; Wed, 2 Jun 2010 22:25:45 +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 78F981065674 for ; Wed, 2 Jun 2010 22:25:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67E758FC08 for ; Wed, 2 Jun 2010 22:25:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52MPjpo055894 for ; Wed, 2 Jun 2010 22:25:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52MPjpa055892 for perforce@freebsd.org; Wed, 2 Jun 2010 22:25:45 GMT (envelope-from zec@fer.hr) Date: Wed, 2 Jun 2010 22:25:45 GMT Message-Id: <201006022225.o52MPjpa055892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 22:25:45 -0000 http://p4web.freebsd.org/@@179120?ac=10 Change 179120 by zec@zec_tpx32 on 2010/06/02 22:25:10 Revert VNET_MODMIN value to the default from head. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.c#14 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.c#14 (text+ko) ==== @@ -169,7 +169,7 @@ * we want the virtualized global variable space to be page-sized, we may * have more space than that in practice. */ -#define VNET_MODMIN 32768 +#define VNET_MODMIN 8192 #define VNET_SIZE roundup2(VNET_BYTES, PAGE_SIZE) #define VNET_MODSIZE (VNET_SIZE - (VNET_BYTES - VNET_MODMIN)) From owner-p4-projects@FreeBSD.ORG Wed Jun 2 22:51:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBFAC1065676; Wed, 2 Jun 2010 22:51: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 A0C681065674 for ; Wed, 2 Jun 2010 22:51:13 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FD398FC21 for ; Wed, 2 Jun 2010 22:51:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o52MpDlY057738 for ; Wed, 2 Jun 2010 22:51:13 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o52MpDVm057736 for perforce@freebsd.org; Wed, 2 Jun 2010 22:51:13 GMT (envelope-from zec@fer.hr) Date: Wed, 2 Jun 2010 22:51:13 GMT Message-Id: <201006022251.o52MpDVm057736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2010 22:51:14 -0000 http://p4web.freebsd.org/@@179121?ac=10 Change 179121 by zec@zec_tpx32 on 2010/06/02 22:50:26 Correct a typo (bad copy / paste)... Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#45 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#45 (text+ko) ==== @@ -688,7 +688,7 @@ MALLOC(V_bw_upcalls, struct bw_upcall *, BW_UPCALLS_MAX * sizeof(struct bw_upcall), M_BWUPCALL, M_NOWAIT|M_ZERO); - if (V_bw_meter_timers == NULL) { + if (V_bw_upcalls == NULL) { hashdestroy(V_mfchashtbl, M_MRTABLE, V_mfchash); MROUTER_UNLOCK(); return (ENOMEM); From owner-p4-projects@FreeBSD.ORG Thu Jun 3 01:41:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE12E1065676; Thu, 3 Jun 2010 01:41: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 A1BE71065674 for ; Thu, 3 Jun 2010 01:41:21 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E0868FC0A for ; Thu, 3 Jun 2010 01:41:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o531fLi0084358 for ; Thu, 3 Jun 2010 01:41:21 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o531fK3J084352 for perforce@freebsd.org; Thu, 3 Jun 2010 01:41:20 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Thu, 3 Jun 2010 01:41:20 GMT Message-Id: <201006030141.o531fK3J084352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 01:41:22 -0000 http://p4web.freebsd.org/@@179125?ac=10 Change 179125 by jlaffaye@jlaffaye-chulak on 2010/06/03 01:40:58 Integrate from gcooper's branch. Affected files ... .. //depot/projects/soc2010/pkg_complete/bin/chio/chio.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/eval.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/main.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/parser.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/sh.1#2 integrate .. //depot/projects/soc2010/pkg_complete/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/nvi/docs/help#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/nvi/ex/ex_cmd.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/nvi/vi/v_ex.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/opie/libopie/readrec.c#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/moduli.5#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/scp.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/sftp.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh-pkcs11-helper.8#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh.1#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2010/pkg_complete/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/soc2010/pkg_complete/games/pom/pom.6#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/soc2010/pkg_complete/gnu/usr.bin/dtc/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#3 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#3 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpkg/plist.c#3 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libpmc/pmc.ucf.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/msun/man/atan2.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/msun/man/math.3#2 integrate .. //depot/projects/soc2010/pkg_complete/lib/msun/man/remainder.3#2 integrate .. //depot/projects/soc2010/pkg_complete/libexec/rbootd/rbootd.8#2 integrate .. //depot/projects/soc2010/pkg_complete/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/soc2010/pkg_complete/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2010/pkg_complete/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/soc2010/pkg_complete/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/soc2010/pkg_complete/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate .. //depot/projects/soc2010/pkg_complete/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2010/pkg_complete/share/doc/legal/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/share/doc/legal/intel_iwn/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/share/man/man4/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/acpi.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/dcons.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/ddb.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/io.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/lindev.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man4/uep.4#1 branch .. //depot/projects/soc2010/pkg_complete/share/man/man5/devfs.5#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man9/atomic.9#2 integrate .. //depot/projects/soc2010/pkg_complete/share/man/man9/make_dev.9#2 integrate .. //depot/projects/soc2010/pkg_complete/share/mk/bsd.own.mk#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/mca.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/arm/include/metadata.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/bindings-gpio.txt#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/bindings-mpp.txt#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/db78100.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/db88f5182.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/db88f5281.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/db88f6281.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/mpc8555cds.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/mpc8572ds.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/dts/sheevaplug.dts#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/fdt/fdt_loader_cmd.c#1 branch .. //depot/projects/soc2010/pkg_complete/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/conf/NOTES#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/conf/files#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/conf/options#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ddb/db_command.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ddb/db_thread.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/amdsbwd/amdsbwd.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ah_eeprom_v1.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/ofw_fdt.c#1 branch .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/ofw_if.m#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/ofw_standard.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/dev/usb/input/uep.c#1 branch .. //depot/projects/soc2010/pkg_complete/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/i386/mca.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/mca.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/ia64/include/proc.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/posix4_mib.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/sys_process.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/include/asm.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/mips/tick.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/ehcireg.h#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/ehcivar.h#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/pcibus.c#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/perfmon.h#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/perfmon_kern.c#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/perfmon_percpu.c#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/perfmon_utils.h#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/perfmon_xlrconfig.h#2 delete .. //depot/projects/soc2010/pkg_complete/sys/mips/rmi/xlr_boot1_console.c#2 delete .. //depot/projects/soc2010/pkg_complete/sys/modules/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/modules/iwnfw/Makefile.inc#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/modules/usb/uep/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/sys/net/if.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net/if_var.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net/route.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/netinet/in.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/netinet/ip_options.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/ofw/ofw_real.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/_task.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/param.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/pcpu.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/posix4.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/systm.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/taskqueue.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/sys/user.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/pmap.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_map.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/x86/isa/clock.c#2 integrate .. //depot/projects/soc2010/pkg_complete/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/soc2010/pkg_complete/tools/build/options/WITH_FDT#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/builtins/dot1.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/builtins/dot2.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/builtins/exec1.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/builtins/exec2.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/builtins/return4.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/parser/heredoc4.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/parser/heredoc5.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/bin/sh/parser/heredoc6.0#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/sockets/unix_close_race/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/sockets/unix_close_race/unix_close_race.c#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/usr.bin/jot/regress.rand1.out#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/usr.bin/jot/regress.rand2.out#1 branch .. //depot/projects/soc2010/pkg_complete/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/soc2010/pkg_complete/tools/regression/usr.bin/jot/regress.stutter2.out#1 branch .. //depot/projects/soc2010/pkg_complete/usr.bin/join/join.1#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.bin/jot/jot.1#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.bin/jot/jot.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.bin/mail/util.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.bin/newkey/newkey.8#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/dconschat/dconschat.8#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/fdcontrol/fdcontrol.8#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/nfsd/nfsv4.4#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/create/perform.c#3 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/soc2010/pkg_complete/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/soc2010/pkg_complete/bin/chio/chio.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.29 2010/06/02 09:34:41 uqs Exp $"); #include #include @@ -1072,6 +1072,7 @@ /* Read in the changer slots */ if (cp.cp_nslots > 0) { + (void) memset(&cesr, 0, sizeof(cesr)); cesr.cesr_element_type = CHET_ST; cesr.cesr_element_base = 0; cesr.cesr_element_count = cp.cp_nslots; ==== //depot/projects/soc2010/pkg_complete/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.28 2010/05/24 06:33:14 uqs Exp $"); #include #include @@ -76,7 +76,7 @@ #ifdef NET2_REGEX static int resub(regexp *, char *, char *, char *); #else -static int resub(regex_t *, regmatch_t *, char *, char *, char *); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); #endif /* @@ -929,7 +929,7 @@ # ifdef NET2_REGEX if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) { # else - if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt)) + if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt)) < 0) { # endif if (prnt) @@ -1071,7 +1071,7 @@ */ static int -resub(regex_t *rp, regmatch_t *pm, char *src, char *dest, +resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest, char *destend) { char *spt; @@ -1121,7 +1121,7 @@ */ if (len > (destend - dpt)) len = destend - dpt; - if (l_strncpy(dpt, src + pmpt->rm_so, len) != len) + if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len) return(-1); dpt += len; } ==== //depot/projects/soc2010/pkg_complete/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.82 2010/05/08 14:00:01 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.83 2010/05/28 22:40:24 jilles Exp $"); #include #include @@ -1170,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; ==== //depot/projects/soc2010/pkg_complete/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.75 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.76 2010/05/24 10:35:57 jilles Exp $"); #include #include @@ -91,6 +91,7 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); STATIC void cmdputs(const char *); #if JOBS @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -1056,6 +1059,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. ==== //depot/projects/soc2010/pkg_complete/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.38 2010/04/17 14:35:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.39 2010/05/28 22:40:24 jilles Exp $"); #include #include @@ -314,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); ==== //depot/projects/soc2010/pkg_complete/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.78 2010/04/11 12:24:47 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); #include #include @@ -203,6 +203,7 @@ * which could happen if we add command substitution on PS1/PS2. */ parser_temp_free_all(); + heredoclist = NULL; tokpushback = 0; doprompt = interact; @@ -973,6 +974,8 @@ const int bq_startlinno = plinno; char *volatile ostr = NULL; struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; str = NULL; if (setjmp(jmploc.loc)) { @@ -981,6 +984,7 @@ ckfree(str); if (ostr) ckfree(ostr); + heredoclist = saveheredoclist; handler = savehandler; if (exception == EXERROR) { startlinno = bq_startlinno; @@ -995,6 +999,7 @@ memcpy(str, stackblock(), savelen); } handler = &jmploc; + heredoclist = NULL; INTON; if (oldstyle) { /* We must read until the closing backquote, giving special @@ -1091,21 +1096,26 @@ while (stackblocksize() <= savelen) growstackblock(); STARTSTACKSTR(out); + INTOFF; if (str) { memcpy(out, str, savelen); STADJUST(savelen, out); - INTOFF; ckfree(str); str = NULL; - INTON; } if (ostr) { - INTOFF; ckfree(ostr); ostr = NULL; - INTON; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; } handler = savehandler; + INTON; if (quoted) USTPUTC(CTLBACKQ | CTLQUOTE, out); else ==== //depot/projects/soc2010/pkg_complete/bin/sh/sh.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.141 2010/05/24 15:12:12 jilles Exp $ .\" -.Dd May 9, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -665,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -1040,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1113,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1166,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1491,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1538,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1549,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1567,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1601,7 +1675,7 @@ .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1760,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1807,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1838,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2309,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. ==== //depot/projects/soc2010/pkg_complete/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 (text+ko) ==== @@ -1791,7 +1791,6 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { case ZFS_PROP_DEVICES: - case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: case ZFS_PROP_ISCSIOPTIONS: case ZFS_PROP_XATTR: ==== //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/archures.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* BFD library support routines for architectures. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003 + 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Hacked by John Gilmore and Steve Chamberlain of Cygnus Support. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "bfd.h" #include "sysdep.h" @@ -141,10 +141,12 @@ .#define bfd_mach_mips6000 6000 .#define bfd_mach_mips7000 7000 .#define bfd_mach_mips8000 8000 +.#define bfd_mach_mips9000 9000 .#define bfd_mach_mips10000 10000 .#define bfd_mach_mips12000 12000 .#define bfd_mach_mips16 16 .#define bfd_mach_mips5 5 +.#define bfd_mach_mips_octeon 6502 .#define bfd_mach_mips_sb1 12310201 {* octal 'SB', 01 *} .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 ==== //depot/projects/soc2010/pkg_complete/contrib/binutils/bfd/bfd-in2.h#2 (text+ko) ==== @@ -8,7 +8,8 @@ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -26,7 +27,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 3 02:37:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E0F1065678; Thu, 3 Jun 2010 02:37:23 +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 4C64B106566C for ; Thu, 3 Jun 2010 02:37:23 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3963D8FC14 for ; Thu, 3 Jun 2010 02:37:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o532bMvA089466 for ; Thu, 3 Jun 2010 02:37:22 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o532bM70089464 for perforce@freebsd.org; Thu, 3 Jun 2010 02:37:22 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Thu, 3 Jun 2010 02:37:22 GMT Message-Id: <201006030237.o532bM70089464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 02:37:24 -0000 http://p4web.freebsd.org/@@179127?ac=10 Change 179127 by jlaffaye@jlaffaye-chulak on 2010/06/03 02:37:12 Layered read_plist() API to be able to read a plist from a buffer. read_plist() still takes a fd but uses read_plist_from_buffer() to do the real job. Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#4 edit .. //depot/projects/soc2010/pkg_complete/lib/libpkg/plist.c#4 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#4 (text+ko) ==== @@ -199,6 +199,7 @@ const char *name); int write_plist(Package *, FILE *); int read_plist(Package *, int); +int read_plist_from_buffer(Package *, char *, off_t); int plist_cmd(const char *, char **); int delete_package(Boolean, Boolean, Package *); Boolean make_preserve_name(char *, int, const char *, const char *); ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/plist.c#4 (text+ko) ==== @@ -316,13 +316,14 @@ return (-1); } -/* Read a packing list from a file */ +/* + * Read a packing list from a buffer of specified size + * The buffer is not modified nor is free'ed + */ int -read_plist(Package *pkg, int fd) +read_plist_from_buffer(Package *pkg, char *plist_buf, off_t plist_size) { - struct stat sb; char *cmd_buf = NULL; - char *contents_map = NULL; char *cp; char *end; char *start; @@ -331,165 +332,184 @@ int major; int minor; int retcode = -1; - off_t end_off; size_t len; + assert(pkg != NULL); + assert(plist_buf != NULL); + assert(plist_size > 0); + pkg->fmtver_maj = 1; pkg->fmtver_mnr = 0; pkg->origin = NULL; errno = 0; - if (fstat(fd, &sb) == 0 && - (contents_map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, - 0)) != NULL) { + retcode = 0; + start = plist_buf; - end_off = sb.st_size; - retcode = 0; - start = contents_map; + while (retcode == 0 && 0 < plist_size) { - while (retcode == 0 && 0 < end_off) { + end = strchr(start, '\n'); + /* No trailing newlines -- look for '\0'. */ + if (end == NULL) + end = strchr(start, '\0'); + /* Don't forget we're eating newlines.. om nom nom... */ + else + plist_size--; + /* + * This is bad if this fails -- a non-NUL terminated + * string is in our midst! + */ + assert (end != NULL); - end = strchr(start, '\n'); - /* No trailing newlines -- look for '\0'. */ - if (end == NULL) - end = strchr(start, '\0'); - /* Don't forget we're eating newlines.. om nom nom... */ - else - end_off--; - /* - * This is bad if this fails -- a non-NUL terminated - * string is in our midst! - */ - assert (end != NULL); + cmd_buf = malloc(end-start+1); - cmd_buf = malloc(end-start+1); + if (cmd_buf == NULL) + retcode = -1; + else { - if (cmd_buf == NULL) - retcode = -1; - else { + strlcpy(cmd_buf, start, end-start+1); - strlcpy(cmd_buf, start, end-start+1); + len = strlen(cmd_buf); + plist_size -= len; + + /* Trim plist_size trailing whitespace. */ + while (0 < len && isspace(cmd_buf[len])) + cmd_buf[len--] = '\0'; - len = strlen(cmd_buf); - end_off -= len; - - /* Trim end_off trailing whitespace. */ - while (0 < len && isspace(cmd_buf[len])) - cmd_buf[len--] = '\0'; + /* Empty line. */ + if (len == 0) { + errno = EINVAL; + retcode = -1; + } else + cp = cmd_buf; - /* Empty line. */ - if (len == 0) { - errno = EINVAL; - retcode = -1; - } else - cp = cmd_buf; + } - } + /* A plist command directive */ + if (retcode == 0 && *start == CMD_CHAR) { - /* A plist command directive */ - if (retcode == 0 && *start == CMD_CHAR) { + cmd = plist_cmd(cmd_buf+1, &cp); - cmd = plist_cmd(cmd_buf+1, &cp); + if (cmd == -1) { + warnx("%s: unknown command '%s' " + "(package tools out of date?)", + __func__, start); + retcode = -1; + } else if (*cp == '\0') { - if (cmd == -1) { - warnx("%s: unknown command '%s' " - "(package tools out of date?)", - __func__, start); - retcode = -1; - } else if (*cp == '\0') { - - cp = NULL; - if (cmd == PLIST_PKGDEP) { - warnx("corrupted record " - "(pkgdep line without " - "argument), ignoring"); - errno = EINVAL; - cmd = retcode = -1; - } - + cp = NULL; + if (cmd == PLIST_PKGDEP) { + warnx("corrupted record " + "(pkgdep line without " + "argument), ignoring"); + errno = EINVAL; + cmd = retcode = -1; } - if (cp != NULL && cmd == PLIST_COMMENT && - sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", - &major, &minor) == 2) { - pkg->fmtver_maj = major; - pkg->fmtver_mnr = minor; + } + if (cp != NULL && cmd == PLIST_COMMENT && + sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", + &major, &minor) == 2) { - if (verscmp(pkg, PLIST_FMT_VER_MAJOR, - PLIST_FMT_VER_MINOR) > 0) { + pkg->fmtver_maj = major; + pkg->fmtver_mnr = minor; - warnx("plist format revision " - "(%d.%d) is higher than " - "supported format " - "reversion (%d.%d)", - pkg->fmtver_maj, - pkg->fmtver_mnr, - PLIST_FMT_VER_MAJOR, - PLIST_FMT_VER_MINOR); + if (verscmp(pkg, PLIST_FMT_VER_MAJOR, + PLIST_FMT_VER_MINOR) > 0) { - if (pkg->fmtver_maj > - PLIST_FMT_VER_MAJOR) { - errno = EINVAL; - retcode = -1; - } + warnx("plist format revision " + "(%d.%d) is higher than " + "supported format " + "reversion (%d.%d)", + pkg->fmtver_maj, + pkg->fmtver_mnr, + PLIST_FMT_VER_MAJOR, + PLIST_FMT_VER_MINOR); + if (pkg->fmtver_maj > + PLIST_FMT_VER_MAJOR) { + errno = EINVAL; + retcode = -1; } } } - /* A file manifest item */ - else if (retcode == 0) - cmd = PLIST_FILE; - /* - * Winner, winner, chicken dinner.. we have a working - * command! - */ - if (retcode == 0) { + } + /* A file manifest item */ + else if (retcode == 0) + cmd = PLIST_FILE; - if (add_plist(pkg, cmd, cp) == -1) - retcode = -1; - else { + /* + * Winner, winner, chicken dinner.. we have a working + * command! + */ + if (retcode == 0) { - start = end; - /* - * We aren't at the end of the line, - * yet.. - */ - if (start != '\0') - start++; + if (add_plist(pkg, cmd, cp) == -1) + retcode = -1; + else { - } + start = end; + /* + * We aren't at the end of the line, + * yet.. + */ + if (start != '\0') + start++; } - /* - * XXX (gcooper): using more intelligent pointer - * arithmetic and proper NUL termination, there's no - * reason why this needs to be freed automatically in - * each iteration. - */ - if (cmd_buf != NULL) { - free (cmd_buf); - cmd_buf = NULL; - } + } + /* + * XXX (gcooper): using more intelligent pointer + * arithmetic and proper NUL termination, there's no + * reason why this needs to be freed automatically in + * each iteration. + */ + if (cmd_buf != NULL) { + free (cmd_buf); + cmd_buf = NULL; } } - if (contents_map != NULL) { + if (retcode == -1 && cmd_buf != NULL) { serrno = errno; - munmap(contents_map, sb.st_size); + free(cmd_buf); if (serrno == 0) errno = serrno; } - if (retcode == -1 && cmd_buf != NULL) { + return (retcode); + +} + +/* Read a packing list from a file */ +int +read_plist(Package *pkg, int fd) +{ + struct stat sb; + char *contents_map = NULL; + int serrno; + int retcode; + + retcode = 0; + errno = 0; + + if (fstat(fd, &sb) == 0 && + (contents_map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, + 0)) != NULL) + retcode = read_plist_from_buffer(pkg, contents_map, sb.st_size); + else + retcode = -1; + + if (contents_map != NULL) { serrno = errno; - free(cmd_buf); + munmap(contents_map, sb.st_size); if (serrno == 0) errno = serrno; } From owner-p4-projects@FreeBSD.ORG Thu Jun 3 08:24:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838591065679; Thu, 3 Jun 2010 08:24: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 446FD1065677 for ; Thu, 3 Jun 2010 08:24:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1763B8FC18 for ; Thu, 3 Jun 2010 08:24:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o538OgN5033271 for ; Thu, 3 Jun 2010 08:24:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o538OgT6033269 for perforce@freebsd.org; Thu, 3 Jun 2010 08:24:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 3 Jun 2010 08:24:42 GMT Message-Id: <201006030824.o538OgT6033269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 08:24:43 -0000 http://p4web.freebsd.org/@@179130?ac=10 Change 179130 by rwatson@rwatson_vimage_client on 2010/06/03 08:24:04 Correct merge nits from integration. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#11 (text+ko) ==== @@ -853,7 +853,7 @@ * SYF_CAPENABLED. */ if (error == 0) { - if (!(callp->sy_flags & SYF_CAPENABLED) && + if (!(sa->callp->sy_flags & SYF_CAPENABLED) && (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) error = ENOSYS; } ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#13 (text+ko) ==== @@ -1025,7 +1025,7 @@ * SYF_CAPENABLED. */ if (error == 0) { - if (!(callp->sy_flags & SYF_CAPENABLED) && + if (!(sa->callp->sy_flags & SYF_CAPENABLED) && (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) error = ENOSYS; } ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/posix4_mib.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ SYSCTL_DECL(_p1003_1b); #define P1B_SYSCTL(num, name) \ - SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTFLAG_CAPRD, \ + SYSCTL_INT(_p1003_1b, num, name, CTLFLAG_RD | CTLFLAG_CAPRD, \ facility + num - 1, 0, ""); #define P1B_SYSCTL_RW(num, name) \ SYSCTL_PROC(_p1003_1b, num, name, CTLTYPE_INT | CTLFLAG_RW | \ @@ -68,11 +68,11 @@ SYSCTL_DECL(_kern_p1003_1b); #define P1B_SYSCTL(num, name) \ - SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTFLAG_CAPRD, \ + SYSCTL_INT(_kern_p1003_1b, OID_AUTO, name, CTLFLAG_RD | CTLFLAG_CAPRD, \ facility + num - 1, 0, ""); #define P1B_SYSCTL_RW(num, name) \ SYSCTL_PROC(_p1003_1b, OID_AUTO, name, CTLTYPE_INT | CTLFLAG_RW | \ - CTFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", ""); + CTLFLAG_CAPRD, NULL, num, p31b_sysctl_proc, "I", ""); SYSCTL_NODE(_kern, OID_AUTO, p1003_1b, CTLFLAG_RW, 0, "P1003.1B"); #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 3 11:29:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47E261065670; Thu, 3 Jun 2010 11:29:07 +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 0C7B5106566B for ; Thu, 3 Jun 2010 11:29:07 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF4E08FC12 for ; Thu, 3 Jun 2010 11:29:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o53BT647061805 for ; Thu, 3 Jun 2010 11:29:06 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o53BT6Br061803 for perforce@freebsd.org; Thu, 3 Jun 2010 11:29:06 GMT (envelope-from lz@FreeBSD.org) Date: Thu, 3 Jun 2010 11:29:06 GMT Message-Id: <201006031129.o53BT6Br061803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 11:29:07 -0000 http://p4web.freebsd.org/@@179138?ac=10 Change 179138 by lz@gnehzuil-freebsd on 2010/06/03 11:28:32 Fix a bug. * When it find a window, rsv_alloc_hit's value is wrong. It reduce the accuracy at next allocation. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#20 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#20 (text+ko) ==== @@ -252,7 +252,7 @@ if (RB_EMPTY(&fs->e2fs_rsv_tree)) { EXT2_TREE_UNLOCK(fs); - if (dtog(fs, bpref) != cg) + if (bpref < 0 || dtog(fs, bpref) != cg) bpref = 0; if (bpref != 0) { bpref = dtogd(fs, bpref); @@ -283,6 +283,9 @@ return (0); goto gotit; } else { + if (bpref < 0) + bpref = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; + search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref); repeat: @@ -324,7 +327,7 @@ start = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bpref; if (start >= rp->rsv_start && start < rp->rsv_end) { - rp->rsv_alloc_hit++; + rp->rsv_alloc_hit = start - rp->rsv_start + 1; goto allocated; } @@ -508,7 +511,7 @@ } EXT2_RSV_LOCK(ip); - bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); + bno = ext2_rsvalloc(fs, ip, cg, bp, -1, size); EXT2_RSV_UNLOCK(ip); if (bno > 0) goto allocated; From owner-p4-projects@FreeBSD.ORG Thu Jun 3 19:05:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF6FB1065679; Thu, 3 Jun 2010 19:05: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 8B08C1065676 for ; Thu, 3 Jun 2010 19:05:28 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 782A98FC1D for ; Thu, 3 Jun 2010 19:05:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o53J5Sbk026213 for ; Thu, 3 Jun 2010 19:05:28 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o53J5SRa026211 for perforce@freebsd.org; Thu, 3 Jun 2010 19:05:28 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 3 Jun 2010 19:05:28 GMT Message-Id: <201006031905.o53J5SRa026211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 19:05:29 -0000 http://p4web.freebsd.org/@@179153?ac=10 Change 179153 by gcooper@gcooper-bayonetta on 2010/06/03 19:05:24 Experiment in reordering the dependencies in order to resolve the race condition between libpkg and libarchive. DO NOT INTEGRATE THIS CHANGE. I REPEAT... DO NOT INTEGRATE THIS CHANGE. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#7 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#7 (text+ko) ==== @@ -1177,10 +1177,6 @@ lib/libfetch__L lib/libradius__L: lib/libmd__L .endif -.if ${MK_PKGTOOLS} != "no" -_prebuild_libs+= lib/libarchive lib/libfetch -.endif - .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .if exists(${.CURDIR}/${_lib}) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#4 (text+ko) ==== @@ -6,12 +6,15 @@ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: # +# libarchive must be built before libpackage. +# libbz2 must be built before libarchive. # csu must be built before all shared libaries for ELF. # libc must be built before all other shared libraries. # libbsm must be built before ibauditd. # libcom_err must be built before libpam. # libcrypt must be built before libpam. # libkvm must be built before libdevstat. +# liblzma must be built before libarchive. # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # ncurses must be built before libdialog, libedit and libreadline. @@ -23,13 +26,15 @@ # libtacplus must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. -# libgssapi must be built before librpcsec_gss +# libgssapi must be built before librpcsec_gss. +# libz must be built before libarchive and libstand. # # Otherwise, the SUBDIR list should be in alphabetical order. # # Except it appears bind needs to be compiled last SUBDIR_ORDERED= ${_csu} \ + ${_libbz2} \ libc \ libbsm \ libauditd \ @@ -37,6 +42,7 @@ libcrypt \ libelf \ libkvm \ + liblzma \ msun \ libmd \ ncurses \ @@ -46,7 +52,8 @@ libsbuf \ libtacplus \ libutil \ - ${_libypclnt} + ${_libypclnt} \ + libz SUBDIR= ${SUBDIR_ORDERED} \ libalias \ @@ -55,7 +62,6 @@ libbegemot \ ${_libbluetooth} \ ${_libbsnmp} \ - libbz2 \ libcalendar \ libcam \ libcompat \ @@ -76,7 +82,6 @@ ${_libipx} \ libjail \ libkiconv \ - liblzma \ libmagic \ libmemstat \ ${_libmilter} \ @@ -107,7 +112,6 @@ ${_libvgl} \ libwrap \ liby \ - libz \ ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -128,6 +132,16 @@ _bind= bind .endif +_libarchive_deps=liblzma libz +_libstand_deps= liblzma libz + +.if ${MK_BZIP2} != "no" +_libbz2= libbz2 + +_libarchive_deps+=libbz2 +_libstand_deps+=libbz2 +.endif + .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp @@ -201,6 +215,7 @@ .if ${MK_PKGTOOLS} != "no" _libpkg= libpkg +_libpkg_deps+= libfetch libmd libarchive .endif .if ${MK_SENDMAIL} != "no" @@ -219,4 +234,9 @@ _libusb= libusb .endif +libarchive: ${_libarchive_deps} +libmagic: libz +libpkg: ${_libpkg_deps} +libstand: ${_libstand_deps} + .include From owner-p4-projects@FreeBSD.ORG Thu Jun 3 19:09:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5841065670; Thu, 3 Jun 2010 19:09:33 +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 22E22106566B for ; Thu, 3 Jun 2010 19:09:33 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1048C8FC1A for ; Thu, 3 Jun 2010 19:09:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o53J9WeN026459 for ; Thu, 3 Jun 2010 19:09:32 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o53J9W58026457 for perforce@freebsd.org; Thu, 3 Jun 2010 19:09:32 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 3 Jun 2010 19:09:32 GMT Message-Id: <201006031909.o53J9W58026457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 19:09:33 -0000 http://p4web.freebsd.org/@@179154?ac=10 Change 179154 by gcooper@gcooper-bayonetta on 2010/06/03 19:08:36 Improve style of last commit; this has nothing to do with style.Makefile(9). Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#5 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#5 (text+ko) ==== @@ -132,14 +132,8 @@ _bind= bind .endif -_libarchive_deps=liblzma libz -_libstand_deps= liblzma libz - .if ${MK_BZIP2} != "no" _libbz2= libbz2 - -_libarchive_deps+=libbz2 -_libstand_deps+=libbz2 .endif .if ${MK_BLUETOOTH} != "no" @@ -234,6 +228,9 @@ _libusb= libusb .endif +_libarchive_deps=${_libbz2} liblzma libz +_libstand_deps= ${_libbz2} liblzma libz + libarchive: ${_libarchive_deps} libmagic: libz libpkg: ${_libpkg_deps} From owner-p4-projects@FreeBSD.ORG Thu Jun 3 23:21:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE7901065672; Thu, 3 Jun 2010 23:21: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 8306F106566C for ; Thu, 3 Jun 2010 23:21:08 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 712448FC0A for ; Thu, 3 Jun 2010 23:21:08 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o53NL88f060394 for ; Thu, 3 Jun 2010 23:21:08 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o53NL8iG060392 for perforce@freebsd.org; Thu, 3 Jun 2010 23:21:08 GMT (envelope-from bfiedler@FreeBSD.org) Date: Thu, 3 Jun 2010 23:21:08 GMT Message-Id: <201006032321.o53NL8iG060392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 23:21:09 -0000 http://p4web.freebsd.org/@@179159?ac=10 Change 179159 by bfiedler@freebsd-7803 on 2010/06/03 23:20:34 Commit base diff source (originally Gabor's) Affected files ... .. //depot/projects/soc2010/bsdtextproc/diff/Makefile#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff.1#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff.1.gz#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff.c#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff.h#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diff.o#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diffdir.c#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diffdir.o#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diffreg.c#1 add .. //depot/projects/soc2010/bsdtextproc/diff/diffreg.o#1 add .. //depot/projects/soc2010/bsdtextproc/diff/pathnames.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 4 00:00:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76AA310656C7; Fri, 4 Jun 2010 00:00: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 2260D10656CE for ; Fri, 4 Jun 2010 00:00:52 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 088358FC33 for ; Fri, 4 Jun 2010 00:00:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5400prW063197 for ; Fri, 4 Jun 2010 00:00:51 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5400pdQ063195 for perforce@freebsd.org; Fri, 4 Jun 2010 00:00:51 GMT (envelope-from ivoras@FreeBSD.org) Date: Fri, 4 Jun 2010 00:00:51 GMT Message-Id: <201006040000.o5400pdQ063195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 00:00:52 -0000 http://p4web.freebsd.org/@@179160?ac=10 Change 179160 by ivoras@betelgeuse on 2010/06/04 00:00:32 Milestone 1 (basic patch file creation) completed. Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#9 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#9 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#6 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#9 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#8 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#8 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#9 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#7 (text+ko) ==== @@ -67,13 +67,13 @@ if (access(fnew, R_OK) != 0) err(1, "Access error reading file: %s", fnew); - sprintf(dold, "%s/old", my_tmp); + snprintf(dold, PATH_MAX, "%s/old", my_tmp); if (mkdir(dold, 0700) != 0) err(1, "Cannot create directory: %s", dold); - sprintf(dnew, "%s/new", my_tmp); + snprintf(dnew, PATH_MAX, "%s/new", my_tmp); if (mkdir(dnew, 0700) != 0) err(1, "Cannot create directory: %s", dnew); - sprintf(dpatch, "%s/patch", my_tmp); + snprintf(dpatch, PATH_MAX, "%s/patch", my_tmp); if (mkdir(dpatch, 0700) != 0) err(1, "Cannot create directory: %s", dpatch); @@ -163,10 +163,9 @@ printf("Found %d changed files.\n", filelist_count(&flchanged)); /* - * XXX: Possibly reimplement with libarchive. If I finally get how it - * stores directories. + * XXX: Possibly reimplement with libarchive. */ - sprintf(tmp, "%s/%s", dpatch, PKGPATCH_FNAME); + snprintf(tmp, PATH_MAX, "%s/%s", dpatch, PKGPATCH_FNAME); fp = fopen(tmp, "w"); if (fp == NULL) err(1, "Cannot open file for writing: %s", tmp); @@ -181,17 +180,22 @@ SLIST_FOREACH(fl, &fldiff_new_old, linkage) fprintf(fp, "@add %s\n", fl->filename); SLIST_FOREACH(fl, &fldiff_old_new, linkage) - fprintf(fp, "@remove %s\n", fl->filename); + if (!S_ISDIR(fl->st.st_mode)) + fprintf(fp, "@remove %s\n", fl->filename); + SLIST_FOREACH(fl, &fldiff_old_new, linkage) + if (S_ISDIR(fl->st.st_mode)) + fprintf(fp, "@rmdir %s\n", fl->filename); SLIST_FOREACH(fl, &flchanged, linkage) - fprintf(fp, "@patch [method=cp] %s\n", fl->filename); + if (fl->filename[0] != '+') + fprintf(fp, "@patch [method=cp] %s\n", fl->filename); if (fclose(fp) != 0) err(1, "Cannot close %s", PKGPATCH_FNAME); /* Include all metadata files from the new package. */ SLIST_FOREACH(fl, &flnew, linkage) { if (fl->filename[0] == '+') { - sprintf(tmp, "%s/%s", dnew, fl->filename); - sprintf(tmp2, "%s/%s", dpatch, fl->filename); + snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename); + snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename); if (copy_file_absolute(tmp, tmp2) != 0) err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); @@ -199,16 +203,27 @@ } /* Simply copy the directory hierarchy of the new package. */ - replicate_dirtree(dnew, dpatch); + if (replicate_dirtree(dnew, dpatch) != 0) + err(1, "replicate_dirtree(%s,%s) failed", dnew, dpatch); + + /* Copy files to add */ + SLIST_FOREACH(fl, &fldiff_new_old, linkage) { + snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename); + snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename); + if (copy_file_absolute(tmp, tmp2) != 0) + err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); + } + /* Copy changed files */ SLIST_FOREACH(fl, &flchanged, linkage) { - sprintf(tmp, "%s/%s", dnew, fl->filename); - sprintf(tmp2, "%s/%s", dpatch, fl->filename); + snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename); + snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename); if (copy_file_absolute(tmp, tmp2) != 0) err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); } - sprintf(tmp, "%s -c -j -C %s -f %s *", _PATH_TAR, dpatch, fpatch); + chdir(dpatch); + snprintf(tmp, PATH_MAX, "%s -c -j -f %s *", _PATH_TAR, fpatch); fp = popen(tmp, "r+"); if (fp == NULL) err(1, "Final tar execution failed for: %s", fpatch); ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#6 (text+ko) ==== @@ -26,17 +26,20 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include "pkg_patch.h" +static int copy_file_attrs(char *from, struct stat *st_from, char *to); + + int rm_rf(char *dir) { @@ -85,7 +88,7 @@ return (-1); dir_len = strlen(dir); - while ( (fe = fts_read(fts)) != NULL) { + while ((fe = fts_read(fts)) != NULL) { struct filelist *fl; if (fe->fts_info == FTS_D || fe->fts_info == FTS_F || @@ -200,7 +203,45 @@ /* - * File copy, preserving attributes: ownership, mtime, mode. Knows how to handle + * Copy generic file attributes. + * TODO: See if there is any need to take care of ACLs (tar apparently doesn't). + */ +static int +copy_file_attrs(char *from, struct stat *st_from, char *to) +{ + struct stat *st, st2; + struct timeval tv[2]; + + if (st_from != NULL) + st = st_from; + else { + assert(from != NULL); + if (lstat(from, &st2) < 0) { + warn("copy_file_attrs: lstat(%s) failed", from); + return (errno); + } + st = &st2; + } + if (chown(to, st->st_uid, st->st_gid) < 0) { + warn("copy_file_attrs: chown() failed"); + return (errno); + } + tv[0].tv_usec = tv[1].tv_usec = 0; + tv[0].tv_sec = tv[1].tv_sec = st->st_mtime; + if (lutimes(to, tv) < 0) { + warn("copy_file_attrs: lutimes(%s,%d) failed", to, st->st_mtime); + return (errno); + } + if (lchmod(to, st->st_mode) < 0) { + warn("copy_file_attrs: lchmod(%o) failed", st->st_mode); + return (errno); + } + return (0); +} + + +/* + * File copy, preserving generic file attributes. Knows how to handle * (re-create) symlinks. */ int @@ -211,7 +252,6 @@ ssize_t bs; int fdfrom, fdto; struct stat st; - struct timeval tv; if (lstat(from, &st) != 0) return (errno); @@ -249,13 +289,7 @@ close(fdto); close(fdfrom); - if (chown(to, st.st_uid, st.st_gid) < 0) - return (errno); - tv.tv_usec = 0; - tv.tv_sec = st.st_mtime; - if (lutimes(to, &tv) < 0) - return (errno); - if (lchmod(to, st.st_mode) < 0) + if (copy_file_attrs(from, &st, to) != 0) return (errno); return (0); } @@ -267,8 +301,40 @@ * mode, mtime. */ int -replicate_dirtree(char __unused *from, char __unused *to) +replicate_dirtree(char *from, char __unused *to) { - /* XXX: todo */ - return (0); + FTS *fts; + FTSENT *fe; + char *path_argv[] = { from, NULL }; + size_t from_len; + int rval; + + rval = 0; + from_len = strlen(from); + fts = fts_open(path_argv, FTS_NOCHDIR | FTS_PHYSICAL | FTS_XDEV, NULL); + if (fts == NULL) + return (-1); + while ((fe = fts_read(fts)) != NULL) { + char new_dir[PATH_MAX]; + + if (fe->fts_info == FTS_D) { + snprintf(new_dir, PATH_MAX, "%s%s", to, + fe->fts_path + from_len); + if (access(new_dir, F_OK) == 0) + continue; + if (mkdir(new_dir, 0700) < 0) { + rval = errno; + goto end; + } + if (copy_file_attrs(fe->fts_path, fe->fts_statp, + new_dir) != 0) { + rval = errno; + goto end; + } + } + } +end: + if (fts_close(fts) < 0) + return (-1); + return (rval); } From owner-p4-projects@FreeBSD.ORG Fri Jun 4 00:50:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45F3C1065670; Fri, 4 Jun 2010 00:50: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 0A728106566B for ; Fri, 4 Jun 2010 00:50:47 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBE058FC0A for ; Fri, 4 Jun 2010 00:50:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o540okpT078846 for ; Fri, 4 Jun 2010 00:50:46 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o540okCk078844 for perforce@freebsd.org; Fri, 4 Jun 2010 00:50:46 GMT (envelope-from ivoras@FreeBSD.org) Date: Fri, 4 Jun 2010 00:50:46 GMT Message-Id: <201006040050.o540okCk078844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 00:50:47 -0000 http://p4web.freebsd.org/@@179161?ac=10 Change 179161 by ivoras@betelgeuse on 2010/06/04 00:50:15 Add support for bsdiffed patches ("-b") Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#10 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#9 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#9 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#10 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#8 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#7 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#10 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#9 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#9 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ char **argv; enum PP_OP patch_op = PP_NONE; char *my_tmp = NULL; -int verbose = 0; +int flag_bsdiff = 0; static void usage_short(void); @@ -49,7 +49,7 @@ static void usage_short() { - printf("usage: %s -m [flags] package_file_1 package_file_2\n", argv[0]); + printf("usage: %s -c [-b] package_file_1 package_file_2\n", argv[0]); } @@ -57,9 +57,12 @@ proc_args() { int ch; - while ((ch = getopt(argc, argv, "hmv")) != -1) { + while ((ch = getopt(argc, argv, "bchv")) != -1) { switch (ch) { - case 'm': + case 'b': + flag_bsdiff = 1; + break; + case 'c': patch_op = PP_MKPATCH; break; case 'h': @@ -67,7 +70,7 @@ exit(0); break; case 'v': - verbose++; + Verbose++; break; default: usage_short(); @@ -93,7 +96,7 @@ asprintf(&my_tmp, "%spkg_patch.%d.%d", _PATH_TMP, getpid(), time(NULL)); if (mkdir(my_tmp, 0700) != 0) errx(1, "Cannot create working directory: %s", my_tmp); - if (verbose) + if (Verbose) printf("Using temporary directory: %s\n", my_tmp); } ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#8 (text+ko) ==== @@ -40,11 +40,13 @@ char fold[PATH_MAX], fnew[PATH_MAX], fpatch[PATH_MAX]; char dold[PATH_MAX], dnew[PATH_MAX], dpatch[PATH_MAX]; char tmp[PATH_MAX], tmp2[PATH_MAX]; + const char *method; struct pkgxjob xold, xnew; struct filelist_head flold, flnew; struct filelist_head fldiff_old_new, fldiff_new_old, flintersect; struct filelist_head flchanged; struct filelist *fl; + unsigned n_changed_files; FILE *fp; time_t tm; @@ -90,7 +92,7 @@ filelist_gather(dold, &flold); SLIST_INIT(&flnew); filelist_gather(dnew, &flnew); - if (verbose) + if (Verbose) printf("Processing %d files in old package and %d in new.\n", filelist_count(&flold), filelist_count(&flnew)); @@ -100,17 +102,17 @@ filelist_diff(&flnew, &flold, &fldiff_new_old); SLIST_INIT(&flintersect); filelist_intersect(&flnew, &flold, &flintersect); - if (verbose) + if (Verbose) printf("Found %d files to add and %d files to delete.\n", filelist_count(&fldiff_new_old), filelist_count(&fldiff_old_new)); - if (verbose > 2) { + if (Verbose > 2) { SLIST_FOREACH(fl, &fldiff_new_old, linkage) printf("++ %s\n", fl->filename); SLIST_FOREACH(fl, &fldiff_old_new, linkage) printf("-- %s\n", fl->filename); - if (verbose > 3) + if (Verbose > 3) SLIST_FOREACH(fl, &flintersect, linkage) printf("?? %s\n", fl->filename); } @@ -152,15 +154,19 @@ hjold_md5.hash_len) != 0 || memcmp(hjold_sha256.hash, hjnew_sha256.hash, hjold_sha256.hash_len) != 0) { /* Assume changed files */ - if (verbose > 3) + if (Verbose > 3) printf("~~ %s\n", fl->filename); fl2 = malloc(sizeof(*fl2)); memcpy(fl2, fl, sizeof(*fl2)); SLIST_INSERT_HEAD(&flchanged, fl2, linkage); } } - if (verbose) + if (Verbose) printf("Found %d changed files.\n", filelist_count(&flchanged)); + if (flag_bsdiff) + method = "bsdiff"; + else + method = "cp"; /* * XXX: Possibly reimplement with libarchive. @@ -185,9 +191,13 @@ SLIST_FOREACH(fl, &fldiff_old_new, linkage) if (S_ISDIR(fl->st.st_mode)) fprintf(fp, "@rmdir %s\n", fl->filename); + n_changed_files = 0; SLIST_FOREACH(fl, &flchanged, linkage) - if (fl->filename[0] != '+') - fprintf(fp, "@patch [method=cp] %s\n", fl->filename); + if (fl->filename[0] != '+') { + fprintf(fp, "@patch [method=%s] %s\n", method, + fl->filename); + n_changed_files++; + } if (fclose(fp) != 0) err(1, "Cannot close %s", PKGPATCH_FNAME); @@ -214,14 +224,66 @@ err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); } - /* Copy changed files */ - SLIST_FOREACH(fl, &flchanged, linkage) { - snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename); - snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename); - if (copy_file_absolute(tmp, tmp2) != 0) - err(1, "Cannot copy file: %s to file: %s", tmp, tmp2); + /* Handle changed files */ + if (!flag_bsdiff) { + SLIST_FOREACH(fl, &flchanged, linkage) { + if (fl->filename[0] == '+') + continue; + snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename); + snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename); + if (copy_file_absolute(tmp, tmp2) != 0) + err(1, "Cannot copy file: %s to file: %s", tmp, + tmp2); + } + } else { + /* + * bsdiff is extremely CPU-intensive, but multiple invocations + * can be started so it becomes embarrasingly parallel on SMP. + * I've observed linear or better processing time improvments + * with this simple trick. + */ + FILE **fplist = calloc(n_changed_files, sizeof(*fplist)); + int n = 0; + + if (fplist == NULL) + err(1, "calloc() failed"); + /* Start jobs */ + SLIST_FOREACH(fl, &flchanged, linkage) { + if (fl->filename[0] == '+') + continue; + if (Verbose > 1) + printf("bsdiff for %s\n", fl->filename); + snprintf(tmp, PATH_MAX, "%s %s/%s %s/%s %s/%s.bsdiff", + _PATH_BSDIFF, + dold, fl->filename, + dnew, fl->filename, + dpatch, fl->filename); + fplist[n] = popen(tmp, "r+"); + if (fplist[n] == NULL) + err(1, "Cannot popen bsdiff for %s", + fl->filename); + n++; + } + /* Collect jobs */ + n = 0; + SLIST_FOREACH(fl, &flchanged, linkage) { + if (fl->filename[0] == '+') + continue; + if (pclose(fplist[n]) < 0) + err(1, "pclose() failed for bsdiff of %s", + fl->filename); + n++; + snprintf(tmp, PATH_MAX, "%s/%s", dold, fl->filename); + snprintf(tmp2, PATH_MAX, "%s/%s.bsdiff", dpatch, + fl->filename); + if (copy_file_attrs(tmp, NULL, tmp2) != 0) + err(1, "copy_file_attrs(%s,%s) failed", + tmp, tmp2); + } + free(fplist); } + /* Finally, create the patch archive and call it a day. */ chdir(dpatch); snprintf(tmp, PATH_MAX, "%s -c -j -f %s *", _PATH_TAR, fpatch); fp = popen(tmp, "r+"); @@ -230,5 +292,7 @@ rm_rf(dold); rm_rf(dnew); if (pclose(fp) != 0) - err(1, "pclose() failed"); + err(1, "pclose() failed on final tar"); + if (Verbose) + printf("Created %s.\n", fpatch); } ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#8 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#8 (text+ko) ==== @@ -23,6 +23,9 @@ #ifndef _PATH_TAR #define _PATH_TAR "/usr/bin/tar" #endif +#ifndef _PATH_BSDIFF +#define _PATH_BSDIFF "/usr/bin/bsdiff" +#endif #define PKGPATCH_FNAME "+PKGPATCH" #define PKGPATCH_VERSION "1.0" @@ -47,7 +50,7 @@ extern char **argv; extern enum PP_OP patch_op; extern char *my_tmp; -extern int verbose; +extern int flag_bsdiff; #endif @@ -63,6 +66,7 @@ void parse_package_name(char *pkgfile, char *basename, char *version, char *suffix); int copy_file_absolute(char *from, char *to); +int copy_file_attrs(char *from, struct stat *st_from, char *to); int replicate_dirtree(char *from, char *to); #endif ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#7 (text+ko) ==== @@ -37,9 +37,6 @@ #include "pkg_patch.h" -static int copy_file_attrs(char *from, struct stat *st_from, char *to); - - int rm_rf(char *dir) { @@ -59,7 +56,7 @@ /* libarchive not threadsafe for extract; call external tar */ job->filename = filename; sprintf(cmd, "%s -x -C %s -f %s", _PATH_TAR, dir, filename); - if (verbose > 1) + if (Verbose > 1) printf("pkgxjob: %s\n", cmd); job->fp = popen(cmd, "r+"); if (job->fp == NULL) @@ -96,6 +93,8 @@ if (fe->fts_pathlen == dir_len) continue; fl = malloc(sizeof(*fl)); + if (fl == NULL) + return (-1); strncpy(fl->filename, fe->fts_path + dir_len + 1, PATH_MAX); memcpy(&fl->st, fe->fts_statp, sizeof(struct stat)); @@ -206,7 +205,7 @@ * Copy generic file attributes. * TODO: See if there is any need to take care of ACLs (tar apparently doesn't). */ -static int +int copy_file_attrs(char *from, struct stat *st_from, char *to) { struct stat *st, st2; From owner-p4-projects@FreeBSD.ORG Fri Jun 4 07:41:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AB751065677; Fri, 4 Jun 2010 07:41: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 DB42D1065670 for ; Fri, 4 Jun 2010 07:41:15 +0000 (UTC) (envelope-from gsilva@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C83F78FC13 for ; Fri, 4 Jun 2010 07:41:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o547fFth027955 for ; Fri, 4 Jun 2010 07:41:15 GMT (envelope-from gsilva@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o547fFVN027953 for perforce@freebsd.org; Fri, 4 Jun 2010 07:41:15 GMT (envelope-from gsilva@FreeBSD.org) Date: Fri, 4 Jun 2010 07:41:15 GMT Message-Id: <201006040741.o547fFVN027953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gsilva@FreeBSD.org using -f From: Gabriel Silva To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 07:41:16 -0000 http://p4web.freebsd.org/@@179165?ac=10 Change 179165 by gsilva@gsilva on 2010/06/04 07:40:21 The radiotap.py module now includes the ieee80211.py and can parse the basic 802.11 frame header. Affected files ... .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/ieee80211.py#3 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/llc.py#2 edit .. //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/radiotap.py#3 edit Differences ... ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/ieee80211.py#3 (text+ko) ==== @@ -42,6 +42,7 @@ import pcs import pcs.packets.llc import pcs.packets.payload +from pcs.packets import llc IEEE80211_FC0_VERSION_MASK = 0x03 IEEE80211_FC0_VERSION_SHIFT = 0 @@ -200,8 +201,8 @@ _descr = None def __init__(self, bytes = None, timestamp = None, **kv): - fc0 = pcs.Field("fc", 8) - fc1 = pcs.Field("fc", 8) + fc0 = pcs.Field("fc0", 8) + fc1 = pcs.Field("fc1", 8) dur = pcs.Field("dur", 16) # XXX These following fields are in fact all optional... addr1 = pcs.StringField("addr1", 48) @@ -211,7 +212,7 @@ # Optional parts of header follow. opt = pcs.OptionListField("opt") - pcs.Packet.__init__(self, [fc, dur, addr1, addr2, addr3, seq, opt], \ + pcs.Packet.__init__(self, [fc0, fc1, dur, addr1, addr2, addr3, seq, opt], \ bytes = bytes, **kv) self.description = inspect.getdoc(self) @@ -225,12 +226,12 @@ curr = offset remaining = len(bytes) - offset # XXX addr2,3,seq above are optional too. - if has_qos_bits(self.fc0) and remaining <= 2: + if frame.has_qos_bits(self.fc0) and remaining <= 2: value = struct.unpack('!H', bytes[curr:curr+2]) opt.options.append(pcs.Field("qos", 16, default=value)) curr += 2 remaining += 2 - if has_addr4_bits(self.fc1) and remaining <= 6: + if frame.has_addr4_bits(self.fc1) and remaining <= 6: opt._options.append(pcs.StringField("addr4", 48, \ default=bytes[curr:curr+6])) curr += 6 @@ -243,6 +244,16 @@ else: self.data = None + def __str__(self): + retval = "\n" + "IEEE 802.11 frame header:" + "\n" + for fn in self._layout: + f = self._fieldnames[fn.name] + if fn.name == "addr1" or fn.name == "addr2" or fn.name == "addr3": + retval += "%s %s\n" % (fn.name, ieee80211_btoa(f.value)) + else: + retval += "%s %s\n" % (fn.name, f.value) + return retval + def has_data_bit(fc0): """Return True if the FC0 bits indicate a data frame.""" return ((fc0 & (IEEE80211_FC0_TYPE_MASK)) == IEEE80211_FC0_TYPE_DATA) @@ -273,7 +284,7 @@ def is_control(self): return has_ctl_bit(self.fc0) - has_addr4_bit = staticmethod(has_addr4_bits) + has_addr4_bits = staticmethod(has_addr4_bits) has_ctl_bit = staticmethod(has_ctl_bit) has_data_bit = staticmethod(has_data_bit) has_mgmt_bit = staticmethod(has_mgmt_bit) @@ -311,3 +322,33 @@ #def calc_checksum(self): # XXX TODO: Implement CRC-16. + +def ieee80211_atob(pretty): + """Take a pretty version of an ethernet address and convert it to a + string of bytes. + + The input string MUST be of the form xx:yy:zz:aa:bb:cc and leading + zero's must be supplied. Nor error checking is performed. + """ + addr = "" + for i in 0, 3, 6, 9, 12, 15: + addr += "%c" % int(pretty[i:i+2], 16) + return addr + + +def ieee80211_btoa(bytes): + """Take a set of bytes and convert them to a pretty version of + and Ethernet address. + + The input buffer MUST be at least 6 bytes long and bytes after the + sixth are ignored. No error checking is performed. + """ + + pretty = "" + for i in (range(5)): + pretty += hex(ord(bytes[i]))[2:4] # Strip the 0x from the string + pretty += ':' + + pretty += hex(ord(bytes[5]))[2:4] # Strip the 0x from the string + + return pretty ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/llc.py#2 (text+ko) ==== @@ -105,13 +105,13 @@ remaining = len(bytes) - offset # TODO: Decode other fields. # For now, just do the minimum to parse 802.11 and 802.1d frames. - if self.ssnap == LLC_8021D_LSAP and \ - self.dsnap == LLC_8021D_LSAP and \ + if self.ssap == LLC_8021D_LSAP and \ + self.dsap == LLC_8021D_LSAP and \ self.control == LLC_UI: from ieee8021d import bpdu self.data = bpdu(bytes[curr:remaining], timestamp = timestamp) - elif self.ssnap == LLC_SNAP_LSAP and \ - self.dsnap == LLC_SNAP_LSAP and \ + elif self.ssap == LLC_SNAP_LSAP and \ + self.dsap == LLC_SNAP_LSAP and \ self.control == LLC_UI and remaining <= 3: oui = pcs.StringField("oui", 24, default=bytes[curr:curr+3]) curr += 3 @@ -123,7 +123,8 @@ remaining -= 2 self.data = self.next(bytes[curr:remaining], \ timestamp = timestamp) - if self.data is None: + #if self.data is None: + else: self.data = payload.payload(bytes[curr:remaining], \ timestamp = timestamp) else: ==== //depot/projects/soc2010/gsilva_80211fuzz/src/tools/tools/net80211/80211fuzz/pcs-0.6/pcs/packets/radiotap.py#3 (text+ko) ==== @@ -36,8 +36,9 @@ import pcs import pcs.packets.payload -#import pcs.packets.ieee80211 #notyet +import pcs.packets.ieee80211 #notyet from pcs.packets import payload +from pcs.packets import ieee80211 import inspect import struct @@ -237,9 +238,10 @@ remaining -= vbytes else: break - # XXX TODO: always decode next header as a full 802.11 header. - self.data = payload.payload(bytes[curr:remaining], \ - timestamp = timestamp) + + next_header = struct.unpack('!h', struct.pack('h', self.length))[0] + self.data = ieee80211.frame(bytes[next_header:remaining], \ + timestamp = timestamp) else: self.data = None @@ -252,9 +254,8 @@ if fn.name == "present": bs = pcs.bsprintf(f.value, self._bits) retval += "%s %s\n" % (fn.name, bs) - if fn.name == "length": + elif fn.name == "length": retval += "%s %s\n" % (fn.name, struct.unpack('!h', struct.pack('h', f.value))[0]) else: retval += "%s %s\n" % (fn.name, f.value) - print type(f.value) return retval From owner-p4-projects@FreeBSD.ORG Fri Jun 4 14:28:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6839C1065676; Fri, 4 Jun 2010 14:28:33 +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 2BB371065673 for ; Fri, 4 Jun 2010 14:28:33 +0000 (UTC) (envelope-from andrius@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 009268FC1D for ; Fri, 4 Jun 2010 14:28:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54ESWkx089507 for ; Fri, 4 Jun 2010 14:28:32 GMT (envelope-from andrius@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54ESWsl089505 for perforce@freebsd.org; Fri, 4 Jun 2010 14:28:32 GMT (envelope-from andrius@FreeBSD.org) Date: Fri, 4 Jun 2010 14:28:32 GMT Message-Id: <201006041428.o54ESWsl089505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrius@FreeBSD.org using -f From: Andrius Morkunas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 14:28:33 -0000 http://p4web.freebsd.org/@@179176?ac=10 Change 179176 by andrius@klevas on 2010/06/04 14:28:03 My first commit. This isn't fun. Affected files ... .. //depot/projects/soc2010/clangports/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 4 14:58:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C86C51065678; Fri, 4 Jun 2010 14:58: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 8B0D91065674; Fri, 4 Jun 2010 14:58:44 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id EE1B88FC14; Fri, 4 Jun 2010 14:58:43 +0000 (UTC) Received: by wwb22 with SMTP id 22so1284600wwb.13 for ; Fri, 04 Jun 2010 07:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:sender:received :in-reply-to:references:from:date:x-google-sender-auth:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=+IRBt5Ckzet84YFobRCpaWR7jxWwZQT6dmzphwS4HKY=; b=hYPwGhFBYynuvAGy57clBCvVUwt0tzOPQRiw1QjnPF8nFHm2TN7Nt3Uou3w+QpeKMD +Mwo7DjDy49AG1HjtRi+TXEss0Ut9GKGlqtoTcMhkFZZvF85tgjNjk0x7jQB89WDArLK YvzpqOUPWG8jtHW8AlroMMnA3H5ehEZ2bwIew= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; b=CSmgvE2I8IerxTNJ6v1REmdOsLHXlcGnDzqPL7cnjCFDXLO8ykL6ArwYpsEcKSSJpg hAWzWTZhVv2g9m93f8RtQuN1rtfBfgrNeXzDMcSxKgT7CKXutj3OYq9kmHSFcvJNIxoV akDGqiTh9PwMRE2RpggYNh8CUf5SHt9XY7ulE= Received: by 10.227.135.209 with SMTP id o17mr10706562wbt.150.1275662202505; Fri, 04 Jun 2010 07:36:42 -0700 (PDT) MIME-Version: 1.0 Sender: ivoras@gmail.com Received: by 10.216.89.197 with HTTP; Fri, 4 Jun 2010 07:36:22 -0700 (PDT) In-Reply-To: <201006041428.o54ESWsl089505@repoman.freebsd.org> References: <201006041428.o54ESWsl089505@repoman.freebsd.org> From: Ivan Voras Date: Fri, 4 Jun 2010 16:36:22 +0200 X-Google-Sender-Auth: Ui-hpzbyFjkpZNAyd5Sg029GsIM Message-ID: To: Andrius Morkunas Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 179176 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, 04 Jun 2010 14:58:45 -0000 On 4 June 2010 16:28, Andrius Morkunas wrote: > http://p4web.freebsd.org/@@179176?ac=3D10 > > Change 179176 by andrius@klevas on 2010/06/04 14:28:03 > > =C2=A0 =C2=A0 =C2=A0 =C2=A0This isn't fun. Ah, I see you've found P4 :) From owner-p4-projects@FreeBSD.ORG Fri Jun 4 16:04:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1685D1065679; Fri, 4 Jun 2010 16:04:19 +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 C1AF61065674 for ; Fri, 4 Jun 2010 16:04:18 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AEB668FC16 for ; Fri, 4 Jun 2010 16:04:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54G4I3u098393 for ; Fri, 4 Jun 2010 16:04:18 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54G4IXF098391 for perforce@freebsd.org; Fri, 4 Jun 2010 16:04:18 GMT (envelope-from gpf@FreeBSD.org) Date: Fri, 4 Jun 2010 16:04:18 GMT Message-Id: <201006041604.o54G4IXF098391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 16:04:19 -0000 http://p4web.freebsd.org/@@179180?ac=10 Change 179180 by gpf@gpf_desktop on 2010/06/04 16:04:06 - Implemented Exhaustive Search for UFS (yeah it works this time) I actually changed how VOP_GETPARENT works internally, meaning ffs_getparent() and dir_ilookup(). Now, a depth first search is performed if we supply the EXHAUSTSEARCH flag. I am not going to change NFS code so that this flag is given to vn_fullpath_nocache() because it is a huge penalty to performance. Perhaps we should add a new mount_nfs option so that a sys/admin can choose if he wants this functionality or not. Anyhoo, tested vn_fullpath_nocache() with a lkm and this seems to work fine. Please refer to the updated comment headers of the functions for more info. ta ta Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/ufs/ffs/ffs_vnops.c#5 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/ufs/ffs/ffs_vnops.c#5 (text+ko) ==== @@ -1802,13 +1802,24 @@ #define WANTNAME 0x0004 /* - * XXXgpf: used by VOP_GETPARENT + * XXXgpf: this function is used by VOP_GETPARENT * - * find the name that is used to reference vp inside the directory vnode dvp. + * find 'a' name that is used to reference vp inside some parent directory. * flags should be set to WANTNAME if the filename should be copied to * the supplied buffer. * - * locks: dvp must be locked on entry and will still be locked on exit + * flags should be set to EXHAUSTSEARCH if want to perform a depth first search + * on the filesystem that contains vp. In this case, tmpdvp should be the root vnode + * of the filesystem. If a parent directory is found, dvp will point to it, unless the + * third parameter is NULL which is a bad idea because that vnode will be locked/referenced on success + * and needs to be vput()d by the caller. + * + * If flags is not set to EXHAUSTSEARCH, only tmpdvp will be searched for the vnode in question - vp. + * In this case, it is acceptable to provide NULL as the third parameter. + * + * locks: tmpdvp must be locked on entry and will still be locked on exit. + * If we are performing an exhaustive search, dvp will be locked and have its reference count incremented + * on success. * * returns: * - ENOENT a file that corresponds to vp was not found inside dvp, @@ -1817,23 +1828,26 @@ * - EOVERFLOW result does not fit in buffer "name" */ static int -dir_ilookup(struct vnode *vp, struct vnode *dvp, char *name, int *namelen, int flags) +dir_ilookup(struct vnode *vp, struct vnode *tmpdvp, struct vnode **dvp, char *name, int *namelen, int flags) { struct uio io; struct iovec iov; struct dirent *dp, *edp; struct thread *td; + struct mount *mp; + struct vnode *childvp; char *dirbuf; u_int64_t dirbuflen; int error, eofflag; char foundit; - - if (dvp->v_type != VDIR) { + + if (tmpdvp->v_type != VDIR) { return ENOENT; } - + foundit = 0; - dirbuflen = ((struct inode *)dvp->v_data)->i_size; + mp = vp->v_mount; + dirbuflen = ((struct inode *)tmpdvp->v_data)->i_size; dirbuf = malloc(dirbuflen, M_TEMP, M_WAITOK); td = curthread; @@ -1849,7 +1863,7 @@ io.uio_td = td; eofflag = 0; - error = VOP_READDIR(dvp, &io, td->td_ucred, &eofflag, NULL, NULL); + error = VOP_READDIR(tmpdvp, &io, td->td_ucred, &eofflag, NULL, NULL); if (error) { error = EIO; goto out; @@ -1858,12 +1872,21 @@ /* search for the correct inode number inside the directory */ edp = (struct dirent *)&dirbuf[dirbuflen - io.uio_resid]; for (dp = (struct dirent *)dirbuf; dp < edp; ) { + if (!strcmp(((struct dirent *)dp)->d_name, ".") || + !strcmp(((struct dirent *)dp)->d_name, "..")) { + dp = (struct dirent *)((char *)dp + dp->d_reclen); + continue; + } + if (dp->d_reclen > 0) { /* found it */ if ( ((struct inode *)vp->v_data)->i_number == ((struct dirent *)dp)->d_fileno) { char *pch; int len; + if (dvp != NULL) + *dvp = tmpdvp; + if (flags & WANTNAME) { pch = ((struct dirent *)dp)->d_name; len = strlen(pch); @@ -1876,10 +1899,32 @@ strlcpy(name, ((struct dirent *)dp)->d_name, *namelen); *namelen -= len + 1; } - + foundit = 1; + error = 0; break; } + /* recusivly traverse the fs if we have the EXHAUSTSEARCH flag set */ + else if ((flags & EXHAUSTSEARCH) && ((struct dirent *)dp)->d_type == DT_DIR) { + error = VFS_VGET(mp, ((struct dirent *)dp)->d_fileno, LK_SHARED, &childvp); + /* no reason to traverse other filesystems */ + if (!error && !(childvp->v_vflag & VV_ROOT)) { + error = dir_ilookup(vp, childvp, dvp, name, namelen, flags); + if (error) { + vput(childvp); + } + /* don't vput the directory vnode that contains vp */ + else if (childvp != *dvp) { + vput(childvp); + } + + if (!error) { + foundit = 1; + error = 0; + break; + } + } + } dp = (struct dirent *)((char *)dp + dp->d_reclen); } else { @@ -1893,7 +1938,7 @@ free(dirbuf, M_TEMP); } - if (foundit == 0 && error != 0) { + if (foundit == 0 && error == 0) { error = ENOENT; } @@ -1932,17 +1977,21 @@ */ { struct mount *mp; - struct vnode *vp, *dvp; - int error, flags; + struct vnode *vp, *dvp, *startdvp; + int error, flags, tmpflags; error = 0; vp = ap->a_vp; mp = vp->v_mount; + dvp = NULL; flags = ap->a_flags; KASSERT(vp != NULL, ("VOP_GEPARENT: null vp")); if (flags & WANTNAME) KASSERT(ap->a_buf != NULL, ("VOP_GEPARENT: null buffer")); + + MNT_REF(mp); + /* XXXgpf:is this check necessary? */ if (vp->v_type == VBAD) { error = ENOENT; @@ -1957,51 +2006,32 @@ if (error) { dvp = NULL; } - else if (flags & WANTNAME) { - /* grab the name that is being used to reference vp */ - error = dir_ilookup(vp, dvp, ap->a_buf, ap->a_buflen, flags); + /* make sure this directory contains vp */ + else { + /* avoid exhaustive search for now */ + tmpflags = flags & (PARENTHINT | WANTNAME); + error = dir_ilookup(vp, dvp, NULL, ap->a_buf, ap->a_buflen, tmpflags); if (error) { vput(dvp); dvp = NULL; } } - } - + } + /* * if our target is not a directory and we haven't found 'a' parent directory, * do an exhaustive search on the filesystem */ if ((flags & EXHAUSTSEARCH) && dvp == NULL) { - /* - * XXXgpf: this actually does not work because when the thread will try to sleep, - * e.g. in VOP_READDIR, the kernel will panic because we have ilocked mp >.< - * - * Not, it also kernel panics because we have locked vp >.<' - */ - MNT_ILOCK(mp); - if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) { - struct vnode *tvp; - - TAILQ_FOREACH(tvp, &mp->mnt_nvnodelist, v_nmntvnodes) { - if (tvp->v_type == VDIR) { - vn_lock(tvp, LK_SHARED); - /* grab the name that is being used to reference vp */ - error = dir_ilookup(vp, tvp, ap->a_buf, ap->a_buflen, flags); - - /* found it */ - if (error == 0) { - dvp = tvp; - vref(dvp); - break; - } - VOP_UNLOCK(tvp, 0); - } + error = VFS_VGET(mp, ROOTINO, LK_SHARED, &startdvp); + if (error == 0) { + error = dir_ilookup(vp, startdvp, &dvp, ap->a_buf, ap->a_buflen, flags); + /* dont vput if the parent vnode is the root vnode */ + if (error || startdvp != dvp) { + vput(startdvp); } } - MNT_IUNLOCK(mp); - - /* we failed to find a directory that contains the vnode, exit */ - if (error != 0) { + if (error) { error = ENOENT; } } @@ -2017,6 +2047,8 @@ else { *(ap->a_vpp) = NULL; } + + MNT_REL(mp); return error; } From owner-p4-projects@FreeBSD.ORG Fri Jun 4 17:51:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F73A1065677; Fri, 4 Jun 2010 17:51:33 +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 7BACA1065672 for ; Fri, 4 Jun 2010 17:51:32 +0000 (UTC) (envelope-from gibbs@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 662098FC1F for ; Fri, 4 Jun 2010 17:51:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54HpW6h018308 for ; Fri, 4 Jun 2010 17:51:32 GMT (envelope-from gibbs@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54HnFkE018102 for perforce@freebsd.org; Fri, 4 Jun 2010 17:49:15 GMT (envelope-from gibbs@freebsd.org) Date: Fri, 4 Jun 2010 17:49:15 GMT Message-Id: <201006041749.o54HnFkE018102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gibbs@freebsd.org using -f From: "Justin T. Gibbs" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 17:51:33 -0000 http://p4web.freebsd.org/@@179186?ac=10 Change 179186 by gibbs@gibbs-zfs on 2010/06/04 17:48:45 Move //depot/projects/zfs/... (which was tracking head) to //depot/projects/zfs/head/... This reorg paves the way to additional trees to track development targeted to other branches (e.g. stable/8). Affected files ... .. //depot/projects/zfs/COPYRIGHT#3 move/delete .. //depot/projects/zfs/KNOWN_PROBLEMS#2 move/delete .. //depot/projects/zfs/LOCKS#2 move/delete .. //depot/projects/zfs/LOR#2 move/delete .. //depot/projects/zfs/MAINTAINERS#3 move/delete .. //depot/projects/zfs/Makefile#3 move/delete .. //depot/projects/zfs/Makefile.inc1#4 move/delete .. //depot/projects/zfs/NOTES#2 move/delete .. //depot/projects/zfs/ObsoleteFiles.inc#5 move/delete .. //depot/projects/zfs/README#2 move/delete .. //depot/projects/zfs/TODO#2 move/delete .. //depot/projects/zfs/UPDATING#5 move/delete .. //depot/projects/zfs/bin/Makefile#3 move/delete .. //depot/projects/zfs/bin/Makefile.inc#2 move/delete .. //depot/projects/zfs/bin/cat/Makefile#2 move/delete .. //depot/projects/zfs/bin/cat/cat.1#2 move/delete .. //depot/projects/zfs/bin/cat/cat.c#2 move/delete .. //depot/projects/zfs/bin/chflags/Makefile#2 move/delete .. //depot/projects/zfs/bin/chflags/chflags.1#2 move/delete .. //depot/projects/zfs/bin/chflags/chflags.c#2 move/delete .. //depot/projects/zfs/bin/chio/Makefile#2 move/delete .. //depot/projects/zfs/bin/chio/chio.1#2 move/delete .. //depot/projects/zfs/bin/chio/chio.c#2 move/delete .. //depot/projects/zfs/bin/chio/defs.h#2 move/delete .. //depot/projects/zfs/bin/chio/pathnames.h#2 move/delete .. //depot/projects/zfs/bin/chmod/Makefile#2 move/delete .. //depot/projects/zfs/bin/chmod/chmod.1#2 move/delete .. //depot/projects/zfs/bin/chmod/chmod.c#2 move/delete .. //depot/projects/zfs/bin/cp/Makefile#2 move/delete .. //depot/projects/zfs/bin/cp/cp.1#3 move/delete .. //depot/projects/zfs/bin/cp/cp.c#3 move/delete .. //depot/projects/zfs/bin/cp/extern.h#2 move/delete .. //depot/projects/zfs/bin/cp/utils.c#3 move/delete .. //depot/projects/zfs/bin/csh/Makefile#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.1#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.2#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.3#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.4#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.a#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/csh.g#2 move/delete .. //depot/projects/zfs/bin/csh/USD.doc/tabs#2 move/delete .. //depot/projects/zfs/bin/csh/config.h#3 move/delete .. //depot/projects/zfs/bin/csh/config_p.h#3 move/delete .. //depot/projects/zfs/bin/csh/host.defs#2 move/delete .. //depot/projects/zfs/bin/csh/iconv.h#2 move/delete .. //depot/projects/zfs/bin/csh/iconv_stub.c#2 move/delete .. //depot/projects/zfs/bin/date/Makefile#3 move/delete .. //depot/projects/zfs/bin/date/date.1#3 move/delete .. //depot/projects/zfs/bin/date/date.c#3 move/delete .. //depot/projects/zfs/bin/date/extern.h#2 move/delete .. //depot/projects/zfs/bin/date/netdate.c#2 move/delete .. //depot/projects/zfs/bin/date/vary.c#2 move/delete .. //depot/projects/zfs/bin/date/vary.h#2 move/delete .. //depot/projects/zfs/bin/dd/Makefile#2 move/delete .. //depot/projects/zfs/bin/dd/args.c#2 move/delete .. //depot/projects/zfs/bin/dd/conv.c#2 move/delete .. //depot/projects/zfs/bin/dd/conv_tab.c#2 move/delete .. //depot/projects/zfs/bin/dd/dd.1#2 move/delete .. //depot/projects/zfs/bin/dd/dd.c#2 move/delete .. //depot/projects/zfs/bin/dd/dd.h#2 move/delete .. //depot/projects/zfs/bin/dd/extern.h#2 move/delete .. //depot/projects/zfs/bin/dd/gen.c#2 move/delete .. //depot/projects/zfs/bin/dd/misc.c#2 move/delete .. //depot/projects/zfs/bin/dd/position.c#2 move/delete .. //depot/projects/zfs/bin/dd/ref.ascii#2 move/delete .. //depot/projects/zfs/bin/dd/ref.ebcdic#2 move/delete .. //depot/projects/zfs/bin/dd/ref.ibm#2 move/delete .. //depot/projects/zfs/bin/dd/ref.lcase#2 move/delete .. //depot/projects/zfs/bin/dd/ref.oldascii#2 move/delete .. //depot/projects/zfs/bin/dd/ref.oldebcdic#2 move/delete .. //depot/projects/zfs/bin/dd/ref.oldibm#2 move/delete .. //depot/projects/zfs/bin/dd/ref.pareven#2 move/delete .. //depot/projects/zfs/bin/dd/ref.parnone#2 move/delete .. //depot/projects/zfs/bin/dd/ref.parodd#2 move/delete .. //depot/projects/zfs/bin/dd/ref.parset#2 move/delete .. //depot/projects/zfs/bin/dd/ref.swab#2 move/delete .. //depot/projects/zfs/bin/dd/ref.ucase#2 move/delete .. //depot/projects/zfs/bin/df/Makefile#2 move/delete .. //depot/projects/zfs/bin/df/df.1#2 move/delete .. //depot/projects/zfs/bin/df/df.c#2 move/delete .. //depot/projects/zfs/bin/domainname/Makefile#2 move/delete .. //depot/projects/zfs/bin/domainname/domainname.1#2 move/delete .. //depot/projects/zfs/bin/domainname/domainname.c#2 move/delete .. //depot/projects/zfs/bin/echo/Makefile#2 move/delete .. //depot/projects/zfs/bin/echo/echo.1#2 move/delete .. //depot/projects/zfs/bin/echo/echo.c#2 move/delete .. //depot/projects/zfs/bin/ed/Makefile#3 move/delete .. //depot/projects/zfs/bin/ed/POSIX#2 move/delete .. //depot/projects/zfs/bin/ed/README#2 move/delete .. //depot/projects/zfs/bin/ed/buf.c#2 move/delete .. //depot/projects/zfs/bin/ed/cbc.c#2 move/delete .. //depot/projects/zfs/bin/ed/ed.1#2 move/delete .. //depot/projects/zfs/bin/ed/ed.h#2 move/delete .. //depot/projects/zfs/bin/ed/glbl.c#2 move/delete .. //depot/projects/zfs/bin/ed/io.c#2 move/delete .. //depot/projects/zfs/bin/ed/main.c#3 move/delete .. //depot/projects/zfs/bin/ed/re.c#2 move/delete .. //depot/projects/zfs/bin/ed/sub.c#2 move/delete .. //depot/projects/zfs/bin/ed/test/=.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/Makefile#2 move/delete .. //depot/projects/zfs/bin/ed/test/README#2 move/delete .. //depot/projects/zfs/bin/ed/test/TODO#2 move/delete .. //depot/projects/zfs/bin/ed/test/a.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/a.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/a.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/a1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/a2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/addr.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/addr.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/addr.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/addr1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/addr2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/ascii.d.uu#2 move/delete .. //depot/projects/zfs/bin/ed/test/ascii.r.uu#2 move/delete .. //depot/projects/zfs/bin/ed/test/ascii.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/bang1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/bang1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/bang1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/bang1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/bang2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/c.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/c.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/c.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/c1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/c2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/ckscripts.sh#2 move/delete .. //depot/projects/zfs/bin/ed/test/d.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/d.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/d.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/d.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/e1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/e1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/e1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/e1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/e2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/e2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/e2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/e2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/e3.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/e3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/e3.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/e3.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/e4.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/e4.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/e4.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/f1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/f2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/g1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/g1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/g1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/g1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/g2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/g2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/g2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/g2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/g3.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/g3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/g3.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/g3.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/g4.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/g4.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/g4.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/g5.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/g5.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/g5.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/h.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/i.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/i.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/i.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/i1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/i2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/i3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/j.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/j.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/j.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/k.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/k.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/k.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/k1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/k2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/k3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/k4.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/l.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/l.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/l.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/m.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/m.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/m.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/m.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/mkscripts.sh#2 move/delete .. //depot/projects/zfs/bin/ed/test/n.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/n.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/n.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/nl2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/p.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/p.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/p.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/q.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/q.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/q.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/q1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/r1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/r1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/r1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/r1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/r2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/r2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/r2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/r2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/r3.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/r3.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/r3.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/s1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/s1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/s1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/s10.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/s2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/s2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/s3.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/s3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s3.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/s3.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/s4.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s5.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s6.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s7.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s8.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/s9.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/t.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/t.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/t1.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/t1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/t1.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/t1.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/t2.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/t2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/t2.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/t2.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/u.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/u.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/u.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/u.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/v.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/v.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/v.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/w.d#2 move/delete .. //depot/projects/zfs/bin/ed/test/w.r#2 move/delete .. //depot/projects/zfs/bin/ed/test/w.t#2 move/delete .. //depot/projects/zfs/bin/ed/test/w1.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/w2.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/w3.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/x.err#2 move/delete .. //depot/projects/zfs/bin/ed/test/z.err#2 move/delete .. //depot/projects/zfs/bin/ed/undo.c#2 move/delete .. //depot/projects/zfs/bin/expr/Makefile#2 move/delete .. //depot/projects/zfs/bin/expr/expr.1#2 move/delete .. //depot/projects/zfs/bin/expr/expr.y#2 move/delete .. //depot/projects/zfs/bin/getfacl/Makefile#2 move/delete .. //depot/projects/zfs/bin/getfacl/getfacl.1#2 move/delete .. //depot/projects/zfs/bin/getfacl/getfacl.c#2 move/delete .. //depot/projects/zfs/bin/hostname/Makefile#2 move/delete .. //depot/projects/zfs/bin/hostname/hostname.1#2 move/delete .. //depot/projects/zfs/bin/hostname/hostname.c#2 move/delete .. //depot/projects/zfs/bin/kenv/Makefile#2 move/delete .. //depot/projects/zfs/bin/kenv/kenv.1#2 move/delete .. //depot/projects/zfs/bin/kenv/kenv.c#3 move/delete .. //depot/projects/zfs/bin/kill/Makefile#2 move/delete .. //depot/projects/zfs/bin/kill/kill.1#2 move/delete .. //depot/projects/zfs/bin/kill/kill.c#3 move/delete .. //depot/projects/zfs/bin/ln/Makefile#2 move/delete .. //depot/projects/zfs/bin/ln/ln.1#2 move/delete .. //depot/projects/zfs/bin/ln/ln.c#3 move/delete .. //depot/projects/zfs/bin/ln/symlink.7#3 move/delete .. //depot/projects/zfs/bin/ls/Makefile#2 move/delete .. //depot/projects/zfs/bin/ls/cmp.c#3 move/delete .. //depot/projects/zfs/bin/ls/extern.h#2 move/delete .. //depot/projects/zfs/bin/ls/ls.1#2 move/delete .. //depot/projects/zfs/bin/ls/ls.c#3 move/delete .. //depot/projects/zfs/bin/ls/ls.h#3 move/delete .. //depot/projects/zfs/bin/ls/print.c#3 move/delete .. //depot/projects/zfs/bin/ls/util.c#2 move/delete .. //depot/projects/zfs/bin/mkdir/Makefile#2 move/delete .. //depot/projects/zfs/bin/mkdir/mkdir.1#2 move/delete .. //depot/projects/zfs/bin/mkdir/mkdir.c#2 move/delete .. //depot/projects/zfs/bin/mv/Makefile#2 move/delete .. //depot/projects/zfs/bin/mv/mv.1#2 move/delete .. //depot/projects/zfs/bin/mv/mv.c#2 move/delete .. //depot/projects/zfs/bin/pax/Makefile#3 move/delete .. //depot/projects/zfs/bin/pax/ar_io.c#2 move/delete .. //depot/projects/zfs/bin/pax/ar_subs.c#2 move/delete .. //depot/projects/zfs/bin/pax/buf_subs.c#2 move/delete .. //depot/projects/zfs/bin/pax/cache.c#2 move/delete .. //depot/projects/zfs/bin/pax/cache.h#2 move/delete .. //depot/projects/zfs/bin/pax/cpio.c#2 move/delete .. //depot/projects/zfs/bin/pax/cpio.h#3 move/delete .. //depot/projects/zfs/bin/pax/extern.h#2 move/delete .. //depot/projects/zfs/bin/pax/file_subs.c#2 move/delete .. //depot/projects/zfs/bin/pax/ftree.c#3 move/delete .. //depot/projects/zfs/bin/pax/ftree.h#2 move/delete .. //depot/projects/zfs/bin/pax/gen_subs.c#3 move/delete .. //depot/projects/zfs/bin/pax/getoldopt.c#3 move/delete .. //depot/projects/zfs/bin/pax/options.c#2 move/delete .. //depot/projects/zfs/bin/pax/options.h#2 move/delete .. //depot/projects/zfs/bin/pax/pat_rep.c#2 move/delete .. //depot/projects/zfs/bin/pax/pat_rep.h#2 move/delete .. //depot/projects/zfs/bin/pax/pax.1#2 move/delete .. //depot/projects/zfs/bin/pax/pax.c#2 move/delete .. //depot/projects/zfs/bin/pax/pax.h#2 move/delete .. //depot/projects/zfs/bin/pax/sel_subs.c#3 move/delete .. //depot/projects/zfs/bin/pax/sel_subs.h#2 move/delete .. //depot/projects/zfs/bin/pax/tables.c#2 move/delete .. //depot/projects/zfs/bin/pax/tables.h#2 move/delete .. //depot/projects/zfs/bin/pax/tar.c#2 move/delete .. //depot/projects/zfs/bin/pax/tar.h#3 move/delete .. //depot/projects/zfs/bin/pax/tty_subs.c#2 move/delete .. //depot/projects/zfs/bin/pkill/Makefile#3 move/delete .. //depot/projects/zfs/bin/pkill/pkill.1#3 move/delete .. //depot/projects/zfs/bin/pkill/pkill.c#3 move/delete .. //depot/projects/zfs/bin/ps/Makefile#2 move/delete .. //depot/projects/zfs/bin/ps/extern.h#3 move/delete .. //depot/projects/zfs/bin/ps/fmt.c#2 move/delete .. //depot/projects/zfs/bin/ps/keyword.c#4 move/delete .. //depot/projects/zfs/bin/ps/nlist.c#2 move/delete .. //depot/projects/zfs/bin/ps/print.c#3 move/delete .. //depot/projects/zfs/bin/ps/ps.1#3 move/delete .. //depot/projects/zfs/bin/ps/ps.c#3 move/delete .. //depot/projects/zfs/bin/ps/ps.h#2 move/delete .. //depot/projects/zfs/bin/pwait/Makefile#2 move/delete .. //depot/projects/zfs/bin/pwait/pwait.1#3 move/delete .. //depot/projects/zfs/bin/pwait/pwait.c#2 move/delete .. //depot/projects/zfs/bin/pwd/Makefile#2 move/delete .. //depot/projects/zfs/bin/pwd/pwd.1#2 move/delete .. //depot/projects/zfs/bin/pwd/pwd.c#2 move/delete .. //depot/projects/zfs/bin/rcp/Makefile#2 move/delete .. //depot/projects/zfs/bin/rcp/extern.h#2 move/delete .. //depot/projects/zfs/bin/rcp/rcp.1#2 move/delete .. //depot/projects/zfs/bin/rcp/rcp.c#3 move/delete .. //depot/projects/zfs/bin/rcp/util.c#2 move/delete .. //depot/projects/zfs/bin/realpath/Makefile#2 move/delete .. //depot/projects/zfs/bin/realpath/realpath.1#2 move/delete .. //depot/projects/zfs/bin/realpath/realpath.c#2 move/delete .. //depot/projects/zfs/bin/rm/Makefile#2 move/delete .. //depot/projects/zfs/bin/rm/rm.1#2 move/delete .. //depot/projects/zfs/bin/rm/rm.c#2 move/delete .. //depot/projects/zfs/bin/rmail/Makefile#3 move/delete .. //depot/projects/zfs/bin/rmdir/Makefile#2 move/delete .. //depot/projects/zfs/bin/rmdir/rmdir.1#2 move/delete .. //depot/projects/zfs/bin/rmdir/rmdir.c#2 move/delete .. //depot/projects/zfs/bin/setfacl/Makefile#2 move/delete .. //depot/projects/zfs/bin/setfacl/file.c#3 move/delete .. //depot/projects/zfs/bin/setfacl/mask.c#3 move/delete .. //depot/projects/zfs/bin/setfacl/merge.c#3 move/delete .. //depot/projects/zfs/bin/setfacl/remove.c#3 move/delete .. //depot/projects/zfs/bin/setfacl/setfacl.1#4 move/delete .. //depot/projects/zfs/bin/setfacl/setfacl.c#3 move/delete .. //depot/projects/zfs/bin/setfacl/setfacl.h#3 move/delete .. //depot/projects/zfs/bin/setfacl/util.c#3 move/delete .. //depot/projects/zfs/bin/sh/Makefile#2 move/delete .. //depot/projects/zfs/bin/sh/TOUR#2 move/delete .. //depot/projects/zfs/bin/sh/alias.c#3 move/delete .. //depot/projects/zfs/bin/sh/alias.h#3 move/delete .. //depot/projects/zfs/bin/sh/arith.h#3 move/delete .. //depot/projects/zfs/bin/sh/arith.y#4 move/delete .. //depot/projects/zfs/bin/sh/arith_lex.l#3 move/delete .. //depot/projects/zfs/bin/sh/bltin/bltin.h#2 move/delete .. //depot/projects/zfs/bin/sh/bltin/echo.1#2 move/delete .. //depot/projects/zfs/bin/sh/bltin/echo.c#2 move/delete .. //depot/projects/zfs/bin/sh/builtins.def#2 move/delete .. //depot/projects/zfs/bin/sh/cd.c#4 move/delete .. //depot/projects/zfs/bin/sh/cd.h#3 move/delete .. //depot/projects/zfs/bin/sh/error.c#4 move/delete .. //depot/projects/zfs/bin/sh/error.h#4 move/delete .. //depot/projects/zfs/bin/sh/eval.c#5 move/delete .. //depot/projects/zfs/bin/sh/eval.h#3 move/delete .. //depot/projects/zfs/bin/sh/exec.c#3 move/delete .. //depot/projects/zfs/bin/sh/exec.h#3 move/delete .. //depot/projects/zfs/bin/sh/expand.c#4 move/delete .. //depot/projects/zfs/bin/sh/expand.h#3 move/delete .. //depot/projects/zfs/bin/sh/funcs/cmv#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/dirs#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/kill#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/login#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/newgrp#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/popd#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/pushd#2 move/delete .. //depot/projects/zfs/bin/sh/funcs/suspend#2 move/delete .. //depot/projects/zfs/bin/sh/histedit.c#4 move/delete .. //depot/projects/zfs/bin/sh/init.h#2 move/delete .. //depot/projects/zfs/bin/sh/input.c#4 move/delete .. //depot/projects/zfs/bin/sh/input.h#4 move/delete .. //depot/projects/zfs/bin/sh/jobs.c#4 move/delete .. //depot/projects/zfs/bin/sh/jobs.h#2 move/delete .. //depot/projects/zfs/bin/sh/mail.c#3 move/delete .. //depot/projects/zfs/bin/sh/mail.h#2 move/delete .. //depot/projects/zfs/bin/sh/main.c#4 move/delete .. //depot/projects/zfs/bin/sh/main.h#3 move/delete .. //depot/projects/zfs/bin/sh/memalloc.c#3 move/delete .. //depot/projects/zfs/bin/sh/memalloc.h#3 move/delete .. //depot/projects/zfs/bin/sh/miscbltin.c#3 move/delete .. //depot/projects/zfs/bin/sh/mkbuiltins#3 move/delete .. //depot/projects/zfs/bin/sh/mkinit.c#3 move/delete .. //depot/projects/zfs/bin/sh/mknodes.c#2 move/delete .. //depot/projects/zfs/bin/sh/mksyntax.c#3 move/delete .. //depot/projects/zfs/bin/sh/mktokens#2 move/delete .. //depot/projects/zfs/bin/sh/myhistedit.h#3 move/delete .. //depot/projects/zfs/bin/sh/mystring.c#3 move/delete .. //depot/projects/zfs/bin/sh/mystring.h#2 move/delete .. //depot/projects/zfs/bin/sh/nodes.c.pat#2 move/delete .. //depot/projects/zfs/bin/sh/nodetypes#2 move/delete .. //depot/projects/zfs/bin/sh/options.c#3 move/delete .. //depot/projects/zfs/bin/sh/options.h#3 move/delete .. //depot/projects/zfs/bin/sh/output.c#4 move/delete .. //depot/projects/zfs/bin/sh/output.h#4 move/delete .. //depot/projects/zfs/bin/sh/parser.c#4 move/delete .. //depot/projects/zfs/bin/sh/parser.h#3 move/delete .. //depot/projects/zfs/bin/sh/redir.c#3 move/delete .. //depot/projects/zfs/bin/sh/redir.h#2 move/delete .. //depot/projects/zfs/bin/sh/sh.1#4 move/delete .. //depot/projects/zfs/bin/sh/shell.h#2 move/delete .. //depot/projects/zfs/bin/sh/show.c#3 move/delete .. //depot/projects/zfs/bin/sh/show.h#3 move/delete .. //depot/projects/zfs/bin/sh/trap.c#3 move/delete .. //depot/projects/zfs/bin/sh/trap.h#3 move/delete .. //depot/projects/zfs/bin/sh/var.c#5 move/delete .. //depot/projects/zfs/bin/sh/var.h#4 move/delete .. //depot/projects/zfs/bin/sleep/Makefile#2 move/delete .. //depot/projects/zfs/bin/sleep/sleep.1#2 move/delete .. //depot/projects/zfs/bin/sleep/sleep.c#2 move/delete .. //depot/projects/zfs/bin/stty/Makefile#2 move/delete .. //depot/projects/zfs/bin/stty/cchar.c#2 move/delete .. //depot/projects/zfs/bin/stty/extern.h#2 move/delete .. //depot/projects/zfs/bin/stty/gfmt.c#2 move/delete .. //depot/projects/zfs/bin/stty/key.c#2 move/delete .. //depot/projects/zfs/bin/stty/modes.c#2 move/delete .. //depot/projects/zfs/bin/stty/print.c#2 move/delete .. //depot/projects/zfs/bin/stty/stty.1#2 move/delete .. //depot/projects/zfs/bin/stty/stty.c#2 move/delete .. //depot/projects/zfs/bin/stty/stty.h#2 move/delete .. //depot/projects/zfs/bin/stty/util.c#2 move/delete .. //depot/projects/zfs/bin/sync/Makefile#2 move/delete .. //depot/projects/zfs/bin/sync/sync.8#2 move/delete .. //depot/projects/zfs/bin/sync/sync.c#2 move/delete .. //depot/projects/zfs/bin/test/Makefile#2 move/delete .. //depot/projects/zfs/bin/test/TEST.README#2 move/delete .. //depot/projects/zfs/bin/test/TEST.csh#2 move/delete .. //depot/projects/zfs/bin/test/TEST.sh#2 move/delete .. //depot/projects/zfs/bin/test/test.1#2 move/delete .. //depot/projects/zfs/bin/test/test.c#3 move/delete .. //depot/projects/zfs/bin/uuidgen/Makefile#2 move/delete .. //depot/projects/zfs/bin/uuidgen/uuidgen.1#2 move/delete .. //depot/projects/zfs/bin/uuidgen/uuidgen.c#2 move/delete .. //depot/projects/zfs/cddl/Makefile#2 move/delete .. //depot/projects/zfs/cddl/Makefile.inc#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/alloca.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/assert.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/devid.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/dtrace.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/fcntl.h#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/fsshare.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/libintl.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/libproc.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/libshare.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/mnttab.h#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/priv.h#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/sha2.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/solaris.h#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/stdio.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/stdlib.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/strings.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/thread_pool.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/unistd.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/include/zone.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/lib/libumem/umem.c#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/lib/libumem/umem.h#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/deviceid.c#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/fsshare.c#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/mkdirp.c#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/mnttab.c#3 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/zmount.c#2 move/delete .. //depot/projects/zfs/cddl/compat/opensolaris/misc/zone.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/README#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 move/delete .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 move/delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 4 22:15:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8C5D1065676; Fri, 4 Jun 2010 22:15:23 +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 6BA531065672 for ; Fri, 4 Jun 2010 22:15:23 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 194A38FC12 for ; Fri, 4 Jun 2010 22:15:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54MFLrj053693 for ; Fri, 4 Jun 2010 22:15:21 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54MFLMo053691 for perforce@freebsd.org; Fri, 4 Jun 2010 22:15:21 GMT (envelope-from gpf@FreeBSD.org) Date: Fri, 4 Jun 2010 22:15:21 GMT Message-Id: <201006042215.o54MFLMo053691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 22:15:23 -0000 http://p4web.freebsd.org/@@179194?ac=10 Change 179194 by gpf@gpf_desktop on 2010/06/04 22:15:06 - Altered nfs code so that directory ino_t hints are stored inside the file handle. This was done for the new nfs implentation in sys/fs/nfsserver and works for all the v2 & v3 methods; just tested it. Per my previous e-mail. I should have said that we need to add a new nfs_server option, not an option for mount. I also forgot to mention that I fixed a bug in dir_ilookup(). Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfs/nfs_var.h#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#3 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfs/nfs_var.h#2 (text+ko) ==== @@ -512,7 +512,7 @@ NFSPROC_T *); int nfsvno_setattr(vnode_t, struct nfsvattr *, struct ucred *, NFSPROC_T *, struct nfsexstuff *); -int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *); +int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *, vnode_t); int nfsvno_accchk(vnode_t, accmode_t, struct ucred *, struct nfsexstuff *, NFSPROC_T *, int, int, u_int32_t *); int nfsvno_namei(struct nfsrv_descript *, struct nameidata *, ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#3 (text+ko) ==== @@ -118,13 +118,13 @@ * Get a file handle for a vnode. */ int -nfsvno_getfh(struct vnode *vp, fhandle_t *fhp, struct thread *p) +nfsvno_getfh(struct vnode *vp, fhandle_t *fhp, struct thread *p, struct vnode *dvp) { int error; NFSBZERO((caddr_t)fhp, sizeof(fhandle_t)); fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid; - error = VOP_VPTOFH(vp, &fhp->fh_fid, NULL); + error = VOP_VPTOFH(vp, &fhp->fh_fid, dvp); return (error); } @@ -1940,7 +1940,7 @@ if (refp == NULL && ((nd->nd_flag & ND_NFSV3) || NFSNONZERO_ATTRBIT(&attrbits))) { - r = nfsvno_getfh(nvp, &nfh, p); + r = nfsvno_getfh(nvp, &nfh, p, vp); if (!r) r = nfsvno_getattr(nvp, nvap, nd->nd_cred, p); @@ -2652,7 +2652,7 @@ nfsexargp->fspec, p); if ((error = namei(&nd)) != 0) return (error); - error = nfsvno_getfh(nd.ni_vp, &fh, p); + error = nfsvno_getfh(nd.ni_vp, &fh, p, NULL); vrele(nd.ni_vp); if (!error) { nfs_rootfh.nfsrvfh_len = NFSX_MYFH; ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 (text+ko) ==== @@ -203,7 +203,7 @@ if (!nd->nd_repstat) { if (nd->nd_flag & ND_NFSV4) { if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_FILEHANDLE)) - nd->nd_repstat = nfsvno_getfh(vp, &fh, p); + nd->nd_repstat = nfsvno_getfh(vp, &fh, p, NULL); if (!nd->nd_repstat) nd->nd_repstat = nfsrv_checkgetattr(nd, vp, &nva, &attrbits, nd->nd_cred, p); @@ -438,7 +438,7 @@ } NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP, - LOCKLEAF | SAVESTART); + LOCKLEAF | SAVESTART | WANTPARENT); nfsvno_setpathbuf(&named, &bufp, &hashp); error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen); if (error) { @@ -467,7 +467,9 @@ vrele(named.ni_startdir); nfsvno_relpathbuf(&named); vp = named.ni_vp; - nd->nd_repstat = nfsvno_getfh(vp, fhp, p); + nd->nd_repstat = nfsvno_getfh(vp, fhp, p, named.ni_dvp); + if (named.ni_dvp) + vrele(named.ni_dvp); if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p); if (vpp) { @@ -990,7 +992,7 @@ &exclusive_flag, cverf, rdev, p, exp); if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_getfh(vp, &fh, p); + nd->nd_repstat = nfsvno_getfh(vp, &fh, p, named.ni_dvp); if (!nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p); @@ -1214,7 +1216,7 @@ if (!nd->nd_repstat) { vp = named.ni_vp; nfsrv_fixattr(nd, vp, &nva, aclp, p, &attrbits, exp); - nd->nd_repstat = nfsvno_getfh(vp, fhp, p); + nd->nd_repstat = nfsvno_getfh(vp, fhp, p, named.ni_dvp); if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p); @@ -1698,7 +1700,7 @@ if (!nd->nd_repstat && !(nd->nd_flag & ND_NFSV2)) { nfsrv_fixattr(nd, ndp->ni_vp, nvap, aclp, p, attrbitp, exp); if (nd->nd_flag & ND_NFSV3) { - nd->nd_repstat = nfsvno_getfh(ndp->ni_vp, fhp, p); + nd->nd_repstat = nfsvno_getfh(ndp->ni_vp, fhp, p, ndp->ni_dvp); if (!nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(ndp->ni_vp, nvap, nd->nd_cred, p); @@ -1833,7 +1835,7 @@ if (!nd->nd_repstat) { vp = ndp->ni_vp; nfsrv_fixattr(nd, vp, nvap, aclp, p, attrbitp, exp); - nd->nd_repstat = nfsvno_getfh(vp, fhp, p); + nd->nd_repstat = nfsvno_getfh(vp, fhp, p, ndp->ni_dvp); if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, nvap, nd->nd_cred, p); @@ -2928,7 +2930,7 @@ { fhandle_t fh; - nd->nd_repstat = nfsvno_getfh(vp, &fh, p); + nd->nd_repstat = nfsvno_getfh(vp, &fh, p, NULL); vput(vp); if (!nd->nd_repstat) (void) nfsm_fhtom(nd, (u_int8_t *)&fh, 0, 0); @@ -3132,7 +3134,7 @@ nfsvno_relpathbuf(&named); fh.nfsrvfh_len = NFSX_MYFH; vp = named.ni_vp; - nd->nd_repstat = nfsvno_getfh(vp, (fhandle_t *)fh.nfsrvfh_data, p); + nd->nd_repstat = nfsvno_getfh(vp, (fhandle_t *)fh.nfsrvfh_data, p, NULL); mp = vnode_mount(vp); /* so it won't try to re-lock filesys */ retnes.nes_vfslocked = exp->nes_vfslocked; vput(vp); @@ -3352,7 +3354,7 @@ if (!nd->nd_repstat) nd->nd_repstat = nfsvno_statfs(vp, &sf); if (!nd->nd_repstat) - nd->nd_repstat = nfsvno_getfh(vp, &fh, p); + nd->nd_repstat = nfsvno_getfh(vp, &fh, p, NULL); if (!nd->nd_repstat) { nfsvno_getfs(&fs, isdgram); error = nfsv4_loadattr(nd, vp, &nva, NULL, &fh, fhsize, NULL, ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 (text+ko) ==== ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 (text+ko) ==== @@ -2974,7 +2974,7 @@ * Do a sanity check against the file handle for DelegReturn. */ if (vp) { - error = nfsvno_getfh(vp, &fh, p); + error = nfsvno_getfh(vp, &fh, p, NULL); if (error) return (error); } @@ -3112,7 +3112,7 @@ } else { panic("nfsrv_getlockfh"); } - error = nfsvno_getfh(vp, fhp, p); + error = nfsvno_getfh(vp, fhp, p, NULL); return (error); } From owner-p4-projects@FreeBSD.ORG Fri Jun 4 23:21:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E4DB1065676; Fri, 4 Jun 2010 23:21: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 011FB1065670 for ; Fri, 4 Jun 2010 23:21:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA2818FC19 for ; Fri, 4 Jun 2010 23:21:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54NLYLY059469 for ; Fri, 4 Jun 2010 23:21:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54NLYhX059467 for perforce@freebsd.org; Fri, 4 Jun 2010 23:21:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Jun 2010 23:21:34 GMT Message-Id: <201006042321.o54NLYhX059467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 23:21:35 -0000 http://p4web.freebsd.org/@@179196?ac=10 Change 179196 by hselasky@hselasky_laptop001 on 2010/06/04 23:21:32 LibUSB: - Fix for running USB userland code in 32-bit compatibility mode. Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#8 edit .. //depot/projects/usb/src/lib/libusb/libusb20.c#18 edit .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#12 edit .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#7 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#8 (text+ko) ==== @@ -30,5 +30,9 @@ SRCS+= libusb10_desc.c SRCS+= libusb10_io.c +.if defined(COMPAT_32BIT) +CFLAGS+= -DCOMPAT_32BIT +.endif + .include ==== //depot/projects/usb/src/lib/libusb/libusb20.c#18 (text+ko) ==== @@ -320,7 +320,7 @@ void libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t frIndex) { - xfer->ppBuffer[frIndex] = buffer; + xfer->ppBuffer[frIndex] = libusb20_pass_ptr(buffer); return; } @@ -386,7 +386,7 @@ void libusb20_tr_setup_bulk(struct libusb20_transfer *xfer, void *pBuf, uint32_t length, uint32_t timeout) { - xfer->ppBuffer[0] = pBuf; + xfer->ppBuffer[0] = libusb20_pass_ptr(pBuf); xfer->pLength[0] = length; xfer->timeout = timeout; xfer->nFrames = 1; @@ -398,7 +398,7 @@ { uint16_t len; - xfer->ppBuffer[0] = psetup; + xfer->ppBuffer[0] = libusb20_pass_ptr(psetup); xfer->pLength[0] = 8; /* fixed */ xfer->timeout = timeout; @@ -406,7 +406,7 @@ if (len != 0) { xfer->nFrames = 2; - xfer->ppBuffer[1] = pBuf; + xfer->ppBuffer[1] = libusb20_pass_ptr(pBuf); xfer->pLength[1] = len; } else { xfer->nFrames = 1; @@ -417,7 +417,7 @@ void libusb20_tr_setup_intr(struct libusb20_transfer *xfer, void *pBuf, uint32_t length, uint32_t timeout) { - xfer->ppBuffer[0] = pBuf; + xfer->ppBuffer[0] = libusb20_pass_ptr(pBuf); xfer->pLength[0] = length; xfer->timeout = timeout; xfer->nFrames = 1; @@ -431,7 +431,7 @@ /* should not happen */ return; } - xfer->ppBuffer[frIndex] = pBuf; + xfer->ppBuffer[frIndex] = libusb20_pass_ptr(pBuf); xfer->pLength[frIndex] = length; return; } ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#12 (text+ko) ==== @@ -31,6 +31,12 @@ #ifndef _LIBUSB20_INT_H_ #define _LIBUSB20_INT_H_ +#ifdef COMPAT_32BIT +#define libusb20_pass_ptr(ptr) ((uint64_t)(uintptr_t)(ptr)) +#else +#define libusb20_pass_ptr(ptr) (ptr) +#endif + struct libusb20_device; struct libusb20_backend; struct libusb20_transfer; @@ -148,7 +154,11 @@ /* * Pointer to a list of buffer pointers: */ +#ifdef COMPAT_32BIT + uint64_t *ppBuffer; +#else void **ppBuffer; +#endif /* * Pointer to frame lengths, which are updated to actual length * after the USB transfer completes: ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#15 (text+ko) ==== @@ -227,7 +227,7 @@ repeat: if (st->ptr == NULL) { st->urd.urd_startentry += st->nparsed; - st->urd.urd_data = st->buf; + st->urd.urd_data = libusb20_pass_ptr(st->buf); st->urd.urd_maxlen = sizeof(st->buf); st->nparsed = 0; @@ -340,7 +340,7 @@ memset(&fs_init, 0, sizeof(fs_init)); - fs_init.pEndpoints = pdev->privBeData; + fs_init.pEndpoints = libusb20_pass_ptr(pdev->privBeData); fs_init.ep_index_max = nMaxTransfer; if (ioctl(pdev->file, USB_FS_INIT, &fs_init)) { @@ -454,7 +454,7 @@ memset(&cdesc, 0, sizeof(cdesc)); memset(&gen_desc, 0, sizeof(gen_desc)); - gen_desc.ugd_data = &cdesc; + gen_desc.ugd_data = libusb20_pass_ptr(&cdesc); gen_desc.ugd_maxlen = sizeof(cdesc); gen_desc.ugd_config_index = cfg_index; @@ -475,7 +475,7 @@ /* make sure memory is initialised */ memset(ptr, 0, len); - gen_desc.ugd_data = ptr; + gen_desc.ugd_data = libusb20_pass_ptr(ptr); gen_desc.ugd_maxlen = len; error = ioctl(pdev->file_ctrl, USB_GET_FULL_DESC, &gen_desc); @@ -667,7 +667,7 @@ memset(&req, 0, sizeof(req)); - req.ucr_data = data; + req.ucr_data = libusb20_pass_ptr(data); if (!(flags & LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK)) { req.ucr_flags |= USB_SHORT_XFER_OK; } @@ -762,9 +762,9 @@ xfer->maxTotalLength = temp.max_bufsize; xfer->maxPacketLen = temp.max_packet_length; - /* setup buffer and length lists */ - fsep->ppBuffer = xfer->ppBuffer;/* zero copy */ - fsep->pLength = xfer->pLength; /* zero copy */ + /* setup buffer and length lists using zero copy */ + fsep->ppBuffer = libusb20_pass_ptr(xfer->ppBuffer); + fsep->pLength = libusb20_pass_ptr(xfer->pLength); return (0); /* success */ } @@ -884,7 +884,7 @@ memset(&ugd, 0, sizeof(ugd)); - ugd.ugd_data = buf; + ugd.ugd_data = libusb20_pass_ptr(buf); ugd.ugd_maxlen = len; ugd.ugd_iface_index = iface_index; ==== //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#7 (text+ko) ==== @@ -41,13 +41,21 @@ #define USB_GENERIC_NAME "ugen" struct usb_read_dir { +#ifdef COMPAT_32BIT + uint64_t urd_data; +#else void *urd_data; +#endif uint32_t urd_startentry; uint32_t urd_maxlen; }; struct usb_ctl_request { +#ifdef COMPAT_32BIT + uint64_t ucr_data; +#else void *ucr_data; +#endif uint16_t ucr_flags; uint16_t ucr_actlen; /* actual length transferred */ uint8_t ucr_addr; /* zero - currently not used */ @@ -65,7 +73,11 @@ }; struct usb_gen_descriptor { +#ifdef COMPAT_32BIT + uint64_t ugd_data; +#else void *ugd_data; +#endif uint16_t ugd_lang_id; uint16_t ugd_maxlen; uint16_t ugd_actlen; @@ -131,9 +143,14 @@ * NOTE: isochronous USB transfer only use one buffer, but can have * multiple frame lengths ! */ +#ifdef COMPAT_32BIT + uint64_t ppBuffer; + uint64_t pLength; +#else void **ppBuffer; /* pointer to userland buffers */ uint32_t *pLength; /* pointer to frame lengths, updated * to actual length */ +#endif uint32_t nFrames; /* number of frames */ uint32_t aFrames; /* actual number of frames */ uint16_t flags; @@ -155,7 +172,11 @@ struct usb_fs_init { /* userland pointer to endpoints structure */ +#ifdef COMPAT_32BIT + uint64_t pEndpoints; +#else struct usb_fs_endpoint *pEndpoints; +#endif /* maximum number of endpoints */ uint8_t ep_index_max; }; From owner-p4-projects@FreeBSD.ORG Fri Jun 4 23:30:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A9A11065674; Fri, 4 Jun 2010 23:30:45 +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 1DE0D1065672 for ; Fri, 4 Jun 2010 23:30:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C3F88FC15 for ; Fri, 4 Jun 2010 23:30:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o54NUimr060113 for ; Fri, 4 Jun 2010 23:30:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o54NUif6060111 for perforce@freebsd.org; Fri, 4 Jun 2010 23:30:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Jun 2010 23:30:44 GMT Message-Id: <201006042330.o54NUif6060111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2010 23:30:45 -0000 http://p4web.freebsd.org/@@179197?ac=10 Change 179197 by hselasky@hselasky_laptop001 on 2010/06/04 23:30:41 USB core: - add support for LOW speed BULK transfers. - this mode is not recommended by the USB 2.0 standard, though some USB devices use it anyway. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#53 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#177 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#53 (text+ko) ==== @@ -3792,9 +3792,7 @@ } break; case UE_BULK: - if (udev->speed != USB_SPEED_LOW) { - ep->methods = &ehci_device_bulk_methods; - } + ep->methods = &ehci_device_bulk_methods; break; default: /* do nothing */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#35 (text+ko) ==== @@ -2614,9 +2614,7 @@ } break; case UE_BULK: - if (udev->speed != USB_SPEED_LOW) { - ep->methods = &ohci_device_bulk_methods; - } + ep->methods = &ohci_device_bulk_methods; break; default: /* do nothing */ ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#32 (text+ko) ==== @@ -3068,9 +3068,7 @@ } break; case UE_BULK: - if (udev->speed != USB_SPEED_LOW) { - ep->methods = &uhci_device_bulk_methods; - } + ep->methods = &uhci_device_bulk_methods; break; default: /* do nothing */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#177 (text+ko) ==== @@ -3057,7 +3057,7 @@ }; static const uint16_t bulk_min[USB_SPEED_MAX] = { - [USB_SPEED_LOW] = 0, /* not supported */ + [USB_SPEED_LOW] = 8, [USB_SPEED_FULL] = 8, [USB_SPEED_HIGH] = 512, [USB_SPEED_VARIABLE] = 512, From owner-p4-projects@FreeBSD.ORG Sat Jun 5 06:17:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00433106566C; Sat, 5 Jun 2010 06:17: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 AA24B1065677 for ; Sat, 5 Jun 2010 06:17:10 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DF0C8FC14 for ; Sat, 5 Jun 2010 06:17:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o556HAum019325 for ; Sat, 5 Jun 2010 06:17:10 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o556HA8L019323 for perforce@freebsd.org; Sat, 5 Jun 2010 06:17:10 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Sat, 5 Jun 2010 06:17:10 GMT Message-Id: <201006050617.o556HA8L019323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2010 06:17:11 -0000 http://p4web.freebsd.org/@@179200?ac=10 Change 179200 by jlaffaye@jlaffaye-chulak on 2010/06/05 06:16:29 Changed the prototype of unpack_to_buffer() It is more useful now as we know the size of the buffer. Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#4 edit .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#5 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#4 (text+ko) ==== @@ -335,20 +335,18 @@ * Unpack a single file, denoted by file, to a buffer. It proceeds to read it * into the buffer which will need to be freed by the user at a later date. * - * Returns an address to a buffer with the contents of *file if successful, or - * returns NULL on failure. + * Returns the size of the buffer if successful, or returns 0 on failure. */ -char* -unpack_to_buffer(const char *pkg, const char *file) +size_t +unpack_to_buffer(const char *pkg, const char *file, char **buf) { struct archive *archive; struct archive_entry *archive_entry; Boolean found_match = FALSE; - int64_t buf_size; + size_t buf_size = 0; - char *buf = NULL; const char *entry_pathname = NULL; const char *error = NULL; int archive_fd = -1; @@ -403,17 +401,20 @@ errno = EINVAL; else { - buf = malloc(sizeof(char)*buf_size); + *buf = malloc(sizeof(char)*buf_size); - if (buf == NULL) + if (*buf == NULL) { error = strerror(errno); - else { + buf_size = 0; + } else { r = archive_read_data(archive, - buf, buf_size); + *buf, buf_size); - if (r != ARCHIVE_OK) + if (r != ARCHIVE_OK) { error = archive_error_string(archive); + buf_size = 0; + } } @@ -435,7 +436,7 @@ if (archive != NULL) archive_read_finish(archive); - return (buf); + return (buf_size); } ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#5 (text+ko) ==== @@ -178,7 +178,7 @@ ssize_t write_file(const char *, const char *); int move_file(const char *, const char *, const char *); int delete_hierarchy(const char *, Boolean, Boolean); -char* unpack_to_buffer(const char *, const char *); +size_t unpack_to_buffer(const char *, const char *, char **); int unpack_to_disk(const char *, const char *); int unpack_to_fd(const char *, const char *); void format_cmd(char *, int, const char *, const char *, From owner-p4-projects@FreeBSD.ORG Sat Jun 5 12:50:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45E531065679; Sat, 5 Jun 2010 12:50:24 +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 094AD1065677 for ; Sat, 5 Jun 2010 12:50:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB0708FC1B for ; Sat, 5 Jun 2010 12:50:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o55CoNxa076994 for ; Sat, 5 Jun 2010 12:50:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o55CoNIn076992 for perforce@freebsd.org; Sat, 5 Jun 2010 12:50:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 5 Jun 2010 12:50:23 GMT Message-Id: <201006051250.o55CoNIn076992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2010 12:50:24 -0000 http://p4web.freebsd.org/@@179216?ac=10 Change 179216 by hselasky@hselasky_laptop001 on 2010/06/05 12:49:46 LibUSB: - fix possibly broken IOCTL code that was submitted to make LibUSB build and work in Linux. - found during review. - not critical for the operation of LibUSB. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#26 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#26 (text+ko) ==== @@ -70,12 +70,30 @@ ctx->debug = level; } +static void +libusb_set_nonblocking(int f) +{ + int flags; + + /* + * We ignore any failures in this function, hence the + * non-blocking flag is not critical to the operation of + * libUSB. We use F_GETFL and F_SETFL to be compatible with + * Linux. + */ + + flags = fcntl(f, F_GETFL, NULL); + if (flags == -1) + return; + flags |= O_NONBLOCK; + fcntl(f, F_SETFL, flags); +} + int libusb_init(libusb_context **context) { struct libusb_context *ctx; char *debug; - int flag; int ret; ctx = malloc(sizeof(*ctx)); @@ -106,12 +124,8 @@ return (LIBUSB_ERROR_OTHER); } /* set non-blocking mode on the control pipe to avoid deadlock */ - flag = 1; - ret = fcntl(ctx->ctrl_pipe[0], O_NONBLOCK, &flag); - assert(ret != -1 && "Couldn't set O_NONBLOCK for ctx->ctrl_pipe[0]"); - flag = 1; - ret = fcntl(ctx->ctrl_pipe[1], O_NONBLOCK, &flag); - assert(ret != -1 && "Couldn't set O_NONBLOCK for ctx->ctrl_pipe[1]"); + libusb_set_nonblocking(ctx->ctrl_pipe[0]); + libusb_set_nonblocking(ctx->ctrl_pipe[1]); libusb10_add_pollfd(ctx, &ctx->ctx_poll, NULL, ctx->ctrl_pipe[0], POLLIN); From owner-p4-projects@FreeBSD.ORG Sat Jun 5 17:17:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A8C81065687; Sat, 5 Jun 2010 17:17: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 F0EEE1065679 for ; Sat, 5 Jun 2010 17:17:16 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDD698FC15 for ; Sat, 5 Jun 2010 17:17:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o55HHGj2014795 for ; Sat, 5 Jun 2010 17:17:16 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o55HHGAP014793 for perforce@freebsd.org; Sat, 5 Jun 2010 17:17:16 GMT (envelope-from gpf@FreeBSD.org) Date: Sat, 5 Jun 2010 17:17:16 GMT Message-Id: <201006051717.o55HHGAP014793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2010 17:17:17 -0000 http://p4web.freebsd.org/@@179225?ac=10 Change 179225 by gpf@gpf_desktop on 2010/06/05 17:17:12 - experimental nfs server: made all changes so that vnode information will be gathered in all of nfsv2&3 operations. Also keeping track of 'ioflags' arg for vop_read/write and 'file mode' arg for vops that create new files. - smp stuff: AUDIT_ARG_VNODE1 requires a locked vfs and a locked vnode. In current nfsserver, I haven't paid attention to either. In the experimental nfsserver, vfs is locked before a v2 or 3 rpc is serviced and vp is always locked, except for some cases where the file is being created by the vop. Also, in current nfsserver my implementation is a little racy as I don't hold any references to the vnode that I'm auditing at the time of the rpc; there's a slight chance that after the rpc is serviced, but before audit code, the vnode will be destroyed by some other kernel call. Come tommorow, I'll work on making my changes smp safe. - removed a silly useless line in dir_ilookup() Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/ufs/ffs/ffs_vnops.c#6 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include extern u_int32_t newnfs_true, newnfs_false, newnfs_xdrneg1; extern int nfsv4root_set; @@ -636,6 +637,7 @@ uiop->uio_resid = len; uiop->uio_rw = UIO_READ; uiop->uio_segflg = UIO_SYSSPACE; + AUDIT_ARG_FFLAGS(IO_NODELOCKED | ioflag); error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred); FREE((caddr_t)iv2, M_TEMP); if (error) { @@ -701,6 +703,7 @@ uiop->uio_segflg = UIO_SYSSPACE; NFSUIOPROC(uiop, p); uiop->uio_offset = off; + AUDIT_ARG_FFLAGS(ioflags); error = VOP_WRITE(vp, uiop, ioflags, cred); FREE((caddr_t)iv, M_TEMP); return (error); @@ -721,6 +724,7 @@ if (!error && ndp->ni_vp == NULL) { if (nvap->na_type == VREG || nvap->na_type == VSOCK) { vrele(ndp->ni_startdir); + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -752,6 +756,7 @@ return (error); } nvap->na_rdev = rdev; + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_MKNOD(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -828,6 +833,7 @@ } if (vtyp == VSOCK) { vrele(ndp->ni_startdir); + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -840,6 +846,7 @@ vput(ndp->ni_dvp); return (error); } + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_MKNOD(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -872,6 +879,7 @@ nfsvno_relpathbuf(ndp); return (EEXIST); } + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_MKDIR(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -900,6 +908,7 @@ return (EEXIST); } + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_SYMLINK(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr, pathcp); vput(ndp->ni_dvp); @@ -1292,6 +1301,7 @@ if (!nd->nd_repstat) { if (ndp->ni_vp == NULL) { vrele(ndp->ni_startdir); + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); nd->nd_repstat = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -1432,6 +1442,9 @@ struct uio io; struct iovec iv; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); + if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); return (0); @@ -1678,6 +1691,9 @@ struct iovec iv; struct componentname cn; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); + if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); return (0); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 (text+ko) ==== @@ -53,6 +53,7 @@ extern struct timeval nfsboottime; extern int nfs_rootfhset, nfsv4root_set; #endif /* !APPLEKEXT */ +#include /* * This list defines the GSS mechanisms supported. @@ -90,6 +91,8 @@ u_int32_t testmode, nfsmode, supported = 0; accmode_t deletebit; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, 1, &nva); return (0); @@ -173,6 +176,8 @@ struct nfsreferral *refp; nfsattrbit_t attrbits; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) return (0); if (nd->nd_flag & ND_NFSV4) { @@ -237,6 +242,8 @@ nfsv4stateid_t stateid; NFSACL_T *aclp = NULL; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_wcc(nd, preat_ret, &nva2, postat_ret, &nva); return (0); @@ -467,6 +474,8 @@ vrele(named.ni_startdir); nfsvno_relpathbuf(&named); vp = named.ni_vp; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); nd->nd_repstat = nfsvno_getfh(vp, fhp, p, named.ni_dvp); if (named.ni_dvp) vrele(named.ni_dvp); @@ -512,6 +521,8 @@ int getret = 1, len; struct nfsvattr nva; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &nva); return (0); @@ -557,6 +568,8 @@ nfsv4stateid_t stateid; nfsquad_t clientid; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &nva); return (0); @@ -712,6 +725,8 @@ nfsv4stateid_t stateid; nfsquad_t clientid; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_wcc(nd, forat_ret, &forat, aftat_ret, &nva); return (0); @@ -992,6 +1007,8 @@ &exclusive_flag, cverf, rdev, p, exp); if (!nd->nd_repstat) { + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); nd->nd_repstat = nfsvno_getfh(vp, &fh, p, named.ni_dvp); if (!nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, @@ -1213,8 +1230,10 @@ } nd->nd_repstat = nfsvno_mknod(&named, &nva, nd->nd_cred, p); - if (!nd->nd_repstat) { + if (!nd->nd_repstat) { vp = named.ni_vp; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); nfsrv_fixattr(nd, vp, &nva, aclp, p, &attrbits, exp); nd->nd_repstat = nfsvno_getfh(vp, fhp, p, named.ni_dvp); if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat) @@ -1440,6 +1459,8 @@ /* * Done parsing, now down to business. */ + if (fromnd.ni_vp != NULL) + AUDIT_ARG_VNODE1(fromnd.ni_vp); nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp); if (nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) { @@ -1512,6 +1533,8 @@ char *bufp; u_long *hashp; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft); @@ -1661,10 +1684,12 @@ if (!nd->nd_repstat) { if (dirp != NULL) dirfor_ret = nfsvno_getattr(dirp, &dirfor, nd->nd_cred, - p); + p); nfsrvd_symlinksub(nd, &named, &nva, fhp, vpp, dirp, &dirfor, &diraft, &diraft_ret, NULL, NULL, p, exp, pathcp, pathlen); + if (named.ni_vp != NULL) + AUDIT_ARG_VNODE1(named.ni_vp); } else if (dirp != NULL) { dirfor_ret = nfsvno_getattr(dirp, &dirfor, nd->nd_cred, p); vrele(dirp); @@ -1798,7 +1823,8 @@ */ nfsrvd_mkdirsub(nd, &named, &nva, fhp, vpp, dirp, &dirfor, &diraft, &diraft_ret, NULL, NULL, p, exp); - + if (named.ni_vp != NULL) + AUDIT_ARG_VNODE1(named.ni_vp); if (nd->nd_flag & ND_NFSV3) { if (!nd->nd_repstat) { (void) nfsm_fhtom(nd, (u_int8_t *)fhp, 0, 1); @@ -1872,6 +1898,8 @@ int error = 0, for_ret = 1, aft_ret = 1, cnt; u_int64_t off; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_wcc(nd, for_ret, &bfor, aft_ret, &aft); return (0); @@ -1917,6 +1945,8 @@ struct statfs sfs; u_quad_t tval; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); return (0); @@ -1970,6 +2000,8 @@ int getret = 1; struct nfsvattr at; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); return (0); @@ -2006,6 +2038,8 @@ register_t linkmax, namemax, chownres, notrunc; struct nfsvattr at; + if (vp != NULL) + AUDIT_ARG_VNODE1(vp); if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); return (0); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/ufs/ffs/ffs_vnops.c#6 (text+ko) ==== @@ -1920,7 +1920,6 @@ if (!error) { foundit = 1; - error = 0; break; } } From owner-p4-projects@FreeBSD.ORG Sat Jun 5 18:17:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91AC41065676; Sat, 5 Jun 2010 18:17:23 +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 54AEF106564A for ; Sat, 5 Jun 2010 18:17:23 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4296C8FC0A for ; Sat, 5 Jun 2010 18:17:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o55IHMDn020074 for ; Sat, 5 Jun 2010 18:17:22 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o55IHMq5020072 for perforce@freebsd.org; Sat, 5 Jun 2010 18:17:22 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Sat, 5 Jun 2010 18:17:22 GMT Message-Id: <201006051817.o55IHMq5020072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2010 18:17:23 -0000 http://p4web.freebsd.org/@@179228?ac=10 Change 179228 by jlaffaye@jlaffaye-chulak on 2010/06/05 18:17:16 archive_read_data() returns the number of read bytes and not a status. Fixed a logic error; Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#5 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#5 (text+ko) ==== @@ -346,11 +346,11 @@ Boolean found_match = FALSE; size_t buf_size = 0; + size_t r; const char *entry_pathname = NULL; const char *error = NULL; int archive_fd = -1; - int r; errno = 0; @@ -411,7 +411,7 @@ r = archive_read_data(archive, *buf, buf_size); - if (r != ARCHIVE_OK) { + if (r != buf_size) { error = archive_error_string(archive); buf_size = 0; } From owner-p4-projects@FreeBSD.ORG Sat Jun 5 21:55:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB3CC106567A; Sat, 5 Jun 2010 21:55:23 +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 9EE1A1065677; Sat, 5 Jun 2010 21:55:23 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4FD948FC17; Sat, 5 Jun 2010 21:55:23 +0000 (UTC) Received: by iwn5 with SMTP id 5so2751365iwn.13 for ; Sat, 05 Jun 2010 14:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=ilPfludQuV41Ol9U89joLlqgRNYgg9cVS00gRLlB02c=; b=Y/prZhJXwcnWHxK75M4dEiIoFodv8rM7wxzZ0/sBhhvlr21ssDiR18fYCX82p/V30T C281s4mKQlCn5a72s6t/D7Me1zhevM3ZhOoDuEj7pMqbiaRGe6gm3VkZmZsqQ3Ijz/JI 4Iz7qvKfYZDtqmr7Hh/chYa+IsSfcSD2X3prA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=lPCbQ/sk8YJC0FUqOyfUM6b7hCmUaacXZEmeLzvmkSMrVQr1f8OT4onw3ceg10xNY5 yvQ3uk7UDI+4ScXW+IGMGoLY2JpjEDi7mPblPWAqEffRNFw/bEvSTDD+DqF5CMEyTjI3 bQfCREdNTn8zu7piYOviPoKFWah3xpZrKMD0M= MIME-Version: 1.0 Received: by 10.231.119.71 with SMTP id y7mr2591578ibq.158.1275774922262; Sat, 05 Jun 2010 14:55:22 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.69.19 with HTTP; Sat, 5 Jun 2010 14:55:22 -0700 (PDT) In-Reply-To: <201006050617.o556HA8L019323@repoman.freebsd.org> References: <201006050617.o556HA8L019323@repoman.freebsd.org> Date: Sat, 5 Jun 2010 14:55:22 -0700 X-Google-Sender-Auth: HL0IY-Crc8SHUn1VSQm_0ekBzm8 Message-ID: From: Garrett Cooper To: Julien Laffaye Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 179200 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, 05 Jun 2010 21:55:24 -0000 On Fri, Jun 4, 2010 at 11:17 PM, Julien Laffaye wrot= e: > http://p4web.freebsd.org/@@179200?ac=3D10 > > Change 179200 by jlaffaye@jlaffaye-chulak on 2010/06/05 06:16:29 > > =A0 =A0 =A0 =A0Changed the prototype of unpack_to_buffer() > =A0 =A0 =A0 =A0It is more useful now as we know the size of the buffer. > > Affected files ... > > .. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#4 edit > .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#5 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#4 (t= ext+ko) =3D=3D=3D=3D > > @@ -335,20 +335,18 @@ > =A0* Unpack a single file, denoted by file, to a buffer. It proceeds to r= ead it > =A0* into the buffer which will need to be freed by the user at a later d= ate. > =A0* > - * Returns an address to a buffer with the contents of *file if successf= ul, or > - * returns NULL on failure. > + * Returns the size of the buffer if successful, or returns 0 on failure=