From 2529def9fd28a0090a732443aea849cdad2315f5 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Tue, 22 Sep 2009 16:06:23 +0200 Subject: Revert "s4:wmic - Output enhancements" This reverts commit fb914640ad656b146f732ab33063575e2e47e37c. Jelmer requested the revert since he feels better when we reapply this change after his merge with the updated WMI branch. --- source4/lib/wmi/tools/wmic.c | 163 +++++++++++++++---------------------------- 1 file changed, 58 insertions(+), 105 deletions(-) (limited to 'source4/lib/wmi') diff --git a/source4/lib/wmi/tools/wmic.c b/source4/lib/wmi/tools/wmic.c index d37e22d44f..bbfe5ed334 100644 --- a/source4/lib/wmi/tools/wmic.c +++ b/source4/lib/wmi/tools/wmic.c @@ -35,91 +35,61 @@ #include "lib/wmi/wmi.h" struct program_args { - char *hostname; - char *query; - char *ns; + char *hostname; + char *query; + char *ns; }; static void parse_args(int argc, char *argv[], struct program_args *pmyargs) { - poptContext pc; - int opt, i; - - int argc_new; - char **argv_new; - - struct poptOption long_options[] = { - POPT_AUTOHELP - POPT_COMMON_SAMBA - POPT_COMMON_CONNECTION - POPT_COMMON_CREDENTIALS - POPT_COMMON_VERSION - {"namespace", 0, POPT_ARG_STRING, &pmyargs->ns, 0, - "WMI namespace, default to root\\cimv2", 0}, - POPT_TABLEEND - }; - - pc = poptGetContext("wmi", argc, (const char **) argv, - long_options, POPT_CONTEXT_KEEP_FIRST); - - poptSetOtherOptionHelp(pc, "//host query\n\nExample: wmic -U [domain/]adminuser%password //host \"select * from Win32_ComputerSystem\""); - - while ((opt = poptGetNextOpt(pc)) != -1) { - poptPrintUsage(pc, stdout, 0); - poptFreeContext(pc); - exit(1); - } - - argv_new = discard_const_p(char *, poptGetArgs(pc)); - - argc_new = argc; - for (i = 0; i < argc; i++) { - if (argv_new[i] == NULL) { - argc_new = i; - break; - } - } - - if (argc_new != 3 || argv_new[1][0] != '/' - || argv_new[1][1] != '/') { - poptPrintUsage(pc, stdout, 0); - poptFreeContext(pc); - exit(1); - } - - pmyargs->hostname = argv_new[1] + 2; - pmyargs->query = argv_new[2]; + poptContext pc; + int opt, i; + + int argc_new; + char **argv_new; + + struct poptOption long_options[] = { + POPT_AUTOHELP + POPT_COMMON_SAMBA + POPT_COMMON_CONNECTION + POPT_COMMON_CREDENTIALS + POPT_COMMON_VERSION + {"namespace", 0, POPT_ARG_STRING, &pmyargs->ns, 0, + "WMI namespace, default to root\\cimv2", 0}, + POPT_TABLEEND + }; + + pc = poptGetContext("wmi", argc, (const char **) argv, + long_options, POPT_CONTEXT_KEEP_FIRST); + + poptSetOtherOptionHelp(pc, "//host query\n\nExample: wmic -U [domain/]adminuser%password //host \"select * from Win32_ComputerSystem\""); + + while ((opt = poptGetNextOpt(pc)) != -1) { + poptPrintUsage(pc, stdout, 0); poptFreeContext(pc); -} + exit(1); + } -static void escape_string(const char *src, char *dst, int len) -{ - char *p = dst, *end = dst + len - 1; - const char *q = src; + argv_new = discard_const_p(char *, poptGetArgs(pc)); - if ( q == NULL) { - strncpy( dst, "(null)", len); - return; + argc_new = argc; + for (i = 0; i < argc; i++) { + if (argv_new[i] == NULL) { + argc_new = i; + break; } + } - while ( *q && p <= end ) { - if ( strchr( "|\\(),", *q)) { - *p++ = '\\'; - *p++ = *q++; - } else if ( *q == '\n' ) { - *p++ = '\\'; - *p++ = 'n'; - q++; - } else if ( *q == '\r' ) { - *p++ = '\\'; - *p++ = 'r'; - q++; - } else { - *p++ = *q++; - } - } + if (argc_new != 3 || argv_new[1][0] != '/' + || argv_new[1][1] != '/') { + poptPrintUsage(pc, stdout, 0); + poptFreeContext(pc); + exit(1); + } - *p++ = 0; + pmyargs->hostname = argv_new[1] + 2; + pmyargs->query = argv_new[2]; + poptFreeContext(pc); } #define WERR_CHECK(msg) if (!W_ERROR_IS_OK(result)) { \ @@ -129,33 +99,20 @@ static void escape_string(const char *src, char *dst, int len) DEBUG(1, ("OK : %s\n", msg)); \ } -#define RETURN_CVAR_ARRAY_STR_START(arr) {\ - uint32_t i;\ +#define RETURN_CVAR_ARRAY_STR(fmt, arr) {\ + uint32_t i;\ char *r;\ \ - if (!arr) {\ - return talloc_strdup(mem_ctx, "(null)");\ - }\ + if (!arr) {\ + return talloc_strdup(mem_ctx, "NULL");\ + }\ r = talloc_strdup(mem_ctx, "(");\ - for (i = 0; i < arr->count; ++i) { - - -#define RETURN_CVAR_ARRAY_STR_END(fmt, arr, item) \ - r = talloc_asprintf_append(r, fmt "%s", item, (i+1 == arr->count)?"":",");\ - }\ - return talloc_asprintf_append(r, ")");\ + for (i = 0; i < arr->count; ++i) {\ + r = talloc_asprintf_append(r, fmt "%s", arr->item[i], (i+1 == arr->count)?"":",");\ + }\ + return talloc_asprintf_append(r, ")");\ } -#define RETURN_CVAR_ARRAY_STR(fmt, arr) \ - RETURN_CVAR_ARRAY_STR_START(arr) \ - RETURN_CVAR_ARRAY_STR_END(fmt, arr, arr->item[i]) - -#define RETURN_CVAR_ARRAY_ESCAPED(fmt, arr) \ - RETURN_CVAR_ARRAY_STR_START(arr) \ - char buf[2048]; \ - escape_string( arr->item[i], buf, 2048); \ - RETURN_CVAR_ARRAY_STR_END(fmt, arr, buf) - char *string_CIMVAR(TALLOC_CTX *mem_ctx, union CIMVAR *v, enum CIMTYPE_ENUMERATION cimtype) { switch (cimtype) { @@ -172,11 +129,7 @@ char *string_CIMVAR(TALLOC_CTX *mem_ctx, union CIMVAR *v, enum CIMTYPE_ENUMERATI case CIM_BOOLEAN: return talloc_asprintf(mem_ctx, "%s", v->v_boolean?"True":"False"); case CIM_STRING: case CIM_DATETIME: - case CIM_REFERENCE: { - char buf[2048]; - escape_string((char*) v-> v_string, buf, 2048); - return talloc_asprintf(mem_ctx, "%s", buf); - } + case CIM_REFERENCE: return talloc_asprintf(mem_ctx, "%s", v->v_string); case CIM_CHAR16: return talloc_asprintf(mem_ctx, "Unsupported"); case CIM_OBJECT: return talloc_asprintf(mem_ctx, "Unsupported"); case CIM_ARR_SINT8: RETURN_CVAR_ARRAY_STR("%d", v->a_sint8); @@ -190,9 +143,9 @@ char *string_CIMVAR(TALLOC_CTX *mem_ctx, union CIMVAR *v, enum CIMTYPE_ENUMERATI case CIM_ARR_REAL32: RETURN_CVAR_ARRAY_STR("%f", v->a_real32); case CIM_ARR_REAL64: RETURN_CVAR_ARRAY_STR("%f", v->a_real64); case CIM_ARR_BOOLEAN: RETURN_CVAR_ARRAY_STR("%d", v->a_boolean); - case CIM_ARR_STRING: RETURN_CVAR_ARRAY_ESCAPED("%s", v->a_string); - case CIM_ARR_DATETIME: RETURN_CVAR_ARRAY_ESCAPED("%s", v->a_datetime); - case CIM_ARR_REFERENCE: RETURN_CVAR_ARRAY_ESCAPED("%s", v->a_reference); + case CIM_ARR_STRING: RETURN_CVAR_ARRAY_STR("%s", v->a_string); + case CIM_ARR_DATETIME: RETURN_CVAR_ARRAY_STR("%s", v->a_datetime); + case CIM_ARR_REFERENCE: RETURN_CVAR_ARRAY_STR("%s", v->a_reference); default: return talloc_asprintf(mem_ctx, "Unsupported"); } } -- cgit