simple registry frontend
Copyright (C) Jelmer Vernooij 2004-2007
+ Copyright (C) Wilco Baan Hofman 2009
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "lib/cmdline/popt_common.h"
#include "lib/events/events.h"
#include "system/time.h"
-#include "lib/smbreadline/smbreadline.h"
+#include "../libcli/smbreadline/smbreadline.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "lib/registry/tools/common.h"
#include "param/param.h"
struct regshell_context {
struct registry_context *registry;
- const char *path;
+ char *path;
+ char *predef;
struct registry_key *current;
+ struct registry_key *root;
};
+static WERROR get_full_path(struct regshell_context *ctx, const char *path, char **ret_path)
+{
+ const char *dir;
+ char *tmp;
+ char *new_path;
+
+ if (path[0] == '\\') {
+ new_path = talloc_strdup(ctx, "");
+ } else {
+ new_path = talloc_strdup(ctx, ctx->path);
+ }
+
+ dir = strtok(discard_const_p(char, path), "\\");
+ if (dir == NULL) {
+ *ret_path = new_path;
+ return WERR_OK;
+ }
+ do {
+ if (strcmp(dir, "..") == 0) {
+ if (strchr(new_path, '\\')) {
+ new_path[strrchr(new_path, '\\') - new_path] = '\0';
+ } else {
+ tmp = new_path;
+ new_path = talloc_strdup(ctx, "");
+ talloc_free(tmp);
+ }
+ continue;
+ }
+ if (strcmp(dir, ".") == 0) {
+ continue;
+ }
+
+ tmp = new_path;
+ /* No prepending a backslash */
+ if (strcmp(new_path, "") == 0) {
+ new_path = talloc_strdup(ctx, dir);
+ } else {
+ new_path = talloc_asprintf(ctx, "%s\\%s", new_path, dir);
+ }
+ talloc_free(tmp);
+
+ } while ((dir = strtok(NULL, "\\")));
+
+ *ret_path = new_path;
+ return WERR_OK;
+}
+
/* *
* ck/cd - change key
* ls - list values/keys
* exit
*/
-static WERROR cmd_info(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_info(struct regshell_context *ctx, int argc, const char **argv)
{
struct security_descriptor *sec_desc = NULL;
time_t last_mod;
if (classname != NULL)
printf("Key Class: %s\n", classname);
last_mod = nt_time_to_unix(last_change);
- printf("Time Last Modified: %s\n", ctime(&last_mod));
+ printf("Time Last Modified: %s", ctime(&last_mod));
printf("Number of subkeys: %d\n", num_subkeys);
printf("Number of values: %d\n", num_values);
error = reg_get_sec_desc(ctx, ctx->current, &sec_desc);
if (!W_ERROR_IS_OK(error)) {
- printf("Error getting security descriptor\n");
- return error;
+ printf("Error getting security descriptor: %s\n", win_errstr(error));
+ return WERR_OK;
}
ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor,
"Security", sec_desc);
return WERR_OK;
}
-static WERROR cmd_predef(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_predef(struct regshell_context *ctx, int argc, const char **argv)
{
struct registry_key *ret = NULL;
if (argc < 2) {
return error;
}
- ctx->path = strupper_talloc(ctx, argv[1]);
+ ctx->predef = strupper_talloc(ctx, argv[1]);
ctx->current = ret;
+ ctx->root = ret;
}
return WERR_OK;
}
static WERROR cmd_pwd(struct regshell_context *ctx,
- int argc, char **argv)
+ int argc, const char **argv)
{
+ if (ctx->predef) {
+ printf("%s\\", ctx->predef);
+ }
printf("%s\n", ctx->path);
return WERR_OK;
}
-static WERROR cmd_set(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_set(struct regshell_context *ctx, int argc, const char **argv)
{
struct registry_value val;
WERROR error;
if (argc < 4) {
fprintf(stderr, "Usage: set value-name type value\n");
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
- if (!reg_string_to_val(ctx, lp_iconv_convenience(cmdline_lp_ctx),
- argv[2], argv[3], &val.data_type,
- &val.data)) {
+ if (!reg_string_to_val(ctx, argv[2], argv[3], &val.data_type, &val.data)) {
fprintf(stderr, "Unable to interpret data\n");
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
error = reg_val_set(ctx->current, argv[1], val.data_type, val.data);
return WERR_OK;
}
-static WERROR cmd_ck(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_ck(struct regshell_context *ctx, int argc, const char **argv)
{
- struct registry_key *new = NULL;
+ struct registry_key *nkey = NULL;
+ char *full_path;
WERROR error;
- if(argc < 2) {
- new = ctx->current;
- } else {
- error = reg_open_key(ctx->registry, ctx->current, argv[1],
- &new);
+ if(argc == 2) {
+ if (!W_ERROR_IS_OK(get_full_path(ctx, argv[1], &full_path))) {
+ fprintf(stderr, "Unable to parse the supplied path\n");
+ return WERR_INVALID_PARAMETER;
+ }
+ error = reg_open_key(ctx->registry, ctx->root, full_path,
+ &nkey);
if(!W_ERROR_IS_OK(error)) {
DEBUG(0, ("Error opening specified key: %s\n",
win_errstr(error)));
return error;
}
- }
- ctx->path = talloc_asprintf(ctx, "%s\\%s", ctx->path, argv[1]);
- printf("Current path is: %s\n", ctx->path);
- ctx->current = new;
+ talloc_free(ctx->path);
+ ctx->path = full_path;
+
+ ctx->current = nkey;
+ }
+ printf("New path is: %s\\%s\n", ctx->predef?ctx->predef:"", ctx->path);
return WERR_OK;
}
-static WERROR cmd_print(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_print(struct regshell_context *ctx, int argc, const char **argv)
{
uint32_t value_type;
DATA_BLOB value_data;
WERROR error;
if (argc != 2) {
- fprintf(stderr, "Usage: print <valuename>");
- return WERR_INVALID_PARAM;
+ fprintf(stderr, "Usage: print <valuename>\n");
+ return WERR_INVALID_PARAMETER;
}
error = reg_key_get_value_by_name(ctx, ctx->current, argv[1],
}
printf("%s\n%s\n", str_regtype(value_type),
- reg_val_data_string(ctx, lp_iconv_convenience(cmdline_lp_ctx), value_type, value_data));
+ reg_val_data_string(ctx, value_type, value_data));
return WERR_OK;
}
-static WERROR cmd_ls(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_ls(struct regshell_context *ctx, int argc, const char **argv)
{
- int i;
+ unsigned int i;
WERROR error;
- uint32_t data_type;
- DATA_BLOB data;
+ uint32_t valuetype;
+ DATA_BLOB valuedata;
const char *name = NULL;
for (i = 0; W_ERROR_IS_OK(error = reg_key_get_subkey_by_index(ctx,
}
if (!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
- DEBUG(0, ("Error occured while browsing thru keys: %s\n",
- win_errstr(error)));
+ fprintf(stderr, "Error occurred while browsing through keys: %s\n",
+ win_errstr(error));
+ return error;
}
for (i = 0; W_ERROR_IS_OK(error = reg_key_get_value_by_index(ctx,
- ctx->current,
- i,
- &name,
- &data_type,
- &data)); i++) {
- printf("V \"%s\" %s %s\n", name, str_regtype(data_type),
- reg_val_data_string(ctx, lp_iconv_convenience(cmdline_lp_ctx), data_type, data));
- }
+ ctx->current, i, &name, &valuetype, &valuedata)); i++)
+ printf("V \"%s\" %s %s\n", name, str_regtype(valuetype),
+ reg_val_data_string(ctx, valuetype, valuedata));
return WERR_OK;
}
-static WERROR cmd_mkkey(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_mkkey(struct regshell_context *ctx, int argc, const char **argv)
{
struct registry_key *tmp;
WERROR error;
if(argc < 2) {
fprintf(stderr, "Usage: mkkey <keyname>\n");
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
error = reg_key_add_name(ctx, ctx->current, argv[1], 0, NULL, &tmp);
if (!W_ERROR_IS_OK(error)) {
- fprintf(stderr, "Error adding new subkey '%s'\n", argv[1]);
+ fprintf(stderr, "Error adding new subkey '%s': %s\n", argv[1],
+ win_errstr(error));
return error;
}
}
static WERROR cmd_rmkey(struct regshell_context *ctx,
- int argc, char **argv)
+ int argc, const char **argv)
{
WERROR error;
if(argc < 2) {
fprintf(stderr, "Usage: rmkey <name>\n");
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
- error = reg_key_del(ctx->current, argv[1]);
+ error = reg_key_del(ctx, ctx->current, argv[1]);
if(!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Error deleting '%s'\n", argv[1]);
return error;
return WERR_OK;
}
-static WERROR cmd_rmval(struct regshell_context *ctx, int argc, char **argv)
+static WERROR cmd_rmval(struct regshell_context *ctx, int argc, const char **argv)
{
WERROR error;
if(argc < 2) {
fprintf(stderr, "Usage: rmval <valuename>\n");
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
- error = reg_del_value(ctx->current, argv[1]);
+ error = reg_del_value(ctx, ctx->current, argv[1]);
if(!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Error deleting value '%s'\n", argv[1]);
return error;
}
_NORETURN_ static WERROR cmd_exit(struct regshell_context *ctx,
- int argc, char **argv)
+ int argc, const char **argv)
{
exit(0);
- return WERR_OK;
}
-static WERROR cmd_help(struct regshell_context *ctx, int, char **);
+static WERROR cmd_help(struct regshell_context *ctx, int, const char **);
static struct {
const char *name;
const char *alias;
const char *help;
- WERROR (*handle)(struct regshell_context *ctx, int argc, char **argv);
+ WERROR (*handle)(struct regshell_context *ctx, int argc, const char **argv);
} regshell_cmds[] = {
{"ck", "cd", "Change current key", cmd_ck },
{"info", "i", "Show detailed information of a key", cmd_info },
};
static WERROR cmd_help(struct regshell_context *ctx,
- int argc, char **argv)
+ int argc, const char **argv)
{
- int i;
+ unsigned int i;
printf("Available commands:\n");
for(i = 0; regshell_cmds[i].name; i++) {
printf("%s - %s\n", regshell_cmds[i].name,
char *line)
{
int argc;
- char **argv = NULL;
+ const char **argv = NULL;
int ret, i;
- if ((ret = poptParseArgvString(line, &argc, (const char ***) &argv)) != 0) {
+ if ((ret = poptParseArgvString(line, &argc, &argv)) != 0) {
fprintf(stderr, "regshell: %s\n", poptStrerror(ret));
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
for(i = 0; regshell_cmds[i].name; i++) {
fprintf(stderr, "No such command '%s'\n", argv[0]);
- return WERR_INVALID_PARAM;
+ return WERR_INVALID_PARAMETER;
}
#define MAX_COMPLETIONS 100
{
/* Complete command */
char **matches;
- int i, len, samelen=0, count=1;
+ size_t len, samelen=0;
+ size_t i, count = 1;
matches = malloc_array_p(char *, MAX_COMPLETIONS);
if (!matches) return NULL;
return matches;
cleanup:
- count--;
- while (count >= 0) {
- free(matches[count]);
- count--;
+ for (i = 0; i < count; i++) {
+ free(matches[i]);
}
free(matches);
return NULL;
{
struct registry_key *base;
const char *subkeyname;
- int i, j = 1;
- int samelen = 0;
- int len;
+ unsigned int i, j = 1;
+ size_t len, samelen = 0;
char **matches;
const char *base_n = "";
TALLOC_CTX *mem_ctx;
WERROR status;
+ int ret;
matches = malloc_array_p(char *, MAX_COMPLETIONS);
if (!matches) return NULL;
len = strlen(text);
for(i = 0; j < MAX_COMPLETIONS-1; i++) {
status = reg_key_get_subkey_by_index(mem_ctx, base, i,
- &subkeyname, NULL, NULL);
+ &subkeyname, NULL, NULL);
if(W_ERROR_IS_OK(status)) {
if(!strncmp(text, subkeyname, len)) {
matches[j] = strdup(subkeyname);
} else if(W_ERROR_EQUAL(status, WERR_NO_MORE_ITEMS)) {
break;
} else {
+ int n;
+
printf("Error creating completion list: %s\n",
win_errstr(status));
+
+ for (n = j; n >= 0; n--) {
+ SAFE_FREE(matches[n]);
+ }
+ SAFE_FREE(matches);
talloc_free(mem_ctx);
return NULL;
}
}
if (j == 2) { /* Exact match */
- asprintf(&matches[0], "%s%s", base_n, matches[1]);
+ ret = asprintf(&matches[0], "%s%s", base_n, matches[1]);
} else {
- asprintf(&matches[0], "%s%s", base_n,
+ ret = asprintf(&matches[0], "%s%s", base_n,
talloc_strndup(mem_ctx, matches[1], samelen));
}
talloc_free(mem_ctx);
+ if (ret == -1) {
+ SAFE_FREE(matches);
+ return NULL;
+ }
matches[j] = NULL;
return matches;
}
}
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
int opt;
const char *file = NULL;
poptContext pc;
const char *remote = NULL;
struct regshell_context *ctx;
- struct event_context *ev_ctx;
+ struct tevent_context *ev_ctx;
bool ret = true;
struct poptOption long_options[] = {
POPT_AUTOHELP
{ NULL }
};
- pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
+ pc = poptGetContext(argv[0], argc, argv, long_options,0);
while((opt = poptGetNextOpt(pc)) != -1) {
}
ev_ctx = s4_event_context_init(ctx);
if (remote != NULL) {
- ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx,
- cmdline_credentials);
+ ctx->registry = reg_common_open_remote(remote, ev_ctx,
+ cmdline_lp_ctx,
+ popt_get_cmdline_credentials());
} else if (file != NULL) {
- ctx->current = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
+ ctx->current = reg_common_open_file(file, ev_ctx,
+ cmdline_lp_ctx,
+ popt_get_cmdline_credentials());
if (ctx->current == NULL)
return 1;
ctx->registry = ctx->current->context;
ctx->path = talloc_strdup(ctx, "");
+ ctx->predef = NULL;
+ ctx->root = ctx->current;
} else {
- ctx->registry = reg_common_open_local(cmdline_credentials, ev_ctx, cmdline_lp_ctx);
+ ctx->registry = reg_common_open_local(
+ popt_get_cmdline_credentials(),
+ ev_ctx, cmdline_lp_ctx);
}
if (ctx->registry == NULL)
return 1;
if (ctx->current == NULL) {
- int i;
+ unsigned int i;
- for (i = 0; reg_predefined_keys[i].handle; i++) {
+ for (i = 0; (reg_predefined_keys[i].handle != 0) &&
+ (ctx->current == NULL); i++) {
WERROR err;
err = reg_get_predefined_key(ctx->registry,
reg_predefined_keys[i].handle,
&ctx->current);
if (W_ERROR_IS_OK(err)) {
- ctx->path = talloc_strdup(ctx,
+ ctx->predef = talloc_strdup(ctx,
reg_predefined_keys[i].name);
+ ctx->path = talloc_strdup(ctx, "");
+ ctx->root = ctx->current;
break;
} else {
ctx->current = NULL;
+ ctx->root = NULL;
}
}
}
if (ctx->current == NULL) {
fprintf(stderr, "Unable to access any of the predefined keys\n");
- return -1;
+ return 1;
}
poptFreeContext(pc);
while (true) {
char *line, *prompt;
- asprintf(&prompt, "%s> ", ctx->path);
+ if (asprintf(&prompt, "%s\\%s> ", ctx->predef?ctx->predef:"",
+ ctx->path) < 0) {
+ ret = false;
+ break;
+ }
current_key = ctx->current; /* No way to pass a void * pointer
via readline :-( */
git.samba.org / metze / samba / wip.git / blobdiff