Adopt use of gnulib for portability.

[pspp-builds.git] / src / cmdline.c

diff --git a/src/cmdline.c b/src/cmdline.c
index 56ce1d94e67ecd53697adec48a3853847ce70226..50214db2717daeac333e2707509c6ea7769bae56 100644 (file)
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -14,8 +14,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "cmdline.h"
@@ -28,26 +28,31 @@
 #include "alloc.h"
 #include "error.h"
 #include "filename.h"
-#include "getline.h"
+#include "getl.h"
 #include "main.h"
 #include "output.h"
 #include "settings.h"
 #include "str.h"
 #include "var.h"
 #include "version.h"
+#include "copyleft.h"
+#include "glob.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
 void welcome (void);
 static void usage (void);
 
 char *subst_vars (char *);
 
-static int testing_mode=0;
-
 /* Parses the command line specified by ARGC and ARGV as received by
    main(). */
 void
 parse_command_line (int argc, char **argv)
 {
+  static int testing_mode = 0;
   static struct option long_options[] =
   {
     {"algorithm", required_argument, NULL, 'a'},
@@ -77,7 +82,6 @@ parse_command_line (int argc, char **argv)
   int c, i;
 
   int cleared_device_defaults = 0;
-
   int no_statrc = 0;
 
   for (;;)
@@ -138,7 +142,7 @@ parse_command_line (int argc, char **argv)
          config_path = optarg;
          break;
        case 'f':
-         printf(_("%s is not yet implemented."), "-f");
+         printf (_("%s is not yet implemented."), "-f");
           putchar('\n');
          break;
        case 'h':
@@ -183,13 +187,7 @@ parse_command_line (int argc, char **argv)
          break;
        case 'V':
          puts (version);
-         puts (_("\nCopyright (C) 1997-9, 2000 Free Software Foundation, "
-                 "Inc.\n"
-                 "This is free software; see the source for copying "
-                 "conditions.  There is NO\n"
-                 "WARRANTY; not even for MERCHANTABILITY or FITNESS "
-                 "FOR A PARTICULAR PURPOSE.\n\n"
-                 "Written by Ben Pfaff <blp@gnu.org>."));
+         puts (legal);
          err_hcf (1);
        case '?':
          usage ();
@@ -206,6 +204,7 @@ parse_command_line (int argc, char **argv)
     {
       /* FIXME: Later this option should do some other things, too. */
       force_long_view();
+      test_mode = 1;
     }