X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fcd.c;h=9f7eaa1f02104c722c2516953d667f2f4437f5f7;hb=0fc606c52d7cec253af9b7463b15baabfbc9a33a;hp=220164f0b420069480580ff481c4c467f692b610;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp
diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c
index 220164f0b4..9f7eaa1f02 100644
--- a/src/language/utilities/cd.c
+++ b/src/language/utilities/cd.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+ 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
@@ -15,12 +15,16 @@
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)
@@ -30,12 +34,12 @@ cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED)
{
char *path = 0;
- if ( ! lex_force_string (lexer))
+ if (! lex_force_string (lexer))
goto error;
- path = ss_xstrdup (lex_tokss (lexer));
+ path = utf8_to_filename (lex_tokcstr (lexer));
- if ( -1 == chdir (path) )
+ if (-1 == chdir (path))
{
int err = errno;
msg (SE, _("Cannot change directory to %s: %s "), path,
@@ -44,6 +48,7 @@ cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED)
}
free (path);
+ lex_get (lexer);
return CMD_SUCCESS;