Changeset 1ee6c18 for commands.c

Timestamp:

2005-12-08T13:41:53Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a1f17d4

Parents:

d636233

Message:

Add abstraction layer for storage

File:

• commands.c (modified) (5 diffs)

commands.c

@@ -86 +86 @@
 int cmd_identify( irc_t *irc, char **cmd )
 {
-        int checkie = bitlbee_load( irc, cmd[1] );
+        int checkie = global.storage->load( irc->nick, cmd[1], irc );
         
         if( checkie == -1 )
@@ -110 +110 @@
 int cmd_register( irc_t *irc, char **cmd )
 {
-        int checkie;
-        char path[512];
-        
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
@@ -118 +115 @@
                 return( 0 );
         }
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        checkie = access( path, F_OK );
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        checkie += access( path, F_OK );
-        
-        if( checkie == -2 )
+
+        if( !global.storage->exists( irc->nick )) 
         {
                 setpassnc( irc, cmd[1] );
@@ -141 +132 @@
 int cmd_drop( irc_t *irc, char **cmd )
 {
-        char s[512];
-        FILE *fp;
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        fp = fopen( s, "r" );
-        if( !fp )
+        if( ! global.storage->exists (irc->nick) )
         {
                 irc_usermsg( irc, "That account does not exist" );
                 return( 0 );
         }
-        
-        fscanf( fp, "%32[^\n]s", s );
-        fclose( fp );
-        if( setpass( irc, cmd[1], s ) < 0 )
-        {
-                irc_usermsg( irc, "Incorrect password" );
-                return( 0 );
-        }
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        unlink( s );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        unlink( s );
+
+        if ( global.storage->check_pass (irc->nick, cmd[1]) ) 
+        {
+                irc_usermsg( irc, "Password invalid" );
+                return( 0 );
+        }
+        
+        global.storage->remove (irc->nick);
         
         setpassnc( irc, NULL );
@@ -634 +614 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( bitlbee_save( irc ) )
+        if( global.storage->save( irc ) )
                 irc_usermsg( irc, "Configuration saved" );
         else