Truncating an overlong hostname properly instead of bailing out

when writing a lock file.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5391 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-11-06 20:14:37 +00:00
parent 452066bc88
commit 4ede3b494f
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2015-11-06 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (write_lockfile): Don't bail out when the hostname is
overlong, but instead truncate it properly and continue. This fixes
Ubuntu bug #1509081 reported by Sam Reed.
2015-11-02 Benno Schulenberg <bensberg@justemail.net>
* src/nano.h: Delete an unused type definition.
* src/nano.h: Improve several comments.

View File

@ -136,8 +136,12 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
mypid = getpid();
if (gethostname(myhostname, 31) < 0) {
statusbar(_("Couldn't determine hostname for lock file: %s"), strerror(errno));
goto free_and_fail;
if (errno == ENAMETOOLONG)
myhostname[31] = '\0';
else {
statusbar(_("Couldn't determine hostname for lock file: %s"), strerror(errno));
goto free_and_fail;
}
}
/* Check if the lock exists before we try to delete it...*/