Changeset 823de9d for root_commands.c

Timestamp:

2009-03-12T19:10:06Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

673a54c

Parents:

9b55485

Message:

commit updates by ashish shukla <wahjava@…>

File:

• root_commands.c (modified) (13 diffs)

root_commands.c

@@ -132 +132 @@
 static void cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        storage_status_t status = storage_load( irc, cmd[1] );
         char *account_on[] = { "account", "on", NULL };
         
@@ -144 +144 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
+                irc_setpass( irc, cmd[1] );
+                irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
                 if( set_getbool( &irc->set, "auto_connect" ) )
@@ -163 +165 @@
         }
 
-        irc_setpass( irc, cmd[1] );
-        switch( storage_save( irc, FALSE )) {
+        switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
                         irc_usermsg( irc, "Nick is already registered" );
@@ -171 +172 @@
                 case STORAGE_OK:
                         irc_usermsg( irc, "Account successfully created" );
+                        irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
@@ -239 +241 @@
 }
 
+static void cmd_showset( irc_t *irc, set_t **head, char *key )
+{
+        char *val;
+        
+        if( ( val = set_getstr( head, key ) ) )
+                irc_usermsg( irc, "%s = `%s'", key, val );
+        else
+                irc_usermsg( irc, "%s is empty", key );
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -450 +462 @@
                 {
                         set_t *s = set_find( &a->set, set_name );
+                        int st;
                         
                         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
@@ -465 +478 @@
                         
                         if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                                set_reset( &a->set, set_name );
+                                st = set_reset( &a->set, set_name );
                         else
-                                set_setstr( &a->set, set_name, cmd[3] );
-                }
-                if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-                {
-                        char *s = set_getstr( &a->set, set_name );
-                        if( s )
-                                irc_usermsg( irc, "%s = `%s'", set_name, s );
+                                st = set_setstr( &a->set, set_name, cmd[3] );
+                        
+                        if( set_getstr( &a->set, set_name ) == NULL )
+                        {
+                                if( st )
+                                        irc_usermsg( irc, "Setting changed successfully" );
+                                else
+                                        irc_usermsg( irc, "Failed to change setting" );
+                        }
                         else
-                                irc_usermsg( irc, "%s is empty", set_name );
+                        {
+                                cmd_showset( irc, &a->set, set_name );
+                        }
+                }
+                else if( set_name )
+                {
+                        cmd_showset( irc, &a->set, set_name );
                 }
                 else
@@ -482 +503 @@
                         while( s )
                         {
-                                if( s->value || s->def )
-                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                                else
-                                        irc_usermsg( irc, "%s is empty", s->key );
+                                cmd_showset( irc, &s, s->key );
                                 s = s->next;
                         }
@@ -615 +633 @@
                         irc->mynick = g_strdup( cmd[2] );
                         
+                        /* If we're called internally (user did "set root_nick"),
+                           let's not go O(INF). :-) */
                         if( strcmp( cmd[0], "set_rename" ) != 0 )
                                 set_setstr( &irc->set, "root_nick", cmd[2] );
@@ -638 +658 @@
         }
         
-        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
 }
 
@@ -826 +846 @@
         if( cmd[1] && cmd[2] )
         {
+                int st;
+                
                 if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
                 {
-                        set_reset( &irc->set, cmd[2] );
+                        st = set_reset( &irc->set, cmd[2] );
                         set_name = cmd[2];
                 }
                 else
                 {
-                        set_setstr( &irc->set, cmd[1], cmd[2] );
-                }
-        }
-        if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-        {
-                char *s = set_getstr( &irc->set, set_name );
-                if( s )
-                        irc_usermsg( irc, "%s = `%s'", set_name, s );
+                        st = set_setstr( &irc->set, cmd[1], cmd[2] );
+                }
+                
+                /* Normally we just show the variable's new/unchanged
+                   value as feedback to the user, but this has always
+                   caused confusion when changing the password. Give
+                   other feedback instead: */
+                if( set_getstr( &irc->set, set_name ) == NULL )
+                {
+                        if( st )
+                                irc_usermsg( irc, "Setting changed successfully" );
+                        else
+                                irc_usermsg( irc, "Failed to change setting" );
+                }
                 else
-                        irc_usermsg( irc, "%s is empty", set_name );
+                {
+                        cmd_showset( irc, &irc->set, set_name );
+                }
+        }
+        else if( set_name )
+        {
+                cmd_showset( irc, &irc->set, set_name );
 
                 if( strchr( set_name, '/' ) )
@@ -852 +886 @@
                 while( s )
                 {
-                        if( s->value || s->def )
-                                irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                        else
-                                irc_usermsg( irc, "%s is empty", s->key );
+                        cmd_showset( irc, &s, s->key );
                         s = s->next;
                 }
@@ -863 +894 @@
 static void cmd_save( irc_t *irc, char **cmd )
 {
-        if( storage_save( irc, TRUE ) == STORAGE_OK )
+        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+                irc_usermsg( irc, "Please create an account first" );
+        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else