[Pspp-cvs] pspp doc/utilities.texi po/pspp.pot src/languag...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/07/30 09:43:28

Modified files:
        doc            : utilities.texi 
        po             : pspp.pot 
        src/language   : command.def 
        src/language/utilities: automake.mk 
Added files:
        src/language/utilities: cd.c 

Log message:
        Implemented the CD command.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/utilities.texi?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/command.def?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/automake.mk?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/cd.c?cvsroot=pspp&rev=1.1

Patches:
Index: doc/utilities.texi
===================================================================
RCS file: /sources/pspp/pspp/doc/utilities.texi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- doc/utilities.texi  6 Jun 2007 05:17:48 -0000       1.14
+++ doc/utilities.texi  30 Jul 2007 09:43:27 -0000      1.15
@@ -10,6 +10,7 @@
 
 @menu
 * ADD DOCUMENT::                Add documentary text to the active file.
+* CD::                          Change the current directory.
 * COMMENT::                     Document your syntax file.
 * DOCUMENT::                    Document the active file.
 * DISPLAY DOCUMENTS::           Display active file documents.
@@ -29,7 +30,7 @@
 * TITLE::                       Provide a document title.
 @end menu
 
address@hidden ADD DOCUMENT, COMMENT, Utilities, Utilities
address@hidden ADD DOCUMENT
 @comment  node-name,  next,  previous,  up
 @section ADD DOCUMENT
 @vindex  ADD DOCUMENT
@@ -49,7 +50,17 @@
 Each line of documentary text must be enclosed in quotation marks, and 
 may not be more than 80 bytes long. @xref{DOCUMENT}.
 
address@hidden CD
address@hidden CD
address@hidden CD
address@hidden directory
address@hidden changing directory
 
address@hidden
+CD 'new directory' .
address@hidden display 
+
address@hidden changes the current directory.  The new directory will become 
that specified by the command.
 
 @node COMMENT
 @section COMMENT

Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- po/pspp.pot 29 Jul 2007 07:56:53 -0000      1.141
+++ po/pspp.pot 30 Jul 2007 09:43:28 -0000      1.142
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-28 19:12+0800\n"
+"POT-Creation-Date: 2007-07-30 17:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -304,15 +304,15 @@
 msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
-#: src/data/format.c:318 src/data/por-file-reader.c:492
-#: src/data/sys-file-reader.c:631 src/ui/gui/data-editor.glade:1143
-#: src/ui/gui/psppire.glade:2144 src/ui/gui/psppire-var-store.c:482
+#: src/data/format.c:318 src/data/sys-file-reader.c:631
+#: src/ui/gui/data-editor.glade:1143 src/ui/gui/psppire.glade:2148
+#: src/ui/gui/psppire-var-store.c:482
 msgid "String"
 msgstr ""
 
-#: src/data/format.c:318 src/data/por-file-reader.c:492
-#: src/data/sys-file-reader.c:631 src/ui/gui/data-editor.glade:1039
-#: src/ui/gui/psppire.glade:2217 src/ui/gui/psppire-var-store.c:475
+#: src/data/format.c:318 src/data/sys-file-reader.c:631
+#: src/ui/gui/data-editor.glade:1039 src/ui/gui/psppire.glade:2221
+#: src/ui/gui/psppire-var-store.c:475
 msgid "Numeric"
 msgstr ""
 
@@ -349,149 +349,155 @@
 msgid "%s: Creating file: %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:94
+#: src/data/por-file-reader.c:95
 #, c-format
-msgid "portable file %s corrupt at offset %ld: "
+msgid "portable file %s corrupt at offset 0x%lx: "
 msgstr ""
 
-#: src/data/por-file-reader.c:130
+#: src/data/por-file-reader.c:124
+#, c-format
+msgid "reading portable file %s at offset 0x%lx: "
+msgstr ""
+
+#: src/data/por-file-reader.c:174
 msgid "unexpected end of file"
 msgstr ""
 
-#: src/data/por-file-reader.c:189
+#: src/data/por-file-reader.c:235
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for reading as a portable file: %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:206
+#: src/data/por-file-reader.c:256
 msgid "Data record expected."
 msgstr ""
 
-#: src/data/por-file-reader.c:288
+#: src/data/por-file-reader.c:338
 msgid "Number expected."
 msgstr ""
 
-#: src/data/por-file-reader.c:316
+#: src/data/por-file-reader.c:366
 msgid "Missing numeric terminator."
 msgstr ""
 
-#: src/data/por-file-reader.c:339
+#: src/data/por-file-reader.c:389
 msgid "Invalid integer."
 msgstr ""
 
-#: src/data/por-file-reader.c:350
+#: src/data/por-file-reader.c:400
 #, c-format
 msgid "Bad string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:411
+#: src/data/por-file-reader.c:461
 #, c-format
 msgid "%s: Not a portable file."
 msgstr ""
 
-#: src/data/por-file-reader.c:427
+#: src/data/por-file-reader.c:477
 #, c-format
 msgid "Unrecognized version code `%c'."
 msgstr ""
 
-#: src/data/por-file-reader.c:436
+#: src/data/por-file-reader.c:486
 #, c-format
 msgid "Bad date string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:438
+#: src/data/por-file-reader.c:488
 #, c-format
 msgid "Bad time string length %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:478
+#: src/data/por-file-reader.c:530
+#, c-format
+msgid ""
+"%s: Bad format specifier byte (%d).  Variable will be assigned a default "
+"format."
+msgstr ""
+
+#: src/data/por-file-reader.c:551
 #, c-format
-msgid "%s: Bad format specifier byte (%d)."
+msgid "Numeric variable %s has invalid format specifier %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:491
+#: src/data/por-file-reader.c:555
 #, c-format
-msgid "%s variable %s has invalid format specifier %s."
+msgid "String variable %s with width %d has invalid format specifier %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:510
+#: src/data/por-file-reader.c:579
 msgid "Expected variable count record."
 msgstr ""
 
-#: src/data/por-file-reader.c:514
+#: src/data/por-file-reader.c:583
 #, c-format
 msgid "Invalid number of variables %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:524
+#: src/data/por-file-reader.c:593
 #, c-format
 msgid "Weight variable name (%s) truncated."
 msgstr ""
 
-#: src/data/por-file-reader.c:538
+#: src/data/por-file-reader.c:608
 msgid "Expected variable record."
 msgstr ""
 
-#: src/data/por-file-reader.c:542
+#: src/data/por-file-reader.c:612
 #, c-format
 msgid "Invalid variable width %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:550
+#: src/data/por-file-reader.c:620
 #, c-format
-msgid "position %d: Invalid variable name `%s'."
+msgid "Invalid variable name `%s' in position %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:554
+#: src/data/por-file-reader.c:624
 #, c-format
 msgid "Bad width %d for variable %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:558 src/language/expressions/evaluate.c:167
+#: src/data/por-file-reader.c:639
 #, c-format
-msgid "Duplicate variable name %s."
+msgid "Duplicate variable name %s in position %d."
 msgstr ""
 
-#: src/data/por-file-reader.c:599
+#: src/data/por-file-reader.c:640
 #, c-format
-msgid "Weighting variable %s not present in dictionary."
+msgid "Duplicate variable name %s in position %d renamed to %s."
 msgstr ""
 
-#: src/data/por-file-reader.c:646
+#: src/data/por-file-reader.c:683
 #, c-format
-msgid "Unknown variable %s while parsing value labels."
-msgstr ""
-
-#: src/data/por-file-reader.c:649
-#, c-format
-msgid ""
-"Cannot assign value labels to %s and %s, which have different variable types "
-"or widths."
+msgid "Weighting variable %s not present in dictionary."
 msgstr ""
 
-#: src/data/por-file-reader.c:673
+#: src/data/por-file-reader.c:730
 #, c-format
-msgid "Duplicate label for value %g for variable %s."
+msgid "Unknown variable %s while parsing value labels."
 msgstr ""
 
-#: src/data/por-file-reader.c:676
+#: src/data/por-file-reader.c:733
 #, c-format
-msgid "Duplicate label for value `%.*s' for variable %s."
+msgid ""
+"Cannot assign value labels to %s and %s, which have different variable types."
 msgstr ""
 
-#: src/data/por-file-writer.c:152
+#: src/data/por-file-writer.c:154
 #, c-format
 msgid "Invalid decimal digits count %d.  Treating as %d."
 msgstr ""
 
-#: src/data/por-file-writer.c:172
+#: src/data/por-file-writer.c:176
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for writing as a portable file: %s."
 msgstr ""
 
-#: src/data/por-file-writer.c:476
+#: src/data/por-file-writer.c:498
 #, c-format
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
@@ -1592,7 +1598,7 @@
 
 #: src/language/dictionary/split-file.c:85
 #: src/language/dictionary/sys-file-info.c:395
-#: src/language/dictionary/sys-file-info.c:543 src/ui/gui/psppire.glade:2108
+#: src/language/dictionary/sys-file-info.c:543 src/ui/gui/psppire.glade:2112
 #: src/ui/gui/var-sheet.c:68
 msgid "Label"
 msgstr ""
@@ -1601,7 +1607,7 @@
 msgid "File:"
 msgstr ""
 
-#: src/language/dictionary/sys-file-info.c:110 src/ui/gui/psppire.glade:2049
+#: src/language/dictionary/sys-file-info.c:110 src/ui/gui/psppire.glade:2053
 msgid "Label:"
 msgstr ""
 
@@ -1841,6 +1847,11 @@
 msgid "expecting number or string"
 msgstr ""
 
+#: src/language/expressions/evaluate.c:167
+#, c-format
+msgid "Duplicate variable name %s."
+msgstr ""
+
 #: src/language/expressions/helpers.c:35
 msgid ""
 "One of the arguments to a DATE function is not an integer.  The result will "
@@ -2511,7 +2522,7 @@
 msgid "Directional measures."
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1206 src/ui/gui/psppire.glade:2232
+#: src/language/stats/crosstabs.q:1206 src/ui/gui/psppire.glade:2236
 #: src/ui/gui/var-sheet.c:65
 msgid "Type"
 msgstr ""
@@ -4669,11 +4680,11 @@
 msgid "_Discrete missing values"
 msgstr ""
 
-#: src/ui/gui/helper.c:134
+#: src/ui/gui/helper.c:135
 msgid "Sorry. The help system hasn't yet been implemented."
 msgstr ""
 
-#: src/ui/gui/helper.c:157
+#: src/ui/gui/helper.c:158
 #, c-format
 msgid "Cannot open reference manual: %s"
 msgstr ""
@@ -4875,71 +4886,71 @@
 msgid "Functions:"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1120 src/ui/gui/psppire.glade:1517
+#: src/ui/gui/psppire.glade:1120 src/ui/gui/psppire.glade:1520
 msgid "If..."
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1349
+#: src/ui/gui/psppire.glade:1350
 msgid "Use filter variable"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1401
+#: src/ui/gui/psppire.glade:1403
 msgid "Based on time or case range"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1414
+#: src/ui/gui/psppire.glade:1416
 msgid "Range..."
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1452
+#: src/ui/gui/psppire.glade:1454
 msgid "Random sample of cases"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1465
+#: src/ui/gui/psppire.glade:1468
 msgid "Sample..."
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1503
+#: src/ui/gui/psppire.glade:1506
 msgid "If condition is satisfied"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1551
+#: src/ui/gui/psppire.glade:1554
 msgid "All Cases"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1566
+#: src/ui/gui/psppire.glade:1569
 msgid "Select"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1595
+#: src/ui/gui/psppire.glade:1599
 msgid "Filtered"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1605
+#: src/ui/gui/psppire.glade:1609
 msgid "Deleted"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1622
+#: src/ui/gui/psppire.glade:1626
 msgid "Unselected Cases Are"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1687
+#: src/ui/gui/psppire.glade:1691
 msgid "Comments:"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1729
+#: src/ui/gui/psppire.glade:1733
 msgid "Display comments in output"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1743
+#: src/ui/gui/psppire.glade:1747
 msgid "Column Number: 0"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1819
+#: src/ui/gui/psppire.glade:1823
 msgid "Variable Information:"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1845
+#: src/ui/gui/psppire.glade:1849
 msgid ""
 "\n"
 "\n"
@@ -4953,31 +4964,31 @@
 "\n"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1939
+#: src/ui/gui/psppire.glade:1943
 msgid "First case"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1952
+#: src/ui/gui/psppire.glade:1956
 msgid "Last case"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:1965
+#: src/ui/gui/psppire.glade:1969
 msgid "Observation"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2030
+#: src/ui/gui/psppire.glade:2034
 msgid "Use expression as label"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2155 src/ui/gui/var-sheet.c:66
+#: src/ui/gui/psppire.glade:2159 src/ui/gui/var-sheet.c:66
 msgid "Width"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2283
+#: src/ui/gui/psppire.glade:2287
 msgid "Goto Case Number:"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2418
+#: src/ui/gui/psppire.glade:2423
 msgid "Sample Size"
 msgstr ""
 
@@ -4999,16 +5010,6 @@
 msgid "%d"
 msgstr ""
 
-#: src/ui/gui/select-cases-dialog.c:67
-#, c-format
-msgid "Approximately %3d%% of all cases."
-msgstr ""
-
-#: src/ui/gui/select-cases-dialog.c:68
-#, c-format
-msgid "Exactly %3d cases from the first %3d cases."
-msgstr ""
-
 #: src/ui/gui/syntax-editor.c:77
 #, c-format
 msgid "Save contents of syntax editor to %s?"

Index: src/language/command.def
===================================================================
RCS file: /sources/pspp/pspp/src/language/command.def,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/language/command.def    7 Jul 2007 06:14:11 -0000       1.18
+++ src/language/command.def    30 Jul 2007 09:43:28 -0000      1.19
@@ -17,6 +17,7 @@
 /* Utility commands acceptable anywhere. */
 DEF_CMD (S_ANY, F_ENHANCED, "CLOSE FILE HANDLE", cmd_close_file_handle)
 DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "COMMENT", cmd_comment)
+DEF_CMD (S_ANY, 0, "CD", cmd_cd)
 DEF_CMD (S_ANY, 0, "ECHO", cmd_echo)
 DEF_CMD (S_ANY, 0, "ERASE", cmd_erase)
 DEF_CMD (S_ANY, 0, "EXIT", cmd_finish)
@@ -145,7 +146,6 @@
 UNIMPL_CMD ("CATPCA", "Categorical principle components analysis")
 UNIMPL_CMD ("CATREG", "Categorical regression")
 UNIMPL_CMD ("CCF", "Time series cross correlation")
-UNIMPL_CMD ("CD", "Change working directory")
 UNIMPL_CMD ("CLEAR TRANSFORMATIONS", "Clears transformations from active file")
 UNIMPL_CMD ("CLUSTER", "Hierachial clustering")
 UNIMPL_CMD ("CONJOINT", "Analyse full concept data")

Index: src/language/utilities/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/language/utilities/automake.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/utilities/automake.mk  14 Dec 2006 10:45:20 -0000      1.4
+++ src/language/utilities/automake.mk  30 Jul 2007 09:43:28 -0000      1.5
@@ -4,6 +4,7 @@
 src_language_utilities_built_sources = \
        src/language/utilities/set.c
 language_utilities_sources = \
+       src/language/utilities/cd.c \
        src/language/utilities/date.c \
        src/language/utilities/echo.c \
        src/language/utilities/title.c \

Index: src/language/utilities/cd.c
===================================================================
RCS file: src/language/utilities/cd.c
diff -N src/language/utilities/cd.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/language/utilities/cd.c 30 Jul 2007 09:43:28 -0000      1.1
@@ -0,0 +1,58 @@
+/* PSPP - computes sample statistics.
+   Copyright (C) 2007 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 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. */
+
+#include <config.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <errno.h>
+#include <language/lexer/lexer.h>
+#include <unistd.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+/* Parses the CD command. */
+int
+cmd_cd (struct lexer *lexer, struct dataset *ds UNUSED)
+{
+  char  *path = 0;
+
+  if ( ! lex_force_string (lexer))
+    goto error;
+
+  path = ds_xstrdup (lex_tokstr (lexer));
+
+  if ( -1 == chdir (path) )
+    {
+      int err = errno;
+      msg (SE, _("Cannot change directory to %s:  %s "), path,
+          strerror (errno));
+      goto error;
+    }
+
+  free (path);
+
+  return CMD_SUCCESS;
+
+ error:
+
+  free(path);
+
+  return CMD_FAILURE;
+}
+