Adopt use of gnulib for portability.

[pspp-builds.git] / src / file-type.c

diff --git a/src/file-type.c b/src/file-type.c
index adf81a995c8730bb6ac0d60b479ae592f3937e09..5751fd40a280d81f14108d6154b30166e5438a30 100644 (file)
--- a/src/file-type.c
+++ b/src/file-type.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 <config.h>
 #include <stdlib.h>
@@ -33,6 +33,9 @@
 #include "var.h"
 #include "vfm.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Defines the three types of complex files read by FILE TYPE. */
 enum
   {
@@ -44,7 +47,7 @@ enum
 /* Limited variable column specifications. */
 struct col_spec
   {
-   char name[SHORT_NAME_LEN + 1];      /* Variable name. */
+    char name[LONG_NAME_LEN + 1]; /* Variable name. */
     int fc, nc;                        /* First column (1-based), # of columns. */
     int fmt;                   /* Format type. */
     struct variable *v;                /* Variable. */
@@ -94,6 +97,8 @@ struct file_type_pgm
 static int parse_col_spec (struct col_spec *, const char *);
 static void create_col_var (struct col_spec *c);
 
+int cmd_file_type (void);
+
 /* Parses FILE TYPE command. */
 int
 cmd_file_type (void)
@@ -264,7 +269,7 @@ cmd_file_type (void)
          goto error;
        }
       
-      if (!strcmp (fty->case_sbc.name, fty->record.name))
+      if (!strcasecmp (fty->case_sbc.name, fty->record.name))
        {
          msg (SE, _("CASE and RECORD must specify different variable "
                     "names."));
@@ -448,8 +453,8 @@ cmd_record_type (void)
              if (!lex_force_string ())
                goto error;
              rct->v[rct->nv].c = xmalloc (fty->record.nc + 1);
-             st_bare_pad_copy (rct->v[rct->nv].c, ds_c_str (&tokstr),
-                               fty->record.nc + 1);
+             buf_copy_str_rpad (rct->v[rct->nv].c, fty->record.nc + 1,
+                                 ds_c_str (&tokstr));
            }
          else
            {
@@ -569,6 +574,7 @@ cmd_record_type (void)
 \f
 /* END FILE TYPE. */
 
+int cmd_end_file_type (void);
 int
 cmd_end_file_type (void)
 {