Changeset 81186cab for irc_commands.c

Timestamp:

2010-04-13T11:38:41Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

21c87a7

Parents:

573dab0

Message:

/away and set away/status stuff back.

File:

• irc_commands.c (modified) (4 diffs)

irc_commands.c

@@ -352 +352 @@
 
 #if 0
-//#if 0
 static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
@@ -524 +523 @@
         }
 }
+#endif
 
 static void irc_cmd_away( irc_t *irc, char **cmd )
 {
-        user_t *u = user_find( irc, irc->nick );
-        char *away = cmd[1];
-        
-        if( !u ) return;
-        
-        if( away && *away )
-        {
+        char *set;
+        
+        if( cmd[1] && *cmd[1] )
+        {
+                char away[strlen(cmd[1])+1];
                 int i, j;
                 
                 /* Copy away string, but skip control chars. Mainly because
                    Jabber really doesn't like them. */
-                u->away = g_malloc( strlen( away ) + 1 );
-                for( i = j = 0; away[i]; i ++ )
-                        if( ( u->away[j] = away[i] ) >= ' ' )
+                for( i = j = 0; cmd[1][i]; i ++ )
+                        if( ( away[j] = cmd[1][i] ) >= ' ' )
                                 j ++;
-                u->away[j] = 0;
-                
-                irc_send_num( irc, 306, ":You're now away: %s", u->away );
-                /* irc_umode_set( irc, irc->myhost, "+a" ); */
-        }
-        else
-        {
-                if( u->away ) g_free( u->away );
-                u->away = NULL;
-                /* irc_umode_set( irc, irc->myhost, "-a" ); */
+                away[j] = '\0';
+                
+                irc_send_num( irc, 306, ":You're now away: %s", away );
+                set = away;
+        }
+        else
+        {
                 irc_send_num( irc, 305, ":Welcome back" );
-        }
-        
-        set_setstr( &irc->set, "away", u->away );
-}
-
+                set = NULL;
+        }
+        
+        set_setstr( &irc->b->set, "away", set );
+}
+
+#if 0
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
@@ -613 +609 @@
         { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
         { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+        { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
 #if 0
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
@@ -621 +618 @@
         { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
-        { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
         { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },