X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Futilities%2Fcd.c;h=d28c0a30aa126d4a6b894e2e511a0d3607f21f47;hb=35717813005e999b6b807fc3f4bd6bb2d770f301;hp=c58492f6b84c0d9a091dfe1a5ea18e68d90f6e30;hpb=577c6ac9b93c494efdabc324365ec70a43f6d742;p=pspp
diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c
index c58492f6b8..d28c0a30aa 100644
--- a/src/language/utilities/cd.c
+++ b/src/language/utilities/cd.c
@@ -1,28 +1,30 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2008, 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
-#include
-#include
+
+#include "language/command.h"
+
#include
-#include
#include
+#include "language/lexer/lexer.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -35,17 +37,18 @@ cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED)
if ( ! lex_force_string (lexer))
goto error;
- path = ds_xstrdup (lex_tokstr (lexer));
+ path = utf8_to_filename (lex_tokcstr (lexer));
if ( -1 == chdir (path) )
{
int err = errno;
msg (SE, _("Cannot change directory to %s: %s "), path,
- strerror (errno));
+ strerror (err));
goto error;
}
free (path);
+ lex_get (lexer);
return CMD_SUCCESS;