/* PSPP - a program for statistical analysis.
- Copyright (C) 2010 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
#include "libpspp/message.h"
#include "libpspp/str.h"
+#include "gl/ftoastr.h"
+#include "gl/minmax.h"
#include "gl/unlocked-io.h"
#include "gl/xalloc.h"
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 = '"';
}
w->opts = *opts;
- w->encoding = (dict_get_encoding (dict)
- ? xstrdup (dict_get_encoding (dict))
- : NULL);
+ w->encoding = xstrdup (dict_get_encoding (dict));
w->n_csv_vars = dict_get_var_cnt (dict);
w->csv_vars = xnmalloc (w->n_csv_vars, sizeof *w->csv_vars);
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);
csv_output_format (w, cv, value);
else
{
- char s[128];
+ char s[MAX (DBL_STRLEN_BOUND, 128)];
+ char *cp;
switch (cv->format.type)
{
case FMT_RBHEX:
case FMT_WKDAY:
case FMT_MONTH:
- snprintf (s, sizeof s, "%.*g", DBL_DIG + 1, value->f);
- if (w->opts.decimal != '.')
- {
- char *cp = strchr (s, '.');
- if (cp != NULL)
- *cp = w->opts.decimal;
- }
+ dtoastr (s, sizeof s, 0, 0, value->f);
+ cp = strpbrk (s, ".,");
+ if (cp != NULL)
+ *cp = w->opts.decimal;
break;
case FMT_DATE: