projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the new "about-logo"
[pspp]
/
src
/
data
/
sys-file-writer.c
diff --git
a/src/data/sys-file-writer.c
b/src/data/sys-file-writer.c
index cf7bc70b2229127193d77028ad9e8d0341a9a39c..d02369856f356a08b33e3a9e5f4a7ac8d21eb5c6 100644
(file)
--- a/
src/data/sys-file-writer.c
+++ b/
src/data/sys-file-writer.c
@@
-74,6
+74,7
@@
struct sfm_writer
bool compress; /* 1=compressed, 0=not compressed. */
casenumber case_cnt; /* Number of cases written so far. */
bool compress; /* 1=compressed, 0=not compressed. */
casenumber case_cnt; /* Number of cases written so far. */
+ uint8_t space; /* ' ' in the file's character encoding. */
/* Compression buffering.
/* Compression buffering.
@@
-176,6
+177,7
@@
struct casewriter *
sfm_open_writer (struct file_handle *fh, struct dictionary *d,
struct sfm_write_options opts)
{
sfm_open_writer (struct file_handle *fh, struct dictionary *d,
struct sfm_write_options opts)
{
+ struct encoding_info encoding_info;
struct sfm_writer *w;
mode_t mode;
int i;
struct sfm_writer *w;
mode_t mode;
int i;
@@
-227,6
+229,9
@@
sfm_open_writer (struct file_handle *fh, struct dictionary *d,
goto error;
}
goto error;
}
+ get_encoding_info (&encoding_info, dict_get_encoding (d));
+ w->space = encoding_info.space[0];
+
/* Write the file header. */
write_header (w, d);
/* Write the file header. */
write_header (w, d);
@@
-712,6
+717,12
@@
write_mrsets (struct sfm_writer *w, const struct dictionary *dict,
size_t n_mrsets;
size_t i;
size_t n_mrsets;
size_t i;
+ if (is_encoding_ebcdic_compatible (encoding))
+ {
+ /* FIXME. */
+ return;
+ }
+
n_mrsets = dict_get_n_mrsets (dict);
if (n_mrsets == 0)
return;
n_mrsets = dict_get_n_mrsets (dict);
if (n_mrsets == 0)
return;
@@
-763,11
+774,12
@@
write_mrsets (struct sfm_writer *w, const struct dictionary *dict,
for (j = 0; j < mrset->n_vars; j++)
{
const char *short_name_utf8 = var_get_short_name (mrset->vars[j], 0);
for (j = 0; j < mrset->n_vars; j++)
{
const char *short_name_utf8 = var_get_short_name (mrset->vars[j], 0);
+ char *lower_name_utf8 = utf8_to_lower (short_name_utf8);
char *short_name = recode_string (encoding, "UTF-8",
char *short_name = recode_string (encoding, "UTF-8",
- short_name_utf8, -1);
- str_lowercase (short_name);
+ lower_name_utf8, -1);
ds_put_format (&s, " %s", short_name);
free (short_name);
ds_put_format (&s, " %s", short_name);
free (short_name);
+ free (lower_name_utf8);
}
ds_put_byte (&s, '\n');
}
}
ds_put_byte (&s, '\n');
}
@@
-1251,7
+1263,7
@@
put_cmp_string (struct sfm_writer *w, const void *data, size_t size)
assert (w->data_cnt < 8);
assert (size <= 8);
assert (w->data_cnt < 8);
assert (size <= 8);
- memset (w->data[w->data_cnt],
' '
, 8);
+ memset (w->data[w->data_cnt],
w->space
, 8);
memcpy (w->data[w->data_cnt], data, size);
w->data_cnt++;
}
memcpy (w->data[w->data_cnt], data, size);
w->data_cnt++;
}
@@
-1313,7
+1325,7
@@
write_string (struct sfm_writer *w, const char *string, size_t width)
size_t pad_bytes = width - data_bytes;
write_bytes (w, string, data_bytes);
while (pad_bytes-- > 0)
size_t pad_bytes = width - data_bytes;
write_bytes (w, string, data_bytes);
while (pad_bytes-- > 0)
- putc (
' '
, w->file);
+ putc (
w->space
, w->file);
}
/* Recodes null-terminated UTF-8 encoded STRING into ENCODING, and writes the
}
/* Recodes null-terminated UTF-8 encoded STRING into ENCODING, and writes the
@@
-1374,5
+1386,5
@@
static void
write_spaces (struct sfm_writer *w, size_t n)
{
while (n-- > 0)
write_spaces (struct sfm_writer *w, size_t n)
{
while (n-- > 0)
- putc (
' '
, w->file);
+ putc (
w->space
, w->file);
}
}