"search --no-floppy" fix

The search command tries to open floppies (fd?) even if the --no-floppy
argument is provided. This may result in a long waiting time for the
timeout if there is not actually a floppy present (but listed in the list
of devices). This patch fixes that by returning early if it is detected
as a floppy, before it tries to open the device.

Author: Andreas Loibl <andreas@andreas-loibl.de>

diff -Naur grub/grub-core/commands/search.c grub-patched/grub-core/commands/search.c
--- grub/grub-core/commands/search.c	2011-04-11 21:48:31.000000000 +0200
+++ grub/grub-core/commands/search.c	2012-03-09 00:58:20.000000000 +0100
@@ -48,7 +48,7 @@
     /* Skip floppy drives when requested.  */
     if (no_floppy &&
 	name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-      return 0;
+      return -1;
 
 #ifdef DO_SEARCH_FILE
       {
diff -Naur grub/grub-core/kern/device.c grub-patched/grub-core/kern/device.c
--- grub/grub-core/kern/device.c	2010-12-01 15:45:43.000000000 +0100
+++ grub/grub-core/kern/device.c	2012-03-09 00:58:20.000000000 +0100
@@ -93,8 +93,9 @@
     {
       grub_device_t dev;
 
-      if (hook (disk_name))
-	return 1;
+      int skip = hook (disk_name);
+      if (skip != 0)
+	return (skip>0);
 
       dev = grub_device_open (disk_name);
       if (! dev)