# HG changeset patch

# Parent 92fa48ef53c909928706ab4c51518953339a38e4

Unified command option parsing

  * cmdopts_parse() & cmdopts_free() in utils.c/h

  * /roster uses parser

    * buddy_search() now expects argument in utf8

  * /say_to uses parser

  * /color uses parser

  * /status and /status_to use parser

    * cmd_setstatus() now expects separate status and message arguments

diff -r 92fa48ef53c9 mcabber/mcabber/commands.c

--- a/mcabber/mcabber/commands.c	Sun Jan 27 00:40:37 2013 +0200

@@ -755,7 +755,7 @@

   g_slist_free(notes);

 }

-static void roster_note(char *arg)

+static void roster_note(gchar *arg)

 {

   const char *bjid;

   guint type;

@@ -781,14 +781,9 @@

   }

   if (arg && *arg) {  // Set a note

-    gchar *msg, *notetxt;

-    msg = to_utf8(arg);

-    if (!strcmp(msg, "-"))

-      notetxt = NULL; // delete note

-    else

-      notetxt = msg;

-    xmpp_set_storage_rosternotes(bjid, notetxt);

-    g_free(msg);

+    if (!strcmp(arg, "-"))

+      arg = NULL; // delete note

+    xmpp_set_storage_rosternotes(bjid, arg);

   } else {      // Display a note

     struct annotation *note = xmpp_get_storage_rosternotes(bjid, FALSE);

     if (note) {

 /* All these do_*() functions will be called with a "arg" parameter */

 /* (with arg not null)                                              */

-static void do_roster(char *arg)

+static void do_roster(char *args)

 {

-  char **paramlst;

-  char *subcmd;

-

-  paramlst = split_arg(arg, 2, 1); // subcmd, arg

-  subcmd = *paramlst;

-  arg = *(paramlst+1);

-

-  if (!subcmd || !*subcmd) {

-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");

-    free_arg_lst(paramlst);

-    return;

+  enum roster_subcommand_t {

+    roster_scmd_bottom, roster_scmd_top, roster_scmd_up, roster_scmd_down,

+    roster_scmd_group_prev, roster_scmd_group_next,

+    roster_scmd_alternate,

+    roster_scmd_unread_first, roster_scmd_unread_next,

+    roster_scmd_search,

+    roster_scmd_display,

+    roster_scmd_hide_offline, roster_scmd_show_offline, roster_scmd_toggle_offline,

+    roster_scmd_item_lock, roster_scmd_item_unlock, roster_scmd_item_toggle_lock,

+    roster_scmd_note,

+    roster_scmd_resource_lock, roster_scmd_resource_unlock,

+    roster_scmd_hide, roster_scmd_show, roster_scmd_toggle,

+  } subcmd;

+#define ROSTER_SCMD_NOARG(NAME) \

+      { 0, #NAME, { NULL, NULL, NULL, NULL }, (gpointer)roster_scmd_##NAME }

+// all of them have at most one argument

+#define ROSTER_SCMD(NAME, FLAGS, VALUE) \

+      { 0, #NAME, { NULL, \

+                    (cmdarg_t[1]){ \

+                      { CMDOPT_LAST | FLAGS, { .arg = VALUE } } \

+                    }, NULL, NULL }, (gpointer)roster_scmd_##NAME }

+  cmdopts_t options = {

+    NULL,

+    (cmdarg_t[1]){

+      { CMDOPT_REQUIRED | CMDOPT_SUBCOMMAND | CMDOPT_LAST, { .cmd = NULL } }

+    },

+    (subcmd_t[23]){

+      ROSTER_SCMD_NOARG(bottom),

+      ROSTER_SCMD_NOARG(top),

+      ROSTER_SCMD_NOARG(group_prev),

+      ROSTER_SCMD_NOARG(group_next),

+      ROSTER_SCMD_NOARG(alternate),

+      ROSTER_SCMD_NOARG(unread_first),

+      ROSTER_SCMD_NOARG(unread_next),

+      ROSTER_SCMD_NOARG(hide_offline),

+      ROSTER_SCMD_NOARG(show_offline),

+      ROSTER_SCMD_NOARG(toggle_offline),

+      ROSTER_SCMD_NOARG(hide),

+      ROSTER_SCMD_NOARG(show),

+      { CMDOPT_LAST, "toggle", { NULL, NULL, NULL, NULL },

+        (gpointer)roster_scmd_toggle },

+    },

+    NULL,

+  };

+  gchar *arg;

+

+  {

+    const char *error = cmdopts_parse (args, &options);

+    if (error != NULL) {

+      scr_log_print (LPRINT_NORMAL, error);

+      return;

+    }

   }

-  if (!strcasecmp(subcmd, "top")) {

+  subcmd = (enum roster_subcommand_t) (options.args[0].value.cmd -> userdata);

+  if (options.args[0].value.cmd -> options.args != NULL) {

+    arg = options.args[0].value.cmd -> options.args[0].value.arg;

+  }

+

+  if (subcmd == roster_scmd_top) {

     scr_roster_top();

     update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "bottom")) {

+  } else if (subcmd == roster_scmd_bottom) {

     scr_roster_bottom();

     update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "hide")) {

+  } else if (subcmd == roster_scmd_hide) {

     scr_roster_visibility(0);

-  } else if (!strcasecmp(subcmd, "show")) {

+  } else if (subcmd == roster_scmd_show) {

     scr_roster_visibility(1);

-  } else if (!strcasecmp(subcmd, "toggle")) {

+  } else if (subcmd == roster_scmd_toggle) {

     scr_roster_visibility(-1);

-  } else if (!strcasecmp(subcmd, "hide_offline")) {

+  } else if (subcmd == roster_scmd_hide_offline) {

     buddylist_set_hide_offline_buddies(TRUE);

     if (current_buddy)

       buddylist_build();

     update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "show_offline")) {

+  } else if (subcmd == roster_scmd_show_offline) {

     buddylist_set_hide_offline_buddies(FALSE);

     buddylist_build();

     update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "toggle_offline")) {

+  } else if (subcmd == roster_scmd_toggle_offline) {

     buddylist_set_hide_offline_buddies(-1);

     buddylist_build();

     update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "display")) {

+  } else if (subcmd == roster_scmd_display) {

     scr_roster_display(arg);

-  } else if (!strcasecmp(subcmd, "item_lock")) {

+  } else if (subcmd == roster_scmd_item_lock) {

     roster_buddylock(arg, 1);

-  } else if (!strcasecmp(subcmd, "item_unlock")) {

+  } else if (subcmd == roster_scmd_item_unlock) {

     roster_buddylock(arg, 0);

-  } else if (!strcasecmp(subcmd, "item_toggle_lock")) {

+  } else if (subcmd == roster_scmd_item_toggle_lock) {

     roster_buddylock(arg, -1);

-  } else if (!strcasecmp(subcmd, "unread_first")) {

+  } else if (subcmd == roster_scmd_unread_first) {

     scr_roster_unread_message(0);

-  } else if (!strcasecmp(subcmd, "unread_next")) {

+  } else if (subcmd == roster_scmd_unread_next) {

     scr_roster_unread_message(1);

-  } else if (!strcasecmp(subcmd, "alternate")) {

+  } else if (subcmd == roster_scmd_alternate) {

     scr_roster_jump_alternate();

-  } else if (!strncasecmp(subcmd, "search", 6)) {

-    strip_arg_special_chars(arg);

-    if (!arg || !*arg) {

-      scr_LogPrint(LPRINT_NORMAL, "What name or JID are you looking for?");

-      free_arg_lst(paramlst);

+  } else if (subcmd == roster_scmd_search) {

+    scr_roster_search(arg);

+    update_roster = TRUE;

+  } else if (subcmd == roster_scmd_up) {

+    roster_updown(-1, arg);

+  } else if (subcmd == roster_scmd_down) {

+    roster_updown(1, arg);

+  } else if (subcmd == roster_scmd_group_prev) {

+    scr_roster_prev_group();

+  } else if (subcmd == roster_scmd_group_next) {

+    scr_roster_next_group();

+  } else if (subcmd == roster_scmd_note) {

+    roster_note(arg);

+  } else if (subcmd == roster_scmd_resource_lock) {

+    roster_resourcelock(arg, TRUE);

+  } else { // roster_scmd_resource_unlock

+    roster_resourcelock(arg, FALSE);

+  }

+

+  cmdopts_free(&options);

+}

+

+void do_color(char *arg)

+{

+  enum color_scmd_t {

+    color_scmd_roster,

+    color_scmd_mucnick,

+    color_scmd_muc,

+  } subcmd;

+  cmdopts_t options = {

+    NULL,

+    (cmdarg_t[1]){

+      { CMDOPT_REQUIRED | CMDOPT_SUBCOMMAND | CMDOPT_LAST, { .cmd = NULL } },

+    },

+    (subcmd_t[3]){

+      { 0, "roster",

+        {

+          NULL,

+          (cmdarg_t[3]){

+            { CMDOPT_REQUIRED, { .arg = NULL } }, // status mask or "clear"

+            { 0,               { .arg = NULL } }, // jid mask

+            { CMDOPT_LAST,     { .arg = NULL } }, // color

+          },

+          NULL,

+          NULL,

+        },

+        (gpointer)color_scmd_roster,

+      },

+      { 0, "muc",

+        {

+          NULL,

+          (cmdarg_t[2]){

+            { CMDOPT_REQUIRED, { .arg = NULL } }, // jid

+            { CMDOPT_LAST,     { .arg = "on" } }, // on/off/preset/-

+          },

+          NULL,

+          NULL,

+        },

+        (gpointer)color_scmd_muc,

+      },

+      { CMDOPT_LAST, "mucnick",

+        {

+          NULL,

+          (cmdarg_t[2]){

+            { CMDOPT_REQUIRED,               { .arg = NULL } }, // nick

+            { CMDOPT_REQUIRED | CMDOPT_LAST, { .arg = NULL } }, // color

+          },

+          NULL,

+          NULL,

+        },

+        (gpointer)color_scmd_mucnick,

+      },

+    },

+    NULL,

+  };

+

+  {

+    const char *error = cmdopts_parse(arg, &options);

+    if (error != NULL) {

+      scr_log_print(LPRINT_NORMAL, error);

       return;

     }

-    scr_roster_search(arg);

-    update_roster = TRUE;

-  } else if (!strcasecmp(subcmd, "up")) {

-    roster_updown(-1, arg);

-  } else if (!strcasecmp(subcmd, "down")) {

-    roster_updown(1, arg);

-  } else if (!strcasecmp(subcmd, "group_prev")) {

-    scr_roster_prev_group();

-  } else if (!strcasecmp(subcmd, "group_next")) {

-    scr_roster_next_group();

-  } else if (!strcasecmp(subcmd, "note")) {

-    roster_note(arg);

-  } else if (!strcasecmp(subcmd, "resource_lock")) {

-    roster_resourcelock(arg, TRUE);

-  } else if (!strcasecmp(subcmd, "resource_unlock")) {

-    roster_resourcelock(arg, FALSE);

-  } else

-    scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");

-  free_arg_lst(paramlst);

-}

-

-void do_color(char *arg)

-{

-  char **paramlst;

-  char *subcmd;

-

-  paramlst = split_arg(arg, 2, 1); // subcmd, arg

-  subcmd = *paramlst;

-  arg = *(paramlst+1);

-

-  if (!subcmd || !*subcmd) {

-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");

-    free_arg_lst(paramlst);

-    return;

   }

-

-  if (!strcasecmp(subcmd, "roster")) {

-    char *status, *wildcard, *color;

-    char **arglist = split_arg(arg, 3, 0);

-

-    status = *arglist;

-    wildcard = to_utf8(arglist[1]);

-    color = arglist[2];

-

-    if (status && !strcmp(status, "clear")) { // Not a color command, clear all

+  

+  subcmd = (enum color_scmd_t) options.args[0].value.cmd -> userdata;

+

+  if (subcmd == color_scmd_roster) {

+    const gchar *status   = options.cmds[0].options.args[0].value.arg;

+    const gchar *wildcard = options.cmds[0].options.args[1].value.arg;

+    const gchar *color    = options.cmds[0].options.args[2].value.arg;

+    if (!strcmp(status, "clear")) { // Not a color command, clear all

       scr_roster_clear_color();

       update_roster = TRUE;

     } else {

-      if (!status || !*status || !wildcard || !*wildcard || !color || !*color) {

-        scr_LogPrint(LPRINT_NORMAL, "Missing argument");

+      if (!*status || !wildcard || !*wildcard || !color || !*color) {

+        scr_log_print(LPRINT_NORMAL, "Missing argument");

       } else {

         update_roster = scr_roster_color(status, wildcard, color) ||

                         update_roster;

       }

     }

-    free_arg_lst(arglist);

-    g_free(wildcard);

-  } else if (!strcasecmp(subcmd, "muc")) {

-    char **arglist = split_arg(arg, 2, 0);

-    char *free_muc = to_utf8(*arglist);

-    const char *muc = free_muc, *mode = arglist[1];

-    if (!muc || !*muc)

-      scr_LogPrint(LPRINT_NORMAL, "What MUC?");

-    else {

-      if (!strcmp(muc, "."))

-        if (!(muc = CURRENT_JID))

-          scr_LogPrint(LPRINT_NORMAL, "No JID selected");

-      if (muc) {

-        if (check_jid_syntax(muc) && strcmp(muc, "*"))

-          scr_LogPrint(LPRINT_NORMAL, "Not a JID");

-        else {

-          if (!mode || !*mode || !strcasecmp(mode, "on"))

-            scr_muc_color(muc, MC_ALL);

-          else if (!strcasecmp(mode, "preset"))

-            scr_muc_color(muc, MC_PRESET);

-          else if (!strcasecmp(mode, "off"))

-            scr_muc_color(muc, MC_OFF);

-          else if (!strcmp(mode, "-"))

-            scr_muc_color(muc, MC_REMOVE);

-          else

-            scr_LogPrint(LPRINT_NORMAL, "Unknown coloring mode");

-        }

+  } else if (subcmd == color_scmd_muc) {

+    const gchar *muc  = options.cmds[1].options.args[0].value.arg;

+    const gchar *mode = options.cmds[1].options.args[1].value.arg;

+    if (!strcmp(muc, "."))

+      if (!(muc = CURRENT_JID))

+        scr_LogPrint(LPRINT_NORMAL, "No JID selected");

+    if (muc) {

+      if (check_jid_syntax(muc) && strcmp(muc, "*"))

+        scr_LogPrint(LPRINT_NORMAL, "Not a JID");

+      else {

+        if (!strcasecmp(mode, "on"))

+          scr_muc_color(muc, MC_ALL);

+        else if (!strcasecmp(mode, "preset"))

+          scr_muc_color(muc, MC_PRESET);

+        else if (!strcasecmp(mode, "off"))

+          scr_muc_color(muc, MC_OFF);

+        else if (!strcmp(mode, "-"))

+          scr_muc_color(muc, MC_REMOVE);

+        else

+          scr_LogPrint(LPRINT_NORMAL, "Unknown coloring mode");

       }

     }

-    free_arg_lst(arglist);

-    g_free(free_muc);

-  } else if (!strcasecmp(subcmd, "mucnick")) {

-    char **arglist = split_arg(arg, 2, 0);

-    const char *nick = *arglist, *color = arglist[1];

-    if (!nick || !*nick || !color || !*color)

-      scr_LogPrint(LPRINT_NORMAL, "Missing argument");

-    else

-      scr_muc_nick_color(nick, color);

-    free_arg_lst(arglist);

-  } else

-    scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");

-  free_arg_lst(paramlst);

+  } else { // color_scmd_mucnick

+    const gchar *nick  = options.cmds[2].options.args[0].value.arg;

+    const gchar *color = options.cmds[2].options.args[1].value.arg;

+    scr_muc_nick_color(nick, color);

+  }

+

+  cmdopts_free(&options);

 }