mcabber: mcabber/src/commands.c comparison

comparison mcabber/src/commands.c @ 772:464be13343a9

Store most data in UTF-8 internally Only chat buffer data is still using 1 byte for char size. User input still doesn't handle UTF-8 locales.

author	Mikael Berthe <mikael@lilotux.net>
date	Sat, 25 Mar 2006 18:10:36 +0100
parents	ae23c8826efb
children	46304b773a44

comparison

equal deleted inserted replaced

-:ce4f8a2129a4
+:464be13343a9
 static GSList *Commands;
 //  cmd_add()
 // Adds a command to the commands list and to the CMD completion list
-void cmd_add(const char *name, const char *help,
+static void cmd_add(const char *name, const char *help,
 guint flags_row1, guint flags_row2, void (*f)())
 {
 cmd *n_cmd = g_new0(cmd, 1);
 strncpy(n_cmd->name, name, 32-1);
 n_cmd->help = help;
 // Add to completion CMD category
 compl_add_category_word(COMPL_CMD, name);
 }
 //  cmd_init()
-// ...
+// Commands table initialization
 void cmd_init(void)
 {
 cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add);
 cmd_add("alias", "Add an alias", 0, 0, &do_alias);
 cmd_add("authorization", "Manage subscription authorizations",
 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s",
 imstatus2char[jb_getstatus()],
 (sm ? sm : ""));
 return;
 }
+arg = to_utf8(arg);
 setstatus(NULL, arg);
+g_free(arg);
 }
 static void do_status_to(char *arg)
 {
 char **paramlst;
 char *jid, *st, *msg;
+char *jid_utf8 = NULL;
 paramlst = split_arg(arg, 3, 1); // jid, status, [message]
 jid = *paramlst;
 st = *(paramlst+1);
 msg = *(paramlst+2);
 } else {
 // Convert jid to lowercase
 char *p = jid;
 for ( ; *p && *p != '/'; p++)
 *p = tolower(*p);
+jid = jid_utf8 = to_utf8(jid);
 }
 } else {
 // Add the current buddy
 if (current_buddy)
 jid = (char*)buddy_getjid(BUDDATA(current_buddy));
 if (jid) {
 char *cmd;
 if (!msg)
 msg = "";
+msg = to_utf8(msg);
 cmd = g_strdup_printf("%s %s", st, msg);
 scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", jid, cmd);
 setstatus(jid, cmd);
+g_free(msg);
 g_free(cmd);
+g_free(jid_utf8);
 }
 free_arg_lst(paramlst);
 }
 static void do_add(char *arg)
 {
 char **paramlst;
 char *id, *nick;
+char *jid_utf8 = NULL;
 if (!jb_getonline()) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 if (check_jid_syntax(id)) {
 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", id);
 id = NULL;
 } else {
 mc_strtolower(id);
+// Actually an UTF-8 id isn't needed because only the bare jid will
+// be used.
+id = jid_utf8 = to_utf8(id);
 }
 } else {
 // Add the current buddy
 if (current_buddy)
 id = (char*)buddy_getjid(BUDDATA(current_buddy));
 if (!id)
 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 }
+if (nick)
+nick = to_utf8(nick);
 if (id) {
 // 2nd parameter = optional nickname
 jb_addbuddy(id, nick, NULL);
 scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
 id);
 }
+g_free(jid_utf8);
+g_free(nick);
 free_arg_lst(paramlst);
 }
 static void do_del(char *arg)
 {
 scr_LogPrint(LPRINT_NORMAL, "This is not a user.");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
+arg = to_utf8(arg);
 send_message(arg);
+g_free(arg);
 }
 static void do_msay(char *arg)
 {
 /* Parameters: begin verbatim abort send send_to */
 }
 scr_set_chatmode(TRUE);
 if (!strcasecmp(subcmd, "send_to")) {
+int err;
+gchar *msg_utf8;
 // Let's send to the specified JID.  We leave now if there
 // has been an error (so we don't leave multi-line mode).
-if (send_message_to(arg, scr_get_multiline()))
+arg = to_utf8(arg);
+msg_utf8 = to_utf8(scr_get_multiline());
+err = send_message_to(arg, msg_utf8);
+g_free(msg_utf8);
+g_free(arg);
+if (err)
 return;
 } else { // Send to currently selected buddy
 gpointer bud;
+gchar *msg_utf8;
 if (!current_buddy) {
 scr_LogPrint(LPRINT_NORMAL, "Whom are you talking to?");
 return;
 }
 scr_LogPrint(LPRINT_NORMAL, "This is not a user.");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
-send_message(scr_get_multiline());
+msg_utf8 = to_utf8(scr_get_multiline());
+send_message(msg_utf8);
+g_free(msg_utf8);
 }
 scr_set_multimode(FALSE);
 }
 static void do_say_to(char *arg)
 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 free_arg_lst(paramlst);
 return;
 }
+jid = to_utf8(jid);
+msg = to_utf8(msg);
 send_message_to(jid, msg);
+g_free(jid);
+g_free(msg);
 free_arg_lst(paramlst);
 }
 //  buffer_updown(updown, nblines)
 // updown: -1=up, +1=down
 {
 gpointer bud;
 const char *jid, *group;
 guint type;
 char *newname, *p;
+char *name_utf8;
 if (!*arg) {
 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID to rename.");
 return;
 }
 for (p = newname; *p; p++) ;
 while (p > newname && *p == ' ') *p = 0;
 strip_arg_special_chars(newname);
-buddy_setname(bud, newname);
+name_utf8 = to_utf8(newname);
-jb_updatebuddy(jid, newname, group);
+buddy_setname(bud, name_utf8);
+jb_updatebuddy(jid, name_utf8, group);
+g_free(name_utf8);
 g_free(newname);
 update_roster = TRUE;
 }
 static void do_move(char *arg)
 {
 gpointer bud;
 const char *jid, *name, *oldgroupname;
 guint type;
 char *newgroupname, *p;
+char *group_utf8;
 if (!current_buddy) return;
 bud = BUDDATA(current_buddy);
 jid  = buddy_getjid(bud);
 for (p = newgroupname; *p; p++) ;
 while (p > newgroupname && *p == ' ') *p-- = 0;
 strip_arg_special_chars(newgroupname);
-if (strcmp(oldgroupname, newgroupname)) {
+group_utf8 = to_utf8(newgroupname);
-jb_updatebuddy(jid, name, *newgroupname ? newgroupname : NULL);
+if (strcmp(oldgroupname, group_utf8)) {
+jb_updatebuddy(jid, name, *group_utf8 ? group_utf8 : NULL);
 scr_RosterUp();
-buddy_setgroup(bud, newgroupname);
+buddy_setgroup(bud, group_utf8);
 }
+g_free(group_utf8);
 g_free(newgroupname);
 update_roster = TRUE;
 }
 static void do_set(char *arg)
 {
 guint assign;
 const gchar *option, *value;
+gchar *option_utf8;
 assign = parse_assigment(arg, &option, &value);
 if (!option) {
 scr_LogPrint(LPRINT_NORMAL, "Set what option?");
 return;
 }
+option_utf8 = to_utf8(option);
 if (!assign) {
 // This is a query
-value = settings_opt_get(option);
+value = settings_opt_get(option_utf8);
 if (value) {
-scr_LogPrint(LPRINT_NORMAL, "%s = [%s]", option, value);
+scr_LogPrint(LPRINT_NORMAL, "%s = [%s]", option_utf8, value);
 } else
-scr_LogPrint(LPRINT_NORMAL, "Option %s is not set", option);
+scr_LogPrint(LPRINT_NORMAL, "Option %s is not set", option_utf8);
+g_free(option_utf8);
 return;
 }
 // Update the option
 // XXX Maybe some options should be protected when user is connected
 // (server, username, etc.).  And we should catch some options here, too
 // (hide_offline_buddies for ex.)
 if (!value) {
-settings_del(SETTINGS_TYPE_OPTION, option);
+settings_del(SETTINGS_TYPE_OPTION, option_utf8);
 } else {
-settings_set(SETTINGS_TYPE_OPTION, option, value);
+gchar *value_utf8 = to_utf8(value);
-}
+settings_set(SETTINGS_TYPE_OPTION, option_utf8, value_utf8);
+g_free(value_utf8);
+}
+g_free(option_utf8);
 }
 static void do_alias(char *arg)
 {
 guint assign;
 }
 if (!assign) {
 // This is a query
 value = settings_get(SETTINGS_TYPE_ALIAS, alias);
 if (value) {
-scr_LogPrint(LPRINT_NORMAL, "%s = %s", alias, value);
+// XXX LPRINT_NOTUTF8 here, see below why it isn't encoded...
+scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "%s = %s", alias, value);
 } else
-scr_LogPrint(LPRINT_NORMAL, "Alias '%s' does not exist", alias);
+scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
+"Alias '%s' does not exist", alias);
 return;
 }
 // Check the alias does not conflict with a registered command
 if (cmd_get(alias)) {
-scr_LogPrint(LPRINT_NORMAL, "'%s' is a reserved word!", alias);
+scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
+"'%s' is a reserved word!", alias);
 return;
 }
 // Update the alias
 if (!value) {
 if (settings_get(SETTINGS_TYPE_ALIAS, alias)) {
 settings_del(SETTINGS_TYPE_ALIAS, alias);
 // Remove alias from the completion list
 compl_del_category_word(COMPL_CMD, alias);
 }
 } else {
-// Add alias to the completion list, if not already in
+/* Add alias to the completion list, if not already in.
+XXX We're not UTF8-encoding "alias" and "value" here because UTF-8 is
+not yet supported in the UI... (and we use the values in the completion
+system)
+*/
 if (!settings_get(SETTINGS_TYPE_ALIAS, alias))
 compl_add_category_word(COMPL_CMD, alias);
 settings_set(SETTINGS_TYPE_ALIAS, alias, value);
 }
 }
 } else
 scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound.", keycode);
 return;
 }
 // Update the key binding
-if (!value)
+if (!value) {
 settings_del(SETTINGS_TYPE_BINDING, keycode);
-else
+} else {
-settings_set(SETTINGS_TYPE_BINDING, keycode, value);
+gchar *value_utf8 = to_utf8(value);
+settings_set(SETTINGS_TYPE_BINDING, keycode, value_utf8);
+g_free(value_utf8);
+}
 }
 static void do_rawxml(char *arg)
 {
 char **paramlst;
 nick = tmpnick = g_strdup(nick);
 p = strchr(nick, '@');
 *p = 0;
 }
 }
+} else {
+nick = tmpnick = to_utf8(nick);
 }
 // If we still have no nickname, give up
 if (!nick || !*nick) {
 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname.");
+g_free(tmpnick);
 free_arg_lst(paramlst);
 return;
 }
 // Note that roomname is part of the array allocated by split_arg(),
 // so we can modify it.
 mc_strtolower(roomname);
+roomname = to_utf8(roomname);
 jb_room_join(roomname, nick);
 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname);
+g_free(roomname);
+g_free(tmpnick);
 buddylist_build();
 update_roster = TRUE;
 free_arg_lst(paramlst);
-if (tmpnick)
-g_free(tmpnick);
 }
 static void room_invite(gpointer bud, char *arg)
 {
 char **paramlst;
 const gchar *roomname;
 char* jid;
+gchar *reason_utf8;
 paramlst = split_arg(arg, 2, 1); // jid, [reason]
 jid = *paramlst;
 arg = *(paramlst+1);
 // An empty reason is no reason...
 free_arg_lst(paramlst);
 return;
 }
 roomname = buddy_getjid(bud);
-jb_room_invite(roomname, jid, arg);
+reason_utf8 = to_utf8(arg);
+jb_room_invite(roomname, jid, reason_utf8);
 scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>...", jid);
+if (reason_utf8) g_free(reason_utf8);
 free_arg_lst(paramlst);
 }
 static void room_affil(gpointer bud, char *arg)
 {
 ra.val.affil = affil_none;
 for (; ra.val.affil < imaffiliation_size; ra.val.affil++)
 if (!strcasecmp(rolename, straffil[ra.val.affil]))
 break;
-if (ra.val.affil < imaffiliation_size)
+if (ra.val.affil < imaffiliation_size) {
-jb_room_setattrib(roomid, jid, NULL, ra, arg);
+gchar *jid_utf8, *reason_utf8;
-else
+jid_utf8 = to_utf8(jid);
+reason_utf8 = to_utf8(arg);
+jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
+if (jid_utf8) g_free(jid_utf8);
+if (reason_utf8) g_free(reason_utf8);
+} else
 scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter.");
 free_arg_lst(paramlst);
 }
 ra.val.role = role_none;
 for (; ra.val.role < imrole_size; ra.val.role++)
 if (!strcasecmp(rolename, strrole[ra.val.role]))
 break;
-if (ra.val.role < imrole_size)
+if (ra.val.role < imrole_size) {
-jb_room_setattrib(roomid, jid, NULL, ra, arg);
+gchar *jid_utf8, *reason_utf8;
-else
+jid_utf8 = to_utf8(jid);
+reason_utf8 = to_utf8(arg);
+jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
+if (jid_utf8) g_free(jid_utf8);
+if (reason_utf8) g_free(reason_utf8);
+} else
 scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");
 free_arg_lst(paramlst);
 }
 // The expected argument is a Jabber id
 static void room_ban(gpointer bud, char *arg)
 {
 char **paramlst;
 gchar *jid;
+gchar *jid_utf8, *reason_utf8;
 struct role_affil ra;
 const char *roomid = buddy_getjid(bud);
 paramlst = split_arg(arg, 2, 1); // jid, [reason]
 jid = *paramlst;
 }
 ra.type = type_affil;
 ra.val.affil = affil_outcast;
-jb_room_setattrib(roomid, jid, NULL, ra, arg);
+jid_utf8 = to_utf8(jid);
+reason_utf8 = to_utf8(arg);
+jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
+if (jid_utf8) g_free(jid_utf8);
+if (reason_utf8) g_free(reason_utf8);
 free_arg_lst(paramlst);
 }
 // The expected argument is a nickname
 static void room_kick(gpointer bud, char *arg)
 {
 char **paramlst;
 gchar *nick;
+gchar *nick_utf8, *reason_utf8;
 struct role_affil ra;
 const char *roomid = buddy_getjid(bud);
 paramlst = split_arg(arg, 2, 1); // nickname, [reason]
 nick = *paramlst;
 }
 ra.type = type_role;
 ra.val.affil = role_none;
-jb_room_setattrib(roomid, NULL, nick, ra, arg);
+nick_utf8 = to_utf8(nick);
+reason_utf8 = to_utf8(arg);
+jb_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8);
+if (nick_utf8) g_free(nick_utf8);
+if (reason_utf8) g_free(reason_utf8);
 free_arg_lst(paramlst);
 }
 static void room_leave(gpointer bud, char *arg)
 {
-gchar *roomid, *utf8_nickname;
+gchar *roomid, *desc;
 const char *nickname;
 nickname = buddy_getnickname(bud);
 if (!nickname) {
 scr_LogPrint(LPRINT_NORMAL, "You are not in this room.");
 return;
 }
-utf8_nickname = to_utf8(nickname);
+roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), nickname);
-roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), utf8_nickname);
+desc = to_utf8(arg);
-jb_setstatus(offline, roomid, arg);
+jb_setstatus(offline, roomid, desc);
-g_free(utf8_nickname);
+g_free(desc);
 g_free(roomid);
 }
 static void room_nick(gpointer bud, char *arg)
 {
 else
 scr_LogPrint(LPRINT_NORMAL, "No topic has been set.");
 return;
 }
+arg = to_utf8(arg);
 // Set the topic
 msg = g_strdup_printf("/me has set the topic to: %s", arg);
 jb_send_msg(buddy_getjid(bud), msg, ROSTER_TYPE_ROOM, arg);
+g_free(arg);
 g_free(msg);
 }
 static void room_destroy(gpointer bud, char *arg)
 {
 gchar *msg;
 if (arg && *arg)
-msg = arg;
+msg = to_utf8(arg);
 else
 msg = NULL;
 jb_room_destroy(buddy_getjid(bud), NULL, msg);
+if (msg) g_free(msg);
 }
 static void room_unlock(gpointer bud, char *arg)
 {
 if (*arg) {
 static void do_authorization(char *arg)
 {
 char **paramlst;
 char *subcmd;
+char *jid_utf8;
 if (!jb_getonline()) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 guint type;
 if (!current_buddy) return;
 bud = BUDDATA(current_buddy);
-arg  = (char*)buddy_getjid(bud);
+jid_utf8 = arg  = (char*)buddy_getjid(bud);
 type = buddy_gettype(bud);
 if (!(type & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT))) {
 scr_LogPrint(LPRINT_NORMAL, "Invalid buddy.");
 return;
 }
+} else {
+jid_utf8 = to_utf8(arg);
 }
 if (!strcasecmp(subcmd, "allow"))  {
-jb_subscr_send_auth(arg);
+jb_subscr_send_auth(jid_utf8);
 scr_LogPrint(LPRINT_LOGNORM,
-"<%s> is now allowed to receive your presence updates.", arg);
+"<%s> is now allowed to receive your presence updates.",
+jid_utf8);
 } else if (!strcasecmp(subcmd, "cancel"))  {
-jb_subscr_cancel_auth(arg);
+jb_subscr_cancel_auth(jid_utf8);
 scr_LogPrint(LPRINT_LOGNORM,
 "<%s> will no longer receive your presence updates.",
-arg);
+jid_utf8);
 } else if (!strcasecmp(subcmd, "request"))  {
-jb_subscr_request_auth(arg);
+jb_subscr_request_auth(jid_utf8);
 scr_LogPrint(LPRINT_LOGNORM,
-"Sent presence notification request to <%s>...", arg);
+"Sent presence notification request to <%s>...", jid_utf8);
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 }
+// Only free jid_utf8 if it has been allocated, i.e. if != arg.
+if (jid_utf8 && jid_utf8 != arg)
+g_free(jid_utf8);
 free_arg_lst(paramlst);
 }
 static void do_version(char *arg)
 {
 static void do_request(char *arg)
 {
 char **paramlst;
 char *jid, *type;
 enum iqreq_type numtype = iqreq_none;
+char *jid_utf8 = NULL;
 paramlst = split_arg(arg, 2, 0); // type, jid
 type = *paramlst;
 jid = *(paramlst+1);
 if (check_jid_syntax(jid)) {
 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
 jid = NULL;
 } else {
 // Convert jid to lowercase
-char *p = jid;
+char *p;
-for ( ; *p && *p != '/'; p++)
+for (p = jid; *p && *p != '/'; p++)
 *p = tolower(*p);
+jid = jid_utf8 = to_utf8(jid);
 }
 } else {
 // Add the current buddy
 if (current_buddy)
 jid = (char*)buddy_getjid(BUDDATA(current_buddy));
 break;
 default:
 break;
 }
 }
+g_free(jid_utf8);
 free_arg_lst(paramlst);
 }
 static void do_event(char *arg)
 {

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/commands.c @ 772:464be13343a9