Changeset 8661caa for storage_xml.c

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (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:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• storage_xml.c (modified) (5 diffs)

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include <glib/gstdio.h>
+
+#if !GLIB_CHECK_VERSION(2,8,0)
+/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
+#define g_access access
+#endif
 
 typedef enum
@@ -243 +249 @@
 static void xml_init( void )
 {
-        if( access( global.conf->configdir, F_OK ) != 0 )
+        if( g_access( global.conf->configdir, F_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
-        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
+        else if( g_access( global.conf->configdir, F_OK ) != 0 || 
+                 g_access( global.conf->configdir, W_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }
@@ -372 +379 @@
         g_free( path2 );
         
-        if( !overwrite && access( path, F_OK ) != -1 )
+        if( !overwrite && g_access( path, F_OK ) == 0 )
                 return STORAGE_ALREADY_EXISTS;
         
@@ -480 +487 @@
 static storage_status_t xml_remove( const char *nick, const char *password )
 {
-        char s[512];
+        char s[512], *lc;
         storage_status_t status;
 
@@ -487 +494 @@
                 return status;
 
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, nick, ".xml" );
+        lc = g_strdup( nick );
+        nick_lc( lc );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, lc, ".xml" );
+        g_free( lc );
+        
         if( unlink( s ) == -1 )
                 return STORAGE_OTHER_ERROR;