-/* PSPP - computes sample statistics.
- Copyright (C) 1997-2004 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-2004, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include <language/data-io/data-writer.h>
+
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
+
+#include <data/file-name.h>
+#include <language/data-io/file-handle.h>
#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include <language/data-io/file-handle.h>
-#include <data/filename.h>
#include <libpspp/str.h>
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct dfm_writer
{
struct file_handle *fh; /* File handle. */
- struct file_ext file; /* Associated file. */
- char *bounce; /* Bounce buffer for fixed-size fields. */
+ FILE *file; /* Associated file. */
};
/* Opens a file handle for writing as a data file. */
{
struct dfm_writer *w;
void **aux;
-
+
aux = fh_open (fh, FH_REF_FILE, "data file", "ws");
if (aux == NULL)
return NULL;
w = *aux = xmalloc (sizeof *w);
w->fh = fh;
- w->file.file = NULL;
- w->bounce = NULL;
-
- w->file.filename = xstrdup (fh_get_filename (w->fh));
- w->file.mode = "wb";
- w->file.file = NULL;
- w->file.sequence_no = NULL;
- w->file.param = NULL;
- w->file.postopen = NULL;
- w->file.preclose = NULL;
-
- if (!fn_open_ext (&w->file))
+ w->file = fn_open (fh_get_file_name (w->fh), "wb");
+
+ if (w->file == NULL)
{
msg (ME, _("An error occurred while opening \"%s\" for writing "
"as a data file: %s."),
- fh_get_filename (w->fh), strerror (errno));
+ fh_get_file_name (w->fh), strerror (errno));
goto error;
}
/* Returns false if an I/O error occurred on WRITER, true otherwise. */
bool
-dfm_write_error (const struct dfm_writer *writer)
+dfm_write_error (const struct dfm_writer *writer)
{
- return ferror (writer->file.file);
+ return ferror (writer->file);
}
-/* Writes record REC having length LEN to the file corresponding to
- HANDLE. REC is not null-terminated. Returns nonzero on success,
- zero on failure. */
-int
+/* Writes record REC (which need not be null-terminated) having
+ length LEN to the file corresponding to HANDLE. Adds any
+ needed formatting, such as a trailing new-line. Returns true
+ on success, false on failure. */
+bool
dfm_put_record (struct dfm_writer *w, const char *rec, size_t len)
{
assert (w != NULL);
if (dfm_write_error (w))
- return 0;
-
- if (fh_get_mode (w->fh) == FH_MODE_BINARY
- && len < fh_get_record_width (w->fh))
+ return false;
+
+ switch (fh_get_mode (w->fh))
{
- size_t rec_width = fh_get_record_width (w->fh);
- if (w->bounce == NULL)
- w->bounce = xmalloc (rec_width);
- memcpy (w->bounce, rec, len);
- memset (&w->bounce[len], 0, rec_width - len);
- rec = w->bounce;
- len = rec_width;
+ case FH_MODE_TEXT:
+ fwrite (rec, len, 1, w->file);
+ putc ('\n', w->file);
+ break;
+
+ case FH_MODE_BINARY:
+ {
+ size_t record_width = fh_get_record_width (w->fh);
+ size_t write_bytes = MIN (len, record_width);
+ size_t pad_bytes = record_width - write_bytes;
+ fwrite (rec, write_bytes, 1, w->file);
+ while (pad_bytes > 0)
+ {
+ static const char spaces[32] = " ";
+ size_t chunk = MIN (pad_bytes, sizeof spaces);
+ fwrite (spaces, chunk, 1, w->file);
+ pad_bytes -= chunk;
+ }
+ }
+ break;
+
+ default:
+ NOT_REACHED ();
}
- fwrite (rec, len, 1, w->file.file);
return !dfm_write_error (w);
}
bool
dfm_close_writer (struct dfm_writer *w)
{
+ char *file_name;
bool ok;
if (w == NULL)
return true;
+ file_name = xstrdup (fh_get_name (w->fh));
if (fh_close (w->fh, "data file", "ws"))
- return true;
+ {
+ free (file_name);
+ return true;
+ }
ok = true;
- if (w->file.file != NULL)
+ if (w->file != NULL)
{
- ok = !dfm_write_error (w);
- if (!fn_close_ext (&w->file))
- ok = false;
+ ok = !dfm_write_error (w) && !fn_close (file_name, w->file);
if (!ok)
- msg (ME, _("I/O error occurred writing data file \"%s\"."),
- fh_get_filename (w->fh));
-
- free (w->file.filename);
- w->file.filename = NULL;
+ msg (ME, _("I/O error occurred writing data file \"%s\"."), file_name);
}
- free (w->bounce);
free (w);
+ free (file_name);
return ok;
}
projects / pspp-builds.git / blobdiff