Ready for testing

[enscript.git] / states / main.c

diff --git a/states/main.c b/states/main.c
index ae2bc9434da32331c67c335affa3a57e34f71251..b0865f4116093c61d1bd8ea07767cb4935f1e39d 100644 (file)
--- a/states/main.c
+++ b/states/main.c
@@ -6,22 +6,20 @@
  */
 
 /*
  */
 
 /*

- * This file is part of GNU enscript.
+ * This file is part of GNU Enscript.

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * Enscript is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.

  *
  *

- * This program is distributed in the hope that it will be useful,
+ * Enscript 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
  * 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; see the file COPYING.  If not, write to
- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * along with Enscript.  If not, see <http://www.gnu.org/licenses/>.

  */
 
 #include "defs.h"
  */
 
 #include "defs.h"


@@ -196,7 +194,7 @@ main (argc, argv)
   argv[0] = program;
 
   /* Format version string. */
   argv[0] = program;
 
   /* Format version string. */

-  sprintf (version, _("states for GNU %s %s"), PACKAGE, VERSION);
+  sprintf (version, _("states for %s"), PACKAGE_STRING);

 
   /* Internationalization. */
 #if HAVE_SETLOCALE
 
   /* Internationalization. */
 #if HAVE_SETLOCALE


@@ -373,7 +371,7 @@ main (argc, argv)
       if (cp)
        {
          path = xmalloc (cp - defs_file + 3);
       if (cp)
        {
          path = xmalloc (cp - defs_file + 3);

-         sprintf (path, ".%c%.*s", PATH_SEPARATOR, cp - defs_file, defs_file);
+         sprintf (path, ".%c%.*s", PATH_SEPARATOR, (int)(cp - defs_file), defs_file);

        }
       else
        path = ".";
        }
       else
        path = ".";


@@ -449,7 +447,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Mandatory arguments to long options are mandatory for short options too.\n"),
           program);
   printf (_("\
 Mandatory arguments to long options are mandatory for short options too.\n"),
           program);
   printf (_("\

-  -D, --define=VAR=VAL       define variable VAR to have value VAR\n\
+  -D, --define=VAR=VAL       define variable VAR to have value VAL\n\

   -f, --file=NAME            read state definitions from file NAME\n\
   -h, --help                 print this help and exit\n\
   -o, --output=NAME          save output to file NAME\n\
   -f, --file=NAME            read state definitions from file NAME\n\
   -h, --help                 print this help and exit\n\
   -o, --output=NAME          save output to file NAME\n\