summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2006-10-19 09:08:44 +0000
committerCorinna Vinschen <corinna@vinschen.de>2006-10-19 09:08:44 +0000
commit3c256e38f9b1de33028b4f6f4635ecf5395e2168 (patch)
tree5e170eabe2a3943de9ecf668cb2c4c0108fa3cd1
parent6d441576873f5f34962fa3982f4e4f1d37eeb405 (diff)
downloadcygnal-3c256e38f9b1de33028b4f6f4635ecf5395e2168.tar.gz
cygnal-3c256e38f9b1de33028b4f6f4635ecf5395e2168.tar.bz2
cygnal-3c256e38f9b1de33028b4f6f4635ecf5395e2168.zip
* regtool.cc (longopts): Add --wow32 option.
(opts): Add -W option. (usage): Add text for --wow32/-W option. (main): Handle --wow32/-W option. * utils.sgml: Document the new -W option.
-rw-r--r--winsup/utils/ChangeLog8
-rw-r--r--winsup/utils/regtool.cc5
-rw-r--r--winsup/utils/utils.sgml6
3 files changed, 19 insertions, 0 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 3afb86962..7a5674cb5 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-19 Corinna Vinschen <corinna@vinschen.de>
+
+ * regtool.cc (longopts): Add --wow32 option.
+ (opts): Add -W option.
+ (usage): Add text for --wow32/-W option.
+ (main): Handle --wow32/-W option.
+ * utils.sgml: Document the new -W option.
+
2006-10-16 Corinna Vinschen <corinna@vinschen.de>
* regtool.cc (KEY_WOW64_64KEY): Drop definition. Instead define
diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc
index b9ed8a8d7..2a4c2fe1d 100644
--- a/winsup/utils/regtool.cc
+++ b/winsup/utils/regtool.cc
@@ -48,6 +48,7 @@ static struct option longopts[] =
{"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
{"wow64", no_argument, NULL, 'w'},
+ {"wow32", no_argument, NULL, 'W'},
{"key-separator", required_argument, NULL, 'K'},
{NULL, 0, NULL, 0}
};
@@ -110,6 +111,7 @@ usage (FILE *where = stderr)
" -q, --quiet no error output, just nonzero return if KEY/VALUE missing\n"
" -v, --verbose verbose output, including VALUE contents when applicable\n"
" -w, --wow64 access 64 bit registry view (ignored on 32 bit Windows)\n"
+ " -W, --wow32 access 32 bit registry view (ignored on 32 bit Windows)\n"
" -V, --version output version information and exit\n"
"\n");
if (where == stdout)
@@ -860,6 +862,9 @@ main (int argc, char **_argv)
case 'w':
wow64 = KEY_WOW64_64KEY;
break;
+ case 'W':
+ wow64 = KEY_WOW64_32KEY;
+ break;
case 'K':
key_sep = *optarg;
break;
diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml
index 1279bda68..7df6c1dfb 100644
--- a/winsup/utils/utils.sgml
+++ b/winsup/utils/utils.sgml
@@ -1061,6 +1061,7 @@ Other Options:
-q, --quiet no error output, just nonzero return if KEY/VALUE missing
-v, --verbose verbose output, including VALUE contents when applicable
-w, --wow64 access 64 bit registry view (ignored on 32 bit Windows)
+ -W, --wow32 access 32 bit registry view (ignored on 32 bit Windows)
-V, --version output version information and exit
KEY is in the format [host]\prefix\KEY\KEY\VALUE, where host is optional
@@ -1096,6 +1097,11 @@ the <literal>-w</literal> the 64 bit view is used and
This option is simply ignored when running on 32 bit Windows versions.
</para>
+<para>The <literal>-W</literal> option allows to access the 32 bit view
+on the registry. The purpose of this option is mainly symmetry. It
+allows to create OS agnostic scripts which would also work in a hypothetic
+64 bit version of Cygwin.</para>
+
<para>You must provide <command>regtool</command> with an
<emphasis>action</emphasis> following options (if any). Currently,
the action must be <literal>add</literal>, <literal>set</literal>,