diff options
| author | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
|---|---|---|
| committer | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
| commit | 8661caad555f4306cf36ee37979a7637b05d5cd4 (patch) | |
| tree | 7e4a7c3d6a700610dd31d109508b07caa3253902 /storage_xml.c | |
| parent | 4ac647dbcef152bebde7209f7c9cbbf8a5e0fc37 (diff) | |
| parent | 718e05f842c1af043eb4efded8b0afe429377f70 (diff) | |
merged in upstream r410.
Only conflict was the correction of jabber normalization which I had already done.
Diffstat (limited to 'storage_xml.c')
| -rw-r--r-- | storage_xml.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/storage_xml.c b/storage_xml.c index f37fce44..240206f1 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -28,6 +28,12 @@ #include "base64.h" #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 { @@ -242,9 +248,10 @@ GMarkupParser xml_parser = 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 ); } @@ -371,7 +378,7 @@ static storage_status_t xml_save( irc_t *irc, int overwrite ) g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" ); g_free( path2 ); - if( !overwrite && access( path, F_OK ) != -1 ) + if( !overwrite && g_access( path, F_OK ) == 0 ) return STORAGE_ALREADY_EXISTS; strcat( path, "~" ); @@ -479,14 +486,18 @@ static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data ) static storage_status_t xml_remove( const char *nick, const char *password ) { - char s[512]; + char s[512], *lc; 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" ); + 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; |