Changeset d179921d

Timestamp:

2008-04-02T14:37:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

0a14b8c

Parents:

f9dbc99 (diff), 5f5d433 (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:

Merge removal of access().

Files:

• bitlbee.h (modified) (1 diff)
• storage_xml.c (modified) (3 diffs)

bitlbee.h

@@ -96 +96 @@
 #define g_main_quit             __PLEASE_USE_B_MAIN_QUIT__
 
-#ifndef F_OK
-#define F_OK 0
-#endif
-
 #ifndef G_GNUC_MALLOC
 /* Doesn't exist in GLib <=2.4 while everything else in BitlBee should

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include <glib/gstdio.h>
 
 typedef enum
@@ -243 +244 @@
 static void xml_init( void )
 {
-        if( 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( access( global.conf->configdir, R_OK ) != 0 || 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 );
 }
@@ -372 +373 @@
         g_free( path2 );
         
-        if( !overwrite && access( path, F_OK ) != -1 )
+        if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) )
                 return STORAGE_ALREADY_EXISTS;