From 16ca69f719d419dcffa65d8e0ef3b8ea65757f15 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sat, 24 Jul 2004 18:58:02 +0000
Subject: [PATCH] 2004-07-24  Yoshinori K. Okuji  <okuji@enbug.org>

	* stage2/stage2.c (cmain): Terminate DEFAULT_FILE with NUL
	correctly. Reported by Alban Crequy <alban.crequy@apinc.org>.
---
 ChangeLog           | 5 +++++
 THANKS              | 1 +
 docs/grub-install.8 | 6 +++++-
 docs/grub.8         | 2 +-
 docs/stamp-vti      | 4 ++--
 docs/version.texi   | 4 ++--
 stage2/stage2.c     | 1 +
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c283c137..d4c3d6a0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/stage2.c (cmain): Terminate DEFAULT_FILE with NUL
+	correctly. Reported by Alban Crequy <alban.crequy@apinc.org>.
+
 2004-07-21  Robert Millan  <robertmh@gnu.org>
 
 	Patch from David Weinehall <tao@debian.org>
diff --git a/THANKS b/THANKS
index c008e0b0c..908cb9121 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ generally assist in the GRUB maintainership process:
 
 Adam Lackorzynski <adam@os.inf.tu-dresden.de>
 Adrian Phillips <a.phillips@dnmi.no>
+Alban Crequy <alban.crequy@apinc.org>
 Alessandro Rubini <rubini@gnu.org>
 Alexander K. Hudek <alexhudek@home.com>
 Alexander Langer <alex@big.endian.de>
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index 88e74a0cc..56411b625 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "June 2004" "grub-install (GNU GRUB 0.95)" FSF
+.TH GRUB-INSTALL "8" "July 2004" "grub-install (GNU GRUB 0.95)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
@@ -32,6 +32,10 @@ BIOS
 probe a device map even if it already exists
 .PP
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
+.PP
+grub-install copies GRUB images into the DIR/boot directory specfied by
+\fB\-\-root\-directory\fR, and uses the grub shell to install grub into the boot
+sector.
 .SH "REPORTING BUGS"
 Report bugs to <bug-grub@gnu.org>.
 .SH "SEE ALSO"
diff --git a/docs/grub.8 b/docs/grub.8
index 152e8002e..fbb71b697 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "June 2004" "grub (GNU GRUB 0.95)" FSF
+.TH GRUB "8" "July 2004" "grub (GNU GRUB 0.95)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/stamp-vti b/docs/stamp-vti
index 43a51afc8..49a3dafa9 100644
--- a/docs/stamp-vti
+++ b/docs/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2004
-@set UPDATED-MONTH June 2004
+@set UPDATED 16 July 2004
+@set UPDATED-MONTH July 2004
 @set EDITION 0.95
 @set VERSION 0.95
diff --git a/docs/version.texi b/docs/version.texi
index 43a51afc8..49a3dafa9 100644
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2004
-@set UPDATED-MONTH June 2004
+@set UPDATED 16 July 2004
+@set UPDATED-MONTH July 2004
 @set EDITION 0.95
 @set VERSION 0.95
diff --git a/stage2/stage2.c b/stage2/stage2.c
index f5982b6ff..96e18cd32 100644
--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -879,6 +879,7 @@ cmain (void)
 		i++;
 		break;
 	      }
+	  default_file[i] = 0;
 	  grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i);
 	  if (grub_open (default_file))
 	    {