X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frepeat.c;h=5ca7dd9b2dcfdeee33675abd90b2526e26babfb2;hb=2e02472cf15ddb64c33a1477cf4cfbf3be2d0c95;hp=3b57b66a7398db1b391e5cadc38eb8daa1e76faf;hpb=b321086267ad1014dc5d09886396cde30f094437;p=pspp diff --git a/src/repeat.c b/src/repeat.c index 3b57b66a73..5ca7dd9b2d 100644 --- a/src/repeat.c +++ b/src/repeat.c @@ -14,8 +14,8 @@ 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include #include "repeat.h" @@ -40,7 +40,7 @@ struct repeat_entry { int type; /* 1=variable names, 0=any other. */ - char id[9]; /* Macro identifier. */ + char id[LONG_NAME_LEN + 1]; /* Macro identifier. */ char **replacement; /* Macro replacement. */ struct repeat_entry *next; }; @@ -125,7 +125,7 @@ static int internal_cmd_do_repeat (void) { /* Name of first DO REPEAT macro. */ - char first_name[9]; + char first_name[LONG_NAME_LEN + 1]; /* Current filename. */ const char *current_filename = NULL; @@ -146,7 +146,7 @@ internal_cmd_do_repeat (void) if (!lex_force_id ()) return 0; for (iter = repeat_tab; iter; iter = iter->next) - if (!strcmp (iter->id, tokid)) + if (!strcasecmp (iter->id, tokid)) { msg (SE, _("Identifier %s is given twice."), tokid); return 0; @@ -169,7 +169,7 @@ internal_cmd_do_repeat (void) if (token == T_ID) result = parse_ids (e); - else if (token == T_NUM) + else if (lex_is_number ()) result = parse_numbers (e); else if (token == T_STRING) result = parse_strings (e); @@ -553,12 +553,12 @@ perform_DO_REPEAT_substitutions (void) /* Collect an identifier. */ { - char name[9]; + char name[LONG_NAME_LEN + 1]; char *start = cp; char *np = name; char *substitution; - while (CHAR_IS_IDN (*cp) && np < &name[8]) + while (CHAR_IS_IDN (*cp) && np < &name[LONG_NAME_LEN]) *np++ = *cp++; while (CHAR_IS_IDN (*cp)) cp++;