drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* regtool.cc: Throughout, convert all registry calls to wide char 

calls and use string conversion according to current locale.
	(longopts): Change "dword-le" to "dword-be", as was originally
	intended.
	(usage): Change usage accordingly.
	(print_version): Simplify copyright dates in output.
	(cmd_list): Handle REG_LINK like REG_SZ.
	(cmd_get): Ditto.
	(main): Call setlocale.
	* utils.sgml (regtool): Fix options and add missing descriptions for
	new features.
This commit is contained in:
Corinna Vinschen 2009-12-16 14:02:57 +00:00
parent d1600b38c0
commit 7077c48e54
3 changed files with 146 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/utils/ChangeLog
View File

@ -1,3 +1,17 @@
2009-12-16 Corinna Vinschen <corinna@vinschen.de>
* regtool.cc: Throughout, convert all registry calls to wide char
calls and use string conversion according to current locale.
(longopts): Change "dword-le" to "dword-be", as was originally
intended.
(usage): Change usage accordingly.
(print_version): Simplify copyright dates in output.
(cmd_list): Handle REG_LINK like REG_SZ.
(cmd_get): Ditto.
(main): Call setlocale.
* utils.sgml (regtool): Fix options and add missing descriptions for
new features.
2009-11-29 Corinna Vinschen <corinna@vinschen.de> 2009-11-29 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (getaclentry): Allow to delete default entries for the * setfacl.c (getaclentry): Allow to delete default entries for the

199
winsup/utils/regtool.cc
View File

@ -1,6 +1,7 @@
/* regtool.cc /* regtool.cc
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat Inc. Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009 Red Hat Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -12,7 +13,9 @@ details. */
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <wchar.h>
#include <getopt.h> #include <getopt.h>
#include <locale.h>
#define WINVER 0x0502 #define WINVER 0x0502
#include <windows.h> #include <windows.h>
#include <sys/cygwin.h> #include <sys/cygwin.h>
@ -36,7 +39,7 @@ static struct option longopts[] =
{ {
{"binary", no_argument, NULL, 'b' }, {"binary", no_argument, NULL, 'b' },
{"dword", no_argument, NULL, 'd' }, {"dword", no_argument, NULL, 'd' },
{"dword-le", no_argument, NULL, 'D' }, {"dword-be", no_argument, NULL, 'D' },
{"expand-string", no_argument, NULL, 'e' }, {"expand-string", no_argument, NULL, 'e' },
{"help", no_argument, NULL, 'h' }, {"help", no_argument, NULL, 'h' },
{"integer", no_argument, NULL, 'i' }, {"integer", no_argument, NULL, 'i' },
@ -84,7 +87,7 @@ DWORD wow64 = 0;
char **argv; char **argv;
HKEY key; HKEY key;
char *value; wchar_t *value;
static void static void
usage (FILE *where = stderr) usage (FILE *where = stderr)
@ -122,7 +125,7 @@ usage (FILE *where = stderr)
"Options for 'set' Action:\n" "Options for 'set' Action:\n"
" -b, --binary set type to REG_BINARY (hex args or '-')\n" " -b, --binary set type to REG_BINARY (hex args or '-')\n"
" -d, --dword set type to REG_DWORD\n" " -d, --dword set type to REG_DWORD\n"
" -D, --dword-le set type to REG_DWORD_LITTLE_ENDIAN\n" " -D, --dword-be set type to REG_DWORD_BIG_ENDIAN\n"
" -e, --expand-string set type to REG_EXPAND_SZ\n" " -e, --expand-string set type to REG_EXPAND_SZ\n"
" -i, --integer set type to REG_DWORD\n" " -i, --integer set type to REG_DWORD\n"
" -m, --multi-string set type to REG_MULTI_SZ\n" " -m, --multi-string set type to REG_MULTI_SZ\n"
@ -182,7 +185,7 @@ print_version ()
printf ("\ printf ("\
%s (cygwin) %.*s\n\ %s (cygwin) %.*s\n\
Registry Tool\n\ Registry Tool\n\
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.\n\ Copyright 2000-2009 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", prog_name, len, v, __DATE__); ", prog_name, len, v, __DATE__);
} }
@ -316,6 +319,8 @@ find_key (int howmanyparts, REGSAM access, int option = 0)
char *n = argv[0], *e, *h, c; char *n = argv[0], *e, *h, c;
char* host = NULL; char* host = NULL;
int i; int i;
size_t len;
if (*n == '/') if (*n == '/')
translate (n); translate (n);
if (*n != '\\') if (*n != '\\')
@ -369,13 +374,21 @@ find_key (int howmanyparts, REGSAM access, int option = 0)
if (*e != key_sep) if (*e != key_sep)
{ {
key = wkprefixes[i].key; key = wkprefixes[i].key;
value = n; if (value)
free (value);
len = mbstowcs (NULL, n, 0) + 1;
value = (wchar_t *) malloc (len);
mbstowcs (value, n, len);
return; return;
} }
else else
{ {
*e = 0; *e = 0;
value = e + 1; if (value)
free (value);
len = mbstowcs (NULL, e + 1, 0) + 1;
value = (wchar_t *) malloc (len);
mbstowcs (value, e + 1, len);
} }
} }
if (host) if (host)
@ -392,15 +405,21 @@ find_key (int howmanyparts, REGSAM access, int option = 0)
key = base; key = base;
else else
{ {
len = mbstowcs (NULL, n, 0) + 1;
wchar_t name[len];
mbstowcs (name, n, len);
if (access) if (access)
{ {
rv = RegOpenKeyEx (base, n, 0, access | wow64, &key); rv = RegOpenKeyExW (base, name, 0, access | wow64, &key);
if (option && (rv == ERROR_SUCCESS || rv == ERROR_ACCESS_DENIED)) if (option && (rv == ERROR_SUCCESS || rv == ERROR_ACCESS_DENIED))
{ {
/* reopen with desired option due to missing option support in RegOpenKeyE */ /* reopen with desired option due to missing option support in
/* FIXME: may create the key in rare cases (e.g. access denied in parent) */ RegOpenKeyE */
/* FIXME: may create the key in rare cases (e.g. access denied
in parent) */
HKEY key2; HKEY key2;
if (RegCreateKeyEx (base, n, 0, NULL, option, access | wow64, NULL, &key2, NULL) if (RegCreateKeyExW (base, name, 0, NULL, option, access | wow64,
NULL, &key2, NULL)
== ERROR_SUCCESS) == ERROR_SUCCESS)
{ {
if (rv == ERROR_SUCCESS) if (rv == ERROR_SUCCESS)
@ -414,27 +433,24 @@ find_key (int howmanyparts, REGSAM access, int option = 0)
} }
else if (argv[1]) else if (argv[1])
{ {
ssize_t len = cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, ssize_t len = cygwin_conv_path (CCP_POSIX_TO_WIN_W, argv[1], NULL, 0);
argv[1], NULL, 0); wchar_t win32_path[len];
char win32_path[len]; cygwin_conv_path (CCP_POSIX_TO_WIN_W, argv[1], win32_path, len);
cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, argv[1], rv = RegLoadKeyW (base, name, win32_path);
win32_path, len);
rv = RegLoadKey (base, n, win32_path);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (verbose) if (verbose)
printf ("key %s loaded from file %s\n", n, win32_path); printf ("key %ls loaded from file %ls\n", name, win32_path);
} }
else else
{ {
rv = RegUnLoadKey (base, n); rv = RegUnLoadKeyW (base, name);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (verbose) if (verbose)
printf ("key %s unloaded\n", n); printf ("key %ls unloaded\n", name);
} }
} }
//printf("key `%s' value `%s'\n", n, value);
} }
@ -443,18 +459,18 @@ cmd_list ()
{ {
DWORD num_subkeys, maxsubkeylen, num_values, maxvalnamelen, maxvaluelen; DWORD num_subkeys, maxsubkeylen, num_values, maxvalnamelen, maxvaluelen;
DWORD maxclasslen; DWORD maxclasslen;
char *subkey_name, *value_name, *class_name; wchar_t *subkey_name, *value_name, *class_name, *vd;
unsigned char *value_data, *vd; unsigned char *value_data;
DWORD i, j, m, n, t; DWORD i, j, m, n, t;
int v; int v;
find_key (1, KEY_READ); find_key (1, KEY_READ);
RegQueryInfoKey (key, 0, 0, 0, &num_subkeys, &maxsubkeylen, &maxclasslen, RegQueryInfoKeyW (key, 0, 0, 0, &num_subkeys, &maxsubkeylen, &maxclasslen,
&num_values, &maxvalnamelen, &maxvaluelen, 0, 0); &num_values, &maxvalnamelen, &maxvaluelen, 0, 0);
subkey_name = (char *) malloc (maxsubkeylen + 1); subkey_name = (wchar_t *) malloc ((maxsubkeylen + 1) * sizeof (wchar_t));
class_name = (char *) malloc (maxclasslen + 1); class_name = (wchar_t *) malloc ((maxclasslen + 1) * sizeof (wchar_t));
value_name = (char *) malloc (maxvalnamelen + 1); value_name = (wchar_t *) malloc ((maxvalnamelen + 1) * sizeof (wchar_t));
value_data = (unsigned char *) malloc (maxvaluelen + 1); value_data = (unsigned char *) malloc (maxvaluelen + 1);
if (!listwhat) if (!listwhat)
@ -463,15 +479,15 @@ cmd_list ()
if (listwhat & LIST_KEYS) if (listwhat & LIST_KEYS)
for (i = 0; i < num_subkeys; i++) for (i = 0; i < num_subkeys; i++)
{ {
m = maxsubkeylen + 1; m = (maxsubkeylen + 1) * sizeof (wchar_t);
n = maxclasslen + 1; n = (maxclasslen + 1) * sizeof (wchar_t);
RegEnumKeyEx (key, i, subkey_name, &m, 0, class_name, &n, 0); RegEnumKeyExW (key, i, subkey_name, &m, 0, class_name, &n, 0);
fputs (subkey_name, stdout); printf ("%ls", subkey_name);
if (postfix || verbose) if (postfix || verbose)
fputc (key_sep, stdout); fputc (key_sep, stdout);
if (verbose) if (verbose)
printf (" (%s)", class_name); printf (" (%ls)", class_name);
puts (""); puts ("");
} }
@ -479,19 +495,18 @@ cmd_list ()
if (listwhat & LIST_VALS) if (listwhat & LIST_VALS)
for (i = 0; i < num_values; i++) for (i = 0; i < num_values; i++)
{ {
m = maxvalnamelen + 1; m = (maxvalnamelen + 1) * sizeof (wchar_t);
n = maxvaluelen + 1; n = maxvaluelen + 1;
RegEnumValue (key, i, value_name, &m, 0, &t, (BYTE *) value_data, &n); RegEnumValueW (key, i, value_name, &m, 0, &t, (BYTE *) value_data, &n);
value_data[n] = 0; value_data[n] = 0;
if (!verbose) if (!verbose)
printf ("%s\n", value_name); printf ("%ls\n", value_name);
else else
{ {
printf ("%s (%s) = ", value_name, types[t]); printf ("%ls (%s) = ", value_name, types[t]);
switch (t) switch (t)
{ {
case REG_NONE: case REG_NONE:
case REG_LINK:
case REG_BINARY: case REG_BINARY:
for (j = 0; j < 8 && j < n; j++) for (j = 0; j < 8 && j < n; j++)
printf ("%02x ", value_data[j]); printf ("%02x ", value_data[j]);
@ -515,14 +530,15 @@ cmd_list ()
break; break;
case REG_EXPAND_SZ: case REG_EXPAND_SZ:
case REG_SZ: case REG_SZ:
printf ("\"%s\"\n", value_data); case REG_LINK:
printf ("\"%ls\"\n", (wchar_t *) value_data);
break; break;
case REG_MULTI_SZ: case REG_MULTI_SZ:
vd = value_data; vd = (wchar_t *) value_data;
while (vd && *vd) while (vd && *vd)
{ {
printf ("\"%s\"", vd); printf ("\"%ls\"", vd);
vd = vd + strlen ((const char *) vd) + 1; vd = vd + wcslen (vd) + 1;
if (*vd) if (*vd)
printf (", "); printf (", ");
} }
@ -543,7 +559,7 @@ cmd_add ()
find_key (2, KEY_ALL_ACCESS); find_key (2, KEY_ALL_ACCESS);
HKEY newkey; HKEY newkey;
DWORD newtype; DWORD newtype;
int rv = RegCreateKeyEx (key, value, 0, (char *) "", REG_OPTION_NON_VOLATILE, int rv = RegCreateKeyExW (key, value, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS | wow64, 0, &newkey, &newtype); KEY_ALL_ACCESS | wow64, 0, &newkey, &newtype);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
@ -551,15 +567,15 @@ cmd_add ()
if (verbose) if (verbose)
{ {
if (newtype == REG_OPENED_EXISTING_KEY) if (newtype == REG_OPENED_EXISTING_KEY)
printf ("Key %s already exists\n", value); printf ("Key %ls already exists\n", value);
else else
printf ("Key %s created\n", value); printf ("Key %ls created\n", value);
} }
return 0; return 0;
} }
extern "C" { extern "C" {
WINADVAPI LONG WINAPI (*regDeleteKeyEx)(HKEY, LPCSTR, REGSAM, DWORD); WINADVAPI LONG WINAPI (*regDeleteKeyEx)(HKEY, LPCWSTR, REGSAM, DWORD);
} }
int int
@ -572,16 +588,16 @@ cmd_remove ()
{ {
HMODULE mod = LoadLibrary ("advapi32.dll"); HMODULE mod = LoadLibrary ("advapi32.dll");
if (mod) if (mod)
regDeleteKeyEx = (WINADVAPI LONG WINAPI (*)(HKEY, LPCSTR, REGSAM, DWORD)) GetProcAddress (mod, "RegDeleteKeyExA"); regDeleteKeyEx = (WINADVAPI LONG WINAPI (*)(HKEY, LPCWSTR, REGSAM, DWORD)) GetProcAddress (mod, "RegDeleteKeyExW");
} }
if (regDeleteKeyEx) if (regDeleteKeyEx)
rv = (*regDeleteKeyEx) (key, value, wow64, 0); rv = (*regDeleteKeyEx) (key, value, wow64, 0);
else else
rv = RegDeleteKey (key, value); rv = RegDeleteKeyW (key, value);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (verbose) if (verbose)
printf ("subkey %s deleted\n", value); printf ("subkey %ls deleted\n", value);
return 0; return 0;
} }
@ -597,7 +613,7 @@ cmd_check ()
int int
cmd_set () cmd_set ()
{ {
int i, n; int i, n, max_n;
DWORD v, rv; DWORD v, rv;
unsigned long long llval; unsigned long long llval;
char *a = argv[1], *data = 0; char *a = argv[1], *data = 0;
@ -657,11 +673,11 @@ cmd_set ()
data[i] = (char) v; data[i] = (char) v;
} }
} }
rv = RegSetValueEx (key, value, 0, value_type, (const BYTE *) data, n); rv = RegSetValueExW (key, value, 0, value_type, (const BYTE *) data, n);
break; break;
case REG_DWORD: case REG_DWORD:
v = strtoul (a, 0, 0); v = strtoul (a, 0, 0);
rv = RegSetValueEx (key, value, 0, REG_DWORD, (const BYTE *) &v, rv = RegSetValueExW (key, value, 0, REG_DWORD, (const BYTE *) &v,
sizeof (v)); sizeof (v));
break; break;
case REG_DWORD_BIG_ENDIAN: case REG_DWORD_BIG_ENDIAN:
@ -670,33 +686,31 @@ cmd_set ()
| ((v & 0xff00) << 8) | ((v & 0xff00) << 8)
| ((v & 0xff0000) >> 8) | ((v & 0xff0000) >> 8)
| ((v & 0xff000000) >> 24)); | ((v & 0xff000000) >> 24));
rv = RegSetValueEx (key, value, 0, REG_DWORD_BIG_ENDIAN, rv = RegSetValueExW (key, value, 0, REG_DWORD_BIG_ENDIAN,
(const BYTE *) &v, sizeof (v)); (const BYTE *) &v, sizeof (v));
break; break;
case REG_QWORD: case REG_QWORD:
llval = strtoul (a, 0, 0); llval = strtoul (a, 0, 0);
rv = RegSetValueEx (key, value, 0, REG_QWORD, (const BYTE *) &llval, rv = RegSetValueExW (key, value, 0, REG_QWORD, (const BYTE *) &llval,
sizeof (llval)); sizeof (llval));
break; break;
case REG_SZ: case REG_SZ:
rv = RegSetValueEx (key, value, 0, REG_SZ, (const BYTE *) a, strlen (a) + 1);
break;
case REG_EXPAND_SZ: case REG_EXPAND_SZ:
rv = RegSetValueEx (key, value, 0, REG_EXPAND_SZ, (const BYTE *) a, n = mbstowcs (NULL, a, 0);
strlen (a) + 1); wchar_t w[n + 1];
mbstowcs (w, a, n + 1);
rv = RegSetValueExW (key, value, 0, value_type,
(const BYTE *) w, (n + 1) * sizeof (wchar_t));
break; break;
case REG_MULTI_SZ: case REG_MULTI_SZ:
for (i = 1, n = 1; argv[i]; i++) for (i = 1, max_n = 1; argv[i]; i++)
n += strlen (argv[i]) + 1; max_n += mbstowcs (NULL, argv[i], 0) + 1;
data = (char *) malloc (n); data = (char *) malloc (max_n * sizeof (wchar_t));
for (i = 1, n = 0; argv[i]; i++) for (i = 1, n = 0; argv[i]; i++)
{ n += mbstowcs ((wchar_t *) data + n, argv[i], max_n - n) + 1;
strcpy (data + n, argv[i]); ((wchar_t *)data)[n] = L'\0';
n += strlen (argv[i]) + 1; rv = RegSetValueExW (key, value, 0, REG_MULTI_SZ, (const BYTE *) data,
} (max_n + 1) * sizeof (wchar_t));
data[n] = 0;
rv = RegSetValueEx (key, value, 0, REG_MULTI_SZ, (const BYTE *) data,
n + 1);
break; break;
case REG_AUTO: case REG_AUTO:
rv = ERROR_SUCCESS; rv = ERROR_SUCCESS;
@ -719,11 +733,11 @@ int
cmd_unset () cmd_unset ()
{ {
find_key (2, KEY_ALL_ACCESS); find_key (2, KEY_ALL_ACCESS);
DWORD rv = RegDeleteValue (key, value); DWORD rv = RegDeleteValueW (key, value);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (verbose) if (verbose)
printf ("value %s deleted\n", value); printf ("value %ls deleted\n", value);
return 0; return 0;
} }
@ -732,12 +746,14 @@ cmd_get ()
{ {
find_key (2, KEY_READ); find_key (2, KEY_READ);
DWORD vtype, dsize, rv; DWORD vtype, dsize, rv;
char *data, *vd; PBYTE data;
rv = RegQueryValueEx (key, value, 0, &vtype, 0, &dsize); wchar_t *vd;
rv = RegQueryValueExW (key, value, 0, &vtype, 0, &dsize);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
data = (char *) malloc (dsize + 1); data = (PBYTE) malloc (dsize + 1);
rv = RegQueryValueEx (key, value, 0, &vtype, (BYTE *) data, &dsize); rv = RegQueryValueExW (key, value, 0, &vtype, data, &dsize);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (value_type == REG_BINARY) if (value_type == REG_BINARY)
@ -753,7 +769,6 @@ cmd_get ()
{ {
case REG_NONE: case REG_NONE:
case REG_BINARY: case REG_BINARY:
case REG_LINK:
fwrite (data, dsize, 1, stdout); fwrite (data, dsize, 1, stdout);
break; break;
case REG_DWORD: case REG_DWORD:
@ -770,27 +785,28 @@ cmd_get ()
printf (hex ? "0x%016llx\n" : "%llu\n", *(unsigned long long *) data); printf (hex ? "0x%016llx\n" : "%llu\n", *(unsigned long long *) data);
break; break;
case REG_SZ: case REG_SZ:
printf ("%s\n", data); case REG_LINK:
printf ("%ls\n", (wchar_t *) data);
break; break;
case REG_EXPAND_SZ: case REG_EXPAND_SZ:
if (value_type == REG_EXPAND_SZ) // hack if (value_type == REG_EXPAND_SZ) // hack
{ {
char *buf; wchar_t *buf;
DWORD bufsize; DWORD bufsize;
bufsize = ExpandEnvironmentStrings (data, 0, 0); bufsize = ExpandEnvironmentStringsW ((wchar_t *) data, 0, 0);
buf = (char *) malloc (bufsize + 1); buf = (wchar_t *) malloc (bufsize + 1);
ExpandEnvironmentStrings (data, buf, bufsize + 1); ExpandEnvironmentStringsW ((wchar_t *) data, buf, bufsize + 1);
free (data); free (data);
data = buf; data = (PBYTE) buf;
} }
printf ("%s\n", data); printf ("%ls\n", (wchar_t *) data);
break; break;
case REG_MULTI_SZ: case REG_MULTI_SZ:
vd = data; vd = (wchar_t *) data;
while (vd && *vd) while (vd && *vd)
{ {
printf ("%s\n", vd); printf ("%ls\n", vd);
vd = vd + strlen ((const char *) vd) + 1; vd = vd + wcslen (vd) + 1;
} }
break; break;
} }
@ -822,7 +838,7 @@ cmd_unload ()
} }
DWORD DWORD
set_privilege (const char * name) set_privilege (const char *name)
{ {
TOKEN_PRIVILEGES tp; TOKEN_PRIVILEGES tp;
if (!LookupPrivilegeValue (NULL, name, &tp.Privileges[0].Luid)) if (!LookupPrivilegeValue (NULL, name, &tp.Privileges[0].Luid))
@ -852,16 +868,14 @@ cmd_save ()
set_privilege (SE_BACKUP_NAME); set_privilege (SE_BACKUP_NAME);
/* REG_OPTION_BACKUP_RESTORE is necessary to save /HKLM/SECURITY */ /* REG_OPTION_BACKUP_RESTORE is necessary to save /HKLM/SECURITY */
find_key (1, KEY_QUERY_VALUE, REG_OPTION_BACKUP_RESTORE); find_key (1, KEY_QUERY_VALUE, REG_OPTION_BACKUP_RESTORE);
ssize_t len = cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, ssize_t len = cygwin_conv_path (CCP_POSIX_TO_WIN_W, argv[1], NULL, 0);
argv[1], NULL, 0); wchar_t win32_path[len];
char win32_path[len]; cygwin_conv_path (CCP_POSIX_TO_WIN_W, argv[1], win32_path, len);
cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, argv[1], DWORD rv = RegSaveKeyW (key, win32_path, NULL);
win32_path, len);
DWORD rv = RegSaveKey (key, win32_path, NULL);
if (rv != ERROR_SUCCESS) if (rv != ERROR_SUCCESS)
Fail (rv); Fail (rv);
if (verbose) if (verbose)
printf ("key saved to %s\n", win32_path); printf ("key saved to %ls\n", win32_path);
return 0; return 0;
} }
@ -889,6 +903,7 @@ main (int argc, char **_argv)
{ {
int g; int g;
setlocale (LC_ALL, "");
prog_name = strrchr (_argv[0], '/'); prog_name = strrchr (_argv[0], '/');
if (prog_name == NULL) if (prog_name == NULL)
prog_name = strrchr (_argv[0], '\\'); prog_name = strrchr (_argv[0], '\\');

29
winsup/utils/utils.sgml
View File

@ -1257,12 +1257,17 @@ Options for 'list' Action:
Options for 'get' Action: Options for 'get' Action:
-b, --binary print REG_BINARY data as hex bytes -b, --binary print REG_BINARY data as hex bytes
-n, --none print data as stream of bytes as stored in registry
-x, --hex print numerical data as hex numbers
Options for 'set' Action: Options for 'set' Action:
-b, --binary set type to REG_BINARY (hex args or '-') -b, --binary set type to REG_BINARY (hex args or '-')
-D, --dword-be set type to REG_DWORD_BIG_ENDIAN
-e, --expand-string set type to REG_EXPAND_SZ -e, --expand-string set type to REG_EXPAND_SZ
-i, --integer set type to REG_DWORD -i, --integer set type to REG_DWORD
-m, --multi-string set type to REG_MULTI_SZ -m, --multi-string set type to REG_MULTI_SZ
-n, --none set type to REG_NONE
-Q, --qword set type to REG_QWORD
-s, --string set type to REG_SZ -s, --string set type to REG_SZ
Options for 'set' and 'unset' Actions: Options for 'set' and 'unset' Actions:
@ -1343,23 +1348,35 @@ before you may remove it, but don't rely on this stopping you from
accidentally removing too much. accidentally removing too much.
</para> </para>
<para>The <literal>get</literal> action prints a value within a key.
With the <literal>-b</literal> option, data is printed as hex bytes.
<literal>-n</literal> allows to print the data as a typeless stream of
bytes. Integer values (REG_DWORD, REG_QWORD) are usually printed
as decimal values. The <literal>-x</literal> option allows to print
the numbers as hexadecimal values.</para>
<para>The <literal>set</literal> action sets a value within a key. <para>The <literal>set</literal> action sets a value within a key.
<literal>-b</literal> means it's binary data (REG_BINARY). <literal>-b</literal> means it's binary data (REG_BINARY).
The binary values are specified as hex bytes in the argument list. The binary values are specified as hex bytes in the argument list.
If the argument is <literal>'-'</literal>, binary data is read If the argument is <literal>'-'</literal>, binary data is read
from stdin instead. from stdin instead.
<literal>-d</literal> or <literal>-i</literal> means the value is a 32 bit
integer value (REG_DWORD).
<literal>-D</literal> means the value is a 32 bit integer value in
Big Endian representation (REG_DWORD_BIG_ENDIAN).
<literal>-Q</literal> means the value is a 64 bit integer value (REG_QWORD).
<literal>-s</literal> means the value is a string (REG_SZ).
<literal>-e</literal> means it's an expanding string (REG_EXPAND_SZ) <literal>-e</literal> means it's an expanding string (REG_EXPAND_SZ)
that contains embedded environment variables. that contains embedded environment variables.
<literal>-i</literal> means the value is an integer (REG_DWORD).
<literal>-m</literal> means it's a multi-string (REG_MULTI_SZ). <literal>-m</literal> means it's a multi-string (REG_MULTI_SZ).
<literal>-s</literal> means the value is a string (REG_SZ).
If you don't specify one of these, <command>regtool</command> tries to If you don't specify one of these, <command>regtool</command> tries to
guess the type based on the value you give. If it looks like a guess the type based on the value you give. If it looks like a
number, it's a DWORD. If it starts with a percent, it's an expanding number, it's a DWORD, unless it's value doesn't fit into 32 bit, in which
case it's a QWORD. If it starts with a percent, it's an expanding
string. If you give multiple values, it's a multi-string. Else, it's string. If you give multiple values, it's a multi-string. Else, it's
a regular string. a regular string.</para>
The <literal>unset</literal> action removes a value from a key.
</para> <para>The <literal>unset</literal> action removes a value from a key.</para>
<para>The <literal>load</literal> action adds a new subkey and loads <para>The <literal>load</literal> action adds a new subkey and loads
the contents of a registry hive into it. the contents of a registry hive into it.