Changeset a1f17d4

Timestamp:

2005-12-08T14:14:28Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7989fcf3

Parents:

1ee6c18

Message:

Simplify storage API a bit

Files:

• commands.c (modified) (3 diffs)
• irc.c (modified) (1 diff)
• storage.h (modified) (2 diffs)
• storage_text.c (modified) (18 diffs)

commands.c

@@ -116 +116 @@
         }
 
-        if( !global.storage->exists( irc->nick )) 
-        {
-                setpassnc( irc, cmd[1] );
-                root_command_string( irc, user_find( irc, irc->mynick ), "save", 0 );
-                irc->status = USTATUS_IDENTIFIED;
-        }
-        else
-        {
-                irc_usermsg( irc, "Nick is already registered" );
+        setpassnc( irc, cmd[1] );
+        switch( global.storage->save( irc, FALSE )) {
+                case STORAGE_ALREADY_EXISTS:
+                        irc_usermsg( irc, "Nick is already registered" );
+                        break;
+                        
+                case STORAGE_OK:
+                        irc->status = USTATUS_IDENTIFIED;
+                        break;
+
+                default:
+                        irc_usermsg( irc, "Error registering" );
+                        break;
         }
         
@@ -132 +136 @@
 int cmd_drop( irc_t *irc, char **cmd )
 {
-        if( ! global.storage->exists (irc->nick) )
-        {
+        storage_status_t status;
+        
+        status = global.storage->remove (irc->nick, cmd[1]);
+        switch (status) {
+        case STORAGE_NO_SUCH_USER:
                 irc_usermsg( irc, "That account does not exist" );
                 return( 0 );
-        }
-
-        if ( global.storage->check_pass (irc->nick, cmd[1]) ) 
-        {
+        case STORAGE_INVALID_PASSWORD:
                 irc_usermsg( irc, "Password invalid" );
                 return( 0 );
-        }
-        
-        global.storage->remove (irc->nick);
-        
-        setpassnc( irc, NULL );
-        irc_usermsg( irc, "Files belonging to account `%s' removed", irc->nick );
-        
-        return( 0 );
+        case STORAGE_OK:
+                setpassnc( irc, NULL );
+                irc_usermsg( irc, "Account `%s' removed", irc->nick );
+                return( 0 );
+        default:
+                irc_usermsg( irc, "Error: '%d'", status );
+                return( 0 );
+        }
 }
 
@@ -614 +618 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( global.storage->save( irc ) )
+        if( global.storage->save( irc, TRUE ) )
                 irc_usermsg( irc, "Configuration saved" );
         else

irc.c

@@ -154 +154 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !global.storage->save( irc ) )
+                if( !global.storage->save( irc, TRUE ) )
                         irc_usermsg( irc, "Error while saving settings!" );
         

storage.h

@@ -27 +27 @@
 #define __STORAGE_H__
 
+typedef enum {
+        STORAGE_OK = 0,
+        STORAGE_NO_SUCH_USER,
+        STORAGE_INVALID_PASSWORD,
+        STORAGE_ALREADY_EXISTS,
+        STORAGE_OTHER_ERROR /* Error that isn't caused by user input, such as 
+                                                   a database that is unreachable. log() will be 
+                                                   used for the exact error message */
+} storage_status_t;
+
 typedef struct {
         const char *name;
@@ -33 +43 @@
         void (*init) (void);
 
-        int (*load) (const char *nick, const char *password, irc_t * irc);
-        int (*exists) (const char *nick);
-        int (*save) (irc_t *irc);
-        int (*remove) (const char *nick);
-        int (*check_pass) (const char *nick, const char *pass);
+        storage_status_t (*load) (const char *nick, const char *password, irc_t * irc);
+        storage_status_t (*save) (irc_t *irc, int overwrite);
+        storage_status_t (*remove) (const char *nick, const char *password);
 
         /* May be NULL if not supported by backend */
-        int (*rename) (const char *onick, const char *nnick, const char *password);
+        storage_status_t (*rename) (const char *onick, const char *nnick, const char *password);
 } storage_t;
 

storage_text.c

@@ -36 +36 @@
 }
 
-static int text_load ( const char *my_nick, const char* password, irc_t *irc )
+static storage_status_t text_load ( const char *my_nick, const char* password, irc_t *irc )
 {
         char s[512];
@@ -50 +50 @@
         g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".accounts" );
         fp = fopen( s, "r" );
-        if( !fp ) return( 0 );
+        if( !fp ) return STORAGE_NO_SUCH_USER;
         
         fscanf( fp, "%32[^\n]s", s );
@@ -56 +56 @@
         {
                 fclose( fp );
-                return( -1 );
+                return STORAGE_INVALID_PASSWORD;
         }
         
@@ -74 +74 @@
         g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".nicks" );
         fp = fopen( s, "r" );
-        if( !fp ) return( 0 );
+        if( !fp ) return STORAGE_NO_SUCH_USER;
         while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
         {
@@ -88 +88 @@
         }
         
-        return( 1 );
-}
-
-static int text_save( irc_t *irc )
+        return STORAGE_OK;
+}
+
+static storage_status_t text_save( irc_t *irc, int overwrite )
 {
         char s[512];
@@ -102 +102 @@
         FILE *fp;
         char *hash;
+
+        if (!overwrite) {
+                g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+                if (access( path, F_OK ) != -1)
+                        return STORAGE_ALREADY_EXISTS;
+        
+                g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+                if (access( path, F_OK ) != -1)
+                        return STORAGE_ALREADY_EXISTS;
+        }
         
         /*\
@@ -127 +137 @@
         g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks~" );
         fp = fopen( path, "w" );
-        if( !fp ) return( 0 );
+        if( !fp ) return STORAGE_OTHER_ERROR;
         for( n = irc->nicks; n; n = n->next )
         {
@@ -138 +148 @@
                         irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
                         fclose( fp );
-                        return( 0 );
+                        return STORAGE_OTHER_ERROR;
                 }
         }
@@ -144 +154 @@
         {
                 irc_usermsg( irc, "fclose() reported an error. Disk full?" );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
   
@@ -153 +163 @@
                 {
                         irc_usermsg( irc, "Error while removing old .nicks file" );
-                        return( 0 );
+                        return STORAGE_OTHER_ERROR;
                 }
         }
@@ -159 +169 @@
         {
                 irc_usermsg( irc, "Error while renaming new .nicks file" );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
         
         g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" );
         fp = fopen( path, "w" );
-        if( !fp ) return( 0 );
+        if( !fp ) return STORAGE_OTHER_ERROR;
         if( fprintf( fp, "%s", hash ) != strlen( hash ) )
         {
                 irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
                 fclose( fp );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
         g_free( hash );
@@ -188 +198 @@
                                 irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
                                 fclose( fp );
-                                return( 0 );
+                                return STORAGE_OTHER_ERROR;
                         }
                 }
@@ -206 +216 @@
                                         irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
                                         fclose( fp );
-                                        return( 0 );
+                                        return STORAGE_OTHER_ERROR;
                                 }
                         }
@@ -223 +233 @@
                                 irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
                                 fclose( fp );
-                                return( 0 );
+                                return STORAGE_OTHER_ERROR;
                         }
                 }
@@ -231 +241 @@
         {
                 irc_usermsg( irc, "fclose() reported an error. Disk full?" );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
         
@@ -240 +250 @@
                 {
                         irc_usermsg( irc, "Error while removing old .accounts file" );
-                        return( 0 );
+                        return STORAGE_OTHER_ERROR;
                 }
         }
@@ -246 +256 @@
         {
                 irc_usermsg( irc, "Error while renaming new .accounts file" );
-                return( 0 );
+                return STORAGE_OTHER_ERROR;
         }
         
         umask( ou );
         
-        return( 1 );
-}
-
-static int text_exists( const char *nick )
-{
-        char path[512];
-        int checkie;
-
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, nick, ".accounts" );
-        checkie = access( path, F_OK );
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, nick, ".nicks" );
-        checkie += access( path, F_OK );
-        
-        return ( checkie != -2 );
-}
-
-static int text_remove( const char *nick )
+        return STORAGE_OK;
+}
+
+static storage_status_t text_remove( const char *nick, const char *password )
 {
         char s[512];
+        FILE *fp;
+        
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".nicks" );
+        fp = fopen( s, "r" );
+        if (!fp)
+                return STORAGE_NO_SUCH_USER;
+
+        fscanf( fp, "%32[^\n]s", s );
+        fclose( fp );
+
+        /*FIXME Test if password is correct */
 
         g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".accounts" );
         if (unlink( s ) == -1)
-                return( 1 );
+                return STORAGE_OTHER_ERROR;
         
         g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".nicks" );
         if (unlink( s ) == -1)
-                return( 1 );
-
-        return( 0 );
-}
-
-static int text_check_pass( const char *nick, const char *password )
-{
-        char s[512];
-        FILE *fp;
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".nicks" );
-        fp = fopen( s, "r" );
-
-        fscanf( fp, "%32[^\n]s", s );
-        fclose( fp );
-
-        /* FIXME */
-        return( 0 );
+                return STORAGE_OTHER_ERROR;
+
+        return STORAGE_OK;
 }
 
@@ -301 +293 @@
         .name = "text",
         .init = text_init,
-        .exists = text_exists,
-        .check_pass = text_check_pass,
         .remove = text_remove,
         .load = text_load,