* grub-core/osdep/aros/getroot.c: Change to //: prefix as discussed

	with AROS devs.
	* grub-core/osdep/aros/hostdisk.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 001c65a9ceb0a5aeea433abb25710c66509bff56..f64132d44a6a4e70fdc3419fe2944e72b14c47f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/osdep/aros/getroot.c: Change to //: prefix as discussed
+       with AROS devs.
+       * grub-core/osdep/aros/hostdisk.c: Likewise.
+
 2013-10-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Avoid including hostfile.h when not necessarry as it pulls

diff --git a/grub-core/osdep/aros/getroot.c b/grub-core/osdep/aros/getroot.c
index 7d09b7af7989862c34937ea1307642f133154a55..f1d66c1c3d9afc80ddc9e7b3f9c335d123acad42 100644 (file)
--- a/grub-core/osdep/aros/getroot.c
+++ b/grub-core/osdep/aros/getroot.c
@@ -40,35 +40,27 @@ grub_util_part_to_disk (const char *dev,
                        struct stat *st __attribute__ ((unused)),
                        int *is_part)
 {
-  const char *p;
-  char *dname;
+  const char *dname;
   char *ret;
   struct DosList *dl;
   struct DeviceNode *dn;
   struct FileSysStartupMsg *fm;
   struct DosEnvec *envec;
 
-  if (!dev[0])
+  if (dev[0] != '/' || dev[1] != '/' || dev[2] != ':')
     return xstrdup (dev);
 
-  p = dev + strlen (dev) - 1;
-  if (*p != ':')
-    return xstrdup (dev);
-  dname = xmalloc (p - dev + 1);
-  memcpy (dname, dev, p - dev);
-  dname[p - dev] = '\0';
+  dname = dev + 3;
   dl = LockDosList(LDF_READ);
 
   if (!dl)
     {
-      free (dname);
       return xstrdup (dev);
     }
 
   dn = (struct DeviceNode *) FindDosEntry (dl, (unsigned char *) dname,
                                           LDF_DEVICES);
   UnLockDosList (LDF_READ);
-  free (dname);
   if (!dn)
     return xstrdup (dev);
 
@@ -80,7 +72,7 @@ grub_util_part_to_disk (const char *dev,
 
   *is_part = 1;
 
-  ret = xasprintf ("%s/%lx/%lx:", fm->fssm_Device, fm->fssm_Unit, (unsigned long) fm->fssm_Flags);
+  ret = xasprintf ("//:%s/%lx/%lx", fm->fssm_Device, fm->fssm_Unit, (unsigned long) fm->fssm_Flags);
 
   return ret;
 }
@@ -108,32 +100,24 @@ grub_util_get_grub_dev_os (const char *os_dev __attribute__ ((unused)))
 grub_disk_addr_t
 grub_util_find_partition_start_os (const char *dev)
 {
-  const char *p;
-  char *dname;
+  const char *dname;
   struct DosList *dl;
   struct DeviceNode *dn;
   struct FileSysStartupMsg *fm;
   struct DosEnvec *envec;
 
-  if (!dev[0])
+  if (dev[0] != '/' || dev[1] != '/' || dev[2] != ':')
     return 0;
 
-  p = dev + strlen (dev) - 1;
-  if (*p != ':')
-    return 0;
-  dname = xmalloc (p - dev + 1);
-  memcpy (dname, dev, p - dev);
-  dname[p - dev] = '\0';
+  dname = dev + 3;
   dl = LockDosList(LDF_READ);
   if (!dl)
     {
-      free (dname);
       return 0;
     }
   dn = (struct DeviceNode *) FindDosEntry (dl, (unsigned char *) dname,
                                           LDF_DEVICES);
   UnLockDosList (LDF_READ);
-  free (dname);
   if (!dn)
     return 0;
 
@@ -150,9 +134,15 @@ char *
 grub_make_system_path_relative_to_its_root (const char *path)
 {
   char *p;
-  unsigned char *tmp = xmalloc (2048);
+  unsigned char *tmp;
   char *ret;
   BPTR lck;
+
+  if (path[0] == '/' && path[1] == '/' && path[2] == ':')
+    return xstrdup (path);
+
+  tmp = xmalloc (2048);
+
   lck = Lock ((const unsigned char *) path, SHARED_LOCK);
   if (!lck || !NameFromLock (lck, tmp, 2040))
     {
@@ -201,12 +191,15 @@ grub_guess_root_devices (const char *path)
       grub_util_info ("Info(%s) failed", path);
       os_dev = xmalloc (2 * sizeof (os_dev[0]));
       sz = strlen (path);
-      os_dev[0] = xmalloc (sz + 2);
-      memcpy (os_dev[0], path, sz);
-      os_dev[0][sz] = ':';
-      os_dev[0][sz+1] = '\0';
-      p = strchr (os_dev[0], ':');
-      *(p + 1) = '\0';
+      os_dev[0] = xmalloc (sz + 5);
+      os_dev[0][0] = '/';
+      os_dev[0][1] = '/';
+      os_dev[0][2] = ':';
+      memcpy (os_dev[0] + 3, path, sz);
+      os_dev[0][sz + 3] = ':';
+      os_dev[0][sz + 4] = '\0';
+      p = strchr (os_dev[0] + 3, ':');
+      *p = '\0';
       os_dev[1] = NULL;
       return os_dev;
     }
@@ -240,10 +233,12 @@ grub_guess_root_devices (const char *path)
   os_dev = xmalloc (2 * sizeof (os_dev[0]));
   sz = strlen (nm);
   
-  os_dev[0] = xmalloc (sz + 2);
-  memcpy (os_dev[0], nm, sz);
-  os_dev[0][sz] = ':';
-  os_dev[0][sz+1] = '\0';
+  os_dev[0] = xmalloc (sz + 4);
+  os_dev[0][0] = '/';
+  os_dev[0][1] = '/';
+  os_dev[0][2] = ':';
+  memcpy (os_dev[0] + 3, nm, sz);
+  os_dev[0][sz+3] = '\0';
   os_dev[1] = NULL;
 
   UnLockDosList (LDF_READ | LDF_DEVICES);
@@ -254,17 +249,18 @@ grub_guess_root_devices (const char *path)
 int
 grub_util_biosdisk_is_floppy (grub_disk_t disk)
 {
-  const char *dname, *p;
+  const char *dname;
 
   dname = grub_util_biosdisk_get_osdev (disk);
 
-  p = strchr (dname, ':');
-  if (!p || p[1])
+  if (dname[0] != '/' || dname[1] != '/' || dname[2] != ':')
     return 0;
 
+  dname += 3;
+
   if (strncmp (dname, TD_NAME, sizeof (TD_NAME) - 1) == 0
       && (TD_NAME[sizeof (TD_NAME) - 1] == '/'
-         || TD_NAME[sizeof (TD_NAME) - 1] == ':'))
+         || TD_NAME[sizeof (TD_NAME) - 1] == '\0'))
     return 1;
   return 0;
 }

diff --git a/grub-core/osdep/aros/hostdisk.c b/grub-core/osdep/aros/hostdisk.c
index 75fafe8d06361c56bcf7000ea38910cf6e8eac68..4bf4575ffefb47c7bff04aa7a20145271c10ea35 100644 (file)
--- a/grub-core/osdep/aros/hostdisk.c
+++ b/grub-core/osdep/aros/hostdisk.c
@@ -64,10 +64,8 @@ canonicalize_file_name (const char *path)
 {
   char *ret;
   BPTR lck;
-  const char *p;
 
-  p = strchr (path, ':');
-  if (p && !p[1])
+  if (path[0] == '/' && path[1] == '/' && path[2] == ':')
     return xstrdup (path);
 
   ret = xmalloc (2048);
@@ -164,7 +162,8 @@ grub_util_fd_t
 grub_util_fd_open (const char *dev, int flg)
 {
   grub_util_fd_t ret = xmalloc (sizeof (*ret));
-  const char *p, *p1, *p2;
+  const char *p1, *p2;
+  const char *dname;
   char *tmp;
   IPTR unit = 0;
   ULONG flags = 0;
@@ -178,15 +177,7 @@ grub_util_fd_open (const char *dev, int flg)
 
   ret->off = 0;
 
-  if (dev[0] == '\0')
-    {
-      free (ret);
-      return NULL;
-    }
-
-  p = strchr (dev, ':');
-
-  if (!p || p[1])
+  if (dev[0] != '/' || dev[1] != '/' || dev[2] != ':')
     {
       ret->type = GRUB_UTIL_FD_FILE;
       ret->fd = open (dev, flg);
@@ -198,9 +189,9 @@ grub_util_fd_open (const char *dev, int flg)
       return ret;
     }
 
-  p1 = strchr (dev, '/');
+  p1 = strchr (dev + 3, '/');
   if (!p1)
-    p1 = p;
+    p1 = dev + strlen (dev);
   else
     {
       unit = grub_strtoul (p1 + 1, (char **) &p2, 16);
@@ -223,15 +214,18 @@ grub_util_fd_open (const char *dev, int flg)
       return NULL;
     }
 
-  tmp = xmalloc (p1 - dev + 1);
-  memcpy (tmp, dev, p1 - dev);
-  tmp[p1 - dev] = '\0';
+  dname = dev + 3;
   ret->type = GRUB_UTIL_FD_DISK;
 
+  tmp = xmalloc (p1 - dname + 1);
+  memcpy (tmp, dname, p1 - dname);
+  tmp[p1 - dname] = '\0';
+
   ret->is_floppy = (strcmp (tmp, TD_NAME) == 0);
   ret->is_64 = 1;
 
-  if (OpenDevice ((unsigned char *) tmp, unit, (struct IORequest *) ret->ioreq, flags))
+  if (OpenDevice ((unsigned char *) tmp, unit,
+                 (struct IORequest *) ret->ioreq, flags))
     {
       free (tmp);
       free (ret);