X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcsv-file-writer.c;h=8e52df50756cdf1b3f75d0d4ea7c020bc3477f49;hb=85686ff9b5292a10af71b72c57a87df199e1a4ad;hp=4ebff0bd001288e28ddf6d085cbc086632b72e88;hpb=d49a471a1fa405dd68d51ade4a4fed35b77cc41d;p=pspp

diff --git a/src/data/csv-file-writer.c b/src/data/csv-file-writer.c
index 4ebff0bd00..8e52df5075 100644
--- a/src/data/csv-file-writer.c
+++ b/src/data/csv-file-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010, 2011, 2012 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
@@ -97,7 +97,7 @@ csv_writer_options_init (struct csv_writer_options *opts)
   opts->use_value_labels = false;
   opts->use_print_formats = false;
   opts->decimal = settings_get_decimal_char (FMT_F);
-  opts->delimiter = 0;
+  opts->delimiter = ',';
   opts->qualifier = '"';
 }
 
@@ -200,6 +200,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++)
         {
+          /* 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);