[1880] 2008-09-28 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1880
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1880
Author:   robertmh
Date:     2008-09-28 15:22:28 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
2008-09-28  Robert Millan  <address@hidden>

        * fs/iso9660.c (struct grub_iso9660_primary_voldesc): Rename `created'
        to `modified'.  Add the real `created' field.
        (grub_iso9660_uuid): Use `modified' rather than `created' for
        constructing the UUID.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/fs/iso9660.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-09-28 14:19:00 UTC (rev 1879)
+++ trunk/grub2/ChangeLog       2008-09-28 15:22:28 UTC (rev 1880)
@@ -1,5 +1,12 @@
-008-09-28  Felix Zielcke  <address@hidden>
+2008-09-28  Robert Millan  <address@hidden>
 
+       * fs/iso9660.c (struct grub_iso9660_primary_voldesc): Rename `created'
+       to `modified'.  Add the real `created' field.
+       (grub_iso9660_uuid): Use `modified' rather than `created' for
+       constructing the UUID.
+
+2008-09-28  Felix Zielcke  <address@hidden>
+
        fs/jfs.c (grub_jfs_find_file): Treat multiple slashes like one.
        Based on code from Tomas Ebenlendr <address@hidden>.
 

Modified: trunk/grub2/fs/iso9660.c
===================================================================
--- trunk/grub2/fs/iso9660.c    2008-09-28 14:19:00 UTC (rev 1879)
+++ trunk/grub2/fs/iso9660.c    2008-09-28 15:22:28 UTC (rev 1880)
@@ -93,8 +93,9 @@
   grub_uint32_t path_table;
   grub_uint8_t unused5[12];
   struct grub_iso9660_dir rootdir;
-  grub_uint8_t unused6[641];
+  grub_uint8_t unused6[624];
   struct grub_iso9660_date created;
+  struct grub_iso9660_date modified;
 } __attribute__ ((packed));
 
 /* A single entry in the path table.  */
@@ -840,14 +841,14 @@
   data = grub_iso9660_mount (disk);
   if (data)
     {
-      if (! data->voldesc.created.year[0] && ! data->voldesc.created.year[1]
-         && ! data->voldesc.created.year[2] && ! data->voldesc.created.year[3]
-         && ! data->voldesc.created.month[0] && ! 
data->voldesc.created.month[1]
-         && ! data->voldesc.created.day[0] && ! data->voldesc.created.day[1]
-         && ! data->voldesc.created.hour[0] && ! data->voldesc.created.hour[1]
-         && ! data->voldesc.created.minute[0] && ! 
data->voldesc.created.minute[1]
-         && ! data->voldesc.created.second[0] && ! 
data->voldesc.created.second[1]
-         && ! data->voldesc.created.hundredth[0] && ! 
data->voldesc.created.hundredth[1])
+      if (! data->voldesc.modified.year[0] && ! data->voldesc.modified.year[1]
+         && ! data->voldesc.modified.year[2] && ! 
data->voldesc.modified.year[3]
+         && ! data->voldesc.modified.month[0] && ! 
data->voldesc.modified.month[1]
+         && ! data->voldesc.modified.day[0] && ! data->voldesc.modified.day[1]
+         && ! data->voldesc.modified.hour[0] && ! 
data->voldesc.modified.hour[1]
+         && ! data->voldesc.modified.minute[0] && ! 
data->voldesc.modified.minute[1]
+         && ! data->voldesc.modified.second[0] && ! 
data->voldesc.modified.second[1]
+         && ! data->voldesc.modified.hundredth[0] && ! 
data->voldesc.modified.hundredth[1])
        {
          grub_error (GRUB_ERR_BAD_NUMBER, "No creation date in filesystem to 
generate UUID.");
          *uuid = NULL;
@@ -856,14 +857,14 @@
        {
          *uuid = grub_malloc (sizeof ("YYYY-MM-DD-HH-mm-ss-hh"));
          grub_sprintf (*uuid, "%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
-                       data->voldesc.created.year[0], 
data->voldesc.created.year[1], 
-                       data->voldesc.created.year[2], 
data->voldesc.created.year[3],
-                       data->voldesc.created.month[0], 
data->voldesc.created.month[1],
-                       data->voldesc.created.day[0], 
data->voldesc.created.day[1],
-                       data->voldesc.created.hour[0], 
data->voldesc.created.hour[1],
-                       data->voldesc.created.minute[0], 
data->voldesc.created.minute[1],
-                       data->voldesc.created.second[0], 
data->voldesc.created.second[1],
-                       data->voldesc.created.hundredth[0], 
data->voldesc.created.hundredth[1]);
+                       data->voldesc.modified.year[0], 
data->voldesc.modified.year[1], 
+                       data->voldesc.modified.year[2], 
data->voldesc.modified.year[3],
+                       data->voldesc.modified.month[0], 
data->voldesc.modified.month[1],
+                       data->voldesc.modified.day[0], 
data->voldesc.modified.day[1],
+                       data->voldesc.modified.hour[0], 
data->voldesc.modified.hour[1],
+                       data->voldesc.modified.minute[0], 
data->voldesc.modified.minute[1],
+                       data->voldesc.modified.second[0], 
data->voldesc.modified.second[1],
+                       data->voldesc.modified.hundredth[0], 
data->voldesc.modified.hundredth[1]);
        }
     }
   else