mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 04:41:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming a variable for clarity and contrast.

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5581 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-01-22 16:56:04 +00:00
parent 3a3b1764af
commit cd1d435ac7
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
some sudos don't filter it out of the environment (which can lead to some sudos don't filter it out of the environment (which can lead to
a root-owned .nano/ directory in the invoking user's home directory). a root-owned .nano/ directory in the invoking user's home directory).
It fixes https://bugs.launchpad.net/ubuntu/+source/nano/+bug/1471459. It fixes https://bugs.launchpad.net/ubuntu/+source/nano/+bug/1471459.
* src/files.c (read_line): Rename a variable for clarity and contrast.
2016-01-21 Benno Schulenberg <bensberg@justemail.net> 2016-01-21 Benno Schulenberg <bensberg@justemail.net>
* src/prompt.c (get_prompt_string): Preserve the cursor position on * src/prompt.c (get_prompt_string): Preserve the cursor position on

28
src/files.c
View File

@ -632,42 +632,42 @@ int is_file_writable(const char *filename)
* Then attach this line after prevnode. */ * Then attach this line after prevnode. */
filestruct *read_line(char *buf, size_t buf_len, filestruct *prevnode) filestruct *read_line(char *buf, size_t buf_len, filestruct *prevnode)
{ {
filestruct *fileptr = (filestruct *)nmalloc(sizeof(filestruct)); filestruct *freshline = (filestruct *)nmalloc(sizeof(filestruct));
/* Convert nulls to newlines. buf_len is the string's real length. */ /* Convert nulls to newlines. buf_len is the string's real length. */
unsunder(buf, buf_len); unsunder(buf, buf_len);
assert(openfile->fileage != NULL && strlen(buf) == buf_len); assert(openfile->fileage != NULL && strlen(buf) == buf_len);
fileptr->data = mallocstrcpy(NULL, buf); freshline->data = mallocstrcpy(NULL, buf);
#ifndef NANO_TINY #ifndef NANO_TINY
/* If it's a DOS file ("\r\n"), and file conversion isn't disabled, /* If it's a DOS file ("\r\n"), and file conversion isn't disabled,
* strip the '\r' part from fileptr->data. */ * strip the '\r' part from the data. */
if (!ISSET(NO_CONVERT) && buf_len > 0 && buf[buf_len - 1] == '\r') if (!ISSET(NO_CONVERT) && buf_len > 0 && buf[buf_len - 1] == '\r')
fileptr->data[buf_len - 1] = '\0'; freshline->data[buf_len - 1] = '\0';
#endif #endif
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR
fileptr->multidata = NULL; freshline->multidata = NULL;
#endif #endif
fileptr->prev = prevnode; freshline->prev = prevnode;
if (prevnode == NULL) { if (prevnode == NULL) {
/* Special case: we're inserting into the first line. */ /* Special case: we're inserting into the first line. */
fileptr->next = openfile->fileage; freshline->next = openfile->fileage;
openfile->fileage = fileptr; openfile->fileage = freshline;
fileptr->lineno = 1; freshline->lineno = 1;
/* Make sure that our edit window stays on the first line. */ /* Make sure that our edit window stays on the first line. */
openfile->edittop = fileptr; openfile->edittop = freshline;
} else { } else {
prevnode->next = fileptr; prevnode->next = freshline;
fileptr->next = NULL; freshline->next = NULL;
fileptr->lineno = prevnode->lineno + 1; freshline->lineno = prevnode->lineno + 1;
} }
return fileptr; return freshline;
} }
/* Read an open file into the current buffer. f should be set to the /* Read an open file into the current buffer. f should be set to the