lib/util: use a helper variable in directory_create_or_exist()
authorStefan Metzmacher <metze@samba.org>
Wed, 14 Mar 2012 09:46:14 +0000 (10:46 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 14 Mar 2012 11:00:46 +0000 (12:00 +0100)
metze

lib/util/util.c

index 54237c57d817c84359896f4779c4fe09cdecc2ab..54a8c88245e39bc434144e80105f36b92d20a6bf 100644 (file)
@@ -145,11 +145,13 @@ _PUBLIC_ bool directory_exist(const char *dname)
 _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid, 
                               mode_t dir_perms)
 {
+       int ret;
        mode_t old_umask;
        struct stat st;
       
        old_umask = umask(0);
-       if (lstat(dname, &st) == -1) {
+       ret = lstat(dname, &st);
+       if (ret == -1) {
                if (errno != ENOENT) {
                        DEBUG(0, ("lstat failed on directory %s: %s\n",
                                  dname, strerror(errno)));
@@ -158,7 +160,8 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid,
                }
 
                /* Create directory */
-               if (mkdir(dname, dir_perms) == -1) {
+               ret = mkdir(dname, dir_perms);
+               if (ret == -1) {
                        DEBUG(0, ("mkdir failed on directory "
                                  "%s: %s\n", dname,
                                  strerror(errno)));