ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3084 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-11-04 05:59:41 +00:00
parent 306049666a
commit a50e36c6b2
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/files.c
View File

@ -1411,16 +1411,7 @@ int write_file(const char *name, FILE *f_open, bool tmp, append_type
assert(openfile->fileage != NULL && openfile->filebot != NULL); assert(openfile->fileage != NULL && openfile->filebot != NULL);
while (fileptr != NULL) { while (fileptr != NULL) {
size_t data_len, size; size_t data_len = strlen(fileptr->data), size;
/* If we're on the last line of the file and it's blank, skip
* over it, since the newline character we wrote after the
* next-to-last line of the file is equivalent to it. */
if (fileptr == openfile->filebot &&
openfile->filebot->data[0] == '\0')
continue;
data_len = strlen(fileptr->data);
/* Newlines to nulls, just before we write to disk. */ /* Newlines to nulls, just before we write to disk. */
sunder(fileptr->data); sunder(fileptr->data);
@ -1437,10 +1428,9 @@ int write_file(const char *name, FILE *f_open, bool tmp, append_type
goto cleanup_and_exit; goto cleanup_and_exit;
} }
/* If we're on the last line of the file and it isn't blank, /* If we're on the last line of the file, don't write a newline
* don't write a newline character after it. */ * character after it. */
if (fileptr != openfile->filebot || if (fileptr != openfile->filebot) {
openfile->filebot->data[0] == '\0') {
#ifndef NANO_SMALL #ifndef NANO_SMALL
if (openfile->fmt == DOS_FILE || openfile->fmt == if (openfile->fmt == DOS_FILE || openfile->fmt ==
MAC_FILE) { MAC_FILE) {