]> git.wh0rd.org Git - nano.git/commitdiff
files.c:do_lockfile(): Actually reference the variable we're using for the dir.
authorChris Allegretta <chrisa@asty.org>
Fri, 11 Jul 2014 10:39:38 +0000 (10:39 +0000)
committerChris Allegretta <chrisa@asty.org>
Fri, 11 Jul 2014 10:39:38 +0000 (10:39 +0000)
Also name it more appropriately.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5058 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

src/files.c

index 97a2e88e51a65f6c95552f3c865bc2c8b688baed..11a5051d539bab0f56b079b342e10a09fd2fab6a 100644 (file)
@@ -247,7 +247,7 @@ int do_lockfile(const char *filename)
     size_t lockfilesize = strlen(filename) + strlen(locking_prefix)
                + strlen(locking_suffix) + 3;
     char *lockfilename = charalloc(lockfilesize);
-    char *lockfilecpy = NULL;
+    char *lockfiledir = NULL;
     char lockprog[12], lockuser[16];
     struct stat fileinfo;
     int lockfd, lockpid;
@@ -296,11 +296,11 @@ int do_lockfile(const char *filename)
             return -1;
         }
     } else {
-       lockfilecpy = mallocstrcpy(NULL, lockfilename);
-       lockfilecpy = dirname(lockfilecpy);
-       if (stat(lockfilename, &fileinfo) == -1) {
+       lockfiledir = mallocstrcpy(NULL, lockfilename);
+       lockfiledir = dirname(lockfiledir);
+       if (stat(lockfiledir, &fileinfo) == -1) {
            statusbar(_("Error writing lock file: Directory \'%s\' doesn't exist"),
-               lockfilecpy);
+               lockfiledir);
            return -1;
        }
     }