X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fcd.c;h=ec5e7646f4ee1bba3fb610d9aa7f45fc7ba1d43c;hb=40fb94bbe38b3e444df7952631ec5fe83f7f1086;hp=38211e7661f8e6b0ac1978b56e6808150f794fbb;hpb=ecf959e2fc23f05e3634262a08681b03017c5491;p=pspp
diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c
index 38211e7661..ec5e7646f4 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 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,20 +34,21 @@ 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 = ds_xstrdup (lex_tokstr (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,
+ msg (SE, _("Cannot change directory to %s: %s"), path,
strerror (err));
goto error;
}
free (path);
+ lex_get (lexer);
return CMD_SUCCESS;