[2143] 2009-04-26 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2143
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2143
Author:   phcoder
Date:     2009-04-26 15:09:30 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
2009-04-26  Vladimir Serbinenko  <address@hidden>

        Bug and warning fixes

        * include/grub/i386/pc/init.h (grub_stop_floppy): added missing 
        declaration
        * commands/test.c (test_parse): fixed bug with file tests and corrected
        declaration of find_file

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/commands/test.c
    trunk/grub2/include/grub/i386/pc/init.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-04-26 14:14:05 UTC (rev 2142)
+++ trunk/grub2/ChangeLog       2009-04-26 15:09:30 UTC (rev 2143)
@@ -1,3 +1,12 @@
+2009-04-26  Vladimir Serbinenko  <address@hidden>
+
+       Bug and warning fixes
+
+       * include/grub/i386/pc/init.h (grub_stop_floppy): added missing 
+       declaration
+       * commands/test.c (test_parse): fixed bug with file tests and corrected
+       declaration of find_file
+
 2009-04-26  Pavel Roskin  <address@hidden>
 
        * Makefile.in: Don't install empty manual pages if help2man is

Modified: trunk/grub2/commands/test.c
===================================================================
--- trunk/grub2/commands/test.c 2009-04-26 14:14:05 UTC (rev 2142)
+++ trunk/grub2/commands/test.c 2009-04-26 15:09:30 UTC (rev 2143)
@@ -55,22 +55,23 @@
   }
 
   /* Check if file exists and fetch its information. */
-  void get_fileinfo (char *pathname)
+  void get_fileinfo (char *path)
   {
-    char *filename, *path;
+    char *filename, *pathname;
     char *device_name;
     grub_fs_t fs;
     grub_device_t dev;
 
     /* A hook for iterating directories. */
     auto int find_file (const char *cur_filename, 
-                       struct grub_dirhook_info info);
-    int find_file (const char *cur_filename, struct grub_dirhook_info info)
+                       const struct grub_dirhook_info *info);
+    int find_file (const char *cur_filename, 
+                  const struct grub_dirhook_info *info)
     {
-      if ((info.case_insensitive ? grub_strcasecmp (cur_filename, filename)
+      if ((info->case_insensitive ? grub_strcasecmp (cur_filename, filename)
           : grub_strcmp (cur_filename, filename)) == 0)
        {
-         file_info = info;
+         file_info = *info;
          file_exists = 1;
          return 1;
        }
@@ -78,7 +79,7 @@
     }
     
     file_exists = 0;
-    device_name = grub_file_get_device_name (pathname);
+    device_name = grub_file_get_device_name (path);
     dev = grub_device_open (device_name);
     if (! dev)
       {
@@ -87,11 +88,11 @@
       }
 
     fs = grub_fs_probe (dev);
-    path = grub_strchr (pathname, ')');
-    if (! path)
-      path = pathname;
+    pathname = grub_strchr (path, ')');
+    if (! pathname)
+      pathname = path;
     else
-      path++;
+      pathname++;
     
     /* Remove trailing '/'. */
     while (*pathname && pathname[grub_strlen (pathname) - 1] == '/')

Modified: trunk/grub2/include/grub/i386/pc/init.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/init.h     2009-04-26 14:14:05 UTC (rev 
2142)
+++ trunk/grub2/include/grub/i386/pc/init.h     2009-04-26 15:09:30 UTC (rev 
2143)
@@ -46,5 +46,6 @@
  * use APM even if it is available.  */
 void EXPORT_FUNC (grub_halt) (int no_apm);
 
+void EXPORT_FUNC(grub_stop_floppy) (void);
 
 #endif /* ! GRUB_INIT_MACHINE_HEADER */