diff options
author | David Bremner <bremner@debian.org> | 2013-01-19 14:25:53 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2013-01-22 21:19:08 -0400 |
commit | a76682a2d2f61eb14e938eeab8f2824891d8e18c (patch) | |
tree | 425e1eada89ae88fd110cf321383f2422d2d3672 /notmuch.c | |
parent | bdf7955cd54d345f9967b6608d25f3f0f7f5e1f5 (diff) |
CLI: remove alias machinery, and "part", "search-tags" commands
The commands are long deprecated, so removal is probably overdue. The
real motivation is to simplify argument handling for notmuch so that
we can migrate to the common argument parsing framework.
Diffstat (limited to 'notmuch.c')
-rw-r--r-- | notmuch.c | 50 |
1 files changed, 1 insertions, 49 deletions
@@ -31,18 +31,6 @@ typedef struct command { const char *summary; } command_t; -#define MAX_ALIAS_SUBSTITUTIONS 3 - -typedef struct alias { - const char *name; - const char *substitutions[MAX_ALIAS_SUBSTITUTIONS]; -} alias_t; - -alias_t aliases[] = { - { "part", { "show", "--format=raw"}}, - { "search-tags", {"search", "--output=tags", "*"}} -}; - static int notmuch_help_command (void *ctx, int argc, char *argv[]); @@ -260,9 +248,7 @@ main (int argc, char *argv[]) { void *local; command_t *command; - alias_t *alias; - unsigned int i, j; - const char **argv_local; + unsigned int i; talloc_enable_null_tracking (); @@ -285,40 +271,6 @@ main (int argc, char *argv[]) return 0; } - for (i = 0; i < ARRAY_SIZE (aliases); i++) { - alias = &aliases[i]; - - if (strcmp (argv[1], alias->name) == 0) - { - int substitutions; - - argv_local = talloc_size (local, sizeof (char *) * - (argc + MAX_ALIAS_SUBSTITUTIONS - 1)); - if (argv_local == NULL) { - fprintf (stderr, "Out of memory.\n"); - return 1; - } - - /* Copy all substution arguments from the alias. */ - argv_local[0] = argv[0]; - for (j = 0; j < MAX_ALIAS_SUBSTITUTIONS; j++) { - if (alias->substitutions[j] == NULL) - break; - argv_local[j+1] = alias->substitutions[j]; - } - substitutions = j; - - /* And copy all original arguments (skipping the argument - * that matched the alias of course. */ - for (j = 2; j < (unsigned) argc; j++) { - argv_local[substitutions+j-1] = argv[j]; - } - - argc += substitutions - 1; - argv = (char **) argv_local; - } - } - for (i = 0; i < ARRAY_SIZE (commands); i++) { command = &commands[i]; |