From 93e391eba353996759a0f3a4d5be4cb4ddc7d11e Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 10 Jul 2015 15:57:49 +0000
Subject: [PATCH] Renaming a variable.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5288 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/files.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index faa7481e..e6da1eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-07-10 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (delete_opennode): Plug a small memory leak.
+ * src/files.c (do_lockfile): Rename a variable; it does not contain
+ the size of the file but the size of the name.
2015-07-06 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (add_to_sclist), src/help.c (help_init), src/nano.h,
diff --git a/src/files.c b/src/files.c
index ca8848ff..9aa7a79a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -249,15 +249,15 @@ int do_lockfile(const char *filename)
{
char *lockdir = dirname((char *) mallocstrcpy(NULL, filename));
char *lockbase = basename((char *) mallocstrcpy(NULL, filename));
- size_t lockfilesize = strlen(filename) + strlen(locking_prefix)
+ size_t locknamesize = strlen(filename) + strlen(locking_prefix)
+ strlen(locking_suffix) + 3;
- char *lockfilename = charalloc(lockfilesize);
+ char *lockfilename = charalloc(locknamesize);
char *lockfiledir = NULL;
static char lockprog[11], lockuser[17];
struct stat fileinfo;
int lockfd, lockpid;
- snprintf(lockfilename, lockfilesize, "%s/%s%s%s", lockdir,
+ snprintf(lockfilename, locknamesize, "%s/%s%s%s", lockdir,
locking_prefix, lockbase, locking_suffix);
#ifdef DEBUG
fprintf(stderr, "lock file name is %s\n", lockfilename);
--
GitLab