X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=1bcd047763f25cdba3d6f6509216b0ec0adc5ffa;hb=f9d0b49f59af300be5600141a0096b26c96abce9;hp=cfbe04396191e5b1f7098f0b7df40ce6fac29edf;hpb=691c25e36fd1ee722dd35419d6110e3876b99f9c;p=pspp-builds.git diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index cfbe0439..1bcd0477 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 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 @@ -200,7 +200,7 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, trns->encoding = dfm_writer_get_legacy_encoding (trns->writer); } else - trns->encoding = LEGACY_NATIVE; + trns->encoding = UTF8; /* Output the variable table if requested. */ if (print_table) @@ -280,7 +280,7 @@ parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record, spec->type = PRT_LITERAL; spec->record = record; spec->first_column = *column; - ds_init_string (&spec->string, lex_tokstr (lexer)); + ds_init_substring (&spec->string, lex_tokss (lexer)); ds_register_pool (&spec->string, trns->pool); lex_get (lexer);