projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Fix buffer overread in journaling when source does not end in \n.
[pspp]
/
src
/
data
/
csv-file-writer.c
diff --git
a/src/data/csv-file-writer.c
b/src/data/csv-file-writer.c
index 684f6baf8604b935696e306b44c251dbdcefde28..c01cb342318e32d9e12ad78505dee4c26a113a7c 100644
(file)
--- a/
src/data/csv-file-writer.c
+++ b/
src/data/csv-file-writer.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2012, 2013
, 2014
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,7
+33,6
@@
#include "data/data-out.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
#include "data/data-out.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
-#include "data/file-name.h"
#include "data/format.h"
#include "data/make-file.h"
#include "data/missing-values.h"
#include "data/format.h"
#include "data/make-file.h"
#include "data/missing-values.h"
@@
-154,8
+153,7
@@
csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
goto error;
/* Create the file on disk. */
goto error;
/* Create the file on disk. */
- w->rf = replace_file_start (fh_get_file_name (fh), "w", 0666,
- &w->file, NULL);
+ w->rf = replace_file_start (fh, "w", 0666, &w->file);
if (w->rf == NULL)
{
msg (ME, _("Error opening `%s' for writing as a system file: %s."),
if (w->rf == NULL)
{
msg (ME, _("Error opening `%s' for writing as a system file: %s."),
@@
-200,6
+198,12
@@
csv_output_buffer (struct csv_writer *w, const char *s, size_t len)
putc (w->opts.qualifier, w->file);
for (p = s; p < &s[len]; p++)
{
putc (w->opts.qualifier, w->file);
for (p = s; p < &s[len]; p++)
{
+ /* We are writing the output file in text mode, so transform any
+ explicit CR-LF line breaks into LF only, to allow the C library to
+ use correct system-specific new-lines. */
+ if (*p == '\r' && p[1] == '\n')
+ continue;
+
if (*p == w->opts.qualifier)
putc (w->opts.qualifier, w->file);
putc (*p, w->file);
if (*p == w->opts.qualifier)
putc (w->opts.qualifier, w->file);
putc (*p, w->file);