char *ret;
ret = strdup (s);
- if (s == NULL) {
+ if (ret == NULL) {
+ fprintf (stderr, "Error: out of memory\n");
+ exit (1);
+ }
+
+ return ret;
+}
+
+static char *
+xstrndup (const char *s, size_t n)
+{
+ char *ret;
+
+ ret = strndup (s, n);
+ if (ret == NULL) {
fprintf (stderr, "Error: out of memory\n");
exit (1);
}
return (mnemon_item_category (mnemon, item) == category);
}
+typedef struct _item_in_category_of_length_closure
+{
+ mnemon_t *mnemon;
+ category_t *category;
+ int length;
+} item_in_category_of_length_closure_t;
+
+static int
+mnemon_item_in_category_of_length (void *closure, item_t *item)
+{
+ item_in_category_of_length_closure_t *iicolc = closure;
+ mnemon_t *mnemon = iicolc->mnemon;
+ category_t *category = iicolc->category;
+ int length = iicolc->length;
+
+ if (mnemon_item_category (mnemon, item) != category)
+ return 0;
+
+ return strlen (item->challenge) == length;
+}
+
static void
mnemon_select_item (mnemon_t *mnemon,
bin_t **bin_ret,
static void
mnemon_print_histogram (mnemon_t *mnemon,
- const char *category_name)
+ const char *category_name,
+ int length)
{
int i, last_score, max;
category_t *category = NULL;
item_match_predicate_t *predicate = NULL;
void *closure = NULL;
item_in_category_closure_t item_in_category;
+ item_in_category_of_length_closure_t item_in_category_of_length;
if (mnemon->num_bins == 0)
return;
if (category_name) {
category = mnemon_get_category_if_exists (mnemon, category_name);
if (category) {
- predicate = mnemon_item_in_category;
- item_in_category.mnemon = mnemon;
- item_in_category.category = category;
- closure = &item_in_category;
+ if (length) {
+ predicate = mnemon_item_in_category_of_length;
+ item_in_category_of_length.mnemon = mnemon;
+ item_in_category_of_length.category = category;
+ item_in_category_of_length.length = length;
+ closure = &item_in_category_of_length;
+ } else {
+ predicate = mnemon_item_in_category;
+ item_in_category.mnemon = mnemon;
+ item_in_category.category = category;
+ closure = &item_in_category;
+ }
}
}
const char *command)
{
const char *arg;
+ int len;
switch (command[0]) {
case 'h':
+ {
+ char *category = NULL;
+ int length = 0;
+
arg = command + 1;
- while (*arg && isspace (*arg))
- arg++;
- if (*arg == '\0')
- arg = NULL;
- mnemon_print_histogram (mnemon, arg);
- break;
+ arg += strspn (arg, " \t");
+ len = strcspn (arg, " \t");
+ if (len) {
+ category = xstrndup (arg, len);
+ arg += len;
+ arg += strspn (arg, " \t");
+ if (*arg)
+ length = atoi (arg);
+ }
+ mnemon_print_histogram (mnemon, category, length);
+ }
+ break;
default:
printf ("Unknown command: %s\n", command);
break;