Changeset 84e9cea

Timestamp:

2006-06-20T21:36:53Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2befb95

Parents:

d028a77

Message:

Added xml_remove() and xml_check_pass().

File:

• storage_xml.c (modified) (10 diffs)

storage_xml.c

@@ -35 +35 @@
 } xml_pass_st;
 
+/* This isn't very clean, probably making a separate error class + code for
+   BitlBee would be a better solution. But this will work for now... */
 #define XML_PASS_ERRORMSG "Wrong username or password"
 
@@ -194 +196 @@
 {
         struct xml_parsedata *xd = data;
-        // irc_t *irc = xd->irc;
         
         if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
@@ -215 +216 @@
         {
                 /* Let's not parse anything else if we only have to check
-                   the password. */
+                   the password, or if we didn't get the chance to check it
+                   yet. */
         }
         else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 &&
@@ -243 +245 @@
 }
 
-static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc )
+static storage_status_t xml_load_real( const char *my_nick, const char *password, irc_t *irc, xml_pass_st action )
 {
         GMarkupParseContext *ctx;
@@ -251 +253 @@
         int fd, st;
         
-        if( irc->status & USTATUS_IDENTIFIED )
+        if( irc && irc->status & USTATUS_IDENTIFIED )
                 return( 1 );
         
@@ -258 +260 @@
         xd->given_nick = g_strdup( my_nick );
         xd->given_pass = g_strdup( password );
+        xd->pass_st = action;
         nick_lc( xd->given_nick );
         
@@ -283 +286 @@
                         else
                         {
-                                if( gerr )
+                                if( gerr && irc )
                                         irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
                                 
@@ -294 +297 @@
         close( fd );
         
+        if( action == XML_PASS_CHECK_ONLY )
+                return STORAGE_OK;
+        
         irc->status |= USTATUS_IDENTIFIED;
         
@@ -304 +310 @@
         
         return STORAGE_OK;
+}
+
+static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc )
+{
+        return xml_load_real( my_nick, password, irc, XML_PASS_UNKNOWN );
+}
+
+static storage_status_t xml_check_pass( const char *my_nick, const char *password )
+{
+        /* This is a little bit risky because we have to pass NULL for the
+           irc_t argument. This *should* be fine, if I didn't miss anything... */
+        return xml_load_real( my_nick, password, NULL, XML_PASS_CHECK_ONLY );
 }
 
@@ -396 +414 @@
 }
 
+static storage_status_t xml_remove( const char *nick, const char *password )
+{
+        char s[512];
+        storage_status_t status;
+
+        status = xml_check_pass( nick, password );
+        if( status != STORAGE_OK )
+                return status;
+
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".xml" );
+        if( unlink( s ) == -1 )
+                return STORAGE_OTHER_ERROR;
+        
+        return STORAGE_OK;
+}
+
 storage_t storage_xml = {
         .name = "xml",
         .init = xml_init,
-//      .check_pass = xml_check_pass,
-//      .remove = xml_remove,
+        .check_pass = xml_check_pass,
+        .remove = xml_remove,
         .load = xml_load,
         .save = xml_save