Add support for read-write parameters. Allow an optional initializer
for read-write parameters. Print the value of those parameters on
success following the PASS.
This commit is contained in:
Marcel Moolenaar 2006-04-10 04:07:20 +00:00
parent ec0889a069
commit 728f00f8c9

View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2005 Marcel Moolenaar * Copyright (c) 2005, 2006 Marcel Moolenaar
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -27,6 +27,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <errno.h> #include <errno.h>
#include <libgeom.h> #include <libgeom.h>
#include <limits.h> #include <limits.h>
@ -35,36 +36,82 @@ __FBSDID("$FreeBSD$");
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
struct retval {
struct retval *retval;
const char *param;
char *value;
};
struct retval *retval;
int verbose; int verbose;
static void static void
usage() usage()
{ {
fprintf(stdout, "usage: %s [-v] param ...\n", getprogname()); fprintf(stdout, "usage: %s [-v] param[:len][=value] ...\n",
getprogname());
exit(1); exit(1);
} }
static int static int
parse(char *arg, char **param, char **value) parse(char *arg, char **param, char **value, int *len)
{ {
char *e; char *e, *colon, *equal;
if (*arg == '\0')
return (EINVAL);
colon = strchr(arg, ':');
equal = strchr(arg, '=');
if (colon == NULL && equal == NULL)
return (EINVAL);
if (colon == arg || equal == arg)
return (EINVAL);
if (colon != NULL && equal != NULL && equal < colon)
return (EINVAL);
if (colon != NULL)
*colon++ = '\0';
if (equal != NULL)
*equal++ = '\0';
*param = arg; *param = arg;
e = strchr(arg, '='); if (colon != NULL) {
if (e != NULL) { /* Length specification. This parameter is RW. */
*e = '\0'; if (*colon == '\0')
*value = e + 1; return (EINVAL);
} else *len = strtol(colon, &e, 0);
*value = NULL; if (*e != '\0')
return (EINVAL);
if (*len <= 0 || *len > PATH_MAX)
return (EINVAL);
*value = malloc(*len);
if (*value == NULL)
return (ENOMEM);
memset(*value, 0, *len);
if (equal != NULL) {
if (strlen(equal) >= PATH_MAX)
return (ENOMEM);
strcpy(*value, equal);
}
} else {
/* This parameter is RO. */
*len = -1;
if (*equal == '\0')
return (EINVAL);
*value = equal;
}
return (0); return (0);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct retval *rv;
struct gctl_req *req; struct gctl_req *req;
char *param, *value; char *param, *value;
const char *s; const char *s;
int c; int c, len;
req = gctl_get_handle(); req = gctl_get_handle();
gctl_ro_param(req, "class", -1, "GPT"); gctl_ro_param(req, "class", -1, "GPT");
@ -83,19 +130,36 @@ int main(int argc, char *argv[])
} }
while (optind < argc) { while (optind < argc) {
parse(argv[optind++], &param, &value); if (!parse(argv[optind++], &param, &value, &len)) {
if (value != NULL) if (len > 0) {
rv = malloc(sizeof(struct retval));
rv->param = param;
rv->value = value;
rv->retval = retval;
retval = rv;
gctl_rw_param(req, param, len, value);
} else
gctl_ro_param(req, param, -1, value); gctl_ro_param(req, param, -1, value);
} }
}
if (verbose) if (verbose)
gctl_dump(req, stdout); gctl_dump(req, stdout);
s = gctl_issue(req); s = gctl_issue(req);
if (s != NULL) if (s == NULL) {
printf("PASS");
while (retval != NULL) {
rv = retval->retval;
printf(" %s=%s", retval->param, retval->value);
free(retval->value);
free(retval);
retval = rv;
}
printf("\n");
} else
printf("FAIL %s\n", s); printf("FAIL %s\n", s);
else
printf("PASS\n");
gctl_free(req); gctl_free(req);
return (0); return (0);
} }