[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1853] 2008-08-31 Felix Zielcke <address@hidden>
From: |
Felix Zielcke |
Subject: |
[1853] 2008-08-31 Felix Zielcke <address@hidden> |
Date: |
Sat, 06 Sep 2008 11:16:54 +0000 |
Revision: 1853
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1853
Author: fzielcke
Date: 2008-09-06 11:16:52 +0000 (Sat, 06 Sep 2008)
Log Message:
-----------
2008-08-31 Felix Zielcke <address@hidden>
* fs/iso9660.c (grub_iso9660_date): New structure.
(grub_iso9660_primary_voldesc): Add `grub_iso9660_date' member.
(grub_iso9660_uuid): New function.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/fs/iso9660.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-09-05 15:48:37 UTC (rev 1852)
+++ trunk/grub2/ChangeLog 2008-09-06 11:16:52 UTC (rev 1853)
@@ -1,3 +1,9 @@
+2008-08-31 Felix Zielcke <address@hidden>
+
+ * fs/iso9660.c (grub_iso9660_date): New structure.
+ (grub_iso9660_primary_voldesc): Add `grub_iso9660_date' member.
+ (grub_iso9660_uuid): New function.
+
2008-09-05 Bean <address@hidden>
* fs/fshelp.c (grub_fshelp_find_file): Handle case insensitive names.
Modified: trunk/grub2/fs/iso9660.c
===================================================================
--- trunk/grub2/fs/iso9660.c 2008-09-05 15:48:37 UTC (rev 1852)
+++ trunk/grub2/fs/iso9660.c 2008-09-06 11:16:52 UTC (rev 1853)
@@ -67,6 +67,18 @@
grub_uint8_t namelen;
} __attribute__ ((packed));
+struct grub_iso9660_date
+{
+ grub_uint8_t year[4];
+ grub_uint8_t month[2];
+ grub_uint8_t day[2];
+ grub_uint8_t hour[2];
+ grub_uint8_t minute[2];
+ grub_uint8_t second[2];
+ grub_uint8_t hundredth[2];
+ grub_uint8_t offset;
+} __attribute__ ((packed));
+
/* The primary volume descriptor. Only little endian is used. */
struct grub_iso9660_primary_voldesc
{
@@ -81,6 +93,8 @@
grub_uint32_t path_table;
grub_uint8_t unused5[12];
struct grub_iso9660_dir rootdir;
+ grub_uint8_t unused6[641];
+ struct grub_iso9660_date created;
} __attribute__ ((packed));
/* A single entry in the path table. */
@@ -812,6 +826,58 @@
return grub_errno;
}
+
+static grub_err_t
+grub_iso9660_uuid (grub_device_t device, char **uuid)
+{
+ struct grub_iso9660_data *data;
+ grub_disk_t disk = device->disk;
+
+#ifndef GRUB_UTIL
+ grub_dl_ref (my_mod);
+#endif
+
+ 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])
+ {
+ grub_error (GRUB_ERR_BAD_NUMBER, "No creation date in filesystem to
generate UUID.");
+ *uuid = NULL;
+ }
+ else
+ {
+ *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]);
+ }
+ }
+ else
+ *uuid = NULL;
+
+#ifndef GRUB_UTIL
+ grub_dl_unref (my_mod);
+#endif
+
+ grub_free (data);
+
+ return grub_errno;
+}
+
static struct grub_fs grub_iso9660_fs =
@@ -822,6 +888,7 @@
.read = grub_iso9660_read,
.close = grub_iso9660_close,
.label = grub_iso9660_label,
+ .uuid = grub_iso9660_uuid,
.next = 0
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1853] 2008-08-31 Felix Zielcke <address@hidden>,
Felix Zielcke <=