From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MI0rU-00012t-Oh for mharc-grub-devel@gnu.org; Sat, 20 Jun 2009 09:44:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MI0rR-00012a-Mc for grub-devel@gnu.org; Sat, 20 Jun 2009 09:44:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MI0rN-0000yX-S4 for grub-devel@gnu.org; Sat, 20 Jun 2009 09:44:01 -0400 Received: from [199.232.76.173] (port=38255 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MI0rN-0000yL-O9 for grub-devel@gnu.org; Sat, 20 Jun 2009 09:43:57 -0400 Received: from aybabtu.com ([69.60.117.155]:53240) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MI0rN-0002j7-Dv for grub-devel@gnu.org; Sat, 20 Jun 2009 09:43:57 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MHzoW-0007lS-8I; Sat, 20 Jun 2009 14:36:56 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MI0rH-0005tg-Aw; Sat, 20 Jun 2009 15:43:51 +0200 Date: Sat, 20 Jun 2009 15:43:51 +0200 From: Robert Millan To: Felix Zielcke Message-ID: <20090620134351.GA22660@thorin> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1) Cc: grub-devel@gnu.org Subject: Re: [2338] 2009-06-17 Felix Zielcke X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2009 13:44:02 -0000 Hi Felix, This commit looks wrong. grub_file_open is already supposed to set grub_errno and grub_errmsg appropiately. Is there a specific problem you wanted to fix here? On Wed, Jun 17, 2009 at 05:19:23PM +0000, Felix Zielcke wrote: > Revision: 2338 > http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2338 > Author: fzielcke > Date: 2009-06-17 17:19:23 +0000 (Wed, 17 Jun 2009) > Log Message: > ----------- > 2009-06-17 Felix Zielcke > > * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the > file can't be found. > * loader/i386/pc/linux.c (grub_cmd_linux): Likewise. > > Modified Paths: > -------------- > trunk/grub2/ChangeLog > trunk/grub2/loader/i386/linux.c > trunk/grub2/loader/i386/pc/linux.c > > Modified: trunk/grub2/ChangeLog > =================================================================== > --- trunk/grub2/ChangeLog 2009-06-17 13:47:37 UTC (rev 2337) > +++ trunk/grub2/ChangeLog 2009-06-17 17:19:23 UTC (rev 2338) > @@ -1,3 +1,9 @@ > +2009-06-17 Felix Zielcke > + > + * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the > + file can't be found. > + * loader/i386/pc/linux.c (grub_cmd_linux): Likewise. > + > 2009-06-17 Vladimir Serbinenko > > Fix newline handling > > Modified: trunk/grub2/loader/i386/linux.c > =================================================================== > --- trunk/grub2/loader/i386/linux.c 2009-06-17 13:47:37 UTC (rev 2337) > +++ trunk/grub2/loader/i386/linux.c 2009-06-17 17:19:23 UTC (rev 2338) > @@ -600,7 +600,10 @@ > > file = grub_file_open (argv[0]); > if (! file) > - goto fail; > + { > + grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found"); > + goto fail; > + } > > if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh)) > { > > Modified: trunk/grub2/loader/i386/pc/linux.c > =================================================================== > --- trunk/grub2/loader/i386/pc/linux.c 2009-06-17 13:47:37 UTC (rev 2337) > +++ trunk/grub2/loader/i386/pc/linux.c 2009-06-17 17:19:23 UTC (rev 2338) > @@ -69,7 +69,10 @@ > > file = grub_file_open (argv[0]); > if (! file) > - goto fail; > + { > + grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found"); > + goto fail; > + } > > if ((grub_size_t) grub_file_size (file) > grub_os_area_size) > { > > > > -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."