Changeset f277225 for storage_xml.c

Timestamp:

2010-06-06T21:58:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04a927c

Parents:

3dc6d86

Message:

Use mkstemp() instead of just a tilde-file when writing new configs to a
temporary file. This solves hard-to-debug issues where for example the
user hand-edited his configs as root and left a root-owned user.xml~ file
behind.

File:

• storage_xml.c (modified) (2 diffs)

storage_xml.c

@@ -404 +404 @@
                 return STORAGE_ALREADY_EXISTS;
         
-        strcat( path, "~" );
-        if( ( fd = open( path, O_WRONLY | O_CREAT | O_TRUNC, 0600 ) ) < 0 )
+        strcat( path, ".XXXXXX" );
+        if( ( fd = mkstemp( path ) ) < 0 )
         {
                 irc_usermsg( irc, "Error while opening configuration file." );
@@ -499 +499 @@
         close( fd );
         
-        path2 = g_strndup( path, strlen( path ) - 1 );
+        path2 = g_strndup( path, strlen( path ) - 7 );
         if( rename( path, path2 ) != 0 )
         {