Update to bash-4.1

1 files changed, 31 insertions, 20 deletions

diff --git a/version.c b/version.c
index f373372..b97fa06 100644
--- a/version.c
+++ b/version.c
@@ -1,22 +1,22 @@
 /* version.c -- distribution and version numbers. */
 
-/* Copyright (C) 1989-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2009 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash 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, or (at your option) any later
-   version.
+   Bash 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 3 of the License, or
+   (at your option) any later version.
 
-   Bash 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.
+   Bash 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 Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include <config.h>
 
@@ -33,15 +33,21 @@
 extern char *shell_name;
 
 /* Defines from version.h */
-const char *dist_version = DISTVERSION;
-int patch_level = PATCHLEVEL;
-int build_version = BUILDVERSION;
+const char * const dist_version = DISTVERSION;
+const int patch_level = PATCHLEVEL;
+const int build_version = BUILDVERSION;
 #ifdef RELSTATUS
-const char *release_status = RELSTATUS;
+const char * const release_status = RELSTATUS;
 #else
-const char *release_status = (char *)0;
+const char * const release_status = (char *)0;
 #endif
-const char *sccs_version = SCCSVERSION;
+const char * const sccs_version = SCCSVERSION;
+
+const char * const bash_copyright = N_("Copyright (C) 2009 Free Software Foundation, Inc.");
+const char * const bash_license = N_("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
+
+/* If == 31, shell compatible with bash-3.1, == 32 with bash-3.2, and so on */
+int shell_compatibility_level = DEFAULT_COMPAT_LEVEL;
 
 /* Functions for getting, setting, and displaying the shell version. */
 
@@ -77,7 +83,12 @@ void
 show_shell_version (extended)
      int extended;
 {
-  printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
+  printf (_("GNU bash, version %s (%s)\n"), shell_version_string (), MACHTYPE);
   if (extended)
-    printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
+    {
+      printf ("%s\n", _(bash_copyright));
+      printf ("%s\n", _(bash_license));
+      printf (_("This is free software; you are free to change and redistribute it.\n"));
+      printf (_("There is NO WARRANTY, to the extent permitted by law.\n"));
+    }
 }