# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1133392323 -3600
# Node ID c72a66dfd2d4360967816d7c57c5945c05bf8fa2
# Parent  c4fee1a2c47859e0f3d9462828d22854d8b8d9d9
Use split_arg() in most commands


diff -r c4fee1a2c478 -r c72a66dfd2d4 mcabber/src/commands.c
--- a/mcabber/src/commands.c	Wed Nov 30 22:34:06 2005 +0100
+++ b/mcabber/src/commands.c	Thu Dec 01 00:12:03 2005 +0100
@@ -356,6 +356,8 @@
 }
 
 /* Commands callback functions */
+/* All these do_*() functions will be called with a "arg" parameter */
+/* (with arg not null)                                              */
 
 static void do_roster(char *arg)
 {
@@ -412,37 +414,41 @@
 // - arg must be "status message" (message is optional)
 static void setstatus(const char *recipient, const char *arg)
 {
+  char **paramlst;
+  char *status;
+  char *msg;
   enum imstatus st;
-  int len;
-  char *msg;
 
   if (!jb_getonline()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected");
     return;
   }
 
-  msg = strchr(arg, ' ');
-  if (!msg)
-    len = strlen(arg);
-  else
-    len = msg - arg;
+  paramlst = split_arg(arg, 2, 0); // status, message
+  status = *paramlst;
+  msg = *(paramlst+1);
+
+  if (!status) {
+    free_arg_lst(paramlst);
+    return;
+  }
 
-  if      (!strncasecmp(arg, "offline",   len)) st = offline;
-  else if (!strncasecmp(arg, "online",    len)) st = available;
-  else if (!strncasecmp(arg, "avail",     len)) st = available;
-  else if (!strncasecmp(arg, "away",      len)) st = away;
-  else if (!strncasecmp(arg, "invisible", len)) st = invisible;
-  else if (!strncasecmp(arg, "dnd",       len)) st = dontdisturb;
-  else if (!strncasecmp(arg, "notavail",  len)) st = notavail;
-  else if (!strncasecmp(arg, "free",      len)) st = freeforchat;
+  if      (!strcasecmp(status, "offline"))   st = offline;
+  else if (!strcasecmp(status, "online"))    st = available;
+  else if (!strcasecmp(status, "avail"))     st = available;
+  else if (!strcasecmp(status, "away"))      st = away;
+  else if (!strcasecmp(status, "invisible")) st = invisible;
+  else if (!strcasecmp(status, "dnd"))       st = dontdisturb;
+  else if (!strcasecmp(status, "notavail"))  st = notavail;
+  else if (!strcasecmp(status, "free"))      st = freeforchat;
   else {
     scr_LogPrint(LPRINT_NORMAL, "Unrecognized status!");
+    free_arg_lst(paramlst);
     return;
   }
 
   // Use provided message, unless requested status is "invisible"
   if (msg && st != invisible) {
-    for (msg++ ; *msg && *msg == ' ' ; msg++) ;
     if (!*msg) msg = NULL;
   } else
     msg = NULL;
@@ -452,11 +458,13 @@
     msg = "";
 
   jb_setstatus(st, recipient, msg);
+
+  free_arg_lst(paramlst);
 }
 
 static void do_status(char *arg)
 {
-  if (!arg || (!*arg)) {
+  if (!*arg) {
     const char *sm = jb_getstatusmsg();
     scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s",
                  imstatus2char[jb_getstatus()],
@@ -468,37 +476,34 @@
 
 static void do_status_to(char *arg)
 {
-  char *id, *st;
-  if (!arg || (*arg == 0)) {
-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
-    return;
-  }
+  char **paramlst;
+  char *jid, *st, *msg;
+
+  paramlst = split_arg(arg, 3, 1); // jid, status, [message]
+  jid = *paramlst;
+  st = *(paramlst+1);
+  msg = *(paramlst+2);
 
-  // Split recipient jid, status
-  id = g_strdup(arg);
-  st = strchr(id, ' ');
-  if (!st) {
-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
-    g_free(id);
-    return;
+  if (!jid || !st) {
+    scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+  } else if (check_jid_syntax(jid)) {
+    scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
+  } else {
+    char *cmd;
+    if (!msg)
+      msg = "";
+    mc_strtolower(jid);
+    cmd = g_strdup_printf("%s %s", st, msg);
+    scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", jid, cmd);
+    setstatus(jid, cmd);
+    g_free(cmd);
   }
-
-  *st++ = 0;
-  while (*st && *st == ' ')
-    st++;
-
-  if (check_jid_syntax(id)) {
-    scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id);
-  } else {
-    mc_strtolower(id);
-    scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", id, st);
-    setstatus(id, st);
-  }
-  g_free(id);
+  free_arg_lst(paramlst);
 }
 
 static void do_add(char *arg)
 {
+  char **paramlst;
   char *id, *nick;
 
   if (!jb_getonline()) {
@@ -506,21 +511,15 @@
     return;
   }
 
-  if (!arg || (!*arg)) {
-    scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
-    return;
-  }
-
-  id = g_strdup(arg);
-  nick = strchr(id, ' ');
-  if (nick) {
-    *nick++ = 0;
-    while (*nick && *nick == ' ')
-      nick++;
-  }
+  paramlst = split_arg(arg, 2, 0); // jid, [nickname]
+  id = *paramlst;
+  nick = *(paramlst+1);
 
   if (check_jid_syntax(id)) {
-    scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id);
+    if (!id)
+      scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+    else
+      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id);
   } else {
     mc_strtolower(id);
     // 2nd parameter = optional nickname
@@ -528,14 +527,14 @@
     scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>",
                  id);
   }
-  g_free(id);
+  free_arg_lst(paramlst);
 }
 
 static void do_del(char *arg)
 {
   const char *jid;
 
-  if (arg && (*arg)) {
+  if (*arg) {
     scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
     return;
   }
@@ -562,7 +561,7 @@
   gpointer group;
   guint leave_windowbuddy;
 
-  if (!arg || (!*arg)) {
+  if (!*arg) {
     scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
     return;
   }
@@ -677,6 +676,7 @@
 
 static void do_say_to(char *arg)
 {
+  char **paramlst;
   char *jid, *msg;
   char *bare_jid, *p;
 
@@ -685,24 +685,22 @@
     return;
   }
 
-  msg = strchr(arg, ' ');
-  if (!msg) {
-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+  paramlst = split_arg(arg, 2, 1); // jid, message
+  jid = *paramlst;
+  msg = *(paramlst+1);
+
+  if (check_jid_syntax(jid)) {
+    if (!jid)
+      scr_LogPrint(LPRINT_NORMAL, "Wrong usage");
+    else
+      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
+    free_arg_lst(paramlst);
     return;
   }
 
-  jid = g_strndup(arg, msg - arg);
-
-  if (check_jid_syntax(jid)) {
-    scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid);
-    g_free(jid);
-    return;
-  }
-
-  while (*msg == ' ') msg++;
-  if (!*msg) {
-    scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter");
-    g_free(jid);
+  if (!msg || !*msg) {
+    scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+    free_arg_lst(paramlst);
     return;
   }
 
@@ -726,8 +724,9 @@
 
   // Network part
   jb_send_msg(jid, msg, ROSTER_TYPE_USER, NULL);
-  g_free(jid);
+
   if (p) g_free(bare_jid);
+  free_arg_lst(paramlst);
 }
 
 static void do_buffer(char *arg)
@@ -921,7 +920,7 @@
   guint type;
   char *newname, *p;
 
-  if (!arg || (!*arg)) {
+  if (!*arg) {
     scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
     return;
   }
@@ -943,6 +942,8 @@
   for (p = newname; *p; p++) ;
   while (p > newname && *p == ' ') *p = 0;
 
+  strip_arg_special_chars(newname);
+
   buddy_setname(bud, newname);
   jb_updatebuddy(jid, newname, group);
 
@@ -974,6 +975,8 @@
   for (p = newgroupname; *p; p++) ;
   while (p > newgroupname && *p == ' ') *p = 0;
 
+  strip_arg_special_chars(newgroupname);
+
   // Call to buddy_setgroup() should be at the end, as current implementation
   // clones the buddy and deletes the old one (and thus, jid and name are
   // freed)
@@ -1082,27 +1085,50 @@
 
 static void do_rawxml(char *arg)
 {
+  char **paramlst;
+  char *subcmd;
+
   if (!jb_getonline()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected");
     return;
   }
 
-  if (!strncasecmp(arg, "send ", 5))  {
+  paramlst = split_arg(arg, 2, 1); // subcmd, arg
+  subcmd = *paramlst;
+  arg = *(paramlst+1);
+
+  if (!subcmd || !*subcmd) {
+    scr_LogPrint(LPRINT_NORMAL, "Please read the manual page"
+                 " before using /rawxml :-)");
+    free_arg_lst(paramlst);
+    return;
+  }
+
+  if (!strcasecmp(subcmd, "send"))  {
     gchar *buffer;
-    for (arg += 5; *arg && *arg == ' '; arg++)
-      ;
-    buffer = to_utf8(arg);
-    if (!buffer) {
-      scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string");
+
+    if (!subcmd || !*subcmd) {
+      scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+      free_arg_lst(paramlst);
       return;
     }
-    scr_LogPrint(LPRINT_NORMAL, "Sending XML string");
-    jb_send_raw(buffer);
-    g_free(buffer);
+
+    // We don't strip_arg_special_chars() here, because it would be a pain for
+    // the user to escape quotes in a XML stream...
+
+    buffer = to_utf8(arg);
+    if (buffer) {
+      scr_LogPrint(LPRINT_NORMAL, "Sending XML string");
+      jb_send_raw(buffer);
+      g_free(buffer);
+    } else {
+      scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string");
+    }
   } else {
-    scr_LogPrint(LPRINT_NORMAL, "Please read the manual page"
-                 " before using /rawxml :-)");
+    scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
   }
+
+  free_arg_lst(paramlst);
 }
 
 //  check_room_subcommand(arg, param_needed, buddy_must_be_a_room)