From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Bob Proulx Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 08 Sep 2014 17:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 18428@debbugs.gnu.org X-Debbugs-Original-To: bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141019724613026 (code B ref -1); Mon, 08 Sep 2014 17:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2014 17:27:26 +0000 Received: from localhost ([127.0.0.1]:34060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR2ir-0003O1-IZ for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57190) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR2io-0003Nl-S9 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR2ia-0003tF-J5 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2ia-0003t7-GS for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2iU-0005yn-9n for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR2iO-0003j0-5Y for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:27:02 -0400 Received: from joseki.proulx.com ([216.17.153.58]:54942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2iN-0003ha-Ru for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:26:56 -0400 Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id 288FE21225 for ; Mon, 8 Sep 2014 11:26:53 -0600 (MDT) Received: by hysteria.proulx.com (Postfix, from userid 1000) id F08612DC39; Mon, 8 Sep 2014 11:26:52 -0600 (MDT) Date: Mon, 8 Sep 2014 11:26:52 -0600 From: Bob Proulx Message-ID: <20140908111135531693134@bob.proulx.com> Mail-Followup-To: bug-coreutils@gnu.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Vincent Lefevre reported to the Debian BTS that the new documentation shipped for the recently added coreutils binary breaks the existing documentation for all of the coreutils utilities. https://bugs.debian.org/760861 Confirmed. Perhaps the documentation node name can be changed to be something non-conflicting with the package name? Or perhaps only conditionally built if the binary is built? Or Vincent's suggestion to use upper case. Or...? If correspondents wish their responses logged to the Debian bug log please add 760861@bugs.debian.org to the email recipients list. (Two BTS instances are a little difficult to stitch together until both bug numbers are known.) Bob Original Debian report by Vincent Lefevre follows: Subject: coreutils: in man pages, info invocation is incorrect: replace c= oreutils by Coreutils Package: coreutils Version: 8.23-2 Severity: minor For instance, in the touch(1) man page: The full documentation for touch is maintained as a Texinfo manual. If the info and touch programs are properly installed at your site, the command info coreutils 'touch invocation' should give you access to the complete manual. This is now incorrect (as of 8.23?), because it gives the page: 2.14 =E2=80=98coreutils=E2=80=99: Multi-call binary =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E2=80=98coreutils=E2=80=99 invokes an individual utility, either implici= tly selected by the last component of =E2=80=98argv[0]=E2=80=99, or by explicitly calling= =E2=80=98coreutils=E2=80=99 with the =E2=80=98--coreutils-prog=E2=80=99 option. Synopsis: coreutils --coreutils-prog=3DPROGRAM =E2=80=A6 The correct info invocation now is: info Coreutils 'touch invocation' Note: Since the coreutils utility doesn't seem to exist in Debian, this section could be removed, but this problem may reappear in the future. So, it's better to use the capital letter C. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Andreas Schwab Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 08 Sep 2014 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 18428@debbugs.gnu.org X-Debbugs-Original-To: bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141019999017247 (code B ref -1); Mon, 08 Sep 2014 18:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2014 18:13:10 +0000 Received: from localhost ([127.0.0.1]:34065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR3R7-0004U5-SW for submit@debbugs.gnu.org; Mon, 08 Sep 2014 14:13:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50941) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR3R5-0004Tp-MA for submit@debbugs.gnu.org; Mon, 08 Sep 2014 14:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR3Qu-0006xP-9t for submit@debbugs.gnu.org; Mon, 08 Sep 2014 14:13:02 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR3Qu-0006xK-7U for submit@debbugs.gnu.org; Mon, 08 Sep 2014 14:12:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR3Qo-0003a7-Py for bug-coreutils@gnu.org; Mon, 08 Sep 2014 14:12:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR3Qj-0006sn-I0 for bug-coreutils@gnu.org; Mon, 08 Sep 2014 14:12:50 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:43399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR3Qj-0006sB-Av for bug-coreutils@gnu.org; Mon, 08 Sep 2014 14:12:45 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3hsHf40sWlz3hjDZ for ; Mon, 8 Sep 2014 20:12:43 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3hsHf322dLzvh23 for ; Mon, 8 Sep 2014 20:12:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id Yz3sW5BRe6ja for ; Mon, 8 Sep 2014 20:12:41 +0200 (CEST) X-Auth-Info: U/7fxoSVQGws9Vp/BTk7vMzaXjpV5iUrDTiBzg3/QFpc9NS06qEGcm7eJp5Pd8Ut Received: from igel.home (ppp-188-174-153-177.dynamic.mnet-online.de [188.174.153.177]) by mail.mnet-online.de (Postfix) with ESMTPA for ; Mon, 8 Sep 2014 20:12:40 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id AEDBA2C1D0D; Mon, 8 Sep 2014 20:12:40 +0200 (CEST) From: Andreas Schwab References: <20140908111135531693134@bob.proulx.com> X-Yow: Do you think the ``Monkees'' should get gas on odd or even days? Date: Mon, 08 Sep 2014 20:12:40 +0200 In-Reply-To: <20140908111135531693134@bob.proulx.com> (Bob Proulx's message of "Mon, 8 Sep 2014 11:26:52 -0600") Message-ID: <87ioky7zhj.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Bob Proulx writes: > For instance, in the touch(1) man page: > > The full documentation for touch is maintained as a Texinfo manual. If > the info and touch programs are properly installed at your site, the > command > > info coreutils 'touch invocation' > > should give you access to the complete manual. > > This is now incorrect (as of 8.23?), because it gives the page: "info touch" still works, which is equivalent to "info '(coreutils)touch invocation'". > Note: Since the coreutils utility doesn't seem to exist in Debian, this > section could be removed, but this problem may reappear in the future. > So, it's better to use the capital letter C. Having info dir entries only differing in case seems like a bad idea. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 08 Sep 2014 19:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Andreas Schwab Cc: 18428@debbugs.gnu.org, 760861@bugs.debian.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141020461424424 (code B ref 18428); Mon, 08 Sep 2014 19:31:02 +0000 Received: (at 18428) by debbugs.gnu.org; 8 Sep 2014 19:30:14 +0000 Received: from localhost ([127.0.0.1]:34088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR4dh-0006Ls-Ur for submit@debbugs.gnu.org; Mon, 08 Sep 2014 15:30:14 -0400 Received: from mail4.vodafone.ie ([213.233.128.170]:23866) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR4dc-0006Ka-9k for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 15:30:10 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApkBABYDDlRtT9ij/2dsb2JhbAANTIQ30UEBgS6EfAEBBDIBRhALDQsJFg8JAwIBAgFFBg0BBQIBAYhDpiiWRAEXj00HhEwBBI8rlTGRJGuCTwEBAQ Received: from unknown (HELO [192.168.1.79]) ([109.79.216.163]) by mail3.vodafone.ie with ESMTP; 08 Sep 2014 20:30:01 +0100 Message-ID: <540E03B9.8020808@draigBrady.com> Date: Mon, 08 Sep 2014 20:30:01 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> In-Reply-To: <87ioky7zhj.fsf@igel.home> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/08/2014 07:12 PM, Andreas Schwab wrote: > Bob Proulx writes: > >> For instance, in the touch(1) man page: >> >> The full documentation for touch is maintained as a Texinfo manual. If >> the info and touch programs are properly installed at your site, the >> command >> >> info coreutils 'touch invocation' >> >> should give you access to the complete manual. >> >> This is now incorrect (as of 8.23?), because it gives the page: > > "info touch" still works, which is equivalent to "info '(coreutils)touch > invocation'". > >> Note: Since the coreutils utility doesn't seem to exist in Debian, this >> section could be removed, but this problem may reappear in the future. >> So, it's better to use the capital letter C. > > Having info dir entries only differing in case seems like a bad idea. I agree. We could rename the node, but the bracketed form works well without the need for any extra quoting. I.E. this is unambiguous: info '(coreutils) stat invocation' The following simple patch implements that. thanks, Pádraig. diff --git a/src/system.h b/src/system.h index 162446c..00180cb 100644 --- a/src/system.h +++ b/src/system.h @@ -582,7 +582,8 @@ emit_ancillary_info (void) last_component (program_name)); } printf (_("For complete documentation, run: " - "info coreutils '%s invocation'\n"), last_component (program_name)); + "info '(coreutils) %s invocation'\n"), + last_component (program_name)); } From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 08 Sep 2014 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Andreas Schwab Cc: 18428@debbugs.gnu.org, 760861@bugs.debian.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.14102116602741 (code B ref 18428); Mon, 08 Sep 2014 21:28:01 +0000 Received: (at 18428) by debbugs.gnu.org; 8 Sep 2014 21:27:40 +0000 Received: from localhost ([127.0.0.1]:34124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR6TM-0000i9-62 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 17:27:40 -0400 Received: from mail2.vodafone.ie ([213.233.128.44]:29030) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR6TJ-0000hu-As for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 17:27:38 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApkBAD0eDlRtT9ij/2dsb2JhbAANTIQ30U0BgS6EfAEBBDIBRhALDQsJFg8JAwIBAgFFBg0BBQIBAYhDpk6WVwEXj00HhEwBBKRckSRrgk8BAQE Received: from unknown (HELO [192.168.1.79]) ([109.79.216.163]) by mail2.vodafone.ie with ESMTP; 08 Sep 2014 22:27:30 +0100 Message-ID: <540E1F41.3010703@draigBrady.com> Date: Mon, 08 Sep 2014 22:27:29 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> In-Reply-To: <540E03B9.8020808@draigBrady.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/08/2014 08:30 PM, Pádraig Brady wrote: > On 09/08/2014 07:12 PM, Andreas Schwab wrote: >> Bob Proulx writes: >> >>> For instance, in the touch(1) man page: >>> >>> The full documentation for touch is maintained as a Texinfo manual. If >>> the info and touch programs are properly installed at your site, the >>> command >>> >>> info coreutils 'touch invocation' >>> >>> should give you access to the complete manual. >>> >>> This is now incorrect (as of 8.23?), because it gives the page: >> >> "info touch" still works, which is equivalent to "info '(coreutils)touch >> invocation'". >> >>> Note: Since the coreutils utility doesn't seem to exist in Debian, this >>> section could be removed, but this problem may reappear in the future. >>> So, it's better to use the capital letter C. >> >> Having info dir entries only differing in case seems like a bad idea. > > I agree. > > We could rename the node, but the bracketed form works well > without the need for any extra quoting. I.E. this is unambiguous: > > info '(coreutils) stat invocation' > > The following simple patch implements that. Another advantage of this more canonical form is that the pinfo curses info viewer can parse it. Pádraig. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Bob Proulx Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 08 Sep 2014 23:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 18428@debbugs.gnu.org, Andreas Schwab Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141022009420626 (code B ref 18428); Mon, 08 Sep 2014 23:49:01 +0000 Received: (at 18428) by debbugs.gnu.org; 8 Sep 2014 23:48:14 +0000 Received: from localhost ([127.0.0.1]:34226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR8fN-0005Mb-B2 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 19:48:13 -0400 Received: from joseki.proulx.com ([216.17.153.58]:44978) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR8fJ-0005MR-Le for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 19:48:10 -0400 Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id 32EE321225; Mon, 8 Sep 2014 17:48:02 -0600 (MDT) Received: by hysteria.proulx.com (Postfix, from userid 1000) id 0FCAD2DC39; Mon, 8 Sep 2014 17:48:01 -0600 (MDT) Date: Mon, 8 Sep 2014 17:48:01 -0600 From: Bob Proulx Message-ID: <20140908174444256738004@bob.proulx.com> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87ioky7zhj.fsf@igel.home> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Score: -2.5 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) Andreas Schwab wrote: > Bob Proulx writes: > > For instance, in the touch(1) man page: > > > > The full documentation for touch is maintained as a Texinfo manual. If > > the info and touch programs are properly installed at your site, the > > command > > > > info coreutils 'touch invocation' > > > > should give you access to the complete manual. > > > > This is now incorrect (as of 8.23?), because it gives the page: ... > > Note: Since the coreutils utility doesn't seem to exist in Debian, this > > section could be removed, but this problem may reappear in the future. > > So, it's better to use the capital letter C. Just for the record the above was written by Vincent Lefevre in his original bug report and was not written by me. In the above I was simply forwarding the report. Bob From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Bob Proulx Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 00:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 18428@debbugs.gnu.org, 760861@bugs.debian.org, Vincent Lefevre Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141022144122653 (code B ref 18428); Tue, 09 Sep 2014 00:11:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 00:10:41 +0000 Received: from localhost ([127.0.0.1]:34230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR915-0005tI-JT for submit@debbugs.gnu.org; Mon, 08 Sep 2014 20:10:40 -0400 Received: from joseki.proulx.com ([216.17.153.58]:45062) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR912-0005t8-Sd for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 20:10:38 -0400 Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id B9A1421225; Mon, 8 Sep 2014 18:10:35 -0600 (MDT) Received: by hysteria.proulx.com (Postfix, from userid 1000) id 979DC2DC39; Mon, 8 Sep 2014 18:10:35 -0600 (MDT) Date: Mon, 8 Sep 2014 18:10:35 -0600 From: Bob Proulx Message-ID: <20140908175408716490617@bob.proulx.com> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <540E03B9.8020808@draigBrady.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Score: -2.5 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) Pádraig Brady wrote: > Andreas Schwab wrote: > > Bob Proulx writes: Not me! :-) It was Vincent Lefevre who wrote: > >> This is now incorrect (as of 8.23?), because it gives the page: > > > > "info touch" still works, which is equivalent to "info '(coreutils)touch > > invocation'". I was previously unaware of the parenthetical form. > >> Note: Since the coreutils utility doesn't seem to exist in Debian, this > >> section could be removed, but this problem may reappear in the future. > >> So, it's better to use the capital letter C. > > > > Having info dir entries only differing in case seems like a bad idea. > > I agree. I agree too. > We could rename the node, but the bracketed form works well > without the need for any extra quoting. I.E. this is unambiguous: > > info '(coreutils) stat invocation' I had not been aware of the parenthetical form. I read through the info documentation and found this concerning the Emacs internal info browser: A node name has two forms. A node in the current file is named by what appears after the `Node: ' in that node's first line. For example, this node's name is `Add'. A node in another file is named by `(FILENAME)NODE-WITHIN-FILE', as in `(info)Add' for this node. If the file name starts with `./', then it is relative to the current directory; otherwise, it is relative starting from the standard directory for Info files of your site. The name `(FILENAME)Top' can be abbreviated to just `(FILENAME)'. By convention, the name `Top' is used for the "highest" node in any single file--the node whose `Up' points out of the file. The `Directory' node is `(dir)', it points to a file `dir' which holds a large menu listing all the Info documents installed on your site. The `Top' node of a document file listed in the `Directory' should have an `Up: (dir)' in it. I didn't find any other documentation of the format but that appears to be explicit and it does work. > The following simple patch implements that. Seems like the best choice to me. Note that IIRC originally the pointer was: info touch But that failed due to shortcomings in variously implemented install-info commands that I don't remember now. Therefore this was changed to "info -f coreutils touch" IIRC and then later mutated again to "info coreutils 'touch invocation'" to get more canonical. But I think in recent years the install-info problems have been fixed. Perhaps we don't need to do any of this anymore? Or perhaps finally getting to the canonical (FILENAME)NODE-WITHIN-FILE form we have finally arrived at the end and should stop there. Bob From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Vincent Lefevre Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 00:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Bob Proulx Cc: 18428@debbugs.gnu.org, 760861@bugs.debian.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141022277824739 (code B ref 18428); Tue, 09 Sep 2014 00:33:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 00:32:58 +0000 Received: from localhost ([127.0.0.1]:34235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR9Mf-0006Qw-TD for submit@debbugs.gnu.org; Mon, 08 Sep 2014 20:32:58 -0400 Received: from ioooi.vinc17.net ([92.243.22.117]:46346) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR9Md-0006Qn-Bh for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 20:32:56 -0400 Received: from smtp-xvii.vinc17.net (128.119.75.86.rev.sfr.net [86.75.119.128]) by ioooi.vinc17.net (Postfix) with ESMTPSA id DDCCC70A; Tue, 9 Sep 2014 02:32:53 +0200 (CEST) Received: by xvii.vinc17.org (Postfix, from userid 1000) id 71D8921A079; Tue, 9 Sep 2014 02:32:53 +0200 (CEST) Date: Tue, 9 Sep 2014 02:32:53 +0200 From: Vincent Lefevre Message-ID: <20140909003253.GG9643@xvii.vinc17.org> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20140908175408716490617@bob.proulx.com> X-Mailer-Info: http://www.vinc17.net/mutt/ User-Agent: Mutt/1.5.23-6361-vl-r59709 (2014-07-25) X-Spam-Score: -2.5 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) On 2014-09-08 18:10:35 -0600, Bob Proulx wrote: > Note that IIRC originally the pointer was: > > info touch > > But that failed due to shortcomings in variously implemented > install-info commands that I don't remember now. There were actually several (Debian-specific?) problems with this form. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483554 > Therefore this was changed to "info -f coreutils touch" IIRC and > then later mutated again to "info coreutils 'touch invocation'" to > get more canonical. > > But I think in recent years the install-info problems have been fixed. If this is the following bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139569 it was fixed in Debian in September 2009. The simple form now seems to be OK. -- Vincent Lefčvre - Web: 100% accessible validated (X)HTML - Blog: Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon) From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 00:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Vincent Lefevre , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org, Bob Proulx Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141022389526660 (code B ref 18428); Tue, 09 Sep 2014 00:52:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 00:51:35 +0000 Received: from localhost ([127.0.0.1]:34250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR9eg-0006vw-CK for submit@debbugs.gnu.org; Mon, 08 Sep 2014 20:51:34 -0400 Received: from mail6.vodafone.ie ([213.233.128.184]:61714) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR9ed-0006vg-4s for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 20:51:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoBAIs7DlRtT9ij/2dsb2JhbAANTINgV8oCh0wBgSyEfAEBBDIBRhALDQsJFg8JAwIBAgFFBgEMAQcBAYhDCKZLll0BEwSPTQeETAEElXCObJEkawGCTgEBAQ Received: from unknown (HELO [192.168.1.79]) ([109.79.216.163]) by mail3.vodafone.ie with ESMTP; 09 Sep 2014 01:51:24 +0100 Message-ID: <540E4F0B.4010705@draigBrady.com> Date: Tue, 09 Sep 2014 01:51:23 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <20140909003253.GG9643@xvii.vinc17.org> In-Reply-To: <20140909003253.GG9643@xvii.vinc17.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/09/2014 01:32 AM, Vincent Lefevre wrote: > On 2014-09-08 18:10:35 -0600, Bob Proulx wrote: >> Note that IIRC originally the pointer was: >> >> info touch >> >> But that failed due to shortcomings in variously implemented >> install-info commands that I don't remember now. > > There were actually several (Debian-specific?) problems with this form. > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483554 > >> Therefore this was changed to "info -f coreutils touch" IIRC and >> then later mutated again to "info coreutils 'touch invocation'" to >> get more canonical. >> >> But I think in recent years the install-info problems have been fixed. > > If this is the following bug: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=139569 > > it was fixed in Debian in September 2009. The simple form now seems > to be OK. There is also ambiguity in the shorter form: info stat info '(coreutils) stat invocation' Likewise for chmod, chown, kill, link, mkdir, ... So we'll stick with the longer form (which is likely to be cut n pasted in any case) thanks, Pádraig. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 03:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: =?UTF-8?Q?P=C3=A1draig?= Brady , Vincent Lefevre , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org, Bob Proulx Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141023494911823 (code B ref 18428); Tue, 09 Sep 2014 03:56:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 03:55:49 +0000 Received: from localhost ([127.0.0.1]:34301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRCWu-00034Z-40 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 23:55:48 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:43652) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRCWl-00034A-QC for 18428@debbugs.gnu.org; Mon, 08 Sep 2014 23:55:41 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 42CE0A60004; Mon, 8 Sep 2014 20:55:29 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zdMC0cpuEZ80; Mon, 8 Sep 2014 20:55:24 -0700 (PDT) Received: from [192.168.1.9] (pool-71-177-17-123.lsanca.dsl-w.verizon.net [71.177.17.123]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 79C4739E8014; Mon, 8 Sep 2014 20:55:24 -0700 (PDT) Message-ID: <540E7A2B.3020205@cs.ucla.edu> Date: Mon, 08 Sep 2014 20:55:23 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <20140909003253.GG9643@xvii.vinc17.org> <540E4F0B.4010705@draigBrady.com> In-Reply-To: <540E4F0B.4010705@draigBrady.com> Content-Type: multipart/mixed; boundary="------------070202020508030104050809" X-Spam-Score: -4.8 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.8 (----) This is a multi-part message in MIME format. --------------070202020508030104050809 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Pádraig Brady wrote: > So we'll stick with the longer form > (which is likely to be cut n pasted in any case) While this sounds like a win, I still like the idea of renaming the troublesome info node, as there is a lot of advice out there to use the old forms for 'info' and it's probably better to support that advice, at least for a while, than to make it immediately stop working. I noticed other problems that are at least somewhat related to the recent coreutils multi-binary executable changes, and fixed some of these problems with the attached patches. (I ran out of energy before fixing the rest. :-) Patch 2 renames the troublesome node. Come to think of it, how about removing the 'coreutils' command entirely? Why should users invoke 'coreutils' directly? We could move it to libexec and remove it from the documentation. --------------070202020508030104050809 Content-Type: text/plain; charset=UTF-8; name="0001-doc-mention-which-commands-are-optional.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-doc-mention-which-commands-are-optional.patch" RnJvbSAyZjQwYmYwM2VjYjM2Mzc2MjVjZWM1NzgzNzFmMjNkY2FlOGZjMWFmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDggU2VwIDIwMTQgMTE6NDA6MzkgLTA3MDAKU3ViamVjdDogW1BBVENI IDEvNF0gZG9jOiBtZW50aW9uIHdoaWNoIGNvbW1hbmRzIGFyZSBvcHRpb25hbAoKKiBkb2Mv Y29yZXV0aWxzLnRleGkgKGNvcmV1dGlscyBpbnZvY2F0aW9uLCBkZiBpbnZvY2F0aW9uKQoo c3R0eSBpbnZvY2F0aW9uLCB3aG9hbWkgaW52b2NhdGlvbiwgbnByb2MgaW52b2NhdGlvbikK KGFyY2ggaW52b2NhdGlvbiwgaG9zdG5hbWUgaW52b2NhdGlvbiwgaG9zdGlkIGludm9jYXRp b24pCih1cHRpbWUgaW52b2NhdGlvbiwgY2hyb290IGludm9jYXRpb24sIG5pY2UgaW52b2Nh dGlvbikKKHN0ZGJ1ZiBpbnZvY2F0aW9uKTogRG9jdW1lbnQgdGhhdCB0aGUgY29tbWFuZCBp cyBpbnN0YWxsZWQKb3B0aW9uYWxseS4KLS0tCiBkb2MvY29yZXV0aWxzLnRleGkgfCA0OSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZp bGUgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RvYy9jb3JldXRp bHMudGV4aSBiL2RvYy9jb3JldXRpbHMudGV4aQppbmRleCAwMTc4ZjYwLi4xNGVlM2IwIDEw MDY0NAotLS0gYS9kb2MvY29yZXV0aWxzLnRleGkKKysrIGIvZG9jL2NvcmV1dGlscy50ZXhp CkBAIC0xNTE2LDYgKzE1MTYsOSBAQCBvciBieSBleHBsaWNpdGx5IGNhbGxpbmcgQGNvbW1h bmR7Y29yZXV0aWxzfSB3aXRoIHRoZQogY29yZXV0aWxzIEBvcHRpb257LS1jb3JldXRpbHMt cHJvZz1QUk9HUkFNfSBAZG90c3t9CiBAZW5kIGV4YW1wbGUKIAorVGhlIEBjb21tYW5ke2Nv cmV1dGlsc30gY29tbWFuZCBpcyBub3QgaW5zdGFsbGVkIGJ5IGRlZmF1bHQsIHNvCitwb3J0 YWJsZSBzY3JpcHRzIHNob3VsZCBub3QgcmVseSBvbiBpdHMgZXhpc3RlbmNlLgorCiBAbm9k ZSBPdXRwdXQgb2YgZW50aXJlIGZpbGVzCiBAY2hhcHRlciBPdXRwdXQgb2YgZW50aXJlIGZp bGVzCiAKQEAgLTExNDM0LDYgKzExNDM3LDkgQEAgSWdub3JlZDsgZm9yIGNvbXBhdGliaWxp dHkgd2l0aCBTeXN0ZW0gViB2ZXJzaW9ucyBvZiBAY29tbWFuZHtkZn0uCiAKIEBlbmQgdGFi bGUKIAorQGNvbW1hbmR7ZGZ9IGlzIGluc3RhbGxlZCBvbmx5IG9uIHN5c3RlbXMgdGhhdCBo YXZlIHVzYWJsZSBtb3VudCB0YWJsZXMsCitzbyBwb3J0YWJsZSBzY3JpcHRzIHNob3VsZCBu b3QgcmVseSBvbiBpdHMgZXhpc3RlbmNlLgorCiBAZXhpdHN0YXR1cwogRmFpbHVyZSBpbmNs dWRlcyB0aGUgY2FzZSB3aGVyZSBubyBvdXRwdXQgaXMgZ2VuZXJhdGVkLCBzbyB5b3UgY2Fu CiBpbnNwZWN0IHRoZSBleGl0IHN0YXR1cyBvZiBhIGNvbW1hbmQgbGlrZSBAc2FtcHtkZiAt dCBleHQzIC10IHJlaXNlcmZzCkBAIC0xMzg0MSw2ICsxMzg0NywxMCBAQCBzeXN0ZW1zLCB0 aG9zZSBvciBvdGhlciBzZXR0aW5ncyBhbHNvIG1heSBub3QKIGJlIGF2YWlsYWJsZSwgYnV0 IGl0J3Mgbm90IGZlYXNpYmxlIHRvIGRvY3VtZW50IGFsbCB0aGUgdmFyaWF0aW9uczoganVz dAogdHJ5IGl0IGFuZCBzZWUuCiAKK0Bjb21tYW5ke3N0dHl9IGlzIGluc3RhbGxlZCBvbmx5 IG9uIHBsYXRmb3JtcyB3aXRoIHRoZSBQT1NJWCB0ZXJtaW5hbAoraW50ZXJmYWNlLCBzbyBw b3J0YWJsZSBzY3JpcHRzIHNob3VsZCBub3QgcmVseSBvbiBpdHMgZXhpc3RlbmNlIG9uCitu b24tUE9TSVggcGxhdGZvcm1zLgorCiBAZXhpdHN0YXR1cwogCiBAbWVudQpAQCAtMTQ3NjAs NiArMTQ3NzAsMTAgQEAgdGhhdCBmaWxlIGluc3RlYWQuICBBIGNvbW1vbiBjaG9pY2UgaXMg QGZpbGV7L3Zhci9sb2cvd3RtcH0uCiBUaGUgb25seSBvcHRpb25zIGFyZSBAb3B0aW9uey0t aGVscH0gYW5kIEBvcHRpb257LS12ZXJzaW9ufS4gIEB4cmVme0NvbW1vbgogb3B0aW9uc30u CiAKK1RoZSBAY29tbWFuZHt1c2Vyc30gY29tbWFuZCBpcyBpbnN0YWxsZWQgb25seSBvbiBw bGF0Zm9ybXMgd2l0aCB0aGUKK1BPU0lYIEBjb2Rlezx1dG1weC5oPn0gaW5jbHVkZSBmaWxl IG9yIGVxdWl2YWxlbnQsIHNvIHBvcnRhYmxlIHNjcmlwdHMKK3Nob3VsZCBub3QgcmVseSBv biBpdHMgZXhpc3RlbmNlIG9uIG5vbi1QT1NJWCBwbGF0Zm9ybXMuCisKIEBleGl0c3RhdHVz CiAKIApAQCAtMTQ5MDgsNiArMTQ5MjIsMTAgQEAgQWZ0ZXIgZWFjaCBsb2dpbiBuYW1lIHBy aW50IGEgY2hhcmFjdGVyIGluZGljYXRpbmcgdGhlIHVzZXIncyBtZXNzYWdlIHN0YXR1czoK IAogQGVuZCB0YWJsZQogCitUaGUgQGNvbW1hbmR7d2hvfSBjb21tYW5kIGlzIGluc3RhbGxl ZCBvbmx5IG9uIHBsYXRmb3JtcyB3aXRoIHRoZQorUE9TSVggQGNvZGV7PHV0bXB4Lmg+fSBp bmNsdWRlIGZpbGUgb3IgZXF1aXZhbGVudCwgc28gcG9ydGFibGUgc2NyaXB0cworc2hvdWxk IG5vdCByZWx5IG9uIGl0cyBleGlzdGVuY2Ugb24gbm9uLVBPU0lYIHBsYXRmb3Jtcy4KKwog QGV4aXRzdGF0dXMKIAogCkBAIC0xNTY0MSw2ICsxNTY1OSw5IEBAIGFyY2ggW0B2YXJ7b3B0 aW9ufV0KIAogVGhlIHByb2dyYW0gYWNjZXB0cyB0aGUgQHJlZntDb21tb24gb3B0aW9uc30g b25seS4KIAorQGNvbW1hbmR7YXJjaH0gaXMgbm90IGluc3RhbGxlZCBieSBkZWZhdWx0LCBz byBwb3J0YWJsZSBzY3JpcHRzIHNob3VsZAorbm90IHJlbHkgb24gaXRzIGV4aXN0ZW5jZS4K KwogQGV4aXRzdGF0dXMKIAogCkBAIC0xNTgzMiw2ICsxNTg1MywxMCBAQCBob3N0bmFtZSBb QHZhcntuYW1lfV0KIFRoZSBvbmx5IG9wdGlvbnMgYXJlIEBvcHRpb257LS1oZWxwfSBhbmQg QG9wdGlvbnstLXZlcnNpb259LiAgQHhyZWZ7Q29tbW9uCiBvcHRpb25zfS4KIAorQGNvbW1h bmR7aG9zdG5hbWV9IGlzIG5vdCBpbnN0YWxsZWQgYnkgZGVmYXVsdCwgYW5kIG90aGVyIHBh Y2thZ2VzCithbHNvIHN1cHBseSBhIEBjb21tYW5ke2hvc3RuYW1lfSBjb21tYW5kLCBzbyBw b3J0YWJsZSBzY3JpcHRzIHNob3VsZAorbm90IHJlbHkgb24gaXRzIGV4aXN0ZW5jZSBvciBv biB0aGUgZXhhY3QgYmVoYXZpb3IgZG9jdW1lbnRlZCBhYm92ZS4KKwogQGV4aXRzdGF0dXMK IAogCkBAIC0xNTg1Nyw2ICsxNTg4MiwxMCBAQCBPbiB0aGF0IHN5c3RlbSwgdGhlIDMyLWJp dCBxdWFudGl0eSBoYXBwZW5zIHRvIGJlIGNsb3NlbHkKIHJlbGF0ZWQgdG8gdGhlIHN5c3Rl bSdzIEludGVybmV0IGFkZHJlc3MsIGJ1dCB0aGF0IGlzbid0IGFsd2F5cwogdGhlIGNhc2Uu CiAKK0Bjb21tYW5ke2hvc3RpZH0gaXMgaW5zdGFsbGVkIG9ubHkgb24gc3lzdGVtcyB0aGF0 IGhhdmUgdGhlCitAY29kZXtnZXRob3N0aWR9IGZ1bmN0aW9uLCBzbyBwb3J0YWJsZSBzY3Jp cHRzIHNob3VsZCBub3QgcmVseSBvbiBpdHMKK2V4aXN0ZW5jZS4KKwogQGV4aXRzdGF0dXMK IAogQG5vZGUgdXB0aW1lIGludm9jYXRpb24KQEAgLTE1ODkwLDYgKzE1OTE5LDEzIEBAIGFs c28gaW5jbHVkZSBwcm9jZXNzZXMgaW4gdGhlIHVuaW50ZXJydXB0aWJsZSBzbGVlcCBzdGF0 ZSAodGhhdCBpcywKIHRob3NlIHByb2Nlc3NlcyB3aGljaCBhcmUgd2FpdGluZyBmb3IgZGlz ayBJL08pLiAgVGhlIExpbnV4IGtlcm5lbAogaW5jbHVkZXMgdW5pbnRlcnJ1cHRpYmxlIHBy b2Nlc3Nlcy4KIAorQGNvbW1hbmR7dXB0aW1lfSBpcyBpbnN0YWxsZWQgb25seSBvbiBwbGF0 Zm9ybXMgd2l0aCBpbmZyYXN0cnVjdHVyZQorZm9yIG9idGFpbmluZyB0aGUgYm9vdCB0aW1l LCBhbmQgb3RoZXIgcGFja2FnZXMgYWxzbyBzdXBwbHkgYW4KK0Bjb21tYW5ke3VwdGltZX0g Y29tbWFuZCwgc28gcG9ydGFibGUgc2NyaXB0cyBzaG91bGQgbm90IHJlbHkgb24gaXRzCitl eGlzdGVuY2Ugb3Igb24gdGhlIGV4YWN0IGJlaGF2aW9yIGRvY3VtZW50ZWQgYWJvdmUuCisK K0BleGl0c3RhdHVzCisKIEBub2RlIFNFTGludXggY29udGV4dAogQGNoYXB0ZXIgU0VMaW51 eCBjb250ZXh0CiAKQEAgLTE2MjAzLDYgKzE2MjM5LDEwIEBAIGZpbGVzIHRvIHRoZSByZXF1 aXJlZCBwb3NpdGlvbnMgdW5kZXIgeW91ciBpbnRlbmRlZCBuZXcgcm9vdCBkaXJlY3Rvcnku CiBGaW5hbGx5LCBpZiB0aGUgZXhlY3V0YWJsZSByZXF1aXJlcyBhbnkgb3RoZXIgZmlsZXMg KGUuZy4sIGRhdGEsIHN0YXRlLAogZGV2aWNlIGZpbGVzKSwgY29weSB0aGVtIGludG8gcGxh Y2UsIHRvby4KIAorQGNvbW1hbmR7Y2hyb290fSBpcyBpbnN0YWxsZWQgb25seSBvbiBzeXN0 ZW1zIHRoYXQgaGF2ZSB0aGUKK0Bjb2Rle2Nocm9vdH0gZnVuY3Rpb24sIHNvIHBvcnRhYmxl IHNjcmlwdHMgc2hvdWxkIG5vdCByZWx5IG9uIGl0cworZXhpc3RlbmNlLgorCiBAY2luZGV4 IGV4aXQgc3RhdHVzIG9mIEBjb21tYW5ke2Nocm9vdH0KIEV4aXQgc3RhdHVzOgogCkBAIC0x NjQzMSw2ICsxNjQ3MSwxMCBAQCBvcHRpb24gc3ludGF4IEBvcHRpb257LUB2YXJ7YWRqdXN0 bWVudH19LiAgTmV3IHNjcmlwdHMgc2hvdWxkIHVzZQogCiBAZW5kIHRhYmxlCiAKK0Bjb21t YW5ke25pY2V9IGlzIGluc3RhbGxlZCBvbmx5IG9uIHN5c3RlbXMgdGhhdCBoYXZlIHRoZSBQ T1NJWAorQGNvZGV7c2V0cHJpb3JpdHl9IGZ1bmN0aW9uLCBzbyBwb3J0YWJsZSBzY3JpcHRz IHNob3VsZCBub3QgcmVseSBvbgoraXRzIGV4aXN0ZW5jZSBvbiBub24tUE9TSVggcGxhdGZv cm1zLgorCiBAY2luZGV4IGV4aXQgc3RhdHVzIG9mIEBjb21tYW5ke25pY2V9CiBFeGl0IHN0 YXR1czoKIApAQCAtMTY2NDIsNiArMTY2ODYsMTEgQEAgU3BlY2lmeSB0aGUgc2l6ZSBvZiB0 aGUgYnVmZmVyIHRvIHVzZSBpbiBmdWxseSBidWZmZXJlZCBtb2RlLgogCiBAZW5kIHRhYmxl CiAKK0Bjb21tYW5ke3N0ZGJ1Zn0gaXMgaW5zdGFsbGVkIG9ubHkgb24gcGxhdGZvcm1zIHRo YXQgdXNlIHRoZQorRXhlY3V0YWJsZSBhbmQgTGlua2FibGUgRm9ybWF0IChFTEYpIGFuZCBz dXBwb3J0IHRoZQorQGNvZGV7Y29uc3RydWN0b3J9IGF0dHJpYnV0ZSwgc28gcG9ydGFibGUg c2NyaXB0cyBzaG91bGQgbm90IHJlbHkgb24KK2l0cyBleGlzdGVuY2UuCisKIEBjaW5kZXgg ZXhpdCBzdGF0dXMgb2YgQGNvbW1hbmR7c3RkYnVmfQogRXhpdCBzdGF0dXM6CiAKLS0gCjEu OS4zCgo= --------------070202020508030104050809 Content-Type: text/plain; charset=UTF-8; name="0002-doc-rename-coreutils-invocation-to-Multi-call-invoca.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-doc-rename-coreutils-invocation-to-Multi-call-invoca.pa"; filename*1="tch" RnJvbSA1YzBlNTk1OTU3MzRmZDg2YTA4NDkyOGVmYTM3MTNlMmUzNWUwNzJhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDggU2VwIDIwMTQgMTI6NTE6MTQgLTA3MDAKU3ViamVjdDogW1BBVENI IDIvNF0gZG9jOiByZW5hbWUgImNvcmV1dGlscyBpbnZvY2F0aW9uIiB0byAiTXVsdGktY2Fs bAogaW52b2NhdGlvbiIKClRoaXMgc3VwcG9ydHMgbG9uZ3N0YW5kaW5nIHNoZWxsIGNvbW1h bmRzIGxpa2UKJ2luZm8gY29yZXV0aWxzICJ0b3VjaCBpbnZvY2F0aW9uIicuClByb2JsZW0g cmVwb3J0ZWQgYnkgVmluY2VudCBMZWZldnJlIHZpYSBCb2IgUHJvdWx4IGluOgpodHRwOi8v YnVncy5nbnUub3JnLzE4NDI4CiogZG9jL2NvcmV1dGlscy50ZXhpIChNdWx0aS1jYWxsIGlu dm9jYXRpb24pOgpSZW5hbWUgZnJvbSAiY29yZXV0aWxzIGludm9jYXRpb24iLgotLS0KIGRv Yy9jb3JldXRpbHMudGV4aSB8IDIxICsrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZG9jL2NvcmV1dGlscy50ZXhpIGIvZG9jL2NvcmV1dGlscy50ZXhpCmluZGV4IDE0ZWUzYjAu LmZiMDgzZjAgMTAwNjQ0Ci0tLSBhL2RvYy9jb3JldXRpbHMudGV4aQorKysgYi9kb2MvY29y ZXV0aWxzLnRleGkKQEAgLTQ3LDcgKzQ3LDcgQEAKICogY2hyb290OiAoY29yZXV0aWxzKWNo cm9vdCBpbnZvY2F0aW9uLiAgICAgICAgIFNwZWNpZnkgdGhlIHJvb3QgZGlyZWN0b3J5Lgog KiBja3N1bTogKGNvcmV1dGlscylja3N1bSBpbnZvY2F0aW9uLiAgICAgICAgICAgUHJpbnQg UE9TSVggQ1JDIGNoZWNrc3VtLgogKiBjb21tOiAoY29yZXV0aWxzKWNvbW0gaW52b2NhdGlv bi4gICAgICAgICAgICAgQ29tcGFyZSBzb3J0ZWQgZmlsZXMgYnkgbGluZS4KLSogY29yZXV0 aWxzOiAoY29yZXV0aWxzKWNvcmV1dGlscyBpbnZvY2F0aW9uLiAgIE11bHRpLWNhbGwgcHJv Z3JhbS4KKyogY29yZXV0aWxzOiAoY29yZXV0aWxzKU11bHRpLWNhbGwgaW52b2NhdGlvbi4g IE11bHRpLWNhbGwgcHJvZ3JhbS4KICogY3A6IChjb3JldXRpbHMpY3AgaW52b2NhdGlvbi4g ICAgICAgICAgICAgICAgIENvcHkgZmlsZXMuCiAqIGNzcGxpdDogKGNvcmV1dGlscyljc3Bs aXQgaW52b2NhdGlvbi4gICAgICAgICBTcGxpdCBieSBjb250ZXh0LgogKiBjdXQ6IChjb3Jl dXRpbHMpY3V0IGludm9jYXRpb24uICAgICAgICAgICAgICAgUHJpbnQgc2VsZWN0ZWQgcGFy dHMgb2YgbGluZXMuCkBAIC0yMzAsNyArMjMwLDcgQEAgQ29tbW9uIE9wdGlvbnMKICogVHJh dmVyc2luZyBzeW1saW5rczo6ICAgICAgICAgIFRyYXZlcnNpbmcgc3ltbGlua3MgdG8gZGly ZWN0b3JpZXMKICogVHJlYXRpbmcgLyBzcGVjaWFsbHk6OiAgICAgICAgIFRyZWF0aW5nIC8g c3BlY2lhbGx5CiAqIFN0YW5kYXJkcyBjb25mb3JtYW5jZTo6ICAgICAgICBTdGFuZGFyZHMg Y29uZm9ybWFuY2UKLSogY29yZXV0aWxzIGludm9jYXRpb246OiAgICAgICAgIE11bHRpLWNh bGwgYmluYXJ5IGludm9jYXRpb24KKyogTXVsdGktY2FsbCBpbnZvY2F0aW9uOjogICAgICAg IE11bHRpLWNhbGwgcHJvZ3JhbSBpbnZvY2F0aW9uCiAKIE91dHB1dCBvZiBlbnRpcmUgZmls ZXMKIApAQCAtNzczLDcgKzc3Myw3IEBAIG5hbWUuCiAqIFRyZWF0aW5nIC8gc3BlY2lhbGx5 OjogICAgICAgIC0tcHJlc2VydmUtcm9vdCBhbmQgLS1uby1wcmVzZXJ2ZS1yb290LgogKiBT cGVjaWFsIGJ1aWx0LWluIHV0aWxpdGllczo6ICBAY29tbWFuZHticmVha30sIEBjb21tYW5k ezp9LCBAZG90c3t9CiAqIFN0YW5kYXJkcyBjb25mb3JtYW5jZTo6ICAgICAgIENvbmZvcm1h bmNlIHRvIHRoZSBQT1NJWCBzdGFuZGFyZC4KLSogY29yZXV0aWxzIGludm9jYXRpb246OiAg ICAgICAgTXVsdGktY2FsbCBiaW5hcnkgaW52b2NhdGlvbi4KKyogTXVsdGktY2FsbCBpbnZv Y2F0aW9uOjogICAgICAgTXVsdGktY2FsbCBwcm9ncmFtIGludm9jYXRpb24uCiBAZW5kIG1l bnUKIAogCkBAIC0xNTAwLDE2ICsxNTAwLDE5IEBAIHRoYXQgYXNzdW1lcyBhbiBvbGRlciB2 ZXJzaW9uIG9mIFBPU0lYIGFuZCB1c2VzIEBzYW1we3NvcnQgKzF9CiBvciBAc2FtcHt0YWls ICsxMH0sIHlvdSBjYW4gd29yayBhcm91bmQgYW55IGNvbXBhdGliaWxpdHkgcHJvYmxlbXMg Ynkgc2V0dGluZwogQHNhbXB7X1BPU0lYMl9WRVJTSU9OPTE5OTIwOX0gaW4geW91ciBlbnZp cm9ubWVudC4KIAotQG5vZGUgY29yZXV0aWxzIGludm9jYXRpb24KLUBzZWN0aW9uIEBjb21t YW5ke2NvcmV1dGlsc306IE11bHRpLWNhbGwgYmluYXJ5CitAYyBUaGlzIG5vZGUgaXMgbmFt ZWQgIk11bHRpLWNhbGwgaW52b2NhdGlvbiIsIG5vdCB0aGUgdXN1YWwKK0BjICJjb3JldXRp bHMgaW52b2NhdGlvbiIsIHNvIHRoYXQgc2hlbGwgY29tbWFuZHMgbGlrZQorQGMgJ2luZm8g Y29yZXV0aWxzICJ0b3VjaCBpbnZvY2F0aW9uIicgd29yayBhcyBleHBlY3RlZC4KK0Bub2Rl IE11bHRpLWNhbGwgaW52b2NhdGlvbgorQHNlY3Rpb24gQGNvbW1hbmR7Y29yZXV0aWxzfTog TXVsdGktY2FsbCBwcm9ncmFtCiAKIEBwaW5kZXggbXVsdGljYWxsCiBAY2luZGV4IGNvbWJp bmVkCi1AY2luZGV4IGNhbGxpbmcgY29tYmluZWQgbXVsdGktY2FsbCBiaW5hcnkKK0BjaW5k ZXggY2FsbGluZyBjb21iaW5lZCBtdWx0aS1jYWxsIHByb2dyYW0KIAotQGNvbW1hbmR7Y29y ZXV0aWxzfSBpbnZva2VzIGFuIGluZGl2aWR1YWwgdXRpbGl0eSwgZWl0aGVyCi1pbXBsaWNp dGx5IHNlbGVjdGVkIGJ5IHRoZSBsYXN0IGNvbXBvbmVudCBvZiBAc2FtcHthcmd2WzBdfSwK LW9yIGJ5IGV4cGxpY2l0bHkgY2FsbGluZyBAY29tbWFuZHtjb3JldXRpbHN9IHdpdGggdGhl CitUaGUgQGNvbW1hbmR7Y29yZXV0aWxzfSBjb21tYW5kIGludm9rZXMgYW4gaW5kaXZpZHVh bCB1dGlsaXR5LCBlaXRoZXIKK2ltcGxpY2l0bHkgc2VsZWN0ZWQgYnkgdGhlIGxhc3QgY29t cG9uZW50IG9mIHRoZSBuYW1lIHVzZWQgdG8gaW52b2tlCitAY29tbWFuZHtjb3JldXRpbHN9 LCBvciBleHBsaWNpdGx5IHdpdGggdGhlCiBAb3B0aW9uey0tY29yZXV0aWxzLXByb2d9IG9w dGlvbi4gIFN5bm9wc2lzOgogCiBAZXhhbXBsZQotLSAKMS45LjMKCg== --------------070202020508030104050809 Content-Type: text/plain; charset=UTF-8; name="0003-maint-prefer-return-status-to-exit-status-in-main.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0003-maint-prefer-return-status-to-exit-status-in-main.patch" RnJvbSBjZThkOWZlOWUzMjUzNjRkNWYwMjg5MzExMjJmMjk0ZGI4OGFlZWYwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDggU2VwIDIwMTQgMTY6MzE6MTQgLTA3MDAKU3ViamVjdDogW1BBVENI IDMvNF0gbWFpbnQ6IHByZWZlciAncmV0dXJuIHN0YXR1czsnIHRvICdleGl0IChzdGF0dXMp OycgaW4KICdtYWluJwoKKiBidWlsZC1hdXgvZ2VuLXNpbmdsZS1iaW5hcnkuc2g6IERvbid0 IHVzZSBBVFRSSUJVVEVfTk9SRVRVUk4KZm9yIG1haW4gZnVuY3Rpb25zLgoqIHNyYy9iYXNl NjQuYywgc3JjL2Jhc2VuYW1lLmMsIHNyYy9jYXQuYywgc3JjL2NoY29uLmMsIHNyYy9jaGdy cC5jOgoqIHNyYy9jaG1vZC5jLCBzcmMvY2hvd24uYywgc3JjL2Nocm9vdC5jLCBzcmMvY2tz dW0uYywgc3JjL2NvbW0uYzoKKiBzcmMvY3AuYywgc3JjL2NzcGxpdC5jLCBzcmMvY3V0LmMs IHNyYy9kYXRlLmMsIHNyYy9kZC5jLCBzcmMvZGYuYzoKKiBzcmMvZGlyY29sb3JzLmMsIHNy Yy9kaXJuYW1lLmMsIHNyYy9kdS5jLCBzcmMvZWNoby5jLCBzcmMvZW52LmM6Ciogc3JjL2V4 cGFuZC5jLCBzcmMvZXhwci5jLCBzcmMvZmFjdG9yLmMsIHNyYy9mbXQuYywgc3JjL2ZvbGQu YzoKKiBzcmMvZ2V0bGltaXRzLmMsIHNyYy9ncm91cHMuYywgc3JjL2hlYWQuYywgc3JjL2hv c3RpZC5jOgoqIHNyYy9ob3N0bmFtZS5jLCBzcmMvaWQuYywgc3JjL2luc3RhbGwuYywgc3Jj L2pvaW4uYywgc3JjL2tpbGwuYzoKKiBzcmMvbGluay5jLCBzcmMvbG4uYywgc3JjL2xvZ25h bWUuYywgc3JjL2xzLmMsIHNyYy9tYWtlLXByaW1lLWxpc3QuYzoKKiBzcmMvbWQ1c3VtLmMs IHNyYy9ta2Rpci5jLCBzcmMvbWtmaWZvLmMsIHNyYy9ta25vZC5jLCBzcmMvbWt0ZW1wLmM6 Ciogc3JjL212LmMsIHNyYy9uaWNlLmMsIHNyYy9ubC5jLCBzcmMvbm9odXAuYywgc3JjL25w cm9jLmM6Ciogc3JjL251bWZtdC5jLCBzcmMvb2QuYywgc3JjL3Bhc3RlLmMsIHNyYy9wYXRo Y2hrLmMsIHNyYy9waW5reS5jOgoqIHNyYy9wci5jLCBzcmMvcHJpbnRlbnYuYywgc3JjL3By aW50Zi5jLCBzcmMvcHR4LmMsIHNyYy9wd2QuYzoKKiBzcmMvcmVhZGxpbmsuYywgc3JjL3Jl YWxwYXRoLmMsIHNyYy9ybS5jLCBzcmMvcm1kaXIuYywgc3JjL3J1bmNvbi5jOgoqIHNyYy9z ZXEuYywgc3JjL3NocmVkLmMsIHNyYy9zaHVmLmMsIHNyYy9zbGVlcC5jLCBzcmMvc29ydC5j OgoqIHNyYy9zcGxpdC5jLCBzcmMvc3RhdC5jLCBzcmMvc3RkYnVmLmMsIHNyYy9zdHR5LmMs IHNyYy9zdW0uYzoKKiBzcmMvc3luYy5jLCBzcmMvdGFjLmMsIHNyYy90YWlsLmMsIHNyYy90 ZWUuYywgc3JjL3RpbWVvdXQuYzoKKiBzcmMvdG91Y2guYywgc3JjL3RyLmMsIHNyYy90cnVl LmMsIHNyYy90cnVuY2F0ZS5jLCBzcmMvdHNvcnQuYzoKKiBzcmMvdHR5LmMsIHNyYy91bmFt ZS5jLCBzcmMvdW5leHBhbmQuYywgc3JjL3VuaXEuYywgc3JjL3VubGluay5jOgoqIHNyYy91 cHRpbWUuYywgc3JjL3VzZXJzLmMsIHNyYy93Yy5jLCBzcmMvd2hvLmMsIHNyYy93aG9hbWku YzoKSW4gJ21haW4nIGZ1bmN0aW9ucywgUHJlZmVyICdyZXR1cm4gc3RhdHVzOycgdG8gJ2V4 aXQgKHN0YXR1cyk7Jy4KKiBzcmMvY29yZXV0aWxzLWFyY2guYyAoX3NpbmdsZV9iaW5hcnlf bWFpbl91bmFtZSkKKF9zaW5nbGVfYmluYXJ5X21haW5fYXJjaCk6Ciogc3JjL2NvcmV1dGls cy1kaXIuYywgc3JjL2NvcmV1dGlscy12ZGlyLmMgKF9zaW5nbGVfYmluYXJ5X21haW5fbHMp Cihfc2luZ2xlX2JpbmFyeV9tYWluX2RpciwgX3NpbmdsZV9iaW5hcnlfbWFpbl92ZGlyKToK T21pdCBBVFRSSUJVVEVfTk9SRVRVUk4uICBSZXR1cm4gYSB2YWx1ZS4KKiBzcmMvY29yZXV0 aWxzLmMgKFNJTkdMRV9CSU5BUllfUFJPR1JBTSk6IE9taXQgQVRUUklCVVRFX05PUkVUVVJO LgoobGF1bmNoX3Byb2dyYW0pOiBOb3cgc3RhdGljLgoqIHNyYy9kZC5jIChmaW5pc2hfdXAp OiBOZXcgZnVuY3Rpb24uCihxdWl0LCBtYWluKTogVXNlIGl0LgoqIHNyYy9nZXRsaW1pdHMu YyAobWFpbik6IFJldHVybiBhIHByb3BlciBleGl0IHN0YXR1cy4KKiBzcmMvdGVzdC5jICh0 ZXN0X21haW5fcmV0dXJuKTogTmV3IG1hY3JvLgoobWFpbik6IFVzZSBpdC4KKiBzcmMvbG9n bmFtZS5jLCBzcmMvbm9odXAuYywgc3JjL3dob2FtaS5jOgpVc2UgJ2Vycm9yJyB0byBzaW1w bGlmeSBleGl0IHN0YXR1cyBpbiAnbWFpbicgZnVuY3Rpb24uCiogc3JjL3llcy5jIChtYWlu KTogVXNlICdyZXR1cm4nIHJhdGhlciB0aGFuICdlcnJvcicgdG8gZXhpdCwKc28gdGhhdCBH Q0MgZG9lc24ndCBzdWdnZXN0IEFUVFJJQlVURV9OT1JFVFVSTi4KLS0tCiBidWlsZC1hdXgv Z2VuLXNpbmdsZS1iaW5hcnkuc2ggfCAgNCArKy0tCiBzcmMvYmFzZTY0LmMgICAgICAgICAg ICAgICAgICAgfCAgMiArLQogc3JjL2Jhc2VuYW1lLmMgICAgICAgICAgICAgICAgIHwgIDIg Ky0KIHNyYy9jYXQuYyAgICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvY2hjb24u YyAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2NoZ3JwLmMgICAgICAgICAgICAg ICAgICAgIHwgIDIgKy0KIHNyYy9jaG1vZC5jICAgICAgICAgICAgICAgICAgICB8ICAyICst CiBzcmMvY2hvd24uYyAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2Nocm9vdC5j ICAgICAgICAgICAgICAgICAgIHwgMTAgKysrKy0tLS0tLQogc3JjL2Nrc3VtLmMgICAgICAg ICAgICAgICAgICAgIHwgIDQgKystLQogc3JjL2NvbW0uYyAgICAgICAgICAgICAgICAgICAg IHwgIDQgKystLQogc3JjL2NvcmV1dGlscy1hcmNoLmMgICAgICAgICAgIHwgIDkgKysrKyst LS0tCiBzcmMvY29yZXV0aWxzLWRpci5jICAgICAgICAgICAgfCAgOSArKysrKy0tLS0KIHNy Yy9jb3JldXRpbHMtdmRpci5jICAgICAgICAgICB8ICA5ICsrKysrLS0tLQogc3JjL2NvcmV1 dGlscy5jICAgICAgICAgICAgICAgIHwgMTMgKysrKystLS0tLS0tCiBzcmMvY3AuYyAgICAg ICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2NzcGxpdC5jICAgICAgICAgICAgICAg ICAgIHwgIDIgKy0KIHNyYy9jdXQuYyAgICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBz cmMvZGF0ZS5jICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2RkLmMgICAgICAg ICAgICAgICAgICAgICAgIHwgMTMgKysrKysrKysrLS0tCiBzcmMvZGYuYyAgICAgICAgICAg ICAgICAgICAgICAgfCAgNCArKy0tCiBzcmMvZGlyY29sb3JzLmMgICAgICAgICAgICAgICAg fCAgMiArLQogc3JjL2Rpcm5hbWUuYyAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9k dS5jICAgICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvZWNoby5jICAgICAgICAg ICAgICAgICAgICAgfCAgNiArKystLS0KIHNyYy9lbnYuYyAgICAgICAgICAgICAgICAgICAg ICB8IDEwICsrKystLS0tLS0KIHNyYy9leHBhbmQuYyAgICAgICAgICAgICAgICAgICB8ICAy ICstCiBzcmMvZXhwci5jICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2ZhY3Rv ci5jICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9mbXQuYyAgICAgICAgICAgICAg ICAgICAgICB8ICAyICstCiBzcmMvZm9sZC5jICAgICAgICAgICAgICAgICAgICAgfCAgMiAr LQogc3JjL2dldGxpbWl0cy5jICAgICAgICAgICAgICAgIHwgIDIgKysKIHNyYy9ncm91cHMu YyAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvaGVhZC5jICAgICAgICAgICAgICAg ICAgICAgfCAgMiArLQogc3JjL2hvc3RpZC5jICAgICAgICAgICAgICAgICAgIHwgIDIgKy0K IHNyYy9ob3N0bmFtZS5jICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvaWQuYyAgICAg ICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL2luc3RhbGwuYyAgICAgICAgICAgICAg ICAgIHwgIDIgKy0KIHNyYy9qb2luLmMgICAgICAgICAgICAgICAgICAgICB8ICA0ICsrLS0K IHNyYy9raWxsLmMgICAgICAgICAgICAgICAgICAgICB8ICA2ICsrKy0tLQogc3JjL2xpbmsu YyAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9sbi5jICAgICAgICAgICAgICAg ICAgICAgICB8ICAyICstCiBzcmMvbG9nbmFtZS5jICAgICAgICAgICAgICAgICAgfCAxNSAr KysrKystLS0tLS0tLQogc3JjL2xzLmMgICAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0K IHNyYy9tYWtlLXByaW1lLWxpc3QuYyAgICAgICAgICB8ICAyICstCiBzcmMvbWQ1c3VtLmMg ICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL21rZGlyLmMgICAgICAgICAgICAgICAg ICAgIHwgIDQgKystLQogc3JjL21rZmlmby5jICAgICAgICAgICAgICAgICAgIHwgIDIgKy0K IHNyYy9ta25vZC5jICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvbWt0ZW1wLmMg ICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL212LmMgICAgICAgICAgICAgICAgICAg ICAgIHwgIDIgKy0KIHNyYy9uaWNlLmMgICAgICAgICAgICAgICAgICAgICB8IDEyICsrKysr LS0tLS0tCiBzcmMvbmwuYyAgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL25v aHVwLmMgICAgICAgICAgICAgICAgICAgIHwgNDUgKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvbnByb2MuYyAgICAgICAgICAgICAgICAgICAgfCAg MiArLQogc3JjL251bWZtdC5jICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9vZC5j ICAgICAgICAgICAgICAgICAgICAgICB8ICA0ICsrLS0KIHNyYy9wYXN0ZS5jICAgICAgICAg ICAgICAgICAgICB8ICAyICstCiBzcmMvcGF0aGNoay5jICAgICAgICAgICAgICAgICAgfCAg MiArLQogc3JjL3Bpbmt5LmMgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9wci5j ICAgICAgICAgICAgICAgICAgICAgICB8ICA0ICstLS0KIHNyYy9wcmludGVudi5jICAgICAg ICAgICAgICAgICB8ICAyICstCiBzcmMvcHJpbnRmLmMgICAgICAgICAgICAgICAgICAgfCAg NCArKy0tCiBzcmMvcHR4LmMgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3B3 ZC5jICAgICAgICAgICAgICAgICAgICAgIHwgIDQgKystLQogc3JjL3JlYWRsaW5rLmMgICAg ICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9yZWFscGF0aC5jICAgICAgICAgICAgICAgICB8 ICAyICstCiBzcmMvcm0uYyAgICAgICAgICAgICAgICAgICAgICAgfCAgNiArKystLS0KIHNy Yy9ybWRpci5jICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvcnVuY29uLmMgICAg ICAgICAgICAgICAgICAgfCAxMCArKysrLS0tLS0tCiBzcmMvc2VxLmMgICAgICAgICAgICAg ICAgICAgICAgfCAgNiArKystLS0KIHNyYy9zaHJlZC5jICAgICAgICAgICAgICAgICAgICB8 ICAyICstCiBzcmMvc2h1Zi5jICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3Ns ZWVwLmMgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy9zb3J0LmMgICAgICAgICAg ICAgICAgICAgICB8ICA0ICsrLS0KIHNyYy9zcGxpdC5jICAgICAgICAgICAgICAgICAgICB8 ICAyICstCiBzcmMvc3RhdC5jICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3N0 ZGJ1Zi5jICAgICAgICAgICAgICAgICAgIHwgIDggKysrLS0tLS0KIHNyYy9zdHR5LmMgICAg ICAgICAgICAgICAgICAgICB8ICA0ICsrLS0KIHNyYy9zdW0uYyAgICAgICAgICAgICAgICAg ICAgICB8ICAyICstCiBzcmMvc3luYy5jICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQog c3JjL3RhYy5jICAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy90YWlsLmMgICAg ICAgICAgICAgICAgICAgICB8ICA2ICsrKy0tLQogc3JjL3RlZS5jICAgICAgICAgICAgICAg ICAgICAgIHwgIDIgKy0KIHNyYy90ZXN0LmMgICAgICAgICAgICAgICAgICAgICB8ICA4ICsr KysrLS0tCiBzcmMvdGltZW91dC5jICAgICAgICAgICAgICAgICAgfCAxMyArKysrKy0tLS0t LS0KIHNyYy90b3VjaC5jICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvdHIuYyAg ICAgICAgICAgICAgICAgICAgICAgfCAgNiArKystLS0KIHNyYy90cnVlLmMgICAgICAgICAg ICAgICAgICAgICB8ICAyICstCiBzcmMvdHJ1bmNhdGUuYyAgICAgICAgICAgICAgICAgfCAg MiArLQogc3JjL3Rzb3J0LmMgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy90dHku YyAgICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvdW5hbWUuYyAgICAgICAgICAg ICAgICAgICAgfCAgMiArLQogc3JjL3VuZXhwYW5kLmMgICAgICAgICAgICAgICAgIHwgIDIg Ky0KIHNyYy91bmlxLmMgICAgICAgICAgICAgICAgICAgICB8ICAyICstCiBzcmMvdW5saW5r LmMgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3VwdGltZS5jICAgICAgICAgICAg ICAgICAgIHwgIDIgKy0KIHNyYy91c2Vycy5jICAgICAgICAgICAgICAgICAgICB8ICAyICst CiBzcmMvd2MuYyAgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3doby5jICAg ICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIHNyYy93aG9hbWkuYyAgICAgICAgICAgICAg ICAgICB8IDEzICsrKysrLS0tLS0tLQogc3JjL3llcy5jICAgICAgICAgICAgICAgICAgICAg IHwgIDUgKysrKy0KIDEwMiBmaWxlcyBjaGFuZ2VkLCAyMDQgaW5zZXJ0aW9ucygrKSwgMjE4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2J1aWxkLWF1eC9nZW4tc2luZ2xlLWJpbmFy eS5zaCBiL2J1aWxkLWF1eC9nZW4tc2luZ2xlLWJpbmFyeS5zaAppbmRleCBhMjQyM2U2Li4x MTI4ZjQwIDEwMDc1NQotLS0gYS9idWlsZC1hdXgvZ2VuLXNpbmdsZS1iaW5hcnkuc2gKKysr IGIvYnVpbGQtYXV4L2dlbi1zaW5nbGUtYmluYXJ5LnNoCkBAIC05MSw4ICs5MSw4IEBAIGZv ciBjbWQgaW4gJEFMTF9QUk9HUkFNUzsgZG8KICAgIyBDRkxBR1MKICAgIyBIYWNrIGFueSBv dGhlciBwcm9ncmFtIGRlZmluaW5nIGEgbWFpbigpIHJlcGxhY2luZyBpdHMgbWFpbiBieQog ICAjIF9zaW5nbGVfYmluYXJ5X21haW5fJFBST0dSQU1fTkFNRS4KLSAgZWNobyAiJHtiYXNl fV9DRkxBR1MgPSBcIi1EbWFpbj1fc2luZ2xlX2JpbmFyeV9tYWluXyR7Y21kfShpbnQsIGNo YXIqKikgIiBcCi0gICAgICAgIkFUVFJJQlVURV9OT1JFVFVSTjsgaW50IF9zaW5nbGVfYmlu YXJ5X21haW5fJHtjbWR9XCIgIiBcCisgIGVjaG8gIiR7YmFzZX1fQ0ZMQUdTID0gXCItRG1h aW49X3NpbmdsZV9iaW5hcnlfbWFpbl8ke2NtZH0gKGludCwgY2hhciAqKik7IiBcCisgICAg ICAgIiBpbnQgX3NpbmdsZV9iaW5hcnlfbWFpbl8ke2NtZH1cIiAiIFwKICAgICAgICAiLUR1 c2FnZT1fdXNhZ2VfJHtjbWR9IFwkKHNyY19jb3JldXRpbHNfQ0ZMQUdTKSIKICAgdmFyPXNy Y18ke2NtZH1fQ0ZMQUdTCiAgIGV2YWwgInZhbHVlPVwkJHZhciIKZGlmZiAtLWdpdCBhL3Ny Yy9iYXNlNjQuYyBiL3NyYy9iYXNlNjQuYwppbmRleCBiMDY1NjA0Li43YjRmZmRhIDEwMDY0 NAotLS0gYS9zcmMvYmFzZTY0LmMKKysrIGIvc3JjL2Jhc2U2NC5jCkBAIC0zMjEsNSArMzIx LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICBlcnJvciAoRVhJ VF9GQUlMVVJFLCBlcnJubywgIiVzIiwgaW5maWxlKTsKICAgICB9CiAKLSAgZXhpdCAoRVhJ VF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3Ny Yy9iYXNlbmFtZS5jIGIvc3JjL2Jhc2VuYW1lLmMKaW5kZXggOTUyMTUzOS4uOWJkNTRkNSAx MDA2NDQKLS0tIGEvc3JjL2Jhc2VuYW1lLmMKKysrIGIvc3JjL2Jhc2VuYW1lLmMKQEAgLTE4 NSw1ICsxODUsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgcGVyZm9y bV9iYXNlbmFtZSAoYXJndltvcHRpbmRdLAogICAgICAgICAgICAgICAgICAgICAgIG9wdGlu ZCArIDIgPT0gYXJnYyA/IGFyZ3Zbb3B0aW5kICsgMV0gOiBOVUxMLCB1c2VfbnVscyk7CiAK LSAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlm ZiAtLWdpdCBhL3NyYy9jYXQuYyBiL3NyYy9jYXQuYwppbmRleCA4YWVmNzlmLi4wMjYzNDhj IDEwMDY0NAotLS0gYS9zcmMvY2F0LmMKKysrIGIvc3JjL2NhdC5jCkBAIC03ODAsNSArNzgw LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBpZiAoaGF2ZV9yZWFkX3N0 ZGluICYmIGNsb3NlIChTVERJTl9GSUxFTk8pIDwgMCkKICAgICBlcnJvciAoRVhJVF9GQUlM VVJFLCBlcnJubywgXygiY2xvc2luZyBzdGFuZGFyZCBpbnB1dCIpKTsKIAotICBleGl0IChv ayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRf U1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9jaGNvbi5jIGIv c3JjL2NoY29uLmMKaW5kZXggY2RhMDY2MS4uMjEzNzViYyAxMDA2NDQKLS0tIGEvc3JjL2No Y29uLmMKKysrIGIvc3JjL2NoY29uLmMKQEAgLTU4Miw1ICs1ODIsNSBAQCBtYWluIChpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAKICAgb2sgPSBwcm9jZXNzX2ZpbGVzIChhcmd2ICsgb3B0 aW5kLCBiaXRfZmxhZ3MgfCBGVFNfTk9TVEFUKTsKIAotICBleGl0IChvayA/IEVYSVRfU1VD Q0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVY SVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9jaGdycC5jIGIvc3JjL2NoZ3JwLmMK aW5kZXggYzcyOTdjOC4uOGRhNmEzNiAxMDA2NDQKLS0tIGEvc3JjL2NoZ3JwLmMKKysrIGIv c3JjL2NoZ3JwLmMKQEAgLTMxMyw1ICszMTMsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAKICAgY2hvcHRfZnJlZSAoJmNob3B0KTsKIAotICBleGl0IChvayA/IEVYSVRf U1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6 IEVYSVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9jaG1vZC5jIGIvc3JjL2NobW9k LmMKaW5kZXggNzU2ZWM1YS4uYTM3MDc1YyAxMDA2NDQKLS0tIGEvc3JjL2NobW9kLmMKKysr IGIvc3JjL2NobW9kLmMKQEAgLTU2Niw1ICs1NjYsNSBAQCBtYWluIChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAgIG9rID0gcHJvY2Vzc19maWxlcyAoYXJndiArIG9wdGluZCwKICAgICAg ICAgICAgICAgICAgICAgICBGVFNfQ09NRk9MTE9XIHwgRlRTX1BIWVNJQ0FMIHwgRlRTX0RF RkVSX1NUQVQpOwogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJF KTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZm IC0tZ2l0IGEvc3JjL2Nob3duLmMgYi9zcmMvY2hvd24uYwppbmRleCAxM2ExOTIzLi44MDM2 ZDFhIDEwMDY0NAotLS0gYS9zcmMvY2hvd24uYworKysgYi9zcmMvY2hvd24uYwpAQCAtMzI2 LDUgKzMyNiw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAogICBjaG9wdF9m cmVlICgmY2hvcHQpOwogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlM VVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpk aWZmIC0tZ2l0IGEvc3JjL2Nocm9vdC5jIGIvc3JjL2Nocm9vdC5jCmluZGV4IDQxOGVhNjcu Ljc1NzU3M2EgMTAwNjQ0Ci0tLSBhL3NyYy9jaHJvb3QuYworKysgYi9zcmMvY2hyb290LmMK QEAgLTM4OCw3ICszODgsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAg ICBpZiAocGFyc2VfYWRkaXRpb25hbF9ncm91cHMgKGdyb3VwcywgJmluX2dpZHMsICZuX2dp ZHMsICFuX2dpZHMpICE9IDApCiAgICAgICAgIHsKICAgICAgICAgICBpZiAoISBuX2dpZHMp Ci0gICAgICAgICAgICBleGl0IChFWElUX0NBTkNFTEVEKTsKKyAgICAgICAgICAgIHJldHVy biBFWElUX0NBTkNFTEVEOwogICAgICAgICAgIC8qIGVsc2UgbG9vay11cCBvdXRzaWRlIHRo ZSBjaHJvb3Qgd29ya2VkLCB0aGVuIGdvIHdpdGggdGhvc2UuICAqLwogICAgICAgICB9CiAg ICAgICBlbHNlCkBAIC00MjgsOSArNDI4LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiph cmd2KQogICAvKiBFeGVjdXRlIHRoZSBnaXZlbiBjb21tYW5kLiAgKi8KICAgZXhlY3ZwIChh cmd2WzBdLCBhcmd2KTsKIAotICB7Ci0gICAgaW50IGV4aXRfc3RhdHVzID0gKGVycm5vID09 IEVOT0VOVCA/IEVYSVRfRU5PRU5UIDogRVhJVF9DQU5OT1RfSU5WT0tFKTsKLSAgICBlcnJv ciAoMCwgZXJybm8sIF8oImZhaWxlZCB0byBydW4gY29tbWFuZCAlcyIpLCBxdW90ZSAoYXJn dlswXSkpOwotICAgIGV4aXQgKGV4aXRfc3RhdHVzKTsKLSAgfQorICBpbnQgZXhpdF9zdGF0 dXMgPSBlcnJubyA9PSBFTk9FTlQgPyBFWElUX0VOT0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9L RTsKKyAgZXJyb3IgKDAsIGVycm5vLCBfKCJmYWlsZWQgdG8gcnVuIGNvbW1hbmQgJXMiKSwg cXVvdGUgKGFyZ3ZbMF0pKTsKKyAgcmV0dXJuIGV4aXRfc3RhdHVzOwogfQpkaWZmIC0tZ2l0 IGEvc3JjL2Nrc3VtLmMgYi9zcmMvY2tzdW0uYwppbmRleCA4ZGIzOWE0Li5iYWFlNTVhIDEw MDY0NAotLS0gYS9zcmMvY2tzdW0uYworKysgYi9zcmMvY2tzdW0uYwpAQCAtMTAyLDcgKzEw Miw3IEBAIG1haW4gKHZvaWQpCiAgICAgICAgICAgICAgIGNyY19yZW1haW5kZXIgKGkgKiA1 ICsgNSkpOwogICAgIH0KICAgcHJpbnRmICgiXG59O1xuIik7Ci0gIGV4aXQgKEVYSVRfU1VD Q0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKICNlbHNlIC8qICFDUkNUQUIg Ki8KQEAgLTMxMiw3ICszMTIsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAK ICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBmY2xvc2UgKHN0ZGluKSA9PSBFT0YpCiAgICAg ZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7Ci0gIGV4aXQgKG9rID8gRVhJVF9T VUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDog RVhJVF9GQUlMVVJFOwogfQogCiAjZW5kaWYgLyogIUNSQ1RBQiAqLwpkaWZmIC0tZ2l0IGEv c3JjL2NvbW0uYyBiL3NyYy9jb21tLmMKaW5kZXggNWEzZWVjNi4uYjVjNjg0MCAxMDA2NDQK LS0tIGEvc3JjL2NvbW0uYworKysgYi9zcmMvY29tbS5jCkBAIC00NDMsNyArNDQzLDcgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBjb21wYXJlX2ZpbGVzIChhcmd2ICsg b3B0aW5kKTsKIAogICBpZiAoaXNzdWVkX2Rpc29yZGVyX3dhcm5pbmdbMF0gfHwgaXNzdWVk X2Rpc29yZGVyX3dhcm5pbmdbMV0pCi0gICAgZXhpdCAoRVhJVF9GQUlMVVJFKTsKKyAgICBy ZXR1cm4gRVhJVF9GQUlMVVJFOwogICBlbHNlCi0gICAgZXhpdCAoRVhJVF9TVUNDRVNTKTsK KyAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2NvcmV1dGls cy1hcmNoLmMgYi9zcmMvY29yZXV0aWxzLWFyY2guYwppbmRleCA4OTljYzkzLi5mNTViZWY5 IDEwMDY0NAotLS0gYS9zcmMvY29yZXV0aWxzLWFyY2guYworKysgYi9zcmMvY29yZXV0aWxz LWFyY2guYwpAQCAtMjIsMTEgKzIyLDEyIEBACiAjaW5jbHVkZSAidW5hbWUuaCIKIC8qIEVu c3VyZSB0aGF0IHRoZSBtYWluIGZvciB1bmFtZSBpcyBkZWNsYXJlZCBldmVuIGlmIHRoZSB0 b29sIGlzIG5vdCBiZWluZwogICAgYnVpbHQgaW4gdGhpcyBzaW5nbGUtYmluYXJ5LiAqLwot aW50IF9zaW5nbGVfYmluYXJ5X21haW5fdW5hbWUgKGludCBhcmdjLCBjaGFyKiogYXJndikg QVRUUklCVVRFX05PUkVUVVJOOwotaW50IF9zaW5nbGVfYmluYXJ5X21haW5fYXJjaCAoaW50 IGFyZ2MsIGNoYXIqKiBhcmd2KSBBVFRSSUJVVEVfTk9SRVRVUk47CitpbnQgX3NpbmdsZV9i aW5hcnlfbWFpbl91bmFtZSAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KTsKK2ludCBfc2luZ2xl X2JpbmFyeV9tYWluX2FyY2ggKGludCBhcmdjLCBjaGFyICoqYXJndik7CiAKLWludCBfc2lu Z2xlX2JpbmFyeV9tYWluX2FyY2ggKGludCBhcmdjLCBjaGFyKiogYXJndikKK2ludAorX3Np bmdsZV9iaW5hcnlfbWFpbl9hcmNoIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiB7CiAgIHVu YW1lX21vZGUgPSBVTkFNRV9BUkNIOwotICBfc2luZ2xlX2JpbmFyeV9tYWluX3VuYW1lIChh cmdjLCBhcmd2KTsKKyAgcmV0dXJuIF9zaW5nbGVfYmluYXJ5X21haW5fdW5hbWUgKGFyZ2Ms IGFyZ3YpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2NvcmV1dGlscy1kaXIuYyBiL3NyYy9jb3Jl dXRpbHMtZGlyLmMKaW5kZXggNGI0ODhmNC4uYWZiZTM5YSAxMDA2NDQKLS0tIGEvc3JjL2Nv cmV1dGlscy1kaXIuYworKysgYi9zcmMvY29yZXV0aWxzLWRpci5jCkBAIC0yMiwxMSArMjIs MTIgQEAKICNpbmNsdWRlICJscy5oIgogLyogRW5zdXJlIHRoYXQgdGhlIG1haW4gZm9yIGxz IGlzIGRlY2xhcmVkIGV2ZW4gaWYgdGhlIHRvb2wgaXMgbm90IGJlaW5nIGJ1aWx0CiAgICBp biB0aGlzIHNpbmdsZS1iaW5hcnkuICovCi1pbnQgX3NpbmdsZV9iaW5hcnlfbWFpbl9scyAo aW50IGFyZ2MsIGNoYXIqKiBhcmd2KSBBVFRSSUJVVEVfTk9SRVRVUk47Ci1pbnQgX3Npbmds ZV9iaW5hcnlfbWFpbl9kaXIgKGludCBhcmdjLCBjaGFyKiogYXJndikgQVRUUklCVVRFX05P UkVUVVJOOworaW50IF9zaW5nbGVfYmluYXJ5X21haW5fbHMgKGludCBhcmdjLCBjaGFyICoq YXJndik7CitpbnQgX3NpbmdsZV9iaW5hcnlfbWFpbl9kaXIgKGludCBhcmdjLCBjaGFyICoq YXJndik7CiAKLWludCBfc2luZ2xlX2JpbmFyeV9tYWluX2RpciAoaW50IGFyZ2MsIGNoYXIq KiBhcmd2KQoraW50Citfc2luZ2xlX2JpbmFyeV9tYWluX2RpciAoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogewogICBsc19tb2RlID0gTFNfTVVMVElfQ09MOwotICBfc2luZ2xlX2JpbmFy eV9tYWluX2xzIChhcmdjLCBhcmd2KTsKKyAgcmV0dXJuIF9zaW5nbGVfYmluYXJ5X21haW5f bHMgKGFyZ2MsIGFyZ3YpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2NvcmV1dGlscy12ZGlyLmMg Yi9zcmMvY29yZXV0aWxzLXZkaXIuYwppbmRleCAwMzYzNjdmLi5iMWIwMTk0IDEwMDY0NAot LS0gYS9zcmMvY29yZXV0aWxzLXZkaXIuYworKysgYi9zcmMvY29yZXV0aWxzLXZkaXIuYwpA QCAtMjIsMTEgKzIyLDEyIEBACiAjaW5jbHVkZSAibHMuaCIKIC8qIEVuc3VyZSB0aGF0IHRo ZSBtYWluIGZvciBscyBpcyBkZWNsYXJlZCBldmVuIGlmIHRoZSB0b29sIGlzIG5vdCBiZWlu ZyBidWlsdAogICAgaW4gdGhpcyBzaW5nbGUtYmluYXJ5LiAqLwotaW50IF9zaW5nbGVfYmlu YXJ5X21haW5fbHMgKGludCBhcmdjLCBjaGFyKiogYXJndikgQVRUUklCVVRFX05PUkVUVVJO OwotaW50IF9zaW5nbGVfYmluYXJ5X21haW5fdmRpciAoaW50IGFyZ2MsIGNoYXIqKiBhcmd2 KSBBVFRSSUJVVEVfTk9SRVRVUk47CitpbnQgX3NpbmdsZV9iaW5hcnlfbWFpbl9scyAoaW50 IGFyZ2MsIGNoYXIgKiphcmd2KTsKK2ludCBfc2luZ2xlX2JpbmFyeV9tYWluX3ZkaXIgKGlu dCBhcmdjLCBjaGFyICoqYXJndik7CiAKLWludCBfc2luZ2xlX2JpbmFyeV9tYWluX3ZkaXIg KGludCBhcmdjLCBjaGFyKiogYXJndikKK2ludAorX3NpbmdsZV9iaW5hcnlfbWFpbl92ZGly IChpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiB7CiAgIGxzX21vZGUgPSBMU19MT05HX0ZPUk1B VDsKLSAgX3NpbmdsZV9iaW5hcnlfbWFpbl9scyAoYXJnYywgYXJndik7CisgIHJldHVybiBf c2luZ2xlX2JpbmFyeV9tYWluX2xzIChhcmdjLCBhcmd2KTsKIH0KZGlmZiAtLWdpdCBhL3Ny Yy9jb3JldXRpbHMuYyBiL3NyYy9jb3JldXRpbHMuYwppbmRleCBjNDU5YjFkLi44OThmZTg0 IDEwMDY0NAotLS0gYS9zcmMvY29yZXV0aWxzLmMKKysrIGIvc3JjL2NvcmV1dGlscy5jCkBA IC0zNSw3ICszNSw3IEBACiAgICBuZWVkcyB0byBtYXRjaCB0aGUgb25lIHBhc3NlZCBhcyBD RkxBR1Mgb24gc2luZ2xlLWJpbmFyeS5tayAoZ2VuZXJhdGVkCiAgICBieSBnZW4tc2luZ2xl LWJpbmFyeS5zaCkuICovCiAjIGRlZmluZSBTSU5HTEVfQklOQVJZX1BST0dSQU0ocHJvZ19u YW1lX3N0ciwgbWFpbl9uYW1lKSBcCi0gIGludCBfc2luZ2xlX2JpbmFyeV9tYWluXyMjbWFp bl9uYW1lIChpbnQsIGNoYXIqKikgQVRUUklCVVRFX05PUkVUVVJOOworICBpbnQgX3Npbmds ZV9iaW5hcnlfbWFpbl8jI21haW5fbmFtZSAoaW50LCBjaGFyICoqKTsKICMgaW5jbHVkZSAi Y29yZXV0aWxzLmgiCiAjIHVuZGVmIFNJTkdMRV9CSU5BUllfUFJPR1JBTQogI2VuZGlmCkBA IC00Niw5ICs0Niw2IEBACiAjZGVmaW5lIEFVVEhPUlMgXAogICBwcm9wZXJfbmFtZSAoIkFs ZXggRGV5bW8iKQogCi12b2lkCi1sYXVuY2hfcHJvZ3JhbSAoY29uc3QgY2hhciAqcHJvZ19u YW1lLCBpbnQgcHJvZ19hcmdjLCBjaGFyICoqcHJvZ19hcmd2KTsKLQogc3RhdGljIHN0cnVj dCBvcHRpb24gY29uc3QgbG9uZ19vcHRpb25zW10gPQogewogICB7R0VUT1BUX0hFTFBfT1BU SU9OX0RFQ0x9LApAQCAtOTIsMTAgKzg5LDEwIEBAIFVzZTogJyVzIC0tY29yZXV0aWxzLXBy b2c9UFJPR1JBTV9OQU1FIC0taGVscCcgZm9yIGluZGl2aWR1YWwgcHJvZ3JhbSBoZWxwLlxu IiksCiAgIGV4aXQgKHN0YXR1cyk7CiB9CiAKLXZvaWQKK3N0YXRpYyB2b2lkCiBsYXVuY2hf cHJvZ3JhbSAoY29uc3QgY2hhciAqcHJvZ19uYW1lLCBpbnQgcHJvZ19hcmdjLCBjaGFyICoq cHJvZ19hcmd2KQogewotICBpbnQgKCpwcm9nX21haW4pKGludCwgY2hhciAqKikgPSBOVUxM OworICBpbnQgKCpwcm9nX21haW4pIChpbnQsIGNoYXIgKiopID0gTlVMTDsKIAogICAvKiBF bnN1cmUgdGhhdCBhdCBsZWFzdCBvbmUgcGFyYW1ldGVyIHdhcyBwYXNzZWQuICAqLwogICBp ZiAoIXByb2dfYXJnYyB8fCAhcHJvZ19hcmd2IHx8ICFwcm9nX2FyZ3ZbMF0gfHwgIXByb2df bmFtZSkKQEAgLTEwMyw3ICsxMDAsNyBAQCBsYXVuY2hfcHJvZ3JhbSAoY29uc3QgY2hhciAq cHJvZ19uYW1lLCBpbnQgcHJvZ19hcmdjLCBjaGFyICoqcHJvZ19hcmd2KQogCiAjaWZkZWYg U0lOR0xFX0JJTkFSWQogICBpZiAoZmFsc2UpOwotICAvKiBMb29rdXAgdGhlIHJpZ2h0IG1h aW4gcHJvZ3JhbS4gICovCisgIC8qIExvb2sgdXAgdGhlIHJpZ2h0IG1haW4gcHJvZ3JhbS4g ICovCiAjIGRlZmluZSBTSU5HTEVfQklOQVJZX1BST0dSQU0ocHJvZ19uYW1lX3N0ciwgbWFp bl9uYW1lKSBcCiAgIGVsc2UgaWYgKFNUUkVRIChwcm9nX25hbWVfc3RyLCBwcm9nX25hbWUp KSBcCiAgICAgcHJvZ19tYWluID0gX3NpbmdsZV9iaW5hcnlfbWFpbl8jI21haW5fbmFtZTsK QEAgLTEyNCw3ICsxMjEsNyBAQCBsYXVuY2hfcHJvZ3JhbSAoY29uc3QgY2hhciAqcHJvZ19u YW1lLCBpbnQgcHJvZ19hcmdjLCBjaGFyICoqcHJvZ19hcmd2KQogICBwcmN0bCAoUFJfU0VU X01NX0FSR19TVEFSVCwgcHJvZ19hcmd2WzBdKTsKICNlbmRpZgogCi0gIGV4aXQgKCgqcHJv Z19tYWluKSAocHJvZ19hcmdjLCBwcm9nX2FyZ3YpKTsKKyAgZXhpdCAocHJvZ19tYWluIChw cm9nX2FyZ2MsIHByb2dfYXJndikpOwogfQogCiBpbnQKZGlmZiAtLWdpdCBhL3NyYy9jcC5j IGIvc3JjL2NwLmMKaW5kZXggNmM3MjMxYS4uNjBiZTY4OCAxMDA2NDQKLS0tIGEvc3JjL2Nw LmMKKysrIGIvc3JjL2NwLmMKQEAgLTEyMTgsNSArMTIxOCw1IEBAIG1haW4gKGludCBhcmdj LCBjaGFyICoqYXJndikKICAgZm9yZ2V0X2FsbCAoKTsKICNlbmRpZgogCi0gIGV4aXQgKG9r ID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9T VUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2NzcGxpdC5jIGIv c3JjL2NzcGxpdC5jCmluZGV4IGEzMGYwOWIuLmY4MDYyZWEgMTAwNjQ0Ci0tLSBhL3NyYy9j c3BsaXQuYworKysgYi9zcmMvY3NwbGl0LmMKQEAgLTE0NjYsNyArMTQ2Niw3IEBAIG1haW4g KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGNsZWFudXBfZmF0YWwgKCk7CiAgICAg fQogCi0gIGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9 CiAKIHZvaWQKZGlmZiAtLWdpdCBhL3NyYy9jdXQuYyBiL3NyYy9jdXQuYwppbmRleCAzMTI1 NTFmLi5iZGM3MjNiIDEwMDY0NAotLS0gYS9zcmMvY3V0LmMKKysrIGIvc3JjL2N1dC5jCkBA IC04MjcsNSArODI3LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAg b2sgPSBmYWxzZTsKICAgICB9CiAKLSAgZXhpdCAob2sgPyBFWElUX1NVQ0NFU1MgOiBFWElU X0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkU7 CiB9CmRpZmYgLS1naXQgYS9zcmMvZGF0ZS5jIGIvc3JjL2RhdGUuYwppbmRleCBlZjA0Y2I1 Li5iYTE5MThmIDEwMDY0NAotLS0gYS9zcmMvZGF0ZS5jCisrKyBiL3NyYy9kYXRlLmMKQEAg LTU0MCw3ICs1NDAsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICBv ayAmPSBzaG93X2RhdGUgKGZvcm1hdCwgd2hlbik7CiAgICAgfQogCi0gIGV4aXQgKG9rID8g RVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUND RVNTIDogRVhJVF9GQUlMVVJFOwogfQogCiAvKiBEaXNwbGF5IHRoZSBkYXRlIGFuZC9vciB0 aW1lIGluIFdIRU4gYWNjb3JkaW5nIHRvIHRoZSBmb3JtYXQgc3BlY2lmaWVkCmRpZmYgLS1n aXQgYS9zcmMvZGQuYyBiL3NyYy9kZC5jCmluZGV4IDFlMzg3ZjMuLjcxYzMzNGMgMTAwNjQ0 Ci0tLSBhL3NyYy9kZC5jCisrKyBiL3NyYy9kZC5jCkBAIC05MTcsMTIgKzkxNywxOCBAQCBw cm9jZXNzX3NpZ25hbHMgKHZvaWQpCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBBVFRSSUJV VEVfTk9SRVRVUk4KLXF1aXQgKGludCBjb2RlKQorc3RhdGljIHZvaWQKK2ZpbmlzaF91cCAo dm9pZCkKIHsKICAgY2xlYW51cCAoKTsKICAgcHJpbnRfc3RhdHMgKCk7CiAgIHByb2Nlc3Nf c2lnbmFscyAoKTsKK30KKworc3RhdGljIHZvaWQgQVRUUklCVVRFX05PUkVUVVJOCitxdWl0 IChpbnQgY29kZSkKK3sKKyAgZmluaXNoX3VwICgpOwogICBleGl0IChjb2RlKTsKIH0KIApA QCAtMjM0MCw1ICsyMzQ2LDYgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAg ICAgICBpbnZhbGlkYXRlX2NhY2hlIChTVERPVVRfRklMRU5PLCAwKTsKICAgICB9CiAKLSAg cXVpdCAoZXhpdF9zdGF0dXMpOworICBmaW5pc2hfdXAgKCk7CisgIHJldHVybiBleGl0X3N0 YXR1czsKIH0KZGlmZiAtLWdpdCBhL3NyYy9kZi5jIGIvc3JjL2RmLmMKaW5kZXggZTkwN2I5 NC4uYTc3NzY2NSAxMDA2NDQKLS0tIGEvc3JjL2RmLmMKKysrIGIvc3JjL2RmLmMKQEAgLTE2 MjAsNyArMTYyMCw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAg ICB9CiAgICAgICB9CiAgICAgaWYgKG1hdGNoKQotICAgICAgZXhpdCAoRVhJVF9GQUlMVVJF KTsKKyAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgIH0KIAogICBpZiAob3B0aW5kIDwg YXJnYykKQEAgLTE3MTQsNSArMTcxNCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKIAogICBJRl9MSU5UIChmcmVlIChjb2x1bW5zKSk7CiAKLSAgZXhpdCAoZXhpdF9zdGF0 dXMpOworICByZXR1cm4gZXhpdF9zdGF0dXM7CiB9CmRpZmYgLS1naXQgYS9zcmMvZGlyY29s b3JzLmMgYi9zcmMvZGlyY29sb3JzLmMKaW5kZXggOTk2MDUzNi4uNTU0NDQxOSAxMDA2NDQK LS0tIGEvc3JjL2RpcmNvbG9ycy5jCisrKyBiL3NyYy9kaXJjb2xvcnMuYwpAQCAtNTAzLDUg KzUwMyw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgfQogICAg IH0KIAotICBleGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJl dHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBh L3NyYy9kaXJuYW1lLmMgYi9zcmMvZGlybmFtZS5jCmluZGV4IGUwNTk5YTMuLjVhMjY4ZTEg MTAwNjQ0Ci0tLSBhL3NyYy9kaXJuYW1lLmMKKysrIGIvc3JjL2Rpcm5hbWUuYwpAQCAtMTMy LDUgKzEzMiw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIHB1dGNo YXIgKHVzZV9udWxzID8gJ1wwJyA6J1xuJyk7CiAgICAgfQogCi0gIGV4aXQgKEVYSVRfU1VD Q0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9zcmMvZHUu YyBiL3NyYy9kdS5jCmluZGV4IDA5NjYzMjYuLjU0NjZlMTcgMTAwNjQ0Ci0tLSBhL3NyYy9k dS5jCisrKyBiL3NyYy9kdS5jCkBAIC0xMTA4LDUgKzExMDgsNSBAQCBtYWluIChpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgIGlmIChwcmludF9ncmFuZF90b3RhbCkKICAgICBwcmludF9z aXplICgmdG90X2R1aSwgXygidG90YWwiKSk7CiAKLSAgZXhpdCAob2sgPyBFWElUX1NVQ0NF U1MgOiBFWElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1MgOiBFWElU X0ZBSUxVUkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvZWNoby5jIGIvc3JjL2VjaG8uYwppbmRl eCA5M2Y0YTgyLi42M2IyNjNlIDEwMDY0NAotLS0gYS9zcmMvZWNoby5jCisrKyBiL3NyYy9l Y2hvLmMKQEAgLTEzNiw3ICsxMzYsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3Yp CiAgICAgICAgIHsKICAgICAgICAgICB2ZXJzaW9uX2V0YyAoc3Rkb3V0LCBQUk9HUkFNX05B TUUsIFBBQ0tBR0VfTkFNRSwgVmVyc2lvbiwgQVVUSE9SUywKICAgICAgICAgICAgICAgICAg ICAgICAgKGNoYXIgKikgTlVMTCk7Ci0gICAgICAgICAgZXhpdCAoRVhJVF9TVUNDRVNTKTsK KyAgICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgICAgICB9CiAgICAgfQogCkBA IC0yMDQsNyArMjA0LDcgQEAganVzdF9lY2hvOgogICAgICAgICAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgICAgIGNhc2UgJ2EnOiBjID0gJ1xhJzsgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIGNhc2UgJ2InOiBjID0gJ1xiJzsgYnJlYWs7Ci0gICAgICAgICAgICAg ICAgICAgIGNhc2UgJ2MnOiBleGl0IChFWElUX1NVQ0NFU1MpOworICAgICAgICAgICAgICAg ICAgICBjYXNlICdjJzogcmV0dXJuIEVYSVRfU1VDQ0VTUzsKICAgICAgICAgICAgICAgICAg ICAgY2FzZSAnZSc6IGMgPSAnXHgxQic7IGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBj YXNlICdmJzogYyA9ICdcZic7IGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNlICdu JzogYyA9ICdcbic7IGJyZWFrOwpAQCAtMjY4LDUgKzI2OCw1IEBAIGp1c3RfZWNobzoKIAog ICBpZiAoZGlzcGxheV9yZXR1cm4pCiAgICAgcHV0Y2hhciAoJ1xuJyk7Ci0gIGV4aXQgKEVY SVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9z cmMvZW52LmMgYi9zcmMvZW52LmMKaW5kZXggMmIzN2Q5OC4uYjc3NjA1MiAxMDA2NDQKLS0t IGEvc3JjL2Vudi5jCisrKyBiL3NyYy9lbnYuYwpAQCAtMTQ0LDcgKzE0NCw3IEBAIG1haW4g KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGNoYXIgKmNvbnN0ICplID0gZW52aXJv bjsKICAgICAgIHdoaWxlICgqZSkKICAgICAgICAgcHJpbnRmICgiJXMlYyIsICplKyssIG9w dF9udWxfdGVybWluYXRlX291dHB1dCA/ICdcMCcgOiAnXG4nKTsKLSAgICAgIGV4aXQgKEVY SVRfU1VDQ0VTUyk7CisgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgIH0KIAogICBp ZiAob3B0X251bF90ZXJtaW5hdGVfb3V0cHV0KQpAQCAtMTU1LDkgKzE1NSw3IEBAIG1haW4g KGludCBhcmdjLCBjaGFyICoqYXJndikKIAogICBleGVjdnAgKGFyZ3Zbb3B0aW5kXSwgJmFy Z3Zbb3B0aW5kXSk7CiAKLSAgewotICAgIGludCBleGl0X3N0YXR1cyA9IChlcnJubyA9PSBF Tk9FTlQgPyBFWElUX0VOT0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRSk7Ci0gICAgZXJyb3Ig KDAsIGVycm5vLCAiJXMiLCBhcmd2W29wdGluZF0pOwotICAgIGV4aXQgKGV4aXRfc3RhdHVz KTsKLSAgfQorICBpbnQgZXhpdF9zdGF0dXMgPSBlcnJubyA9PSBFTk9FTlQgPyBFWElUX0VO T0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRTsKKyAgZXJyb3IgKDAsIGVycm5vLCAiJXMiLCBh cmd2W29wdGluZF0pOworICByZXR1cm4gZXhpdF9zdGF0dXM7CiB9CmRpZmYgLS1naXQgYS9z cmMvZXhwYW5kLmMgYi9zcmMvZXhwYW5kLmMKaW5kZXggMDgyYjVkNC4uYmJhZjBlNyAxMDA2 NDQKLS0tIGEvc3JjL2V4cGFuZC5jCisrKyBiL3NyYy9leHBhbmQuYwpAQCAtNDI2LDUgKzQy Niw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgaWYgKGhhdmVfcmVhZF9z dGRpbiAmJiBmY2xvc2UgKHN0ZGluKSAhPSAwKQogICAgIGVycm9yIChFWElUX0ZBSUxVUkUs IGVycm5vLCAiLSIpOwogCi0gIGV4aXQgKGV4aXRfc3RhdHVzKTsKKyAgcmV0dXJuIGV4aXRf c3RhdHVzOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2V4cHIuYyBiL3NyYy9leHByLmMKaW5kZXgg YTk3NjYzYS4uYmJmMzI1MSAxMDA2NDQKLS0tIGEvc3JjL2V4cHIuYworKysgYi9zcmMvZXhw ci5jCkBAIC0zMjYsNyArMzI2LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog ICAgIHN5bnRheF9lcnJvciAoKTsKICAgcHJpbnR2ICh2KTsKIAotICBleGl0IChudWxsICh2 KSk7CisgIHJldHVybiBudWxsICh2KTsKIH0KIAogLyogUmV0dXJuIGEgVkFMVUUgZm9yIEku ICAqLwpkaWZmIC0tZ2l0IGEvc3JjL2ZhY3Rvci5jIGIvc3JjL2ZhY3Rvci5jCmluZGV4IGY3 YmVhZWIuLmY2MzZlMzYgMTAwNjQ0Ci0tLSBhL3NyYy9mYWN0b3IuYworKysgYi9zcmMvZmFj dG9yLmMKQEAgLTI1NDMsNSArMjU0Myw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKICAgICB9CiAjZW5kaWYKIAotICBleGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRf RkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsK IH0KZGlmZiAtLWdpdCBhL3NyYy9mbXQuYyBiL3NyYy9mbXQuYwppbmRleCBkYmQxODBiLi4z ZWUwNGQ5IDEwMDY0NAotLS0gYS9zcmMvZm10LmMKKysrIGIvc3JjL2ZtdC5jCkBAIC00NTYs NyArNDU2LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICB9CiAg ICAgfQogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAg cmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQogCiAvKiBUcmlt IHNwYWNlIGZyb20gdGhlIGZyb250IGFuZCBiYWNrIG9mIHRoZSBzdHJpbmcgUCwgeWllbGRp bmcgdGhlIHByZWZpeCwKZGlmZiAtLWdpdCBhL3NyYy9mb2xkLmMgYi9zcmMvZm9sZC5jCmlu ZGV4IDQ0NGRjOGIuLjFmMDNjMmUgMTAwNjQ0Ci0tLSBhL3NyYy9mb2xkLmMKKysrIGIvc3Jj L2ZvbGQuYwpAQCAtMzExLDUgKzMxMSw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBmY2xvc2UgKHN0ZGluKSA9PSBFT0YpCiAg ICAgZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7CiAKLSAgZXhpdCAob2sgPyBF WElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NF U1MgOiBFWElUX0ZBSUxVUkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvZ2V0bGltaXRzLmMgYi9z cmMvZ2V0bGltaXRzLmMKaW5kZXggNTk3ZWZkOC4uM2E3ZDdlMSAxMDA2NDQKLS0tIGEvc3Jj L2dldGxpbWl0cy5jCisrKyBiL3NyYy9nZXRsaW1pdHMuYwpAQCAtMTY3LDQgKzE2Nyw2IEBA IG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgcHJpbnRfZmxvYXQgKEZMVCk7CiAg IHByaW50X2Zsb2F0IChEQkwpOwogICBwcmludF9mbG9hdCAoTERCTCk7CisKKyAgcmV0dXJu IEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3NyYy9ncm91cHMuYyBiL3NyYy9ncm91 cHMuYwppbmRleCBmMTlmZjBhLi5jOTA0ZjMyIDEwMDY0NAotLS0gYS9zcmMvZ3JvdXBzLmMK KysrIGIvc3JjL2dyb3Vwcy5jCkBAIC0xMzYsNSArMTM2LDUgQEAgbWFpbiAoaW50IGFyZ2Ms IGNoYXIgKiphcmd2KQogICAgICAgICB9CiAgICAgfQogCi0gIGV4aXQgKG9rID8gRVhJVF9T VUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDog RVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2hlYWQuYyBiL3NyYy9oZWFkLmMK aW5kZXggNjViZDUyYS4uMDliYzMzZCAxMDA2NDQKLS0tIGEvc3JjL2hlYWQuYworKysgYi9z cmMvaGVhZC5jCkBAIC0xMDY2LDUgKzEwNjYsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgIGlmIChoYXZlX3JlYWRfc3RkaW4gJiYgY2xvc2UgKFNURElOX0ZJTEVOTykg PCAwKQogICAgIGVycm9yIChFWElUX0ZBSUxVUkUsIGVycm5vLCAiLSIpOwogCi0gIGV4aXQg KG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJ VF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2hvc3RpZC5j IGIvc3JjL2hvc3RpZC5jCmluZGV4IDViNDBlYjAuLjg2NzE4MTIgMTAwNjQ0Ci0tLSBhL3Ny Yy9ob3N0aWQuYworKysgYi9zcmMvaG9zdGlkLmMKQEAgLTg0LDUgKzg0LDUgQEAgbWFpbiAo aW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgIHByaW50ZiAoIiUwOHhcbiIsIGlkKTsKIAot ICBleGl0IChFWElUX1NVQ0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZm IC0tZ2l0IGEvc3JjL2hvc3RuYW1lLmMgYi9zcmMvaG9zdG5hbWUuYwppbmRleCBiYWI1MWFl Li45ZWY3NTk4IDEwMDY0NAotLS0gYS9zcmMvaG9zdG5hbWUuYworKysgYi9zcmMvaG9zdG5h bWUuYwpAQCAtMTEyLDUgKzExMiw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikK ICAgICAgIHVzYWdlIChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAotICBleGl0IChFWElUX1NV Q0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2lk LmMgYi9zcmMvaWQuYwppbmRleCBjY2QxZTg3Li4zMzQ0NWEwIDEwMDY0NAotLS0gYS9zcmMv aWQuYworKysgYi9zcmMvaWQuYwpAQCAtMzE0LDcgKzMxNCw3IEBAIG1haW4gKGludCBhcmdj LCBjaGFyICoqYXJndikKICAgcHV0Y2hhciAob3B0X3plcm8gPyAnXDAnIDogJ1xuJyk7CiAK ICAgSUZfTElOVCAoZnJlZSAocHdfbmFtZSkpOwotICBleGl0IChvayA/IEVYSVRfU1VDQ0VT UyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRf RkFJTFVSRTsKIH0KIAogLyogQ29udmVydCBhIGdpZF90IHRvIHN0cmluZy4gIERvIG5vdCB1 c2UgdGhpcyBmdW5jdGlvbiBkaXJlY3RseS4KZGlmZiAtLWdpdCBhL3NyYy9pbnN0YWxsLmMg Yi9zcmMvaW5zdGFsbC5jCmluZGV4IGMzNDI0MjIuLmRiNGVlNDUgMTAwNjQ0Ci0tLSBhL3Ny Yy9pbnN0YWxsLmMKKysrIGIvc3JjL2luc3RhbGwuYwpAQCAtMTA0Miw1ICsxMDQyLDUgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICB9CiAgICAgfQogCi0gIGV4 aXQgKGV4aXRfc3RhdHVzKTsKKyAgcmV0dXJuIGV4aXRfc3RhdHVzOwogfQpkaWZmIC0tZ2l0 IGEvc3JjL2pvaW4uYyBiL3NyYy9qb2luLmMKaW5kZXggNWMyNmU3OC4uOTY1YWI0OSAxMDA2 NDQKLS0tIGEvc3JjL2pvaW4uYworKysgYi9zcmMvam9pbi5jCkBAIC0xMTkxLDcgKzExOTEs NyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgZXJyb3IgKEVYSVRfRkFJ TFVSRSwgZXJybm8sICIlcyIsIGdfbmFtZXNbMV0pOwogCiAgIGlmIChpc3N1ZWRfZGlzb3Jk ZXJfd2FybmluZ1swXSB8fCBpc3N1ZWRfZGlzb3JkZXJfd2FybmluZ1sxXSkKLSAgICBleGl0 IChFWElUX0ZBSUxVUkUpOworICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgIGVsc2UKLSAg ICBleGl0IChFWElUX1NVQ0NFU1MpOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRp ZmYgLS1naXQgYS9zcmMva2lsbC5jIGIvc3JjL2tpbGwuYwppbmRleCA3MjQ2NjdlLi40YWI4 NmE0IDEwMDY0NAotLS0gYS9zcmMva2lsbC5jCisrKyBiL3NyYy9raWxsLmMKQEAgLTMwNiw3 ICszMDYsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICB1c2FnZSAo RVhJVF9GQUlMVVJFKTsKICAgICB9CiAKLSAgZXhpdCAobGlzdAotICAgICAgICA/IGxpc3Rf c2lnbmFscyAodGFibGUsIG9wdGluZCA8IGFyZ2MgPyBhcmd2ICsgb3B0aW5kIDogTlVMTCkK LSAgICAgICAgOiBzZW5kX3NpZ25hbHMgKHNpZ251bSwgYXJndiArIG9wdGluZCkpOworICBy ZXR1cm4gKGxpc3QKKyAgICAgICAgICA/IGxpc3Rfc2lnbmFscyAodGFibGUsIG9wdGluZCA8 IGFyZ2MgPyBhcmd2ICsgb3B0aW5kIDogTlVMTCkKKyAgICAgICAgICA6IHNlbmRfc2lnbmFs cyAoc2lnbnVtLCBhcmd2ICsgb3B0aW5kKSk7CiB9CmRpZmYgLS1naXQgYS9zcmMvbGluay5j IGIvc3JjL2xpbmsuYwppbmRleCA5ZjE4ZmUyLi42ZjNhMjk3IDEwMDY0NAotLS0gYS9zcmMv bGluay5jCisrKyBiL3NyYy9saW5rLmMKQEAgLTkwLDUgKzkwLDUgQEAgbWFpbiAoaW50IGFy Z2MsIGNoYXIgKiphcmd2KQogICAgIGVycm9yIChFWElUX0ZBSUxVUkUsIGVycm5vLCBfKCJj YW5ub3QgY3JlYXRlIGxpbmsgJXMgdG8gJXMiKSwKICAgICAgICAgICAgcXVvdGVfbiAoMCwg YXJndltvcHRpbmQgKyAxXSksIHF1b3RlX24gKDEsIGFyZ3Zbb3B0aW5kXSkpOwogCi0gIGV4 aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1n aXQgYS9zcmMvbG4uYyBiL3NyYy9sbi5jCmluZGV4IDQyYmNjZmMuLjUxNDBlOTIgMTAwNjQ0 Ci0tLSBhL3NyYy9sbi5jCisrKyBiL3NyYy9sbi5jCkBAIC02NDcsNSArNjQ3LDUgQEAgbWFp biAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBlbHNlCiAgICAgb2sgPSBkb19saW5rIChm aWxlWzBdLCBmaWxlWzFdKTsKIAotICBleGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRf RkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsK IH0KZGlmZiAtLWdpdCBhL3NyYy9sb2duYW1lLmMgYi9zcmMvbG9nbmFtZS5jCmluZGV4IDZh ZmExYjUuLjM2OGM0YzkgMTAwNjQ0Ci0tLSBhL3NyYy9sb2duYW1lLmMKKysrIGIvc3JjL2xv Z25hbWUuYwpAQCAtNzIsMTUgKzcyLDEyIEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKICAgICAgIHVzYWdlIChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAotICAvKiBQT1NJWCBy ZXF1aXJlcyB1c2luZyBnZXRsb2dpbiAob3IgZXF1aXZhbGVudCBjb2RlKS4gICovCisgIC8q IFBPU0lYIHJlcXVpcmVzIHVzaW5nIGdldGxvZ2luIChvciBlcXVpdmFsZW50IGNvZGUpIGFu ZCBwcm9oaWJpdHMKKyAgICAgdXNpbmcgYSBmYWxsYmFjayB0ZWNobmlxdWUuICAqLwogICBj cCA9IGdldGxvZ2luICgpOwotICBpZiAoY3ApCi0gICAgewotICAgICAgcHV0cyAoY3ApOwot ICAgICAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKLSAgICB9Ci0gIC8qIFBPU0lYIHByb2hpYml0 cyB1c2luZyBhIGZhbGxiYWNrIHRlY2huaXF1ZS4gICovCisgIGlmICghIGNwKQorICAgIGVy cm9yIChFWElUX0ZBSUxVUkUsIDAsIF8oIm5vIGxvZ2luIG5hbWUiKSk7CiAKLSAgZXJyb3Ig KDAsIDAsIF8oIm5vIGxvZ2luIG5hbWUiKSk7Ci0gIGV4aXQgKEVYSVRfRkFJTFVSRSk7Cisg IHB1dHMgKGNwKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3Ny Yy9scy5jIGIvc3JjL2xzLmMKaW5kZXggYTQ1Y2ZjMS4uOTQyNzZiNiAxMDA2NDQKLS0tIGEv c3JjL2xzLmMKKysrIGIvc3JjL2xzLmMKQEAgLTE1MTMsNyArMTUxMyw3IEBAIG1haW4gKGlu dCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGhhc2hfZnJlZSAoYWN0aXZlX2Rpcl9zZXQp OwogICAgIH0KIAotICBleGl0IChleGl0X3N0YXR1cyk7CisgIHJldHVybiBleGl0X3N0YXR1 czsKIH0KIAogLyogU2V0IGFsbCB0aGUgb3B0aW9uIGZsYWdzIGFjY29yZGluZyB0byB0aGUg c3dpdGNoZXMgc3BlY2lmaWVkLgpkaWZmIC0tZ2l0IGEvc3JjL21ha2UtcHJpbWUtbGlzdC5j IGIvc3JjL21ha2UtcHJpbWUtbGlzdC5jCmluZGV4IGMwMWIxMjAuLjVjNzlhY2UgMTAwNjQ0 Ci0tLSBhL3NyYy9tYWtlLXByaW1lLWxpc3QuYworKysgYi9zcmMvbWFrZS1wcmltZS1saXN0 LmMKQEAgLTE4Nyw3ICsxODcsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAg ICAgfQogICBsaW1pdCA9IGF0b2kgKGFyZ3ZbMV0pOwogICBpZiAobGltaXQgPCAzKQotICAg IGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIAogICAv KiBNYWtlIGxpbWl0IG9kZCAqLwogICBpZiAoICEobGltaXQgJiAxKSkKZGlmZiAtLWdpdCBh L3NyYy9tZDVzdW0uYyBiL3NyYy9tZDVzdW0uYwppbmRleCBjYzZkZDQ5Li5jZDI3ZTgwIDEw MDY0NAotLS0gYS9zcmMvbWQ1c3VtLmMKKysrIGIvc3JjL21kNXN1bS5jCkBAIC04NzQsNSAr ODc0LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBpZiAoaGF2ZV9yZWFk X3N0ZGluICYmIGZjbG9zZSAoc3RkaW4pID09IEVPRikKICAgICBlcnJvciAoRVhJVF9GQUlM VVJFLCBlcnJubywgXygic3RhbmRhcmQgaW5wdXQiKSk7CiAKLSAgZXhpdCAob2sgPyBFWElU X1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1Mg OiBFWElUX0ZBSUxVUkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvbWtkaXIuYyBiL3NyYy9ta2Rp ci5jCmluZGV4IGViOTY5M2MuLjcwYmNhMDcgMTAwNjQ0Ci0tLSBhL3NyYy9ta2Rpci5jCisr KyBiL3NyYy9ta2Rpci5jCkBAIC0zMDEsNiArMzAxLDYgQEAgbWFpbiAoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQogICAgICAgICBvcHRpb25zLm1vZGUgPSBTX0lSV1hVR087CiAgICAgfQog Ci0gIGV4aXQgKHNhdmV3ZF9wcm9jZXNzX2ZpbGVzIChhcmdjIC0gb3B0aW5kLCBhcmd2ICsg b3B0aW5kLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc19kaXIsICZv cHRpb25zKSk7CisgIHJldHVybiBzYXZld2RfcHJvY2Vzc19maWxlcyAoYXJnYyAtIG9wdGlu ZCwgYXJndiArIG9wdGluZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9j ZXNzX2RpciwgJm9wdGlvbnMpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL21rZmlmby5jIGIvc3Jj L21rZmlmby5jCmluZGV4IDQxNWFlNTYuLjYzMjQ3MjkgMTAwNjQ0Ci0tLSBhL3NyYy9ta2Zp Zm8uYworKysgYi9zcmMvbWtmaWZvLmMKQEAgLTE3Nyw1ICsxNzcsNSBAQCBtYWluIChpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIH0KICAgICB9CiAKLSAgZXhpdCAoZXhpdF9z dGF0dXMpOworICByZXR1cm4gZXhpdF9zdGF0dXM7CiB9CmRpZmYgLS1naXQgYS9zcmMvbWtu b2QuYyBiL3NyYy9ta25vZC5jCmluZGV4IDhmNTQ3ZTkuLjc5N2U2YmIgMTAwNjQ0Ci0tLSBh L3NyYy9ta25vZC5jCisrKyBiL3NyYy9ta25vZC5jCkBAIC0yNjksNSArMjY5LDUgQEAgbWFp biAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGVycm9yIChFWElUX0ZBSUxVUkUsIGVy cm5vLCBfKCJjYW5ub3Qgc2V0IHBlcm1pc3Npb25zIG9mICVzIiksCiAgICAgICAgICAgIHF1 b3RlIChhcmd2W29wdGluZF0pKTsKIAotICBleGl0IChFWElUX1NVQ0NFU1MpOworICByZXR1 cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3JjL21rdGVtcC5jIGIvc3JjL21r dGVtcC5jCmluZGV4IDJiZDgwYmEuLmQzNmU1MDIgMTAwNjQ0Ci0tLSBhL3NyYy9ta3RlbXAu YworKysgYi9zcmMvbWt0ZW1wLmMKQEAgLTM0NSw1ICszNDUsNSBAQCBtYWluIChpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgIGZyZWUgKHRlbXBsYXRlKTsKICNlbmRpZgogCi0gIGV4aXQg KHN0YXR1cyk7CisgIHJldHVybiBzdGF0dXM7CiB9CmRpZmYgLS1naXQgYS9zcmMvbXYuYyBi L3NyYy9tdi5jCmluZGV4IDFkYjQwNGYuLmI3MWQyMTAgMTAwNjQ0Ci0tLSBhL3NyYy9tdi5j CisrKyBiL3NyYy9tdi5jCkBAIC01MDgsNSArNTA4LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQogICBlbHNlCiAgICAgb2sgPSBtb3ZlZmlsZSAoZmlsZVswXSwgZmlsZVsx XSwgZmFsc2UsICZ4KTsKIAotICBleGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJ TFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0K ZGlmZiAtLWdpdCBhL3NyYy9uaWNlLmMgYi9zcmMvbmljZS5jCmluZGV4IDQ4OGVmOTUuLjkx ZThmOTkgMTAwNjQ0Ci0tLSBhL3NyYy9uaWNlLmMKKysrIGIvc3JjL25pY2UuYwpAQCAtMTg3 LDcgKzE4Nyw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGlmIChj dXJyZW50X25pY2VuZXNzID09IC0xICYmIGVycm5vICE9IDApCiAgICAgICAgIGVycm9yIChF WElUX0NBTkNFTEVELCBlcnJubywgXygiY2Fubm90IGdldCBuaWNlbmVzcyIpKTsKICAgICAg IHByaW50ZiAoIiVkXG4iLCBjdXJyZW50X25pY2VuZXNzKTsKLSAgICAgIGV4aXQgKEVYSVRf U1VDQ0VTUyk7CisgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgIH0KIAogICBlcnJu byA9IDA7CkBAIC0yMDksMTQgKzIwOSwxMiBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFy Z3YpCiAgICAgICAgICBlbmNvdW50ZXJlZCBhIHdyaXRlIGZhaWx1cmUsIHRoZXJlIGlzIG5v IG5lZWQgdG8gdHJ5IGNhbGxpbmcKICAgICAgICAgIGVycm9yKCkgYWdhaW4uICAqLwogICAg ICAgaWYgKGZlcnJvciAoc3RkZXJyKSkKLSAgICAgICAgZXhpdCAoRVhJVF9DQU5DRUxFRCk7 CisgICAgICAgIHJldHVybiBFWElUX0NBTkNFTEVEOwogICAgIH0KIAogICBleGVjdnAgKGFy Z3ZbaV0sICZhcmd2W2ldKTsKIAotICB7Ci0gICAgaW50IGV4aXRfc3RhdHVzID0gKGVycm5v ID09IEVOT0VOVCA/IEVYSVRfRU5PRU5UIDogRVhJVF9DQU5OT1RfSU5WT0tFKTsKLSAgICBl cnJvciAoMCwgZXJybm8sICIlcyIsIGFyZ3ZbaV0pOwotICAgIGV4aXQgKGV4aXRfc3RhdHVz KTsKLSAgfQorICBpbnQgZXhpdF9zdGF0dXMgPSBlcnJubyA9PSBFTk9FTlQgPyBFWElUX0VO T0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRTsKKyAgZXJyb3IgKDAsIGVycm5vLCAiJXMiLCBh cmd2W2ldKTsKKyAgcmV0dXJuIGV4aXRfc3RhdHVzOwogfQpkaWZmIC0tZ2l0IGEvc3JjL25s LmMgYi9zcmMvbmwuYwppbmRleCA5ODJmNDY4Li5kNDVkY2JkIDEwMDY0NAotLS0gYS9zcmMv bmwuYworKysgYi9zcmMvbmwuYwpAQCAtNjEyLDUgKzYxMiw1IEBAIG1haW4gKGludCBhcmdj LCBjaGFyICoqYXJndikKICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBmY2xvc2UgKHN0ZGlu KSA9PSBFT0YpCiAgICAgZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7CiAKLSAg ZXhpdCAob2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sg PyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvbm9o dXAuYyBiL3NyYy9ub2h1cC5jCmluZGV4IGVjYTFmNTEuLjEzYmIwNDUgMTAwNjQ0Ci0tLSBh L3NyYy9ub2h1cC5jCisrKyBiL3NyYy9ub2h1cC5jCkBAIC0xMjMsMTAgKzEyMyw4IEBAIG1h aW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgaWYgKGlnbm9yaW5nX2lucHV0KQogICAg IHsKICAgICAgIGlmIChmZF9yZW9wZW4gKFNURElOX0ZJTEVOTywgIi9kZXYvbnVsbCIsIE9f V1JPTkxZLCAwKSA8IDApCi0gICAgICAgIHsKLSAgICAgICAgICBlcnJvciAoMCwgZXJybm8s IF8oImZhaWxlZCB0byByZW5kZXIgc3RhbmRhcmQgaW5wdXQgdW51c2FibGUiKSk7Ci0gICAg ICAgICAgZXhpdCAoZXhpdF9pbnRlcm5hbF9mYWlsdXJlKTsKLSAgICAgICAgfQorICAgICAg ICBlcnJvciAoZXhpdF9pbnRlcm5hbF9mYWlsdXJlLCBlcnJubywKKyAgICAgICAgICAgICAg IF8oImZhaWxlZCB0byByZW5kZXIgc3RhbmRhcmQgaW5wdXQgdW51c2FibGUiKSk7CiAgICAg ICBpZiAoIXJlZGlyZWN0aW5nX3N0ZG91dCAmJiAhcmVkaXJlY3Rpbmdfc3RkZXJyKQogICAg ICAgICBlcnJvciAoMCwgMCwgXygiaWdub3JpbmcgaW5wdXQiKSk7CiAgICAgfQpAQCAtMTY0 LDcgKzE2Miw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgICAg ICAgaWYgKGluX2hvbWUpCiAgICAgICAgICAgICAgICAgZXJyb3IgKDAsIHNhdmVkX2Vycm5v MiwgXygiZmFpbGVkIHRvIG9wZW4gJXMiKSwKICAgICAgICAgICAgICAgICAgICAgICAgcXVv dGUgKGluX2hvbWUpKTsKLSAgICAgICAgICAgICAgZXhpdCAoZXhpdF9pbnRlcm5hbF9mYWls dXJlKTsKKyAgICAgICAgICAgICAgcmV0dXJuIGV4aXRfaW50ZXJuYWxfZmFpbHVyZTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICBmaWxlID0gaW5faG9tZTsKICAgICAgICAgfQpAQCAt MjEzLDI4ICsyMTEsMjMgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICBl cnJvcigpIGFnYWluLCBwYXJ0aWN1bGFybHkgc2luY2Ugd2UgbWF5IGhhdmUganVzdCBjaGFu Z2VkIHRoZQogICAgICB1bmRlcmx5aW5nIGZkIG91dCBmcm9tIHVuZGVyIHN0ZGVyci4gICov CiAgIGlmIChmZXJyb3IgKHN0ZGVycikpCi0gICAgZXhpdCAoZXhpdF9pbnRlcm5hbF9mYWls dXJlKTsKKyAgICByZXR1cm4gZXhpdF9pbnRlcm5hbF9mYWlsdXJlOwogCiAgIHNpZ25hbCAo U0lHSFVQLCBTSUdfSUdOKTsKIAotICB7Ci0gICAgaW50IGV4aXRfc3RhdHVzOwotICAgIGlu dCBzYXZlZF9lcnJubzsKLSAgICBjaGFyICoqY21kID0gYXJndiArIG9wdGluZDsKLQotICAg IGV4ZWN2cCAoKmNtZCwgY21kKTsKLSAgICBleGl0X3N0YXR1cyA9IChlcnJubyA9PSBFTk9F TlQgPyBFWElUX0VOT0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRSk7Ci0gICAgc2F2ZWRfZXJy bm8gPSBlcnJubzsKLQotICAgIC8qIFRoZSBleGVjdmUgZmFpbGVkLiAgT3V0cHV0IGEgZGlh Z25vc3RpYyB0byBzdGRlcnIgb25seSBpZjoKLSAgICAgICAtIHN0ZGVyciB3YXMgaW5pdGlh bGx5IHJlZGlyZWN0ZWQgdG8gYSBub24tdHR5LCBvcgotICAgICAgIC0gc3RkZXJyIHdhcyBp bml0aWFsbHkgZGlyZWN0ZWQgdG8gYSB0dHksIGFuZCB3ZQotICAgICAgICAgY2FuIGR1cDIg aXQgdG8gcG9pbnQgYmFjayB0byB0aGF0IHNhbWUgdHR5LgotICAgICAgIEluIG90aGVyIHdv cmRzLCBvdXRwdXQgdGhlIGRpYWdub3N0aWMgaWYgcG9zc2libGUsIGJ1dCBvbmx5IGlmCi0g ICAgICAgaXQgd2lsbCBnbyB0byB0aGUgb3JpZ2luYWwgc3RkZXJyLiAgKi8KLSAgICBpZiAo ZHVwMiAoc2F2ZWRfc3RkZXJyX2ZkLCBTVERFUlJfRklMRU5PKSA9PSBTVERFUlJfRklMRU5P KQotICAgICAgZXJyb3IgKDAsIHNhdmVkX2Vycm5vLCBfKCJmYWlsZWQgdG8gcnVuIGNvbW1h bmQgJXMiKSwgcXVvdGUgKCpjbWQpKTsKLQotICAgIGV4aXQgKGV4aXRfc3RhdHVzKTsKLSAg fQorICBjaGFyICoqY21kID0gYXJndiArIG9wdGluZDsKKyAgZXhlY3ZwICgqY21kLCBjbWQp OworICBpbnQgZXhpdF9zdGF0dXMgPSBlcnJubyA9PSBFTk9FTlQgPyBFWElUX0VOT0VOVCA6 IEVYSVRfQ0FOTk9UX0lOVk9LRTsKKyAgaW50IHNhdmVkX2Vycm5vID0gZXJybm87CisKKyAg LyogVGhlIGV4ZWN2ZSBmYWlsZWQuICBPdXRwdXQgYSBkaWFnbm9zdGljIHRvIHN0ZGVyciBv bmx5IGlmOgorICAgICAtIHN0ZGVyciB3YXMgaW5pdGlhbGx5IHJlZGlyZWN0ZWQgdG8gYSBu b24tdHR5LCBvcgorICAgICAtIHN0ZGVyciB3YXMgaW5pdGlhbGx5IGRpcmVjdGVkIHRvIGEg dHR5LCBhbmQgd2UKKyAgICAgY2FuIGR1cDIgaXQgdG8gcG9pbnQgYmFjayB0byB0aGF0IHNh bWUgdHR5LgorICAgICBJbiBvdGhlciB3b3Jkcywgb3V0cHV0IHRoZSBkaWFnbm9zdGljIGlm IHBvc3NpYmxlLCBidXQgb25seSBpZgorICAgICBpdCB3aWxsIGdvIHRvIHRoZSBvcmlnaW5h bCBzdGRlcnIuICAqLworICBpZiAoZHVwMiAoc2F2ZWRfc3RkZXJyX2ZkLCBTVERFUlJfRklM RU5PKSA9PSBTVERFUlJfRklMRU5PKQorICAgIGVycm9yICgwLCBzYXZlZF9lcnJubywgXygi ZmFpbGVkIHRvIHJ1biBjb21tYW5kICVzIiksIHF1b3RlICgqY21kKSk7CisKKyAgcmV0dXJu IGV4aXRfc3RhdHVzOwogfQpkaWZmIC0tZ2l0IGEvc3JjL25wcm9jLmMgYi9zcmMvbnByb2Mu YwppbmRleCA5YmZjOGIzLi40NGVlNDgzIDEwMDY0NAotLS0gYS9zcmMvbnByb2MuYworKysg Yi9zcmMvbnByb2MuYwpAQCAtMTI5LDUgKzEyOSw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFy ICoqYXJndikKIAogICBwcmludGYgKCIlbHVcbiIsIG5wcm9jKTsKIAotICBleGl0IChFWElU X1NVQ0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3Jj L251bWZtdC5jIGIvc3JjL251bWZtdC5jCmluZGV4IGI1MjRlNjUuLmYxMTEzNzQgMTAwNjQ0 Ci0tLSBhL3NyYy9udW1mbXQuYworKysgYi9zcmMvbnVtZm10LmMKQEAgLTE1MzgsNSArMTUz OCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgaWYgKCF2YWxpZF9udW1i ZXJzICYmIF9pbnZhbGlkICE9IGludmFsX3dhcm4gJiYgX2ludmFsaWQgIT0gaW52YWxfaWdu b3JlKQogICAgIGV4aXRfc3RhdHVzID0gRVhJVF9DT05WRVJTSU9OX1dBUk5JTkdTOwogCi0g IGV4aXQgKGV4aXRfc3RhdHVzKTsKKyAgcmV0dXJuIGV4aXRfc3RhdHVzOwogfQpkaWZmIC0t Z2l0IGEvc3JjL29kLmMgYi9zcmMvb2QuYwppbmRleCA3YmMwZTJhLi5jMzJkNzg1IDEwMDY0 NAotLS0gYS9zcmMvb2QuYworKysgYi9zcmMvb2QuYwpAQCAtMTc4MSw3ICsxNzgxLDcgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIH0KIAogICBpZiAoIW9rKQotICAg IGV4aXQgKEVYSVRfRkFJTFVSRSk7CisgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKIAogICBp ZiAoZmxhZ19kdW1wX3N0cmluZ3MgJiYgbl9zcGVjcyA+IDApCiAgICAgZXJyb3IgKEVYSVRf RkFJTFVSRSwgMCwKQEAgLTE5NzIsNSArMTk3Miw1IEBAIGNsZWFudXA6CiAgIGlmIChoYXZl X3JlYWRfc3RkaW4gJiYgZmNsb3NlIChzdGRpbikgPT0gRU9GKQogICAgIGVycm9yIChFWElU X0ZBSUxVUkUsIGVycm5vLCBfKCJzdGFuZGFyZCBpbnB1dCIpKTsKIAotICBleGl0IChvayA/ IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VD Q0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9wYXN0ZS5jIGIvc3Jj L3Bhc3RlLmMKaW5kZXggMzY2M2FhZi4uOGY4ZjQ2NSAxMDA2NDQKLS0tIGEvc3JjL3Bhc3Rl LmMKKysrIGIvc3JjL3Bhc3RlLmMKQEAgLTUxOCw1ICs1MTgsNSBAQCBtYWluIChpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAKICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBmY2xvc2UgKHN0 ZGluKSA9PSBFT0YpCiAgICAgZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7Ci0g IGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9r ID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3Bh dGhjaGsuYyBiL3NyYy9wYXRoY2hrLmMKaW5kZXggNGIzODg0Zi4uM2NiOGJlZiAxMDA2NDQK LS0tIGEvc3JjL3BhdGhjaGsuYworKysgYi9zcmMvcGF0aGNoay5jCkBAIC0xNTMsNyArMTUz LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIG9rICY9IHZhbGlkYXRl X2ZpbGVfbmFtZSAoYXJndltvcHRpbmRdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY2hlY2tfYmFzaWNfcG9ydGFiaWxpdHksIGNoZWNrX2V4dHJhX3BvcnRhYmlsaXR5KTsK IAotICBleGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVy biBvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KIAogLyogSWYgRklMRSBj b250YWlucyBhIGNvbXBvbmVudCB3aXRoIGEgbGVhZGluZyAiLSIsIHJlcG9ydCBhbiBlcnJv cgpkaWZmIC0tZ2l0IGEvc3JjL3Bpbmt5LmMgYi9zcmMvcGlua3kuYwppbmRleCBjNDhlMTcw Li4xNTRiNmFhIDEwMDY0NAotLS0gYS9zcmMvcGlua3kuYworKysgYi9zcmMvcGlua3kuYwpA QCAtNjA0LDUgKzYwNCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgZWxz ZQogICAgIGxvbmdfcGlua3kgKG5fdXNlcnMsIGFyZ3YgKyBvcHRpbmQpOwogCi0gIGV4aXQg KEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQg YS9zcmMvcHIuYyBiL3NyYy9wci5jCmluZGV4IDE1MTViNGEuLmEzZGM5YmYgMTAwNjQ0Ci0t LSBhL3NyYy9wci5jCisrKyBiL3NyYy9wci5jCkBAIC0xMTcwLDkgKzExNzAsNyBAQCBtYWlu IChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBm Y2xvc2UgKHN0ZGluKSA9PSBFT0YpCiAgICAgZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8s IF8oInN0YW5kYXJkIGlucHV0IikpOwotICBpZiAoZmFpbGVkX29wZW5zKQotICAgIGV4aXQg KEVYSVRfRkFJTFVSRSk7Ci0gIGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBmYWls ZWRfb3BlbnMgPyBFWElUX0ZBSUxVUkUgOiBFWElUX1NVQ0NFU1M7CiB9CiAKIC8qIFBhcnNl IG9wdGlvbnMgb2YgdGhlIGZvcm0gLXNjTk5OLgpkaWZmIC0tZ2l0IGEvc3JjL3ByaW50ZW52 LmMgYi9zcmMvcHJpbnRlbnYuYwppbmRleCBlMWZhZWI1Li4wNjQ2YzcwIDEwMDY0NAotLS0g YS9zcmMvcHJpbnRlbnYuYworKysgYi9zcmMvcHJpbnRlbnYuYwpAQCAtMTUwLDUgKzE1MCw1 IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIG9rID0gKG1hdGNoZXMg PT0gYXJnYyAtIG9wdGluZCk7CiAgICAgfQogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNT IDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9G QUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3ByaW50Zi5jIGIvc3JjL3ByaW50Zi5jCmlu ZGV4IDdkNTIzMTAuLjNkMzAzYmUgMTAwNjQ0Ci0tLSBhL3NyYy9wcmludGYuYworKysgYi9z cmMvcHJpbnRmLmMKQEAgLTY1Nyw3ICs2NTcsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgICAgICAgIHsKICAgICAgICAgICB2ZXJzaW9uX2V0YyAoc3Rkb3V0LCBQUk9H UkFNX05BTUUsIFBBQ0tBR0VfTkFNRSwgVmVyc2lvbiwgQVVUSE9SUywKICAgICAgICAgICAg ICAgICAgICAgICAgKGNoYXIgKikgTlVMTCk7Ci0gICAgICAgICAgZXhpdCAoRVhJVF9TVUND RVNTKTsKKyAgICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgICAgICB9CiAgICAg fQogCkBAIC02OTIsNSArNjkyLDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog ICAgICAgICAgICBfKCJ3YXJuaW5nOiBpZ25vcmluZyBleGNlc3MgYXJndW1lbnRzLCBzdGFy dGluZyB3aXRoICVzIiksCiAgICAgICAgICAgIHF1b3RlIChhcmd2WzBdKSk7CiAKLSAgZXhp dCAoZXhpdF9zdGF0dXMpOworICByZXR1cm4gZXhpdF9zdGF0dXM7CiB9CmRpZmYgLS1naXQg YS9zcmMvcHR4LmMgYi9zcmMvcHR4LmMKaW5kZXggZDE2NWU5Ni4uMzlhYzVlNCAxMDA2NDQK LS0tIGEvc3JjL3B0eC5jCisrKyBiL3NyYy9wdHguYwpAQCAtMjE1NSw1ICsyMTU1LDUgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgIC8qIEFsbCBkb25lLiAgKi8KIAot ICBleGl0IChFWElUX1NVQ0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZm IC0tZ2l0IGEvc3JjL3B3ZC5jIGIvc3JjL3B3ZC5jCmluZGV4IGQxMjZlZDcuLjliYmQ3ODcg MTAwNjQ0Ci0tLSBhL3NyYy9wd2QuYworKysgYi9zcmMvcHdkLmMKQEAgLTM3Miw3ICszNzIs NyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICBpZiAod2QpCiAgICAg ICAgIHsKICAgICAgICAgICBwdXRzICh3ZCk7Ci0gICAgICAgICAgZXhpdCAoRVhJVF9TVUND RVNTKTsKKyAgICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgICAgICB9CiAgICAg fQogCkBAIC0zOTAsNSArMzkwLDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog ICAgICAgZmlsZV9uYW1lX2ZyZWUgKGZpbGVfbmFtZSk7CiAgICAgfQogCi0gIGV4aXQgKEVY SVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9z cmMvcmVhZGxpbmsuYyBiL3NyYy9yZWFkbGluay5jCmluZGV4IGY0NmQ5NDguLmQ2M2YwN2Ig MTAwNjQ0Ci0tLSBhL3NyYy9yZWFkbGluay5jCisrKyBiL3NyYy9yZWFkbGluay5jCkBAIC0x NzQsNSArMTc0LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICB9 CiAgICAgfQogCi0gIGV4aXQgKHN0YXR1cyk7CisgIHJldHVybiBzdGF0dXM7CiB9CmRpZmYg LS1naXQgYS9zcmMvcmVhbHBhdGguYyBiL3NyYy9yZWFscGF0aC5jCmluZGV4IDBjNTUzMjcu LjkzMDUzMGMgMTAwNjQ0Ci0tLSBhL3NyYy9yZWFscGF0aC5jCisrKyBiL3NyYy9yZWFscGF0 aC5jCkBAIC0yNzMsNSArMjczLDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog ICBmb3IgKDsgb3B0aW5kIDwgYXJnYzsgKytvcHRpbmQpCiAgICAgb2sgJj0gcHJvY2Vzc19w YXRoIChhcmd2W29wdGluZF0sIGNhbl9tb2RlKTsKIAotICBleGl0IChvayA/IEVYSVRfU1VD Q0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/IEVYSVRfU1VDQ0VTUyA6IEVY SVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9ybS5jIGIvc3JjL3JtLmMKaW5kZXgg NzA4ZDg1ZC4uN2FiMWMwNyAxMDA2NDQKLS0tIGEvc3JjL3JtLmMKKysrIGIvc3JjL3JtLmMK QEAgLTMxNSw3ICszMTUsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgIGlm IChhcmdjIDw9IG9wdGluZCkKICAgICB7CiAgICAgICBpZiAoeC5pZ25vcmVfbWlzc2luZ19m aWxlcykKLSAgICAgICAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgICAgICAgcmV0dXJuIEVY SVRfU1VDQ0VTUzsKICAgICAgIGVsc2UKICAgICAgICAgewogICAgICAgICAgIGVycm9yICgw LCAwLCBfKCJtaXNzaW5nIG9wZXJhbmQiKSk7CkBAIC0zNDcsMTAgKzM0NywxMCBAQCBtYWlu IChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZWN0X3BsdXJhbCAobl9maWxlcykpKSwKICAgICAgICAgICAgICAgIHByb2dyYW1fbmFt ZSwgbl9maWxlcyk7CiAgICAgICBpZiAoIXllc25vICgpKQotICAgICAgICBleGl0IChFWElU X1NVQ0NFU1MpOworICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAgIH0KIAogICBl bnVtIFJNX3N0YXR1cyBzdGF0dXMgPSBybSAoZmlsZSwgJngpOwogICBhc3NlcnQgKFZBTElE X1NUQVRVUyAoc3RhdHVzKSk7Ci0gIGV4aXQgKHN0YXR1cyA9PSBSTV9FUlJPUiA/IEVYSVRf RkFJTFVSRSA6IEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBzdGF0dXMgPT0gUk1fRVJST1Ig PyBFWElUX0ZBSUxVUkUgOiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9zcmMvcm1k aXIuYyBiL3NyYy9ybWRpci5jCmluZGV4IGU2N2QzYjAuLjZiZGZiMGYgMTAwNjQ0Ci0tLSBh L3NyYy9ybWRpci5jCisrKyBiL3NyYy9ybWRpci5jCkBAIC0yNDgsNSArMjQ4LDUgQEAgbWFp biAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICB9CiAgICAgfQogCi0gIGV4aXQg KG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJ VF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3J1bmNvbi5j IGIvc3JjL3J1bmNvbi5jCmluZGV4IDE0Y2NjM2QuLmVmZTgzZjIgMTAwNjQ0Ci0tLSBhL3Ny Yy9ydW5jb24uYworKysgYi9zcmMvcnVuY29uLmMKQEAgLTE3Nyw3ICsxNzcsNyBAQCBtYWlu IChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIGVycm9yIChFWElUX0ZBSUxVUkUs IGVycm5vLCBfKCJmYWlsZWQgdG8gZ2V0IGN1cnJlbnQgY29udGV4dCIpKTsKICAgICAgIGZw dXRzIChjdXJfY29udGV4dCwgc3Rkb3V0KTsKICAgICAgIGZwdXRjICgnXG4nLCBzdGRvdXQp OwotICAgICAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgICAgIHJldHVybiBFWElUX1NVQ0NF U1M7CiAgICAgfQogCiAgIGlmICghKHVzZXIgfHwgcm9sZSB8fCB0eXBlIHx8IHJhbmdlIHx8 IGNvbXB1dGVfdHJhbnMpKQpAQCAtMjU4LDkgKzI1OCw3IEBAIG1haW4gKGludCBhcmdjLCBj aGFyICoqYXJndikKIAogICBleGVjdnAgKGFyZ3Zbb3B0aW5kXSwgYXJndiArIG9wdGluZCk7 CiAKLSAgewotICAgIGludCBleGl0X3N0YXR1cyA9IChlcnJubyA9PSBFTk9FTlQgPyBFWElU X0VOT0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRSk7Ci0gICAgZXJyb3IgKDAsIGVycm5vLCAi JXMiLCBhcmd2W29wdGluZF0pOwotICAgIGV4aXQgKGV4aXRfc3RhdHVzKTsKLSAgfQorICBp bnQgZXhpdF9zdGF0dXMgPSBlcnJubyA9PSBFTk9FTlQgPyBFWElUX0VOT0VOVCA6IEVYSVRf Q0FOTk9UX0lOVk9LRTsKKyAgZXJyb3IgKDAsIGVycm5vLCAiJXMiLCBhcmd2W29wdGluZF0p OworICByZXR1cm4gZXhpdF9zdGF0dXM7CiB9CmRpZmYgLS1naXQgYS9zcmMvc2VxLmMgYi9z cmMvc2VxLmMKaW5kZXggMTEyNDM1OC4uNzk0MzgyNCAxMDA2NDQKLS0tIGEvc3JjL3NlcS5j CisrKyBiL3NyYy9zZXEuYwpAQCAtNTc0LDcgKzU3NCw3IEBAIG1haW4gKGludCBhcmdjLCBj aGFyICoqYXJndikKICAgICAgIGNoYXIgY29uc3QgKnMxID0gbl9hcmdzID09IDEgPyAiMSIg OiBhcmd2W29wdGluZF07CiAgICAgICBjaGFyIGNvbnN0ICpzMiA9IGFyZ3Zbb3B0aW5kICsg KG5fYXJncyAtIDEpXTsKICAgICAgIGlmIChzZXFfZmFzdCAoczEsIHMyKSkKLSAgICAgICAg ZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgICAgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIAog ICAgICAgLyogVXBvbiBhbnkgZmFpbHVyZSwgbGV0IHRoZSBtb3JlIGdlbmVyYWwgY29kZSBk ZWFsIHdpdGggaXQuICAqLwogICAgIH0KQEAgLTYwOCw3ICs2MDgsNyBAQCBtYWluIChpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIHsKICAgICAgICAgICBJRl9MSU5UIChmcmVl IChzMSkpOwogICAgICAgICAgIElGX0xJTlQgKGZyZWUgKHMyKSk7Ci0gICAgICAgICAgZXhp dCAoRVhJVF9TVUNDRVNTKTsKKyAgICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogICAg ICAgICB9CiAKICAgICAgIGZyZWUgKHMxKTsKQEAgLTYyMSw1ICs2MjEsNSBAQCBtYWluIChp bnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgcHJpbnRfbnVtYmVycyAoZm9ybWF0X3N0ciwg bGF5b3V0LCBmaXJzdC52YWx1ZSwgc3RlcC52YWx1ZSwgbGFzdC52YWx1ZSk7CiAKLSAgZXhp dCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdp dCBhL3NyYy9zaHJlZC5jIGIvc3JjL3NocmVkLmMKaW5kZXggYmQ4OGUzOC4uZDE3Yzg3MCAx MDA2NDQKLS0tIGEvc3JjL3NocmVkLmMKKysrIGIvc3JjL3NocmVkLmMKQEAgLTEzMTgsNyAr MTMxOCw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGZyZWUgKHFu YW1lKTsKICAgICB9CiAKLSAgZXhpdCAob2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxV UkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkU7CiB9CiAv KgogICogdmltOnN3PTI6c3RzPTI6CmRpZmYgLS1naXQgYS9zcmMvc2h1Zi5jIGIvc3JjL3No dWYuYwppbmRleCAyNTA1YmU2Li45MTVmN2I3IDEwMDY0NAotLS0gYS9zcmMvc2h1Zi5jCisr KyBiL3NyYy9zaHVmLmMKQEAgLTYyMiw1ICs2MjIsNSBAQCBtYWluIChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAgICAgfQogI2VuZGlmCiAKLSAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAg cmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3NyYy9zbGVlcC5jIGIvc3Jj L3NsZWVwLmMKaW5kZXggZTI0YzI1MS4uMTBmZDk4OSAxMDA2NDQKLS0tIGEvc3JjL3NsZWVw LmMKKysrIGIvc3JjL3NsZWVwLmMKQEAgLTE0NSw1ICsxNDUsNSBAQCBtYWluIChpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgIGlmICh4bmFub3NsZWVwIChzZWNvbmRzKSkKICAgICBlcnJv ciAoRVhJVF9GQUlMVVJFLCBlcnJubywgXygiY2Fubm90IHJlYWQgcmVhbHRpbWUgY2xvY2si KSk7CiAKLSAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsK IH0KZGlmZiAtLWdpdCBhL3NyYy9zb3J0LmMgYi9zcmMvc29ydC5jCmluZGV4IGMyNDkzMTku LmRlYjdjM2EgMTAwNjQ0Ci0tLSBhL3NyYy9zb3J0LmMKKysrIGIvc3JjL3NvcnQuYwpAQCAt NDcwOCw3ICs0NzA4LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgICAg ICAvKiBQT1NJWCByZXF1aXJlcyB0aGF0IHNvcnQgcmV0dXJuIDEgSUZGIGludm9rZWQgd2l0 aCAtYyBvciAtQyBhbmQgdGhlCiAgICAgICAgICBpbnB1dCBpcyBub3QgcHJvcGVybHkgc29y dGVkLiAgKi8KLSAgICAgIGV4aXQgKGNoZWNrIChmaWxlc1swXSwgY2hlY2tvbmx5KSA/IEVY SVRfU1VDQ0VTUyA6IFNPUlRfT1VUX09GX09SREVSKTsKKyAgICAgIHJldHVybiBjaGVjayAo ZmlsZXNbMF0sIGNoZWNrb25seSkgPyBFWElUX1NVQ0NFU1MgOiBTT1JUX09VVF9PRl9PUkRF UjsKICAgICB9CiAKICAgLyogQ2hlY2sgYWxsIGlucHV0cyBhcmUgYWNjZXNzaWJsZSwgb3Ig ZXhpdCBpbW1lZGlhdGVseS4gICovCkBAIC00NzQ2LDUgKzQ3NDYsNSBAQCBtYWluIChpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAgIGlmIChoYXZlX3JlYWRfc3RkaW4gJiYgZmNsb3NlIChz dGRpbikgPT0gRU9GKQogICAgIGRpZSAoXygiY2xvc2UgZmFpbGVkIiksICItIik7CiAKLSAg ZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAt LWdpdCBhL3NyYy9zcGxpdC5jIGIvc3JjL3NwbGl0LmMKaW5kZXggZGFjYWNhYS4uMzYyOTVj NCAxMDA2NDQKLS0tIGEvc3JjL3NwbGl0LmMKKysrIGIvc3JjL3NwbGl0LmMKQEAgLTE0ODgs NSArMTQ4OCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICBlcnJvciAo RVhJVF9GQUlMVVJFLCBlcnJubywgIiVzIiwgaW5maWxlKTsKICAgY2xvc2VvdXQgKE5VTEws IG91dHB1dF9kZXNjLCBmaWx0ZXJfcGlkLCBvdXRmaWxlKTsKIAotICBleGl0IChFWElUX1NV Q0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3N0 YXQuYyBiL3NyYy9zdGF0LmMKaW5kZXggYjY1ZGJlNS4uYzc4YWI3MCAxMDA2NDQKLS0tIGEv c3JjL3N0YXQuYworKysgYi9zcmMvc3RhdC5jCkBAIC0xNTc1LDUgKzE1NzUsNSBAQCBtYWlu IChpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgICAgICAgICA/IGRvX3N0YXRmcyAoYXJn dltpXSwgZm9ybWF0KQogICAgICAgICAgICA6IGRvX3N0YXQgKGFyZ3ZbaV0sIGZvcm1hdCwg Zm9ybWF0MikpOwogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJF KTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZm IC0tZ2l0IGEvc3JjL3N0ZGJ1Zi5jIGIvc3JjL3N0ZGJ1Zi5jCmluZGV4IDkyZWUyODIuLmM4 Mzk4YWIgMTAwNjQ0Ci0tLSBhL3NyYy9zdGRidWYuYworKysgYi9zcmMvc3RkYnVmLmMKQEAg LTM4Nyw5ICszODcsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgZXhl Y3ZwICgqYXJndiwgYXJndik7CiAKLSAgewotICAgIGludCBleGl0X3N0YXR1cyA9IChlcnJu byA9PSBFTk9FTlQgPyBFWElUX0VOT0VOVCA6IEVYSVRfQ0FOTk9UX0lOVk9LRSk7Ci0gICAg ZXJyb3IgKDAsIGVycm5vLCBfKCJmYWlsZWQgdG8gcnVuIGNvbW1hbmQgJXMiKSwgcXVvdGUg KGFyZ3ZbMF0pKTsKLSAgICBleGl0IChleGl0X3N0YXR1cyk7Ci0gIH0KKyAgaW50IGV4aXRf c3RhdHVzID0gZXJybm8gPT0gRU5PRU5UID8gRVhJVF9FTk9FTlQgOiBFWElUX0NBTk5PVF9J TlZPS0U7CisgIGVycm9yICgwLCBlcnJubywgXygiZmFpbGVkIHRvIHJ1biBjb21tYW5kICVz IiksIHF1b3RlIChhcmd2WzBdKSk7CisgIHJldHVybiBleGl0X3N0YXR1czsKIH0KZGlmZiAt LWdpdCBhL3NyYy9zdHR5LmMgYi9zcmMvc3R0eS5jCmluZGV4IDNjNDg1NzguLjQ4NDNiOWIg MTAwNjQ0Ci0tLSBhL3NyYy9zdHR5LmMKKysrIGIvc3JjL3N0dHkuYwpAQCAtODYyLDcgKzg2 Miw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIG1heF9jb2wgPSBz Y3JlZW5fY29sdW1ucyAoKTsKICAgICAgIGN1cnJlbnRfY29sID0gMDsKICAgICAgIGRpc3Bs YXlfc2V0dGluZ3MgKG91dHB1dF90eXBlLCAmbW9kZSwgZGV2aWNlX25hbWUpOwotICAgICAg ZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiAgICAg fQogCiAgIHNwZWVkX3dhc19zZXQgPSBmYWxzZTsKQEAgLTEwNzAsNyArMTA3MCw3IEBAIG1h aW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgfQogICAgIH0KIAotICBleGl0 IChFWElUX1NVQ0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQogCiAvKiBSZXR1 cm4gZmFsc2UgaWYgbm90IGFwcGxpZWQgYmVjYXVzZSBub3QgcmV2ZXJzaWJsZTsgb3RoZXJ3 aXNlCmRpZmYgLS1naXQgYS9zcmMvc3VtLmMgYi9zcmMvc3VtLmMKaW5kZXggNDQyYjdhZC4u NWM1MDJjZSAxMDA2NDQKLS0tIGEvc3JjL3N1bS5jCisrKyBiL3NyYy9zdW0uYwpAQCAtMjcw LDUgKzI3MCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAogICBpZiAoaGF2 ZV9yZWFkX3N0ZGluICYmIGZjbG9zZSAoc3RkaW4pID09IEVPRikKICAgICBlcnJvciAoRVhJ VF9GQUlMVVJFLCBlcnJubywgIi0iKTsKLSAgZXhpdCAob2sgPyBFWElUX1NVQ0NFU1MgOiBF WElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxV UkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvc3luYy5jIGIvc3JjL3N5bmMuYwppbmRleCA4Yzg5 MDQzLi5iNzA2ZmJlIDEwMDY0NAotLS0gYS9zcmMvc3luYy5jCisrKyBiL3NyYy9zeW5jLmMK QEAgLTY5LDUgKzY5LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGVy cm9yICgwLCAwLCBfKCJpZ25vcmluZyBhbGwgYXJndW1lbnRzIikpOwogCiAgIHN5bmMgKCk7 Ci0gIGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRp ZmYgLS1naXQgYS9zcmMvdGFjLmMgYi9zcmMvdGFjLmMKaW5kZXggYzc2YWZjNy4uYmEwNTVh MCAxMDA2NDQKLS0tIGEvc3JjL3RhYy5jCisrKyBiL3NyYy90YWMuYwpAQCAtNjk5LDUgKzY5 OSw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgZnJlZSAoR19idWZmZXIg LSBvZmZzZXQpOwogI2VuZGlmCiAKLSAgZXhpdCAob2sgPyBFWElUX1NVQ0NFU1MgOiBFWElU X0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkU7 CiB9CmRpZmYgLS1naXQgYS9zcmMvdGFpbC5jIGIvc3JjL3RhaWwuYwppbmRleCA1ZmY3Mzhk Li43ZGQzZjRhIDEwMDY0NAotLS0gYS9zcmMvdGFpbC5jCisrKyBiL3NyYy90YWlsLmMKQEAg LTIyMTgsNyArMjIxOCw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKIAogICAv KiBEb24ndCByZWFkIGFueXRoaW5nIGlmIHdlJ2xsIG5ldmVyIG91dHB1dCBhbnl0aGluZy4g ICovCiAgIGlmICghIG5fdW5pdHMgJiYgISBmb3JldmVyICYmICEgZnJvbV9zdGFydCkKLSAg ICBleGl0IChFWElUX1NVQ0NFU1MpOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiAKICAg RiA9IHhubWFsbG9jIChuX2ZpbGVzLCBzaXplb2YgKkYpOwogICBmb3IgKGkgPSAwOyBpIDwg bl9maWxlczsgaSsrKQpAQCAtMjI4Niw3ICsyMjg2LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQogICAgICAgICAgICAgICAgIGVycm9yIChFWElUX0ZBSUxVUkUsIGVycm5v LCBfKCJ3cml0ZSBlcnJvciIpKTsKIAogICAgICAgICAgICAgICBpZiAoIXRhaWxfZm9yZXZl cl9pbm90aWZ5ICh3ZCwgRiwgbl9maWxlcywgc2xlZXBfaW50ZXJ2YWwpKQotICAgICAgICAg ICAgICAgIGV4aXQgKEVYSVRfRkFJTFVSRSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIEVY SVRfRkFJTFVSRTsKICAgICAgICAgICAgIH0KICAgICAgICAgICBlcnJvciAoMCwgZXJybm8s IF8oImlub3RpZnkgY2Fubm90IGJlIHVzZWQsIHJldmVydGluZyB0byBwb2xsaW5nIikpOwog ICAgICAgICB9CkBAIC0yMjk3LDUgKzIyOTcsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAKICAgaWYgKGhhdmVfcmVhZF9zdGRpbiAmJiBjbG9zZSAoU1RESU5fRklMRU5P KSA8IDApCiAgICAgZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7Ci0gIGV4aXQg KG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJ VF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3RlZS5jIGIv c3JjL3RlZS5jCmluZGV4IGJlMzY1NjAuLjgyMWQ4MjUgMTAwNjQ0Ci0tLSBhL3NyYy90ZWUu YworKysgYi9zcmMvdGVlLmMKQEAgLTEyNSw3ICsxMjUsNyBAQCBtYWluIChpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAgIGlmIChjbG9zZSAoU1RESU5fRklMRU5PKSAhPSAwKQogICAgIGVy cm9yIChFWElUX0ZBSUxVUkUsIGVycm5vLCBfKCJzdGFuZGFyZCBpbnB1dCIpKTsKIAotICBl eGl0IChvayA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRSk7CisgIHJldHVybiBvayA/ IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KIAogLyogQ29weSB0aGUgc3RhbmRh cmQgaW5wdXQgaW50byBlYWNoIG9mIHRoZSBORklMRVMgZmlsZXMgaW4gRklMRVMKZGlmZiAt LWdpdCBhL3NyYy90ZXN0LmMgYi9zcmMvdGVzdC5jCmluZGV4IDc1OTY4NzkuLjI0YmNiOTMg MTAwNjQ0Ci0tLSBhL3NyYy90ZXN0LmMKKysrIGIvc3JjL3Rlc3QuYwpAQCAtNTcsMTAgKzU3 LDEyIEBAIGVudW0geyBURVNUX1RSVUUsIFRFU1RfRkFMU0UsIFRFU1RfRkFJTFVSRSB9Owog CiAjaWYgZGVmaW5lZCBURVNUX1NUQU5EQUxPTkUKICMgZGVmaW5lIHRlc3RfZXhpdCh2YWwp IGV4aXQgKHZhbCkKKyMgZGVmaW5lIHRlc3RfbWFpbl9yZXR1cm4odmFsKSByZXR1cm4gdmFs CiAjZWxzZQogICAgc3RhdGljIGptcF9idWYgdGVzdF9leGl0X2J1ZjsKICAgIHN0YXRpYyBp bnQgdGVzdF9lcnJvcl9yZXR1cm4gPSAwOwogIyBkZWZpbmUgdGVzdF9leGl0KHZhbCkgdGVz dF9lcnJvcl9yZXR1cm4gPSB2YWwsIGxvbmdqbXAgKHRlc3RfZXhpdF9idWYsIDEpCisjIGRl ZmluZSB0ZXN0X21haW5fcmV0dXJuKHZhbCkgdGVzdF9leGl0ICh2YWwpCiAjZW5kaWYgLyog IVRFU1RfU1RBTkRBTE9ORSAqLwogCiBzdGF0aWMgaW50IHBvczsJCS8qIFRoZSBvZmZzZXQg b2YgdGhlIGN1cnJlbnQgYXJndW1lbnQgaW4gQVJHVi4gKi8KQEAgLTg1MSw3ICs4NTMsNyBA QCBtYWluIChpbnQgbWFyZ2MsIGNoYXIgKiptYXJndikKICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgdmVyc2lvbl9ldGMgKHN0ZG91dCwgUFJPR1JBTV9OQU1FLCBQQUNLQUdFX05B TUUsIFZlcnNpb24sIEFVVEhPUlMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2hh ciAqKSBOVUxMKTsKLSAgICAgICAgICAgICAgdGVzdF9leGl0IChFWElUX1NVQ0NFU1MpOwor ICAgICAgICAgICAgICB0ZXN0X21haW5fcmV0dXJuIChFWElUX1NVQ0NFU1MpOwogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgICBpZiAobWFyZ2MgPCAyIHx8ICFTVFJFUSAobWFy Z3ZbbWFyZ2MgLSAxXSwgIl0iKSkKQEAgLTg2NCwxMiArODY2LDEyIEBAIG1haW4gKGludCBt YXJnYywgY2hhciAqKm1hcmd2KQogICBwb3MgPSAxOwogCiAgIGlmIChwb3MgPj0gYXJnYykK LSAgICB0ZXN0X2V4aXQgKFRFU1RfRkFMU0UpOworICAgIHRlc3RfbWFpbl9yZXR1cm4gKFRF U1RfRkFMU0UpOwogCiAgIHZhbHVlID0gcG9zaXh0ZXN0IChhcmdjIC0gMSk7CiAKICAgaWYg KHBvcyAhPSBhcmdjKQogICAgIHRlc3Rfc3ludGF4X2Vycm9yIChfKCJleHRyYSBhcmd1bWVu dCAlcyIpLCBxdW90ZSAoYXJndltwb3NdKSk7CiAKLSAgdGVzdF9leGl0ICh2YWx1ZSA/IFRF U1RfVFJVRSA6IFRFU1RfRkFMU0UpOworICB0ZXN0X21haW5fcmV0dXJuICh2YWx1ZSA/IFRF U1RfVFJVRSA6IFRFU1RfRkFMU0UpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3RpbWVvdXQuYyBi L3NyYy90aW1lb3V0LmMKaW5kZXggNjhiYWEyMy4uYzRjYzA3NCAxMDA2NDQKLS0tIGEvc3Jj L3RpbWVvdXQuYworKysgYi9zcmMvdGltZW91dC5jCkBAIC00NDAsMTIgKzQ0MCwxMCBAQCBt YWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgIGlmIChtb25pdG9yZWRfcGlkID09IC0x KQogICAgIHsKICAgICAgIGVycm9yICgwLCBlcnJubywgXygiZm9yayBzeXN0ZW0gY2FsbCBm YWlsZWQiKSk7Ci0gICAgICBleGl0IChFWElUX0NBTkNFTEVEKTsKKyAgICAgIHJldHVybiBF WElUX0NBTkNFTEVEOwogICAgIH0KICAgZWxzZSBpZiAobW9uaXRvcmVkX3BpZCA9PSAwKQog ICAgIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBjaGlsZCAqLwotICAgICAgaW50 IGV4aXRfc3RhdHVzOwotCiAgICAgICAvKiBleGVjIGRvZXNuJ3QgcmVzZXQgU0lHX0lHTiAt PiBTSUdfREZMLiAgKi8KICAgICAgIHNpZ25hbCAoU0lHVFRJTiwgU0lHX0RGTCk7CiAgICAg ICBzaWduYWwgKFNJR1RUT1UsIFNJR19ERkwpOwpAQCAtNDUzLDkgKzQ1MSw5IEBAIG1haW4g KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgIGV4ZWN2cCAoYXJndlswXSwgYXJndik7 ICAgLyogRklYTUU6IHNob3VsZCB3ZSB1c2UgInNoIC1jIiAuLi4gaGVyZT8gICovCiAKICAg ICAgIC8qIGV4aXQgbGlrZSBzaCwgZW52LCBub2h1cCwgLi4uICAqLwotICAgICAgZXhpdF9z dGF0dXMgPSAoZXJybm8gPT0gRU5PRU5UID8gRVhJVF9FTk9FTlQgOiBFWElUX0NBTk5PVF9J TlZPS0UpOworICAgICAgaW50IGV4aXRfc3RhdHVzID0gZXJybm8gPT0gRU5PRU5UID8gRVhJ VF9FTk9FTlQgOiBFWElUX0NBTk5PVF9JTlZPS0U7CiAgICAgICBlcnJvciAoMCwgZXJybm8s IF8oImZhaWxlZCB0byBydW4gY29tbWFuZCAlcyIpLCBxdW90ZSAoYXJndlswXSkpOwotICAg ICAgZXhpdCAoZXhpdF9zdGF0dXMpOworICAgICAgcmV0dXJuIGV4aXRfc3RhdHVzOwogICAg IH0KICAgZWxzZQogICAgIHsKQEAgLTUwMCw4ICs0OTgsNyBAQCBtYWluIChpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAgICAgICAgIH0KIAogICAgICAgaWYgKHRpbWVkX291dCAmJiAhcHJl c2VydmVfc3RhdHVzKQotICAgICAgICBleGl0IChFWElUX1RJTUVET1VUKTsKLSAgICAgIGVs c2UKLSAgICAgICAgZXhpdCAoc3RhdHVzKTsKKyAgICAgICAgc3RhdHVzID0gRVhJVF9USU1F RE9VVDsKKyAgICAgIHJldHVybiBzdGF0dXM7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvc3Jj L3RvdWNoLmMgYi9zcmMvdG91Y2guYwppbmRleCAxYmEyNDI2Li5iMTI4ZTg4IDEwMDY0NAot LS0gYS9zcmMvdG91Y2guYworKysgYi9zcmMvdG91Y2guYwpAQCAtNDMzLDUgKzQzMyw1IEBA IG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgZm9yICg7IG9wdGluZCA8IGFyZ2M7 ICsrb3B0aW5kKQogICAgIG9rICY9IHRvdWNoIChhcmd2W29wdGluZF0pOwogCi0gIGV4aXQg KG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIG9rID8gRVhJ VF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3RyLmMgYi9z cmMvdHIuYwppbmRleCAwNjg1OGY5Li41OTA1YTYzIDEwMDY0NAotLS0gYS9zcmMvdHIuYwor KysgYi9zcmMvdHIuYwpAQCAtMTgwNCwxMyArMTgwNCwxMyBAQCBtYWluIChpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAKICAgc3BlY19pbml0IChzMSk7CiAgIGlmICghcGFyc2Vfc3RyIChh cmd2W29wdGluZF0sIHMxKSkKLSAgICBleGl0IChFWElUX0ZBSUxVUkUpOworICAgIHJldHVy biBFWElUX0ZBSUxVUkU7CiAKICAgaWYgKG5vbl9vcHRpb25fYXJncyA9PSAyKQogICAgIHsK ICAgICAgIHNwZWNfaW5pdCAoczIpOwogICAgICAgaWYgKCFwYXJzZV9zdHIgKGFyZ3Zbb3B0 aW5kICsgMV0sIHMyKSkKLSAgICAgICAgZXhpdCAoRVhJVF9GQUlMVVJFKTsKKyAgICAgICAg cmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAgIGVsc2UKICAgICBzMiA9IE5VTEw7CkBA IC0xOTQ0LDUgKzE5NDQsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgIGlm IChjbG9zZSAoU1RESU5fRklMRU5PKSAhPSAwKQogICAgIGVycm9yIChFWElUX0ZBSUxVUkUs IGVycm5vLCBfKCJzdGFuZGFyZCBpbnB1dCIpKTsKIAotICBleGl0IChFWElUX1NVQ0NFU1Mp OworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3JjL3RydWUuYyBi L3NyYy90cnVlLmMKaW5kZXggOGExYzRmOS4uZWE0ODMzYSAxMDA2NDQKLS0tIGEvc3JjL3Ry dWUuYworKysgYi9zcmMvdHJ1ZS5jCkBAIC03Niw1ICs3Niw1IEBAIG1haW4gKGludCBhcmdj LCBjaGFyICoqYXJndikKICAgICAgICAgICAgICAgICAgICAgIChjaGFyICopIE5VTEwpOwog ICAgIH0KIAotICBleGl0IChFWElUX1NUQVRVUyk7CisgIHJldHVybiBFWElUX1NUQVRVUzsK IH0KZGlmZiAtLWdpdCBhL3NyYy90cnVuY2F0ZS5jIGIvc3JjL3RydW5jYXRlLmMKaW5kZXgg ZjMxMjUwOS4uNDRkMGI5NiAxMDA2NDQKLS0tIGEvc3JjL3RydW5jYXRlLmMKKysrIGIvc3Jj L3RydW5jYXRlLmMKQEAgLTQyMCw1ICs0MjAsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgICAgICAgIH0KICAgICB9CiAKLSAgZXhpdCAoZXJyb3JzID8gRVhJVF9GQUlM VVJFIDogRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIGVycm9ycyA/IEVYSVRfRkFJTFVSRSA6 IEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3NyYy90c29ydC5jIGIvc3JjL3Rzb3J0 LmMKaW5kZXggNjYxYzcxNy4uODM4MGNlOCAxMDA2NDQKLS0tIGEvc3JjL3Rzb3J0LmMKKysr IGIvc3JjL3Rzb3J0LmMKQEAgLTU1Nyw1ICs1NTcsNSBAQCBtYWluIChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAKICAgb2sgPSB0c29ydCAob3B0aW5kID09IGFyZ2MgPyAiLSIgOiBhcmd2 W29wdGluZF0pOwogCi0gIGV4aXQgKG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJF KTsKKyAgcmV0dXJuIG9rID8gRVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFOwogfQpkaWZm IC0tZ2l0IGEvc3JjL3R0eS5jIGIvc3JjL3R0eS5jCmluZGV4IDE2MzAxZTEuLmY4YzI1NTQg MTAwNjQ0Ci0tLSBhL3NyYy90dHkuYworKysgYi9zcmMvdHR5LmMKQEAgLTEyMCw1ICsxMjAs NSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIHB1dHMgKF8oIm5v dCBhIHR0eSIpKTsKICAgICB9CiAKLSAgZXhpdCAoaXNhdHR5IChTVERJTl9GSUxFTk8pID8g RVhJVF9TVUNDRVNTIDogRVhJVF9GQUlMVVJFKTsKKyAgcmV0dXJuIGlzYXR0eSAoU1RESU5f RklMRU5PKSA/IEVYSVRfU1VDQ0VTUyA6IEVYSVRfRkFJTFVSRTsKIH0KZGlmZiAtLWdpdCBh L3NyYy91bmFtZS5jIGIvc3JjL3VuYW1lLmMKaW5kZXggZTNiZWQ0OC4uM2NjM2NiYSAxMDA2 NDQKLS0tIGEvc3JjL3VuYW1lLmMKKysrIGIvc3JjL3VuYW1lLmMKQEAgLTM3MSw1ICszNzEs NSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgcHV0Y2hhciAoJ1xuJyk7 CiAKLSAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0K ZGlmZiAtLWdpdCBhL3NyYy91bmV4cGFuZC5jIGIvc3JjL3VuZXhwYW5kLmMKaW5kZXggNTA1 ZTIyMy4uMDNjOWEyZSAxMDA2NDQKLS0tIGEvc3JjL3VuZXhwYW5kLmMKKysrIGIvc3JjL3Vu ZXhwYW5kLmMKQEAgLTUyOCw1ICs1MjgsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFy Z3YpCiAgIGlmIChoYXZlX3JlYWRfc3RkaW4gJiYgZmNsb3NlIChzdGRpbikgIT0gMCkKICAg ICBlcnJvciAoRVhJVF9GQUlMVVJFLCBlcnJubywgIi0iKTsKIAotICBleGl0IChleGl0X3N0 YXR1cyk7CisgIHJldHVybiBleGl0X3N0YXR1czsKIH0KZGlmZiAtLWdpdCBhL3NyYy91bmlx LmMgYi9zcmMvdW5pcS5jCmluZGV4IDU0MjAwZmYuLjM1OGQwNmMgMTAwNjQ0Ci0tLSBhL3Ny Yy91bmlxLmMKKysrIGIvc3JjL3VuaXEuYwpAQCAtNjYyLDUgKzY2Miw1IEBAIG1haW4gKGlu dCBhcmdjLCBjaGFyICoqYXJndikKIAogICBjaGVja19maWxlIChmaWxlWzBdLCBmaWxlWzFd LCBkZWxpbWl0ZXIpOwogCi0gIGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElU X1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9zcmMvdW5saW5rLmMgYi9zcmMvdW5saW5rLmMK aW5kZXggMjYwYTUzMC4uYTA1YWEzMiAxMDA2NDQKLS0tIGEvc3JjL3VubGluay5jCisrKyBi L3NyYy91bmxpbmsuYwpAQCAtODUsNSArODUsNSBAQCBtYWluIChpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgIGlmICh1bmxpbmsgKGFyZ3Zbb3B0aW5kXSkgIT0gMCkKICAgICBlcnJvciAo RVhJVF9GQUlMVVJFLCBlcnJubywgXygiY2Fubm90IHVubGluayAlcyIpLCBxdW90ZSAoYXJn dltvcHRpbmRdKSk7CiAKLSAgZXhpdCAoRVhJVF9TVUNDRVNTKTsKKyAgcmV0dXJuIEVYSVRf U1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3NyYy91cHRpbWUuYyBiL3NyYy91cHRpbWUuYwpp bmRleCA0YWI5MTRmLi45MzkzMWQyIDEwMDY0NAotLS0gYS9zcmMvdXB0aW1lLmMKKysrIGIv c3JjL3VwdGltZS5jCkBAIC0yNTMsNSArMjUzLDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogICAgICAgdXNhZ2UgKEVYSVRfRkFJTFVSRSk7CiAgICAgfQogCi0gIGV4aXQg KEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQg YS9zcmMvdXNlcnMuYyBiL3NyYy91c2Vycy5jCmluZGV4IGVlNDRjODEuLmEwZGNlMTkgMTAw NjQ0Ci0tLSBhL3NyYy91c2Vycy5jCisrKyBiL3NyYy91c2Vycy5jCkBAIC0xNDcsNSArMTQ3 LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgdXNhZ2UgKEVYSVRf RkFJTFVSRSk7CiAgICAgfQogCi0gIGV4aXQgKEVYSVRfU1VDQ0VTUyk7CisgIHJldHVybiBF WElUX1NVQ0NFU1M7CiB9CmRpZmYgLS1naXQgYS9zcmMvd2MuYyBiL3NyYy93Yy5jCmluZGV4 IDQ5MDlkOWYuLjIwNDgwMjUgMTAwNjQ0Ci0tLSBhL3NyYy93Yy5jCisrKyBiL3NyYy93Yy5j CkBAIC03OTcsNSArNzk3LDUgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBp ZiAoaGF2ZV9yZWFkX3N0ZGluICYmIGNsb3NlIChTVERJTl9GSUxFTk8pICE9IDApCiAgICAg ZXJyb3IgKEVYSVRfRkFJTFVSRSwgZXJybm8sICItIik7CiAKLSAgZXhpdCAob2sgPyBFWElU X1NVQ0NFU1MgOiBFWElUX0ZBSUxVUkUpOworICByZXR1cm4gb2sgPyBFWElUX1NVQ0NFU1Mg OiBFWElUX0ZBSUxVUkU7CiB9CmRpZmYgLS1naXQgYS9zcmMvd2hvLmMgYi9zcmMvd2hvLmMK aW5kZXggZjA3Y2VlNi4uMjNlMjUxMSAxMDA2NDQKLS0tIGEvc3JjL3doby5jCisrKyBiL3Ny Yy93aG8uYwpAQCAtODI4LDUgKzgyOCw1IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKICAgICAgIHVzYWdlIChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAotICBleGl0IChFWElU X1NVQ0NFU1MpOworICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQpkaWZmIC0tZ2l0IGEvc3Jj L3dob2FtaS5jIGIvc3JjL3dob2FtaS5jCmluZGV4IDczMDFhYmIuLjU0NWU1MjEgMTAwNjQ0 Ci0tLSBhL3NyYy93aG9hbWkuYworKysgYi9zcmMvd2hvYW1pLmMKQEAgLTgzLDEyICs4Myw5 IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgZXJybm8gPSAwOwogICB1aWQg PSBnZXRldWlkICgpOwogICBwdyA9ICh1aWQgPT0gTk9fVUlEICYmIGVycm5vID8gTlVMTCA6 IGdldHB3dWlkICh1aWQpKTsKLSAgaWYgKHB3KQotICAgIHsKLSAgICAgIHB1dHMgKHB3LT5w d19uYW1lKTsKLSAgICAgIGV4aXQgKEVYSVRfU1VDQ0VTUyk7Ci0gICAgfQotICBmcHJpbnRm IChzdGRlcnIsIF8oIiVzOiBjYW5ub3QgZmluZCBuYW1lIGZvciB1c2VyIElEICVsdVxuIiks Ci0gICAgICAgICAgIHByb2dyYW1fbmFtZSwgKHVuc2lnbmVkIGxvbmcgaW50KSB1aWQpOwot ICBleGl0IChFWElUX0ZBSUxVUkUpOworICBpZiAoIXB3KQorICAgIGVycm9yIChFWElUX0ZB SUxVUkUsIGVycm5vLCAiY2Fubm90IGZpbmQgbmFtZSBmb3IgdXNlciBJRCAlbHUiLAorICAg ICAgICAgICAodW5zaWduZWQgbG9uZyBpbnQpIHVpZCk7CisgIHB1dHMgKHB3LT5wd19uYW1l KTsKKyAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KZGlmZiAtLWdpdCBhL3NyYy95ZXMuYyBi L3NyYy95ZXMuYwppbmRleCA5NzIxMzEyLi5lNTk1N2I5IDEwMDY0NAotLS0gYS9zcmMveWVz LmMKKysrIGIvc3JjL3llcy5jCkBAIC04Myw2ICs4Myw5IEBAIG1haW4gKGludCBhcmdjLCBj aGFyICoqYXJndikKICAgICAgIGZvciAoaSA9IG9wdGluZDsgaSA8IGFyZ2M7IGkrKykKICAg ICAgICAgaWYgKGZwdXRzIChhcmd2W2ldLCBzdGRvdXQpID09IEVPRgogICAgICAgICAgICAg fHwgcHV0Y2hhciAoaSA9PSBhcmdjIC0gMSA/ICdcbicgOiAnICcpID09IEVPRikKLSAgICAg ICAgICBlcnJvciAoRVhJVF9GQUlMVVJFLCBlcnJubywgXygic3RhbmRhcmQgb3V0cHV0Iikp OworICAgICAgICAgIHsKKyAgICAgICAgICAgIGVycm9yICgwLCBlcnJubywgXygic3RhbmRh cmQgb3V0cHV0IikpOworICAgICAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKKyAgICAg ICAgICB9CiAgICAgfQogfQotLSAKMS45LjMKCg== --------------070202020508030104050809 Content-Type: text/plain; charset=UTF-8; name="0004-maint-avoid-file-scope-names-of-the-form-_-a-z.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0004-maint-avoid-file-scope-names-of-the-form-_-a-z.patch" RnJvbSBhMWMxOTE0OTY5OTcyYTUxOTBjNDJhOTdiNDlkOWU2Njg2NzIxNjg0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDggU2VwIDIwMTQgMjA6NDE6NDQgLTA3MDAKU3ViamVjdDogW1BBVENI IDQvNF0gbWFpbnQ6IGF2b2lkIGZpbGUtc2NvcGUgbmFtZXMgb2YgdGhlIGZvcm0gX1thLXpd KgoKVGhlIEMgc3RhbmRhcmQgc2F5cyB0aGlzIGlzbid0IHBvcnRhYmxlLCBpZiB5b3UgaW5j bHVkZQpzdGFuZGFyZCBpbmNsdWRlIGZpbGVzLgoqIGJ1aWxkLWF1eC9nZW4tc2luZ2xlLWJp bmFyeS5zaDoKKiBzcmMvY29yZXV0aWxzLWFyY2guYyAoc2luZ2xlX2JpbmFyeV9tYWluX2Fy Y2gpCihzaW5nbGVfYmluYXJ5X21haW5fdW5hbWUpOgoqIHNyYy9jb3JldXRpbHMtZGlyLmMg KHNpbmdsZV9iaW5hcnlfbWFpbl9scykKKF9zaW5nbGVfYmluYXJ5X21haW5fZGlyKToKKiBz cmMvY29yZXV0aWxzLXZkaXIuYyAoc2luZ2xlX2JpbmFyeV9tYWluX2xzKQooX3NpbmdsZV9i aW5hcnlfbWFpbl92ZGlyKToKKiBzcmMvY29yZXV0aWxzLmMgKFNJTkdMRV9CSU5BUllfUFJP R1JBTSk6ClJlbW92ZSBsZWFkaW5nIF8gZnJvbSBzaW5nbGVfYmluYXJ5IHByZWZpeC4KKiBz cmMvbnVtZm10LmMgKHJvdW5kX3N0eWxlKTogUmVuYW1lIGZyb20gX3JvdW5kLiAgQWxsIHVz ZXMgY2hhbmdlZC4KKGludmFsX3N0eWxlKTogUmVuYW1lIGZyb20gX2ludmFsaWQuICBBbGwg dXNlcyBjaGFuZ2VkLgotLS0KIGJ1aWxkLWF1eC9nZW4tc2luZ2xlLWJpbmFyeS5zaCB8ICA2 ICsrKy0tLQogc3JjL2NvcmV1dGlscy1hcmNoLmMgICAgICAgICAgIHwgIDggKysrKy0tLS0K IHNyYy9jb3JldXRpbHMtZGlyLmMgICAgICAgICAgICB8ICA4ICsrKystLS0tCiBzcmMvY29y ZXV0aWxzLXZkaXIuYyAgICAgICAgICAgfCAgOCArKysrLS0tLQogc3JjL2NvcmV1dGlscy5j ICAgICAgICAgICAgICAgIHwgIDQgKystLQogc3JjL251bWZtdC5jICAgICAgICAgICAgICAg ICAgIHwgMjYgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwg MzEgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYnVpbGQt YXV4L2dlbi1zaW5nbGUtYmluYXJ5LnNoIGIvYnVpbGQtYXV4L2dlbi1zaW5nbGUtYmluYXJ5 LnNoCmluZGV4IDExMjhmNDAuLjRlMDdjZmQgMTAwNzU1Ci0tLSBhL2J1aWxkLWF1eC9nZW4t c2luZ2xlLWJpbmFyeS5zaAorKysgYi9idWlsZC1hdXgvZ2VuLXNpbmdsZS1iaW5hcnkuc2gK QEAgLTkwLDkgKzkwLDkgQEAgZm9yIGNtZCBpbiAkQUxMX1BST0dSQU1TOyBkbwogCiAgICMg Q0ZMQUdTCiAgICMgSGFjayBhbnkgb3RoZXIgcHJvZ3JhbSBkZWZpbmluZyBhIG1haW4oKSBy ZXBsYWNpbmcgaXRzIG1haW4gYnkKLSAgIyBfc2luZ2xlX2JpbmFyeV9tYWluXyRQUk9HUkFN X05BTUUuCi0gIGVjaG8gIiR7YmFzZX1fQ0ZMQUdTID0gXCItRG1haW49X3NpbmdsZV9iaW5h cnlfbWFpbl8ke2NtZH0gKGludCwgY2hhciAqKik7IiBcCi0gICAgICAgIiBpbnQgX3Npbmds ZV9iaW5hcnlfbWFpbl8ke2NtZH1cIiAiIFwKKyAgIyBzaW5nbGVfYmluYXJ5X21haW5fJFBS T0dSQU1fTkFNRS4KKyAgZWNobyAiJHtiYXNlfV9DRkxBR1MgPSBcIi1EbWFpbj1zaW5nbGVf YmluYXJ5X21haW5fJHtjbWR9IChpbnQsIGNoYXIgKiopOyIgXAorICAgICAgICIgaW50IHNp bmdsZV9iaW5hcnlfbWFpbl8ke2NtZH1cIiAiIFwKICAgICAgICAiLUR1c2FnZT1fdXNhZ2Vf JHtjbWR9IFwkKHNyY19jb3JldXRpbHNfQ0ZMQUdTKSIKICAgdmFyPXNyY18ke2NtZH1fQ0ZM QUdTCiAgIGV2YWwgInZhbHVlPVwkJHZhciIKZGlmZiAtLWdpdCBhL3NyYy9jb3JldXRpbHMt YXJjaC5jIGIvc3JjL2NvcmV1dGlscy1hcmNoLmMKaW5kZXggZjU1YmVmOS4uNjZlNDk5MCAx MDA2NDQKLS0tIGEvc3JjL2NvcmV1dGlscy1hcmNoLmMKKysrIGIvc3JjL2NvcmV1dGlscy1h cmNoLmMKQEAgLTIyLDEyICsyMiwxMiBAQAogI2luY2x1ZGUgInVuYW1lLmgiCiAvKiBFbnN1 cmUgdGhhdCB0aGUgbWFpbiBmb3IgdW5hbWUgaXMgZGVjbGFyZWQgZXZlbiBpZiB0aGUgdG9v bCBpcyBub3QgYmVpbmcKICAgIGJ1aWx0IGluIHRoaXMgc2luZ2xlLWJpbmFyeS4gKi8KLWlu dCBfc2luZ2xlX2JpbmFyeV9tYWluX3VuYW1lIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpOwot aW50IF9zaW5nbGVfYmluYXJ5X21haW5fYXJjaCAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KTsK K2ludCBzaW5nbGVfYmluYXJ5X21haW5fdW5hbWUgKGludCBhcmdjLCBjaGFyICoqYXJndik7 CitpbnQgc2luZ2xlX2JpbmFyeV9tYWluX2FyY2ggKGludCBhcmdjLCBjaGFyICoqYXJndik7 CiAKIGludAotX3NpbmdsZV9iaW5hcnlfbWFpbl9hcmNoIChpbnQgYXJnYywgY2hhciAqKmFy Z3YpCitzaW5nbGVfYmluYXJ5X21haW5fYXJjaCAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQog ewogICB1bmFtZV9tb2RlID0gVU5BTUVfQVJDSDsKLSAgcmV0dXJuIF9zaW5nbGVfYmluYXJ5 X21haW5fdW5hbWUgKGFyZ2MsIGFyZ3YpOworICByZXR1cm4gc2luZ2xlX2JpbmFyeV9tYWlu X3VuYW1lIChhcmdjLCBhcmd2KTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9jb3JldXRpbHMtZGly LmMgYi9zcmMvY29yZXV0aWxzLWRpci5jCmluZGV4IGFmYmUzOWEuLjQ1NDNjYjQgMTAwNjQ0 Ci0tLSBhL3NyYy9jb3JldXRpbHMtZGlyLmMKKysrIGIvc3JjL2NvcmV1dGlscy1kaXIuYwpA QCAtMjIsMTIgKzIyLDEyIEBACiAjaW5jbHVkZSAibHMuaCIKIC8qIEVuc3VyZSB0aGF0IHRo ZSBtYWluIGZvciBscyBpcyBkZWNsYXJlZCBldmVuIGlmIHRoZSB0b29sIGlzIG5vdCBiZWlu ZyBidWlsdAogICAgaW4gdGhpcyBzaW5nbGUtYmluYXJ5LiAqLwotaW50IF9zaW5nbGVfYmlu YXJ5X21haW5fbHMgKGludCBhcmdjLCBjaGFyICoqYXJndik7Ci1pbnQgX3NpbmdsZV9iaW5h cnlfbWFpbl9kaXIgKGludCBhcmdjLCBjaGFyICoqYXJndik7CitpbnQgc2luZ2xlX2JpbmFy eV9tYWluX2xzIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpOworaW50IHNpbmdsZV9iaW5hcnlf bWFpbl9kaXIgKGludCBhcmdjLCBjaGFyICoqYXJndik7CiAKIGludAotX3NpbmdsZV9iaW5h cnlfbWFpbl9kaXIgKGludCBhcmdjLCBjaGFyICoqYXJndikKK3NpbmdsZV9iaW5hcnlfbWFp bl9kaXIgKGludCBhcmdjLCBjaGFyICoqYXJndikKIHsKICAgbHNfbW9kZSA9IExTX01VTFRJ X0NPTDsKLSAgcmV0dXJuIF9zaW5nbGVfYmluYXJ5X21haW5fbHMgKGFyZ2MsIGFyZ3YpOwor ICByZXR1cm4gc2luZ2xlX2JpbmFyeV9tYWluX2xzIChhcmdjLCBhcmd2KTsKIH0KZGlmZiAt LWdpdCBhL3NyYy9jb3JldXRpbHMtdmRpci5jIGIvc3JjL2NvcmV1dGlscy12ZGlyLmMKaW5k ZXggYjFiMDE5NC4uMjIzZjcwYyAxMDA2NDQKLS0tIGEvc3JjL2NvcmV1dGlscy12ZGlyLmMK KysrIGIvc3JjL2NvcmV1dGlscy12ZGlyLmMKQEAgLTIyLDEyICsyMiwxMiBAQAogI2luY2x1 ZGUgImxzLmgiCiAvKiBFbnN1cmUgdGhhdCB0aGUgbWFpbiBmb3IgbHMgaXMgZGVjbGFyZWQg ZXZlbiBpZiB0aGUgdG9vbCBpcyBub3QgYmVpbmcgYnVpbHQKICAgIGluIHRoaXMgc2luZ2xl LWJpbmFyeS4gKi8KLWludCBfc2luZ2xlX2JpbmFyeV9tYWluX2xzIChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpOwotaW50IF9zaW5nbGVfYmluYXJ5X21haW5fdmRpciAoaW50IGFyZ2MsIGNo YXIgKiphcmd2KTsKK2ludCBzaW5nbGVfYmluYXJ5X21haW5fbHMgKGludCBhcmdjLCBjaGFy ICoqYXJndik7CitpbnQgc2luZ2xlX2JpbmFyeV9tYWluX3ZkaXIgKGludCBhcmdjLCBjaGFy ICoqYXJndik7CiAKIGludAotX3NpbmdsZV9iaW5hcnlfbWFpbl92ZGlyIChpbnQgYXJnYywg Y2hhcioqIGFyZ3YpCitzaW5nbGVfYmluYXJ5X21haW5fdmRpciAoaW50IGFyZ2MsIGNoYXIq KiBhcmd2KQogewogICBsc19tb2RlID0gTFNfTE9OR19GT1JNQVQ7Ci0gIHJldHVybiBfc2lu Z2xlX2JpbmFyeV9tYWluX2xzIChhcmdjLCBhcmd2KTsKKyAgcmV0dXJuIHNpbmdsZV9iaW5h cnlfbWFpbl9scyAoYXJnYywgYXJndik7CiB9CmRpZmYgLS1naXQgYS9zcmMvY29yZXV0aWxz LmMgYi9zcmMvY29yZXV0aWxzLmMKaW5kZXggODk4ZmU4NC4uNTdkYzc4NCAxMDA2NDQKLS0t IGEvc3JjL2NvcmV1dGlscy5jCisrKyBiL3NyYy9jb3JldXRpbHMuYwpAQCAtMzUsNyArMzUs NyBAQAogICAgbmVlZHMgdG8gbWF0Y2ggdGhlIG9uZSBwYXNzZWQgYXMgQ0ZMQUdTIG9uIHNp bmdsZS1iaW5hcnkubWsgKGdlbmVyYXRlZAogICAgYnkgZ2VuLXNpbmdsZS1iaW5hcnkuc2gp LiAqLwogIyBkZWZpbmUgU0lOR0xFX0JJTkFSWV9QUk9HUkFNKHByb2dfbmFtZV9zdHIsIG1h aW5fbmFtZSkgXAotICBpbnQgX3NpbmdsZV9iaW5hcnlfbWFpbl8jI21haW5fbmFtZSAoaW50 LCBjaGFyICoqKTsKKyAgaW50IHNpbmdsZV9iaW5hcnlfbWFpbl8jI21haW5fbmFtZSAoaW50 LCBjaGFyICoqKTsKICMgaW5jbHVkZSAiY29yZXV0aWxzLmgiCiAjIHVuZGVmIFNJTkdMRV9C SU5BUllfUFJPR1JBTQogI2VuZGlmCkBAIC0xMDMsNyArMTAzLDcgQEAgbGF1bmNoX3Byb2dy YW0gKGNvbnN0IGNoYXIgKnByb2dfbmFtZSwgaW50IHByb2dfYXJnYywgY2hhciAqKnByb2df YXJndikKICAgLyogTG9vayB1cCB0aGUgcmlnaHQgbWFpbiBwcm9ncmFtLiAgKi8KICMgZGVm aW5lIFNJTkdMRV9CSU5BUllfUFJPR1JBTShwcm9nX25hbWVfc3RyLCBtYWluX25hbWUpIFwK ICAgZWxzZSBpZiAoU1RSRVEgKHByb2dfbmFtZV9zdHIsIHByb2dfbmFtZSkpIFwKLSAgICBw cm9nX21haW4gPSBfc2luZ2xlX2JpbmFyeV9tYWluXyMjbWFpbl9uYW1lOworICAgIHByb2df bWFpbiA9IHNpbmdsZV9iaW5hcnlfbWFpbl8jI21haW5fbmFtZTsKICMgaW5jbHVkZSAiY29y ZXV0aWxzLmgiCiAjIHVuZGVmIFNJTkdMRV9CSU5BUllfUFJPR1JBTQogI2VuZGlmCmRpZmYg LS1naXQgYS9zcmMvbnVtZm10LmMgYi9zcmMvbnVtZm10LmMKaW5kZXggZjExMTM3NC4uZmYy ZTQxZCAxMDA2NDQKLS0tIGEvc3JjL251bWZtdC5jCisrKyBiL3NyYy9udW1mbXQuYwpAQCAt MTYxLDggKzE2MSw4IEBAIGVudW0geyBNQVhfQUNDRVBUQUJMRV9ESUdJVFMgPSAyNyB9Owog CiBzdGF0aWMgZW51bSBzY2FsZV90eXBlIHNjYWxlX2Zyb20gPSBzY2FsZV9ub25lOwogc3Rh dGljIGVudW0gc2NhbGVfdHlwZSBzY2FsZV90byA9IHNjYWxlX25vbmU7Ci1zdGF0aWMgZW51 bSByb3VuZF90eXBlIF9yb3VuZCA9IHJvdW5kX2Zyb21femVybzsKLXN0YXRpYyBlbnVtIGlu dmFsX3R5cGUgX2ludmFsaWQgPSBpbnZhbF9hYm9ydDsKK3N0YXRpYyBlbnVtIHJvdW5kX3R5 cGUgcm91bmRfc3R5bGUgPSByb3VuZF9mcm9tX3plcm87CitzdGF0aWMgZW51bSBpbnZhbF90 eXBlIGludmFsX3N0eWxlID0gaW52YWxfYWJvcnQ7CiBzdGF0aWMgY29uc3QgY2hhciAqc3Vm Zml4ID0gTlVMTDsKIHN0YXRpYyB1aW50bWF4X3QgZnJvbV91bml0X3NpemUgPSAxOwogc3Rh dGljIHVpbnRtYXhfdCB0b191bml0X3NpemUgPSAxOwpAQCAtNjc3LDcgKzY3Nyw3IEBAIHNp bXBsZV9zdHJ0b2RfZmF0YWwgKGVudW0gc2ltcGxlX3N0cnRvZF9lcnJvciBlcnIsIGNoYXIg Y29uc3QgKmlucHV0X3N0cikKIAogICAgIH0KIAotICBpZiAoX2ludmFsaWQgIT0gaW52YWxf aWdub3JlKQorICBpZiAoaW52YWxfc3R5bGUgIT0gaW52YWxfaWdub3JlKQogICAgIGVycm9y IChjb252X2V4aXRfY29kZSwgMCwgZ2V0dGV4dCAobXNnaWQpLCBxdW90ZSAoaW5wdXRfc3Ry KSk7CiB9CiAKQEAgLTEwNzcsNyArMTA3Nyw3IEBAIHBhcnNlX2h1bWFuX251bWJlciAoY29u c3QgY2hhciAqc3RyLCBsb25nIGRvdWJsZSAvKm91dHB1dCAqLyAqdmFsdWUsCiAKICAgaWYg KHB0ciAmJiAqcHRyICE9ICdcMCcpCiAgICAgewotICAgICAgaWYgKF9pbnZhbGlkICE9IGlu dmFsX2lnbm9yZSkKKyAgICAgIGlmIChpbnZhbF9zdHlsZSAhPSBpbnZhbF9pZ25vcmUpCiAg ICAgICAgIGVycm9yIChjb252X2V4aXRfY29kZSwgMCwgXygiaW52YWxpZCBzdWZmaXggaW4g aW5wdXQgJXM6ICVzIiksCiAgICAgICAgICAgICAgICBxdW90ZV9uICgwLCBzdHIpLCBxdW90 ZV9uICgxLCBwdHIpKTsKICAgICAgIGUgPSBTU0VfSU5WQUxJRF9TVUZGSVg7CkBAIC0xMDk5 LDcgKzEwOTksNyBAQCBwcmVwYXJlX3BhZGRlZF9udW1iZXIgKGNvbnN0IGxvbmcgZG91Ymxl IHZhbCwgc2l6ZV90IHByZWNpc2lvbikKICAgZXhwbGQgKHZhbCwgMTAsICZ4KTsKICAgaWYg KHNjYWxlX3RvID09IHNjYWxlX25vbmUgJiYgeCA+IE1BWF9VTlNDQUxFRF9ESUdJVFMpCiAg ICAgewotICAgICAgaWYgKF9pbnZhbGlkICE9IGludmFsX2lnbm9yZSkKKyAgICAgIGlmIChp bnZhbF9zdHlsZSAhPSBpbnZhbF9pZ25vcmUpCiAgICAgICAgIGVycm9yIChjb252X2V4aXRf Y29kZSwgMCwgXygidmFsdWUgdG9vIGxhcmdlIHRvIGJlIHByaW50ZWQ6ICclTGcnIgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoY29uc2lkZXIgdXNpbmcgLS10 bykiKSwgdmFsKTsKICAgICAgIHJldHVybiAwOwpAQCAtMTEwNywxNCArMTEwNywxNCBAQCBw cmVwYXJlX3BhZGRlZF9udW1iZXIgKGNvbnN0IGxvbmcgZG91YmxlIHZhbCwgc2l6ZV90IHBy ZWNpc2lvbikKIAogICBpZiAoeCA+IE1BWF9BQ0NFUFRBQkxFX0RJR0lUUyAtIDEpCiAgICAg ewotICAgICAgaWYgKF9pbnZhbGlkICE9IGludmFsX2lnbm9yZSkKKyAgICAgIGlmIChpbnZh bF9zdHlsZSAhPSBpbnZhbF9pZ25vcmUpCiAgICAgICAgIGVycm9yIChjb252X2V4aXRfY29k ZSwgMCwgXygidmFsdWUgdG9vIGxhcmdlIHRvIGJlIHByaW50ZWQ6ICclTGcnIgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAoY2Fubm90IGhhbmRsZSB2YWx1ZXMg PiA5OTlZKSIpLCB2YWwpOwogICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgIGRvdWJsZV90 b19odW1hbiAodmFsLCBwcmVjaXNpb24sIGJ1Ziwgc2l6ZW9mIChidWYpLCBzY2FsZV90bywg Z3JvdXBpbmcsCi0gICAgICAgICAgICAgICAgICAgX3JvdW5kKTsKKyAgICAgICAgICAgICAg ICAgICByb3VuZF9zdHlsZSk7CiAgIGlmIChzdWZmaXgpCiAgICAgc3RybmNhdCAoYnVmLCBz dWZmaXgsIHNpemVvZiAoYnVmKSAtIHN0cmxlbiAoYnVmKSAtMSk7CiAKQEAgLTEzMDQsNyAr MTMwNCw3IEBAIHByb2Nlc3NfbGluZSAoY2hhciAqbGluZSwgYm9vbCBuZXdsaW5lKQogCiAg IGV4dHJhY3RfZmllbGRzIChsaW5lLCBmaWVsZCwgJnByZSwgJm51bSwgJnN1Zik7CiAgIGlm ICghbnVtKQotICAgIGlmIChfaW52YWxpZCAhPSBpbnZhbF9pZ25vcmUpCisgICAgaWYgKGlu dmFsX3N0eWxlICE9IGludmFsX2lnbm9yZSkKICAgICAgIGVycm9yIChjb252X2V4aXRfY29k ZSwgMCwgXygiaW5wdXQgbGluZSBpcyB0b28gc2hvcnQsICIKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAibm8gbnVtYmVycyBmb3VuZCB0byBjb252ZXJ0IGluIGZpZWxk ICVsZCIpLAogICAgICAgICAgICBmaWVsZCk7CkBAIC0xMzkwLDcgKzEzOTAsNyBAQCBtYWlu IChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg Y2FzZSBST1VORF9PUFRJT046Ci0gICAgICAgICAgX3JvdW5kID0gWEFSR01BVENIICgiLS1y b3VuZCIsIG9wdGFyZywgcm91bmRfYXJncywgcm91bmRfdHlwZXMpOworICAgICAgICAgIHJv dW5kX3N0eWxlID0gWEFSR01BVENIICgiLS1yb3VuZCIsIG9wdGFyZywgcm91bmRfYXJncywg cm91bmRfdHlwZXMpOwogICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgR1JPVVBJ TkdfT1BUSU9OOgpAQCAtMTQ1OCw3ICsxNDU4LDggQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgSU5WQUxJRF9PUFRJ T046Ci0gICAgICAgICAgX2ludmFsaWQgPSBYQVJHTUFUQ0ggKCItLWludmFsaWQiLCBvcHRh cmcsIGludmFsX2FyZ3MsIGludmFsX3R5cGVzKTsKKyAgICAgICAgICBpbnZhbF9zdHlsZSA9 IFhBUkdNQVRDSCAoIi0taW52YWxpZCIsIG9wdGFyZywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW52YWxfYXJncywgaW52YWxfdHlwZXMpOwogICAgICAgICAgIGJy ZWFrOwogCiAgICAgICAgICAgY2FzZV9HRVRPUFRfSEVMUF9DSEFSOwpAQCAtMTQ5Miw3ICsx NDkzLDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICBzZXR1cF9wYWRkaW5n X2J1ZmZlciAocGFkZGluZ193aWR0aCk7CiAgIGF1dG9fcGFkZGluZyA9IChwYWRkaW5nX3dp ZHRoID09IDAgJiYgZGVsaW1pdGVyID09IERFTElNSVRFUl9ERUZBVUxUKTsKIAotICBpZiAo X2ludmFsaWQgIT0gaW52YWxfYWJvcnQpCisgIGlmIChpbnZhbF9zdHlsZSAhPSBpbnZhbF9h Ym9ydCkKICAgICBjb252X2V4aXRfY29kZSA9IDA7CiAKICAgaWYgKGFyZ2MgPiBvcHRpbmQp CkBAIC0xNTM1LDcgKzE1MzYsOCBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAg ICAgZXJyb3IgKDAsIDAsIF8oImZhaWxlZCB0byBjb252ZXJ0IHNvbWUgb2YgdGhlIGlucHV0 IG51bWJlcnMiKSk7CiAKICAgaW50IGV4aXRfc3RhdHVzID0gRVhJVF9TVUNDRVNTOwotICBp ZiAoIXZhbGlkX251bWJlcnMgJiYgX2ludmFsaWQgIT0gaW52YWxfd2FybiAmJiBfaW52YWxp ZCAhPSBpbnZhbF9pZ25vcmUpCisgIGlmICghdmFsaWRfbnVtYmVycworICAgICAgJiYgaW52 YWxfc3R5bGUgIT0gaW52YWxfd2FybiAmJiBpbnZhbF9zdHlsZSAhPSBpbnZhbF9pZ25vcmUp CiAgICAgZXhpdF9zdGF0dXMgPSBFWElUX0NPTlZFUlNJT05fV0FSTklOR1M7CiAKICAgcmV0 dXJuIGV4aXRfc3RhdHVzOwotLSAKMS45LjMKCg== --------------070202020508030104050809-- From unknown Mon Jun 23 02:25:43 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bob Proulx Subject: bug#18428: closed (Re: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation) Message-ID: References: <540ECD56.5@draigBrady.com> <20140908111135531693134@bob.proulx.com> X-Gnu-PR-Message: they-closed 18428 X-Gnu-PR-Package: coreutils Reply-To: 18428@debbugs.gnu.org Date: Tue, 09 Sep 2014 09:51:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1410256263-14001-1" This is a multi-part message in MIME format... ------------=_1410256263-14001-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #18428: coreutils binary breaks coreutils documentation which was filed against the coreutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 18428@debbugs.gnu.org. --=20 18428: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D18428 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1410256263-14001-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 18428-done) by debbugs.gnu.org; 9 Sep 2014 09:50:26 +0000 Received: from localhost ([127.0.0.1]:34420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRI49-0003cv-6f for submit@debbugs.gnu.org; Tue, 09 Sep 2014 05:50:25 -0400 Received: from mail3.vodafone.ie ([213.233.128.45]:26522) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRI45-0003ce-Ud for 18428-done@debbugs.gnu.org; Tue, 09 Sep 2014 05:50:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtsBAD3MDlRtTh0V/2dsb2JhbAANTINgV4J8hVvBQodUAYEqhHsBAQEDASMEUgULCw0EAwECAQkNFAICD0AIEwEFAgEBiDYNpVV4lWcBF409gX8RBwkJDIJbgVMFk0eBSmCIYYYLj1+BR2uBD4FAAQEB Received: from unknown (HELO [192.168.1.79]) ([109.78.29.21]) by mail3.vodafone.ie with ESMTP; 09 Sep 2014 10:50:15 +0100 Message-ID: <540ECD56.5@draigBrady.com> Date: Tue, 09 Sep 2014 10:50:14 +0100 From: =?UTF-8?B?UMOhZHJhaWcgQnJhZHk=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: 18428-done@debbugs.gnu.org Subject: Re: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <20140909003253.GG9643@xvii.vinc17.org> <540E4F0B.4010705@draigBrady.com> <540E7A2B.3020205@cs.ucla.edu> In-Reply-To: <540E7A2B.3020205@cs.ucla.edu> X-Enigmail-Version: 1.6 Content-Type: multipart/mixed; boundary="------------020509090701040104040305" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 18428-done Cc: Alex Deymo , Mike Frysinger X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------020509090701040104040305 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 09/09/2014 04:55 AM, Paul Eggert wrote: > Subject: [PATCH 1/4] doc: mention which commands are optional I was thinking that the bst way to do that would be to adjust things so that the node wasn't installed if the command wasn't. But it's better to have this info generally available online also, so +1 > Subject: [PATCH 2/4] doc: rename "coreutils invocation" to "Multi-call I had done essentially this in my local patch :) so +1 One caveat is that `coreutils --help` is now not accurate in its presented texinfo node name. Though I wouldn't worry about that TBH, especially if relegating coreutils(1) to a helper command in libexec. Now some systems may very well like the explicit option of `coreutils $cmd ...`, but since we need the --coreutils-prog option too I'd be on for keeping this as a helper command. I've attached the now optional patch to adjust node names, which I'm 60:40 for applying since it works with pinfo. > Subject: [PATCH 3/4] maint: prefer 'return status;' to 'exit (status);' in 'main' simpler so +1 There were a couple of syntax-check errors with this, fixed in the attached. > Subject: [PATCH 4/4] maint: avoid file-scope names of the form _[a-z]* +1 Marking this bug as done... thanks! Pádraig. --------------020509090701040104040305 Content-Type: text/x-patch; name="multicall-info.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="multicall-info.patch" >From 20f46a2e347a53855b70b47297cd1856741d6265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Tue, 9 Sep 2014 10:25:39 +0100 Subject: [PATCH 1/2] maint: fix syntax-check issues in recent commit Avoid 2 new syntax-check failures introduced in commit v8.23-19-g8defcee * cfg.mk (sc_some_programs_must_avoid_exit_failure): s/exit/return/. * src/whoami.c (main): Reinstate translation marker for diagnostic. --- cfg.mk | 2 +- src/whoami.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 26a5966..178ff76 100644 --- a/cfg.mk +++ b/cfg.mk @@ -436,7 +436,7 @@ sc_prohibit_test_empty: sc_some_programs_must_avoid_exit_failure: @grep -nw EXIT_FAILURE \ $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' src) \ - | grep -vE '= EXIT_FAILURE|exit \(.* \?' | grep . \ + | grep -vE '= EXIT_FAILURE|return .* \?' | grep . \ && { echo '$(ME): do not use EXIT_FAILURE in the above' \ 1>&2; exit 1; } || : diff --git a/src/whoami.c b/src/whoami.c index 545e521..5ec0dc1 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -84,7 +84,7 @@ main (int argc, char **argv) uid = geteuid (); pw = (uid == NO_UID && errno ? NULL : getpwuid (uid)); if (!pw) - error (EXIT_FAILURE, errno, "cannot find name for user ID %lu", + error (EXIT_FAILURE, errno, _("cannot find name for user ID %lu"), (unsigned long int) uid); puts (pw->pw_name); return EXIT_SUCCESS; -- 1.7.7.6 >From 8e8c8fe1bccc47ec6a07ac44cf5af88e7cd3f3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Tue, 9 Sep 2014 02:05:45 +0100 Subject: [PATCH 2/2] doc: adjust reference to info nodes in man pages old form: coreutils '$cmd invocation' new form: '(coreutils) $cmd invocation' The old form erroneously referenced the node for the 'coreutils' multi-call program. Now that problematic node name was renamed in commit v8.23-18-g72e470b, but the newer less ambiguous form also has the advantage of working with the pinfo viewer for example. * man/local.mk: Adjust man page references to texinfo nodes. * src/system.h: Adjust --help references to texinfo nodes. --- man/local.mk | 2 +- src/system.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/local.mk b/man/local.mk index f4b213f..f2d1357 100644 --- a/man/local.mk +++ b/man/local.mk @@ -102,7 +102,7 @@ man/dynamic-deps.mk: Makefile --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ --output=$$t/$$name.1 $$t/$$argv \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ + --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ && sed \ -e 's|$*\.td/||g' \ -e '/For complete documentation/d' \ diff --git a/src/system.h b/src/system.h index 162446c..00180cb 100644 --- a/src/system.h +++ b/src/system.h @@ -582,7 +582,8 @@ emit_ancillary_info (void) last_component (program_name)); } printf (_("For complete documentation, run: " - "info coreutils '%s invocation'\n"), last_component (program_name)); + "info '(coreutils) %s invocation'\n"), + last_component (program_name)); } static inline void -- 1.7.7.6 --------------020509090701040104040305-- ------------=_1410256263-14001-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Sep 2014 17:27:26 +0000 Received: from localhost ([127.0.0.1]:34060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR2ir-0003O1-IZ for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57190) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XR2io-0003Nl-S9 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR2ia-0003tF-J5 for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2ia-0003t7-GS for submit@debbugs.gnu.org; Mon, 08 Sep 2014 13:27:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2iU-0005yn-9n for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR2iO-0003j0-5Y for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:27:02 -0400 Received: from joseki.proulx.com ([216.17.153.58]:54942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2iN-0003ha-Ru for bug-coreutils@gnu.org; Mon, 08 Sep 2014 13:26:56 -0400 Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id 288FE21225 for ; Mon, 8 Sep 2014 11:26:53 -0600 (MDT) Received: by hysteria.proulx.com (Postfix, from userid 1000) id F08612DC39; Mon, 8 Sep 2014 11:26:52 -0600 (MDT) Date: Mon, 8 Sep 2014 11:26:52 -0600 From: Bob Proulx To: bug-coreutils@gnu.org Subject: coreutils binary breaks coreutils documentation Message-ID: <20140908111135531693134@bob.proulx.com> Mail-Followup-To: bug-coreutils@gnu.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Vincent Lefevre reported to the Debian BTS that the new documentation shipped for the recently added coreutils binary breaks the existing documentation for all of the coreutils utilities. https://bugs.debian.org/760861 Confirmed. Perhaps the documentation node name can be changed to be something non-conflicting with the package name? Or perhaps only conditionally built if the binary is built? Or Vincent's suggestion to use upper case. Or...? If correspondents wish their responses logged to the Debian bug log please add 760861@bugs.debian.org to the email recipients list. (Two BTS instances are a little difficult to stitch together until both bug numbers are known.) Bob Original Debian report by Vincent Lefevre follows: Subject: coreutils: in man pages, info invocation is incorrect: replace c= oreutils by Coreutils Package: coreutils Version: 8.23-2 Severity: minor For instance, in the touch(1) man page: The full documentation for touch is maintained as a Texinfo manual. If the info and touch programs are properly installed at your site, the command info coreutils 'touch invocation' should give you access to the complete manual. This is now incorrect (as of 8.23?), because it gives the page: 2.14 =E2=80=98coreutils=E2=80=99: Multi-call binary =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E2=80=98coreutils=E2=80=99 invokes an individual utility, either implici= tly selected by the last component of =E2=80=98argv[0]=E2=80=99, or by explicitly calling= =E2=80=98coreutils=E2=80=99 with the =E2=80=98--coreutils-prog=E2=80=99 option. Synopsis: coreutils --coreutils-prog=3DPROGRAM =E2=80=A6 The correct info invocation now is: info Coreutils 'touch invocation' Note: Since the coreutils utility doesn't seem to exist in Debian, this section could be removed, but this problem may reappear in the future. So, it's better to use the capital letter C. ------------=_1410256263-14001-1-- From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Michael Stone Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 12:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Bob Proulx , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.14102670914101 (code B ref 18428); Tue, 09 Sep 2014 12:52:02 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 12:51:31 +0000 Received: from localhost ([127.0.0.1]:34540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRKtO-000144-IP for submit@debbugs.gnu.org; Tue, 09 Sep 2014 08:51:31 -0400 Received: from harad.mathom.us ([54.218.24.45]:59366) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRKtK-00013l-VO for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 08:51:27 -0400 Received: from osgiliath.mathom.us (osgiliath.mathom.us [IPv6:2604:8800:16c:2341::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by harad.mathom.us (Postfix) with ESMTPS id 6DAD218C; Tue, 9 Sep 2014 12:51:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by osgiliath.mathom.us (Postfix) with ESMTP id 7F8A16E4F6; Tue, 9 Sep 2014 08:51:18 -0400 (EDT) Received: from osgiliath.mathom.us ([127.0.0.1]) by localhost (osgiliath.mathom.us [127.0.0.1]) (amavisd-new, port 10024) with LMTP id F659WlDhTAvQ; Tue, 9 Sep 2014 08:51:18 -0400 (EDT) Received: by osgiliath.mathom.us (Postfix, from userid 1000) id 64D246E68A; Tue, 9 Sep 2014 08:51:18 -0400 (EDT) Date: Tue, 9 Sep 2014 08:51:18 -0400 From: Michael Stone Message-ID: <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20140908175408716490617@bob.proulx.com> X-Pgp-Fingerprint: 02D5 315F F11F 1861 860E 1E02 F61A ACDC FA11 FFDE User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) On Mon, Sep 08, 2014 at 06:10:35PM -0600, Bob Proulx wrote: >But I think in recent years the install-info problems have been fixed. >Perhaps we don't need to do any of this anymore? Or perhaps finally >getting to the canonical (FILENAME)NODE-WITHIN-FILE form we have >finally arrived at the end and should stop there. The real solution is to stop pretending that the info documentation is useful. We get a lot of bug reports about the man pages & help output, not so many about the info docs. It could be because the info docs are perfect, I suspect it's because they're rarely consulted. Sometimes we can point to the info doc and close a man page bug with a satisfied sense of "they should have read the documentation". But I'm just not sure that documentation that seems to exist solely to win a fight over whether behavior is documented is actually helpful. Maybe point people at https://www.gnu.org/software/coreutils/manual/html_node/ ? Even better would be if it were interactive. E.g., the postgresql project has some really nice online docs per-version which allow people to add comments: http://www.postgresql.org/docs/9.3/interactive/index.html Mike Stone From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 14:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Michael Stone Cc: 18428@debbugs.gnu.org, 760861@bugs.debian.org, Bob Proulx Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141027310614826 (code B ref 18428); Tue, 09 Sep 2014 14:32:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 14:31:46 +0000 Received: from localhost ([127.0.0.1]:35460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRMSQ-0003r2-4Z for submit@debbugs.gnu.org; Tue, 09 Sep 2014 10:31:46 -0400 Received: from mail4.vodafone.ie ([213.233.128.170]:37133) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRMSN-0003qo-6D for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 10:31:44 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap8BACAOD1RtTh0V/2dsb2JhbAANTINgV8othndTAYEjhHsBAQEDATIBRgULCw0BCgkWDwkDAgECAUUGDQEHAQEFEgOIHA0IpWiWaAEXigCDEII9B4RMBY8slTGPX4FHawEBgk0BAQE Received: from unknown (HELO [192.168.1.79]) ([109.78.29.21]) by mail3.vodafone.ie with ESMTP; 09 Sep 2014 15:31:35 +0100 Message-ID: <540F0F47.2040908@draigBrady.com> Date: Tue, 09 Sep 2014 15:31:35 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> In-Reply-To: <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/09/2014 01:51 PM, Michael Stone wrote: > On Mon, Sep 08, 2014 at 06:10:35PM -0600, Bob Proulx wrote: >> But I think in recent years the install-info problems have been fixed. >> Perhaps we don't need to do any of this anymore? Or perhaps finally >> getting to the canonical (FILENAME)NODE-WITHIN-FILE form we have >> finally arrived at the end and should stop there. > > The real solution is to stop pretending that the info documentation is useful. It's useful to many, but I agree most don't bother with it due to the awkward non intuitive default info reader _interface_ (though pinfo is a bit better in that regard). I guess it comes down to people wanting quick notes in the shell for which they use man, and for longer reading/research they prefer the browser. As the info _content_ is available for the latter online, this is why I remained focused in keeping the content up to date and complete. > We get a lot of bug reports about the man pages & help output, not so many about the info docs. It could be because the info docs are perfect, I suspect it's because they're rarely consulted. I contend the content is fine and good, though the terminal interface is generally not used. > Sometimes we can point to the info doc and close a man page bug with a satisfied sense > of "they should have read the documentation". But I'm just not sure that documentation > that seems to exist solely to win a fight over whether behavior is documented is actually helpful. Agreed. > Maybe point people at https://www.gnu.org/software/coreutils/manual/html_node/ ? Personally I use this function: cinfo() { xdg-open "http://www.gnu.org/software/coreutils/manual/html_node/$1-invocation.html#$1-invocation"; } which I use like `cinfo dd`, though that's another command and not portable enough currently. Recently enough we have directed users more to the online info in the --help output of all commands like: GNU coreutils online help: For complete documentation, run: info '(coreutils) ls invocation' compared to the man page trailer of: GNU coreutils online help: .... SEE ALSO The full documentation for ls is maintained as a Texinfo manual. If the info and ls programs are properly installed at your site, the command info coreutils 'ls invocation' should give you access to the complete manual. Though it would be better to have direct links. Now the above full node URL is too long/awkward, so I've just now setup redirects, so the following proposed new trailers for ls --help and man pages should work: ls --help: ... Full documentation online at: Full installed documentation: info '(coreutils) ls invocation' man ls: ... SEE ALSO Full documentation online at: Full installed documentation: info '(coreutils) ls invocation' > Even better would be if it were interactive. E.g., the postgresql project has some really > nice online docs per-version which allow people to add comments: http://www.postgresql.org/docs/9.3/interactive/index.html Something to consider for the future. thanks, Pádraig. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Michael Stone Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 14:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: =?UTF-8?Q?P=C3=A1draig?= Brady , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org, Bob Proulx Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141027435317112 (code B ref 18428); Tue, 09 Sep 2014 14:53:01 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 14:52:33 +0000 Received: from localhost ([127.0.0.1]:35477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRMmW-0004Ru-KM for submit@debbugs.gnu.org; Tue, 09 Sep 2014 10:52:33 -0400 Received: from harad.mathom.us ([54.218.24.45]:59425) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRMmT-0004Re-HW for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 10:52:30 -0400 Received: from osgiliath.mathom.us (osgiliath.mathom.us [IPv6:2604:8800:16c:2341::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by harad.mathom.us (Postfix) with ESMTPS id EF62B125; Tue, 9 Sep 2014 14:52:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by osgiliath.mathom.us (Postfix) with ESMTP id E422F6E4F6; Tue, 9 Sep 2014 10:52:21 -0400 (EDT) Received: from osgiliath.mathom.us ([127.0.0.1]) by localhost (osgiliath.mathom.us [127.0.0.1]) (amavisd-new, port 10024) with LMTP id TZJVqxITCkHw; Tue, 9 Sep 2014 10:52:21 -0400 (EDT) Received: by osgiliath.mathom.us (Postfix, from userid 1000) id C55F76E512; Tue, 9 Sep 2014 10:52:21 -0400 (EDT) Date: Tue, 9 Sep 2014 10:52:21 -0400 From: Michael Stone Message-ID: References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <540F0F47.2040908@draigBrady.com> X-Pgp-Fingerprint: 02D5 315F F11F 1861 860E 1E02 F61A ACDC FA11 FFDE User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) On Tue, Sep 09, 2014 at 03:31:35PM +0100, Pádraig Brady wrote: >It's useful to many, but I agree most don't bother with it >due to the awkward non intuitive default info reader _interface_ >(though pinfo is a bit better in that regard). Right. I've heard the argument for 15 years that info docs are really good, it's just the interface. :) In all that time, a better interface hasn't really caught on, and the web happened. >Though it would be better to have direct links. >Now the above full node URL is too long/awkward, so I've just now setup redirects, >so the following proposed new trailers for ls --help and man pages should work: > >ls --help: > ... > Full documentation online at: > Full installed documentation: info '(coreutils) ls invocation' A huge improvement. I suspect that this might also help the info docs show up in google, instead of being below the fold. Alternative wording: Full documentation online at: or available locally via: info '(coreutils) ls invocation' To make it more clear it's the same thing available different ways. Mike Stone From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Assaf Gordon Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 16:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Michael Stone , =?UTF-8?Q?P=C3=A1draig?= Brady , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org, Bob Proulx Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.14102819042633 (code B ref 18428); Tue, 09 Sep 2014 16:59:02 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 16:58:24 +0000 Received: from localhost ([127.0.0.1]:35596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XROkJ-0000gP-Sf for submit@debbugs.gnu.org; Tue, 09 Sep 2014 12:58:24 -0400 Received: from mail-qa0-f50.google.com ([209.85.216.50]:60513) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XROkH-0000gA-3H for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 12:58:22 -0400 Received: by mail-qa0-f50.google.com with SMTP id cm18so15649917qab.23 for <18428@debbugs.gnu.org>; Tue, 09 Sep 2014 09:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=t+irMOePLCP9kEECbHohWpjsz3g5wyNKYL7MoyOaWcI=; b=ZVKRa+PTWbi6MOiyqC2muCTyVQxhKC10HBSGd3EnXVwcXYAwiuDCiSVjGROitVcU7r 0Od/i5pEJ63WmJlHESVq+u/ohAmfq4At11vvEe+pCNVXu2m7D0bYF/w8/uSfxOF/Mgdu 8nimKAgMLAnQfmg85PpMECyUyah3XZSrTlwYgQphq7yjIxEiXI0/19cJlYc8CT+i3C7W IOb4IqJxJdJGkYOR6uY1KAsWb++vhhHIzZ9+WBTIUMa4tIppqd4fdKl7cpKcOihVoaDn NrM2pKweR8cL0Aqd3eL+5/piT4HEZCBkUiT0Hgi+Ckrs9P1X3SQG0nS5FXmHUsQ93nk/ OKwQ== X-Received: by 10.140.96.200 with SMTP id k66mr16667262qge.78.1410281895110; Tue, 09 Sep 2014 09:58:15 -0700 (PDT) Received: from disco.wi.mit.edu ([18.4.1.144]) by mx.google.com with ESMTPSA id v90sm10239072qge.31.2014.09.09.09.58.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Sep 2014 09:58:14 -0700 (PDT) Message-ID: <540F31A6.8040106@gmail.com> Date: Tue, 09 Sep 2014 12:58:14 -0400 From: Assaf Gordon User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 09/09/2014 10:52 AM, Michael Stone wrote: > On Tue, Sep 09, 2014 at 03:31:35PM +0100, Pádraig Brady wrote: >> It's useful to many, but I agree most don't bother with it >> due to the awkward non intuitive default info reader _interface_ >> (though pinfo is a bit better in that regard). > > Right. I've heard the argument for 15 years that info docs are really good, it's just the interface. :) In all that time, a better interface hasn't really caught on, and the web happened. > >> Though it would be better to have direct links. >> Now the above full node URL is too long/awkward, so I've just now setup redirects, >> so the following proposed new trailers for ls --help and man pages should work: >> >> ls --help: >> ... >> Full documentation online at: >> Full installed documentation: info '(coreutils) ls invocation' > > A huge improvement. I suspect that this might also help the info docs show up in google, instead of being below the fold. Alternative wording: > > Full documentation online at: > or available locally via: info '(coreutils) ls invocation' > BTW, "http://gnu.org/s/" redirects to "http://www.gnu.org/software/" , so http://gnu.org/s/coreutils/ls also works. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 18:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Assaf Gordon Cc: 18428@debbugs.gnu.org, Bob Proulx , Michael Stone Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141028712911546 (code B ref 18428); Tue, 09 Sep 2014 18:26:02 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 18:25:29 +0000 Received: from localhost ([127.0.0.1]:35644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRQ6b-00030A-0t for submit@debbugs.gnu.org; Tue, 09 Sep 2014 14:25:29 -0400 Received: from mail5.vodafone.ie ([213.233.128.176]:11684) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRQ6X-0002zs-G8 for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 14:25:26 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqQBAGdFD1RtTh0V/2dsb2JhbAANTBMBAYNLUwTKKodMAYEjhHwBAQQnCwEWMBALDQsJFgQLCQMCAQIBRQYNAQcBAQWIPgMFpj2WXwEXjRCCPQeETAEEhQoCkGWObIcMiFOBR2uCTwEBAQ Received: from unknown (HELO [192.168.1.79]) ([109.78.29.21]) by mail3.vodafone.ie with ESMTP; 09 Sep 2014 19:25:18 +0100 Message-ID: <540F460E.3080803@draigBrady.com> Date: Tue, 09 Sep 2014 19:25:18 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> <540F31A6.8040106@gmail.com> In-Reply-To: <540F31A6.8040106@gmail.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/09/2014 05:58 PM, Assaf Gordon wrote: > On 09/09/2014 10:52 AM, Michael Stone wrote: >> On Tue, Sep 09, 2014 at 03:31:35PM +0100, Pádraig Brady wrote: >>> It's useful to many, but I agree most don't bother with it >>> due to the awkward non intuitive default info reader _interface_ >>> (though pinfo is a bit better in that regard). >> >> Right. I've heard the argument for 15 years that info docs are really good, it's just the interface. :) In all that time, a better interface hasn't really caught on, and the web happened. >> >>> Though it would be better to have direct links. >>> Now the above full node URL is too long/awkward, so I've just now setup redirects, >>> so the following proposed new trailers for ls --help and man pages should work: >>> >>> ls --help: >>> ... >>> Full documentation online at: >>> Full installed documentation: info '(coreutils) ls invocation' >> >> A huge improvement. I suspect that this might also help the info docs show up in google, instead of being below the fold. Alternative wording: >> >> Full documentation online at: >> or available locally via: info '(coreutils) ls invocation' >> > > BTW, > "http://gnu.org/s/" redirects to "http://www.gnu.org/software/" , > so > http://gnu.org/s/coreutils/ls > > also works. Oh nice one. Note the redirections here are: gnu.org -- perm --> www.gnu.org www.gnu.org/s -- temp --> www.gnu.org/software www......./ls -- temp --> www.gnu.org/software/coreutils/...#ls-invocation So to avoid the first permanent redirection I'll probably go with: http://www.gnu.org/s/coreutils/ls thanks, Pádraig. From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Vincent Lefevre Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 18:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Assaf Gordon , 760861@bugs.debian.org Cc: 18428@debbugs.gnu.org, =?UTF-8?Q?P=C3=A1draig?= Brady , Bob Proulx , Michael Stone Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141028855014109 (code B ref 18428); Tue, 09 Sep 2014 18:50:02 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 18:49:10 +0000 Received: from localhost ([127.0.0.1]:35660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRQTV-0003fV-Lp for submit@debbugs.gnu.org; Tue, 09 Sep 2014 14:49:09 -0400 Received: from ioooi.vinc17.net ([92.243.22.117]:46569) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRQTS-0003fJ-MA for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 14:49:07 -0400 Received: from smtp-xvii.vinc17.net (128.119.75.86.rev.sfr.net [86.75.119.128]) by ioooi.vinc17.net (Postfix) with ESMTPSA id 2DAC129A; Tue, 9 Sep 2014 20:49:05 +0200 (CEST) Received: by xvii.vinc17.org (Postfix, from userid 1000) id EC03121A079; Tue, 9 Sep 2014 20:49:04 +0200 (CEST) Date: Tue, 9 Sep 2014 20:49:04 +0200 From: Vincent Lefevre Message-ID: <20140909184904.GI9643@xvii.vinc17.org> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> <540F31A6.8040106@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <540F31A6.8040106@gmail.com> X-Mailer-Info: http://www.vinc17.net/mutt/ User-Agent: Mutt/1.5.23-6361-vl-r59709 (2014-07-25) X-Spam-Score: -2.5 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) On 2014-09-09 12:58:14 -0400, Assaf Gordon wrote: > BTW, > "http://gnu.org/s/" redirects to "http://www.gnu.org/software/" , > so > http://gnu.org/s/coreutils/ls > > also works. But isn't it better to avoid a redirection (if possible)? -- Vincent Lefčvre - Web: 100% accessible validated (X)HTML - Blog: Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon) From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Bob Proulx Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 09 Sep 2014 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: 760861@bugs.debian.org, 18428@debbugs.gnu.org, Assaf Gordon , Vincent Lefevre Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141029085317852 (code B ref 18428); Tue, 09 Sep 2014 19:28:02 +0000 Received: (at 18428) by debbugs.gnu.org; 9 Sep 2014 19:27:33 +0000 Received: from localhost ([127.0.0.1]:35668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRR4e-0004dr-Px for submit@debbugs.gnu.org; Tue, 09 Sep 2014 15:27:33 -0400 Received: from joseki.proulx.com ([216.17.153.58]:50179) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRR4c-0004df-0X for 18428@debbugs.gnu.org; Tue, 09 Sep 2014 15:27:31 -0400 Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id DD1B821232; Tue, 9 Sep 2014 13:27:27 -0600 (MDT) Received: by hysteria.proulx.com (Postfix, from userid 1000) id C46FE2DC39; Tue, 9 Sep 2014 13:27:27 -0600 (MDT) Date: Tue, 9 Sep 2014 13:27:27 -0600 From: Bob Proulx Message-ID: <20140909131658597178386@bob.proulx.com> References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> <540F31A6.8040106@gmail.com> <20140909184904.GI9643@xvii.vinc17.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140909184904.GI9643@xvii.vinc17.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Score: -2.5 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.5 (--) Vincent Lefevre wrote: > Assaf Gordon wrote: > > BTW, > > "http://gnu.org/s/" redirects to "http://www.gnu.org/software/" , > > so > > http://gnu.org/s/coreutils/ls > > > > also works. > > But isn't it better to avoid a redirection (if possible)? I think it is better to use the canonical form. This will be the documented interface. The short redirect in this case is really a typing aide. But the reason it redirects is so that the canonical form is presented to the user for bookmarking and other purposes. If we are playing golf and trying to reduce the number of characters at the expense of readability then the logical conclusion is that we should use a tinyurl such as http://tinyurl.com/osczpn8 or http://bit.ly/1p3QK7a and that obviously isn't good. Let's use the canonical form. Bob From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Thu, 11 Sep 2014 00:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Michael Stone Cc: 18428@debbugs.gnu.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141039550328539 (code B ref 18428); Thu, 11 Sep 2014 00:32:01 +0000 Received: (at 18428) by debbugs.gnu.org; 11 Sep 2014 00:31:43 +0000 Received: from localhost ([127.0.0.1]:37139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRsIY-0007QE-JF for submit@debbugs.gnu.org; Wed, 10 Sep 2014 20:31:43 -0400 Received: from mail1.vodafone.ie ([213.233.128.43]:6645) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRsIV-0007Q1-JD for 18428@debbugs.gnu.org; Wed, 10 Sep 2014 20:31:41 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjUCAETsEFRtTvWg/2dsb2JhbAANU4NgU4hbriaTTYdNAYEnhHsBAQEESTAQCw0BAwMBAgEJFg8JAwIBAgE9CAYNAQUCAQEFiD4DBakNljMBF40QgVsRAT8MBQcGA4RDBYULAo5CgUpgiGKGDYcTiCEeFoFHa4EPgUABAQE Received: from unknown (HELO [192.168.1.79]) ([109.78.245.160]) by mail1.vodafone.ie with ESMTP; 11 Sep 2014 01:31:36 +0100 Message-ID: <5410ED67.9080900@draigBrady.com> Date: Thu, 11 Sep 2014 01:31:35 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: multipart/mixed; boundary="------------010100040906090006060403" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------010100040906090006060403 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit On 09/09/2014 03:52 PM, Michael Stone wrote: > On Tue, Sep 09, 2014 at 03:31:35PM +0100, Pádraig Brady wrote: >> It's useful to many, but I agree most don't bother with it >> due to the awkward non intuitive default info reader _interface_ >> (though pinfo is a bit better in that regard). > > Right. I've heard the argument for 15 years that info docs are really good, it's just the interface. :) In all that time, a better interface hasn't really caught on, and the web happened. > >> Though it would be better to have direct links. >> Now the above full node URL is too long/awkward, so I've just now setup redirects, >> so the following proposed new trailers for ls --help and man pages should work: >> >> ls --help: >> ... >> Full documentation online at: >> Full installed documentation: info '(coreutils) ls invocation' > > A huge improvement. I suspect that this might also help the info docs show up in google, instead of being below the fold. Alternative wording: > > Full documentation online at: > or available locally via: info '(coreutils) ls invocation' > > To make it more clear it's the same thing available different ways. Done in the attached which I'll push later. thanks, Pádraig. --------------010100040906090006060403 Content-Type: text/x-patch; name="online-info.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="online-info.patch" >From e4627416b4be078a184372b9b0582517612a3c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Tue, 9 Sep 2014 02:05:45 +0100 Subject: [PATCH 1/2] doc: adjust reference to info nodes in man pages old form: coreutils '$cmd invocation' new form: '(coreutils) $cmd invocation' The old form erroneously referenced the node for the 'coreutils' multi-call program. Now that problematic node name was renamed in commit v8.23-18-g72e470b, but the newer less ambiguous form also has the advantage of working with the pinfo viewer for example. Full discussion at http://bugs.gnu.org/18428 * man/local.mk: Adjust man page references to texinfo nodes. * src/system.h: Adjust --help references to texinfo nodes. --- man/dummy-man | 2 +- man/local.mk | 2 +- src/system.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/man/dummy-man b/man/dummy-man index dca2b67..bf31912 100755 --- a/man/dummy-man +++ b/man/dummy-man @@ -69,5 +69,5 @@ The full documentation for is maintained as a Texinfo manual, which should be accessible on your system via the command .IP -.B info coreutils $bs(aq$progname invocation$bs(aq +.B info $bs(aq(coreutils) $progname invocation$bs(aq END diff --git a/man/local.mk b/man/local.mk index f4b213f..f2d1357 100644 --- a/man/local.mk +++ b/man/local.mk @@ -102,7 +102,7 @@ man/dynamic-deps.mk: Makefile --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ --output=$$t/$$name.1 $$t/$$argv \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ + --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ && sed \ -e 's|$*\.td/||g' \ -e '/For complete documentation/d' \ diff --git a/src/system.h b/src/system.h index 162446c..00180cb 100644 --- a/src/system.h +++ b/src/system.h @@ -582,7 +582,8 @@ emit_ancillary_info (void) last_component (program_name)); } printf (_("For complete documentation, run: " - "info coreutils '%s invocation'\n"), last_component (program_name)); + "info '(coreutils) %s invocation'\n"), + last_component (program_name)); } static inline void -- 1.7.7.6 >From 0b96a07dd2576fc4a3c64aee48307f3707b38cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Wed, 10 Sep 2014 11:53:50 +0100 Subject: [PATCH 2/2] doc: reference online info pages directly from man pages * src/system.h (emit_ancillary_info): Add a direct reference to the corresponding online info documentation. Corresponding redirects were put in place on www.gnu.org to allow for concise links. * help2man: Adjust to add the "online help" link (and subsequent translation bugs link) to a "REPORTING BUGS" section. Also add the concise links for further information in --help to the "SEE ALSO" section, and dispense with the more verbose default for that. --- man/help2man | 23 +++++++++++++++++++++-- src/system.h | 13 ++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/man/help2man b/man/help2man index bfeb989..47aa2a7 100755 --- a/man/help2man +++ b/man/help2man @@ -405,16 +405,19 @@ s/\\/\x82/g; # "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an # optional word, so that either "Report bugs" or "Report _program_ bugs" will # be matched. -my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to'); +my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|' . + 'Email +bug +reports +to|' . + '.* +online +help:'); my $PAT_AUTHOR = _('Written +by'); my $PAT_OPTIONS = _('Options'); my $PAT_ENVIRONMENT = _('Environment'); my $PAT_FILES = _('Files'); my $PAT_EXAMPLES = _('Examples'); my $PAT_FREE_SOFTWARE = _('This +is +free +software'); +my $PAT_SEE_ALSO = _('Full +documentation'); # Start a new paragraph (if required) for these. -s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og; +s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR|$PAT_SEE_ALSO) /$1\n\n$2 /og; # Convert iso-8859-1 copyright symbol or (c) to nroff # character. @@ -462,6 +465,12 @@ while (length) $sect = _('AUTHOR'); } + elsif (/^($PAT_SEE_ALSO)/o) + { + $sect = _('SEE ALSO'); + $opt_no_info = 1; + } + # Examples, indicated by an indented leading $, % or > are # rendered in a constant width font. if (/^( +)([\$\%>] )\S/) @@ -588,6 +597,16 @@ while (length) # ... s/\n([[:upper:]])/\n.br\n$1/g; } + elsif ($sect eq _('SEE ALSO')) + { + # Handle external references of the form: + # + # GNU online resources: + # Full documentation at: + # or available locally via: info ... + # + s/\n(.)/\n.br\n$1/g; + } } # Check if matched paragraph contains /pat/. diff --git a/src/system.h b/src/system.h index 00180cb..1682b32 100644 --- a/src/system.h +++ b/src/system.h @@ -567,7 +567,10 @@ Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n\ static inline void emit_ancillary_info (void) { + char const * program = last_component (program_name); + printf (_("\n%s online help: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); + /* Don't output this redundant message for English locales. Note we still output for 'C' so that it gets included in the man page. */ const char *lc_messages = setlocale (LC_MESSAGES, NULL); @@ -578,12 +581,12 @@ emit_ancillary_info (void) the URLs at http://translationproject.org/team/. Otherwise, replace the entire URL with your translation team's email address. */ printf (_("Report %s translation bugs to " - "\n"), - last_component (program_name)); + "\n"), program); } - printf (_("For complete documentation, run: " - "info '(coreutils) %s invocation'\n"), - last_component (program_name)); + printf (_("Full documentation at: <%s%s>\n"), + PACKAGE_URL, program); + printf (_("or available locally via: info '(coreutils) %s invocation'\n"), + program); } static inline void -- 1.7.7.6 --------------010100040906090006060403-- From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: Bug#760861: bug#18428: Bug#760861: bug#18428: coreutils binary breaks coreutils documentation Resent-From: Bernhard Voelker Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Thu, 11 Sep 2014 08:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: =?UTF-8?Q?P=C3=A1draig?= Brady , Michael Stone Cc: 18428@debbugs.gnu.org Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141042567521626 (code B ref 18428); Thu, 11 Sep 2014 08:55:02 +0000 Received: (at 18428) by debbugs.gnu.org; 11 Sep 2014 08:54:35 +0000 Received: from localhost ([127.0.0.1]:37335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XS09C-0005ck-AD for submit@debbugs.gnu.org; Thu, 11 Sep 2014 04:54:34 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:50478) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XS098-0005cZ-Kv for 18428@debbugs.gnu.org; Thu, 11 Sep 2014 04:54:31 -0400 Received: from [10.0.4.15] (gw.camline.com [62.153.148.194]) by mrelayeu.kundenserver.de (node=mreue104) with ESMTP (Nemesis) id 0Mb9Rr-1Xm0lz43ch-00KiwQ; Thu, 11 Sep 2014 10:54:29 +0200 Message-ID: <54116344.5080103@bernhard-voelker.de> Date: Thu, 11 Sep 2014 10:54:28 +0200 From: Bernhard Voelker User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> <5410ED67.9080900@draigBrady.com> In-Reply-To: <5410ED67.9080900@draigBrady.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-Provags-ID: V02:K0:w0sbYYDdAiq/ZIbsP3MyRMxyrW0N5O4D3Udrfho7QpK pjt1izTPR6CoxoXk/fod1aFENwcIi/fwFfWNoam1Mk1shx5ljG /Hd3edgY36ZNciWgkujrhiOLmu5rKZr871Q8xJnN5R9JIzy290 GOhrWqYia/AvKkIa6LQQ0FBLGj9CDW7sPPfTaKhSNxt1ajcAJc iHSFRJvOFVlq7rTWJfKtqiA5JH1NpwfzmtNYAIeNeiMOXe35pB H/H4OCZF9BqvcGWxNtckmbRymth3gnKFOhCoMY/IAqxFbmkXgA c/01v6X7JRlU7yPYJcOBeyhZPYvps95fikvjW/wjfQ0KgILf7i CmwtTGr1hIMiQ8GQVvnCLrlDmd9Tz0ukufe6C/Onc X-UI-Out-Filterresults: notjunk:1; X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/11/2014 02:31 AM, Pádraig Brady wrote: > Subject: [PATCH 1/2] doc: adjust reference to info nodes in man pages ... > Subject: [PATCH 2/2] doc: reference online info pages directly from man pages The result of both patches looks almost good: --- a/share/man/man1/basename.1 +++ b/share/man/man1/basename.1 @@ -43,11 +43,12 @@ basename \-s .h include/stdio.h .TP basename \-a any/str1 any/str2 \-> "str1" followed by "str2" -.PP -GNU coreutils online help: -Report basename translation bugs to .SH AUTHOR Written by David MacKenzie. +.SH "REPORTING BUGS" +GNU coreutils online help: +.br +Report basename translation bugs to .SH COPYRIGHT Copyright \(co 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later . @@ -57,14 +58,7 @@ There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" dirname(1), readlink(1) .PP -The full documentation for -.B basename -is maintained as a Texinfo manual. If the -.B info -and -.B basename -programs are properly installed at your site, the command -.IP -.B info coreutils \(aqbasename invocation\(aq -.PP -should give you access to the complete manual. +.br +Full documentation at: +.br +or available locally via: info '(coreutils) basename invocation' ________________________________^_______________________________^ I think we need the \aq instead of ' here, don't we? > * help2man: Adjust to add the "online help" link (and subsequent > translation bugs link) to a "REPORTING BUGS" section. > Also add the concise links for further information in --help > to the "SEE ALSO" section, and dispense with the more verbose > default for that. With this, we'd deviate from stock GNU help2man again. I haven't looked into http://www.gnu.org/software/help2man/ too much yet, but are you sure we can't do the same with the original upstream help2man? BTW: we are using 1.43.3 while 1.46.2 is already available. Maybe there are a few new options which may help. Thanks & have a nice day, Berny From unknown Mon Jun 23 02:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18428: coreutils binary breaks coreutils documentation Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: "Debbugs-submit" Resent-CC: bug-coreutils@gnu.org Resent-Date: Thu, 11 Sep 2014 10:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18428 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: To: Bernhard Voelker Cc: 18428@debbugs.gnu.org, Michael Stone Received: via spool by 18428-submit@debbugs.gnu.org id=B18428.141042964627893 (code B ref 18428); Thu, 11 Sep 2014 10:01:01 +0000 Received: (at 18428) by debbugs.gnu.org; 11 Sep 2014 10:00:46 +0000 Received: from localhost ([127.0.0.1]:37350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XS1BF-0007Fn-5b for submit@debbugs.gnu.org; Thu, 11 Sep 2014 06:00:45 -0400 Received: from mail1.vodafone.ie ([213.233.128.43]:46311) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XS1BB-0007Fb-IV for 18428@debbugs.gnu.org; Thu, 11 Sep 2014 06:00:43 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApQBADVyEVRtTJWM/2dsb2JhbAANU9EbgxYKAYElhHwBAQQyAUEFEAsNAQoJFg8JAwIBAgFFBg0BBwEBiEOpL5ZIARePTQeETAEEjzOVNZEvgzoBAQE Received: from unknown (HELO [192.168.1.79]) ([109.76.149.140]) by mail1.vodafone.ie with ESMTP; 11 Sep 2014 11:00:40 +0100 Message-ID: <541172C7.2040302@draigBrady.com> Date: Thu, 11 Sep 2014 11:00:39 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 References: <20140908111135531693134@bob.proulx.com> <87ioky7zhj.fsf@igel.home> <540E03B9.8020808@draigBrady.com> <20140908175408716490617@bob.proulx.com> <42693e9e-381d-11e4-8290-00163eeb5320@msgid.mathom.us> <540F0F47.2040908@draigBrady.com> <5410ED67.9080900@draigBrady.com> <54116344.5080103@bernhard-voelker.de> In-Reply-To: <54116344.5080103@bernhard-voelker.de> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 09/11/2014 09:54 AM, Bernhard Voelker wrote: > +or available locally via: info '(coreutils) basename invocation' > ________________________________^_______________________________^ > > I think we need the \aq instead of ' here, don't we? Good catch! Interestingly it renders as a standard ' quote in the shell these days, but converting to PDF at least, introduces the non copy and pasteable curly quotes. So I've added a s/'/\aq(/ and pushed. thanks! Pádraig. p.s. I just diffed the latest help2man and there was nothing significantly different or useful. We can sync that up easily at some stage in the future.