Changeset b99296f for storage.c

Timestamp:

2008-09-07T17:13:49Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

92e90b7

Parents:

0a4f6f4 (diff), ba3a8a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

BitlBee 1.2.3 merge.

File:

• storage.c (modified) (6 diffs)

storage.c

@@ -103 +103 @@
 }
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc)
-{
-        GList *gl;
+storage_status_t storage_load (irc_t * irc, const char *password)
+{
+        GList *gl;
+        
+        if (irc && irc->status & USTATUS_IDENTIFIED)
+                return STORAGE_OTHER_ERROR;
         
         /* Loop until we don't get NO_SUCH_USER */
@@ -112 +115 @@
                 storage_status_t status;
 
-                status = st->load(nick, password, irc);
-                if (status == STORAGE_OK) {
-                        irc_setpass(irc, password);
+                status = st->load(irc, password);
+                if (status == STORAGE_OK)
                         return status;
-                }
                 
                 if (status != STORAGE_NO_SUCH_USER) 
@@ -125 +126 @@
 }
 
-storage_status_t storage_save (irc_t *irc, int overwrite)
-{
-        return ((storage_t *)global.storage->data)->save(irc, overwrite);
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite)
+{
+        storage_status_t st;
+        
+        if (password != NULL) {
+                /* Should only use this in the "register" command. */
+                if (irc->password || overwrite)
+                        return STORAGE_OTHER_ERROR;
+                
+                irc_setpass(irc, password);
+        } else if ((irc->status & USTATUS_IDENTIFIED) == 0) {
+                return STORAGE_NO_SUCH_USER;
+        }
+        
+        st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+        
+        if (password != NULL) {
+                irc_setpass(irc, NULL);
+        }
+        
+        return st;
 }
 
@@ -143 +162 @@
 
                 status = st->remove(nick, password);
-                if (status != STORAGE_NO_SUCH_USER && 
-                        status != STORAGE_OK)
+                if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
                         ret = status;
         }
@@ -150 +168 @@
         return ret;
 }
+
+#if 0
+Not using this yet. Test thoroughly before adding UI hooks to this function.
 
 storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
@@ -189 +210 @@
         return STORAGE_OK;
 }
+#endif