[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-10-25 10:26:33
Message-ID: 1256466393.018823.8628.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1040004 by ossi:

use rename() instead of link()/unlink() sequence

whoops - just removed some more SVr4 compat ... :D

 M  +3 -7      auth.c  


--- trunk/KDE/kdebase/workspace/kdm/backend/auth.c #1040003:1040004
@@ -73,7 +73,6 @@
 #  include <sys/stropts.h>
 # endif
 # ifdef __EMX__
-#  define link rename
 #  define chown(a,b,c)
 #  include <io.h>
 # endif
@@ -1089,15 +1088,12 @@
 static char *
 moveUserAuth( const char *name, char *new_name, char *envname )
 {
-	if (unlink( name ))
-		debug( "unlink %s failed\n", name );
-	if (link( new_name, name )) {
-		debug( "link failed %s %s\n", new_name, name );
-		logError( "Cannot move user authorization into place\n" );
+	if (rename( new_name, name )) {
+		debug( "rename %s => %s failed: %m\n", new_name, name );
+		logError( "Cannot move user authorization into place: %m\n" );
 		envname = new_name;
 	} else {
 		debug( "new authorization moved into place\n" );
-		unlink( new_name );
 	}
 	XauUnlockAuth( name );
 	return envname;
[prev in list] [next in list] [prev in thread] [next in thread]