Changes in storage_xml.c [88d2208:5f5d433]

File:

• storage_xml.c (modified) (5 diffs)

storage_xml.c

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