projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zip Reader: Take members from the index if they exist.
[pspp]
/
src
/
data
/
file-handle-def.c
diff --git
a/src/data/file-handle-def.c
b/src/data/file-handle-def.c
index 6ca6977c87733d792fce4c7f31d48f8afab97e80..121a4909c43cf6793acf4c09dc6643ccdd3a209f 100644
(file)
--- a/
src/data/file-handle-def.c
+++ b/
src/data/file-handle-def.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011
, 2012
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
@@
-26,12
+26,13
@@
#include "data/dataset.h"
#include "data/file-name.h"
#include "data/variable.h"
#include "data/dataset.h"
#include "data/file-name.h"
#include "data/variable.h"
+#include "libpspp/cast.h"
#include "libpspp/compiler.h"
#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/hmap.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
-#include "libpspp/hash-functions.h"
#include "gl/xalloc.h"
#include "gl/xalloc.h"
@@
-50,11
+51,11
@@
struct file_handle
/* FH_REF_FILE only. */
char *file_name; /* File name as provided by user. */
enum fh_mode mode; /* File mode. */
/* FH_REF_FILE only. */
char *file_name; /* File name as provided by user. */
enum fh_mode mode; /* File mode. */
- const char *encoding; /* File encoding. */
/* FH_REF_FILE and FH_REF_INLINE only. */
size_t record_width; /* Length of fixed-format records. */
size_t tab_width; /* Tab width, 0=do not expand tabs. */
/* FH_REF_FILE and FH_REF_INLINE only. */
size_t record_width; /* Length of fixed-format records. */
size_t tab_width; /* Tab width, 0=do not expand tabs. */
+ char *encoding; /* Charset for contents. */
/* FH_REF_DATASET only. */
struct dataset *ds; /* Dataset. */
/* FH_REF_DATASET only. */
struct dataset *ds; /* Dataset. */
@@
-71,7
+72,8
@@
static struct file_handle *default_handle;
static struct file_handle *inline_file;
static struct file_handle *create_handle (const char *id,
static struct file_handle *inline_file;
static struct file_handle *create_handle (const char *id,
- char *name, enum fh_referent);
+ char *name, enum fh_referent,
+ const char *encoding);
static void free_handle (struct file_handle *);
static void unname_handle (struct file_handle *);
static void free_handle (struct file_handle *);
static void unname_handle (struct file_handle *);
@@
-82,7
+84,8
@@
static struct hmap locks = HMAP_INITIALIZER (locks);
void
fh_init (void)
{
void
fh_init (void)
{
- inline_file = create_handle ("INLINE", xstrdup ("INLINE"), FH_REF_INLINE);
+ inline_file = create_handle ("INLINE", xstrdup ("INLINE"), FH_REF_INLINE,
+ "Auto");
inline_file->record_width = 80;
inline_file->tab_width = 8;
}
inline_file->record_width = 80;
inline_file->tab_width = 8;
}
@@
-110,6
+113,7
@@
free_handle (struct file_handle *handle)
free (handle->id);
free (handle->name);
free (handle->file_name);
free (handle->id);
free (handle->name);
free (handle->file_name);
+ free (handle->encoding);
free (handle);
}
free (handle);
}
@@
-172,11
+176,10
@@
fh_from_id (const char *id)
struct file_handle *handle;
HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node,
struct file_handle *handle;
HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node,
- hash_case_string (id, 0), &named_handles)
- if (!strcasecmp (id, handle->id))
+
utf8_
hash_case_string (id, 0), &named_handles)
+ if (!
utf8_
strcasecmp (id, handle->id))
{
{
- handle->ref_cnt++;
- return handle;
+ return fh_ref (handle);
}
return NULL;
}
return NULL;
@@
-189,7
+192,8
@@
fh_from_id (const char *id)
The new handle is not fully initialized. The caller is
responsible for completing its initialization. */
static struct file_handle *
The new handle is not fully initialized. The caller is
responsible for completing its initialization. */
static struct file_handle *
-create_handle (const char *id, char *handle_name, enum fh_referent referent)
+create_handle (const char *id, char *handle_name, enum fh_referent referent,
+ const char *encoding)
{
struct file_handle *handle = xzalloc (sizeof *handle);
{
struct file_handle *handle = xzalloc (sizeof *handle);
@@
-197,13
+201,12
@@
create_handle (const char *id, char *handle_name, enum fh_referent referent)
handle->id = id != NULL ? xstrdup (id) : NULL;
handle->name = handle_name;
handle->referent = referent;
handle->id = id != NULL ? xstrdup (id) : NULL;
handle->name = handle_name;
handle->referent = referent;
+ handle->encoding = xstrdup (encoding);
if (id != NULL)
{
if (id != NULL)
{
- assert (fh_from_id (id) == NULL);
hmap_insert (&named_handles, &handle->name_node,
hmap_insert (&named_handles, &handle->name_node,
- hash_case_string (handle->id, 0));
- handle->ref_cnt++;
+ utf8_hash_case_string (handle->id, 0));
}
return handle;
}
return handle;
@@
-215,7
+218,6
@@
create_handle (const char *id, char *handle_name, enum fh_referent referent)
struct file_handle *
fh_inline_file (void)
{
struct file_handle *
fh_inline_file (void)
{
- fh_ref (inline_file);
return inline_file;
}
return inline_file;
}
@@
-231,12
+233,11
@@
fh_create_file (const char *id, const char *file_name,
struct file_handle *handle;
handle_name = id != NULL ? xstrdup (id) : xasprintf ("`%s'", file_name);
struct file_handle *handle;
handle_name = id != NULL ? xstrdup (id) : xasprintf ("`%s'", file_name);
- handle = create_handle (id, handle_name, FH_REF_FILE);
+ handle = create_handle (id, handle_name, FH_REF_FILE
, properties->encoding
);
handle->file_name = xstrdup (file_name);
handle->mode = properties->mode;
handle->record_width = properties->record_width;
handle->tab_width = properties->tab_width;
handle->file_name = xstrdup (file_name);
handle->mode = properties->mode;
handle->record_width = properties->record_width;
handle->tab_width = properties->tab_width;
- handle->encoding = properties->encoding;
return handle;
}
return handle;
}
@@
-253,7
+254,7
@@
fh_create_dataset (struct dataset *ds)
if (name[0] == '\0')
name = _("active dataset");
if (name[0] == '\0')
name = _("active dataset");
- handle = create_handle (NULL, xstrdup (name), FH_REF_DATASET);
+ handle = create_handle (NULL, xstrdup (name), FH_REF_DATASET
, C_ENCODING
);
handle->ds = ds;
return handle;
}
handle->ds = ds;
return handle;
}
@@
-263,7
+264,7
@@
const struct fh_properties *
fh_default_properties (void)
{
static const struct fh_properties default_properties
fh_default_properties (void)
{
static const struct fh_properties default_properties
- = {FH_MODE_TEXT, 1024, 4,
C_ENCODING
};
+ = {FH_MODE_TEXT, 1024, 4,
(char *) "Auto"
};
return &default_properties;
}
return &default_properties;
}
@@
-333,10
+334,9
@@
fh_get_tab_width (const struct file_handle *handle)
/* Returns the encoding of characters read from HANDLE. */
const char *
/* Returns the encoding of characters read from HANDLE. */
const char *
-fh_get_
legacy_
encoding (const struct file_handle *handle)
+fh_get_encoding (const struct file_handle *handle)
{
{
- assert (handle->referent & (FH_REF_FILE | FH_REF_INLINE));
- return (handle->referent == FH_REF_FILE ? handle->encoding : C_ENCODING);
+ return handle->encoding;
}
/* Returns the dataset handle associated with HANDLE.
}
/* Returns the dataset handle associated with HANDLE.
@@
-352,7
+352,7
@@
fh_get_dataset (const struct file_handle *handle)
struct file_handle *
fh_get_default_handle (void)
{
struct file_handle *
fh_get_default_handle (void)
{
- return default_handle ?
fh_ref (default_handle)
: fh_inline_file ();
+ return default_handle ?
default_handle
: fh_inline_file ();
}
/* Sets NEW_DEFAULT_HANDLE as the default handle. */
}
/* Sets NEW_DEFAULT_HANDLE as the default handle. */
@@
-361,7
+361,7
@@
fh_set_default_handle (struct file_handle *new_default_handle)
{
assert (new_default_handle == NULL
|| (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE)));
{
assert (new_default_handle == NULL
|| (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE)));
- if (default_handle != NULL)
+ if (default_handle != NULL
&& default_handle != inline_file
)
fh_unref (default_handle);
default_handle = new_default_handle;
if (default_handle != NULL)
fh_unref (default_handle);
default_handle = new_default_handle;
if (default_handle != NULL)