From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 36310 invoked by alias); 13 Nov 2019 09:17:30 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 36266 invoked by uid 9078); 13 Nov 2019 09:17:29 -0000 Date: Wed, 13 Nov 2019 09:17:00 -0000 Message-ID: <20191113091729.36264.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] regtool: allow /proc/registry{, 32, 64}/ registry path prefix X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: d14714c690c0b11b0aa7e6d09c930a321eeac7f9 X-Git-Newrev: d3110717f0a39ec7d00921c048bfd3c8f8efe7c4 X-SW-Source: 2019-q4/txt/msg00027.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d3110717f0a39ec7d00921c048bfd3c8f8efe7c4 commit d3110717f0a39ec7d00921c048bfd3c8f8efe7c4 Author: Brian Inglis Date: Mon Nov 11 10:29:00 2019 -0700 regtool: allow /proc/registry{,32,64}/ registry path prefix The user can supply the registry path prefix /proc/registry{,32,64}/ to use path completion. Diff: --- winsup/doc/utils.xml | 7 +++++-- winsup/utils/regtool.cc | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml index 043ed73..5f266bc 100644 --- a/winsup/doc/utils.xml +++ b/winsup/doc/utils.xml @@ -1976,8 +1976,11 @@ remote host in either \\hostname or hostname: format and prefix is any of: users HKU HKEY_USERS You can use forward slash ('/') as a separator instead of backslash, in -that case backslash is treated as escape character -Example: regtool get '\user\software\Microsoft\Clock\iFormat' +that case backslash is treated as an escape character. +You can also supply the registry path prefix /proc/registry{,32,64}/ to +use path completion. +Example: + regtool list '/HKLM/SOFTWARE/Classes/MIME/Database/Content Type/audio\\/wav' diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc index a44d907..f91e61d 100644 --- a/winsup/utils/regtool.cc +++ b/winsup/utils/regtool.cc @@ -166,11 +166,13 @@ usage (FILE *where = stderr) " machine HKLM HKEY_LOCAL_MACHINE\n" " users HKU HKEY_USERS\n" "\n" - "If the keyname starts with a forward slash ('/'), the forward slash is used\n" - "as separator and the backslash can be used as escape character.\n"); + "You can use forward slash ('/') as a separator instead of backslash, in\n" + "that case backslash is treated as an escape character.\n" + "You can also supply the registry path prefix /proc/registry{,32,64}/ to\n" + "use path completion.\n"); fprintf (where, "" "Example:\n" - "%s list '/machine/SOFTWARE/Classes/MIME/Database/Content Type/audio\\/wav'\n\n", prog_name); + "%s list '/HKLM/SOFTWARE/Classes/MIME/Database/Content Type/audio\\/wav'\n\n", prog_name); } if (where == stderr) fprintf (where, @@ -350,6 +352,15 @@ find_key (int howmanyparts, REGSAM access, int option = 0) *h = 0; n = e; } + else if (strncmp ("\\proc\\registry", n, strlen ("\\proc\\registry")) == 0) + { + /* skip /proc/registry{,32,64}/ prefix */ + n += strlen ("\\proc\\registry"); + if (strncmp ("64", n, strlen ("64")) == 0) + n += strlen ("64"); + else if (strncmp ("32", n, strlen ("32")) == 0) + n += strlen ("32"); + } while (*n != '\\') n++; *n++ = 0;