projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Disallow system and scratch long variable names too.
[pspp]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index ddc685431b470c335694f98378d97754817ed056..8a747b7a57fc32fbd73465e70548aa48c1df9d47 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-2000, 2006-2007, 2009-201
5
Free Software Foundation, Inc.
+ Copyright (C) 1997-2000, 2006-2007, 2009-201
6
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
@@
-408,7
+408,7
@@
sfm_open (struct file_handle *fh)
if (r->lock == NULL)
goto error;
if (r->lock == NULL)
goto error;
- r->file = fn_open (fh
_get_file_name (fh)
, "rb");
+ r->file = fn_open (fh, "rb");
if (r->file == NULL)
{
msg (ME, _("Error opening `%s' for reading as a system file: %s."),
if (r->file == NULL)
{
msg (ME, _("Error opening `%s' for reading as a system file: %s."),
@@
-894,7
+894,7
@@
sfm_close (struct any_reader *r_)
if (r->file)
{
if (r->file)
{
- if (fn_close (
fh_get_file_name (r->fh)
, r->file) == EOF)
+ if (fn_close (
r->fh
, r->file) == EOF)
{
msg (ME, _("Error closing system file `%s': %s."),
fh_get_file_name (r->fh), strerror (errno));
{
msg (ME, _("Error closing system file `%s': %s."),
fh_get_file_name (r->fh), strerror (errno));
@@
-2046,7
+2046,8
@@
parse_long_var_name_map (struct sfm_reader *r,
while (read_variable_to_value_pair (r, dict, text, &var, &long_name))
{
/* Validate long name. */
while (read_variable_to_value_pair (r, dict, text, &var, &long_name))
{
/* Validate long name. */
- if (!dict_id_is_valid (dict, long_name, false))
+ if (!dict_id_is_valid (dict, long_name, false)
+ || long_name[0] == '$' || long_name[0] == '#')
{
sys_warn (r, record->pos,
_("Long variable mapping from %s to invalid "
{
sys_warn (r, record->pos,
_("Long variable mapping from %s to invalid "