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

history: encode newlines in filenames as nulls 

So they will not break a line in the positionlog file in two.

(Strangely, the reading in of such a log file already decodes
nulls back into newlines.)

This fixes https://savannah.gnu.org/bugs/?49877.
master
Benno Schulenberg 2016-12-18 12:22:58 +01:00
parent 0b0b812206
commit 06d9ee89e5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/files.c
View File

@ -3056,12 +3056,21 @@ void save_poshistory(void)
chmod(poshist, S_IRUSR | S_IWUSR); chmod(poshist, S_IRUSR | S_IWUSR);
for (posptr = position_history; posptr != NULL; posptr = posptr->next) { for (posptr = position_history; posptr != NULL; posptr = posptr->next) {
size_t length;
/* Assume 20 decimal positions each for line and column number, /* Assume 20 decimal positions each for line and column number,
* plus two spaces, plus the line feed, plus the null byte. */ * plus two spaces, plus the line feed, plus the null byte. */
statusstr = charalloc(strlen(posptr->filename) + 44); statusstr = charalloc(strlen(posptr->filename) + 44);
sprintf(statusstr, "%s %ld %ld\n", posptr->filename, (long)posptr->lineno, sprintf(statusstr, "%s %ld %ld\n", posptr->filename, (long)posptr->lineno,
(long)posptr->xno); (long)posptr->xno);
if (fwrite(statusstr, sizeof(char), strlen(statusstr), hist) < strlen(statusstr)) length = strlen(statusstr);
/* Encode newlines in filenames as nulls. */
sunder(statusstr);
/* Restore the terminating newline. */
statusstr[length - 1] = '\n';
if (fwrite(statusstr, sizeof(char), length, hist) < length)
fprintf(stderr, _("Error writing %s: %s\n"), poshist, strerror(errno)); fprintf(stderr, _("Error writing %s: %s\n"), poshist, strerror(errno));
free(statusstr); free(statusstr);
} }