projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed error running 'make distcheck'
[pspp]
/
src
/
language
/
utilities
/
cd.c
diff --git
a/src/language/utilities/cd.c
b/src/language/utilities/cd.c
index 38211e7661f8e6b0ac1978b56e6808150f794fbb..9f7eaa1f02104c722c2516953d667f2f4437f5f7 100644
(file)
--- a/
src/language/utilities/cd.c
+++ b/
src/language/utilities/cd.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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 <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <language/command.h>
-#include <libpspp/message.h>
+
+#include "language/command.h"
+
#include <errno.h>
#include <errno.h>
-#include <language/lexer/lexer.h>
#include <unistd.h>
#include <unistd.h>
+#include "language/lexer/lexer.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-30,12
+34,12
@@
cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED)
{
char *path = 0;
{
char *path = 0;
- if (
! lex_force_string (lexer))
+ if (! lex_force_string (lexer))
goto error;
goto error;
- path =
ds_xstrdup (lex_tok
str (lexer));
+ path =
utf8_to_filename (lex_tokc
str (lexer));
- if (
-1 == chdir (path)
)
+ if (
-1 == chdir (path)
)
{
int err = errno;
msg (SE, _("Cannot change directory to %s: %s "), 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);
}
free (path);
+ lex_get (lexer);
return CMD_SUCCESS;
return CMD_SUCCESS;