* grub-core/disk/cryptodisk.c (luks_script_get): Adapt to new procfs

	API.

diff --git a/ChangeLog b/ChangeLog
index 92575aab7395ee34eb9b3d369f427b16ac7470b0..ef4c6901aace68c15e4c2102df71aa0b268cbc3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/cryptodisk.c (luks_script_get): Adapt to new procfs
+       API.
+
 2013-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/tests/legacy_password_test.c (vectors): Make static.

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index a8a9b7171263c052c0b138c84edb79a771ca0eeb..9a4509bf04a368b2186669b09bce856ddc8a6114 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1011,12 +1011,14 @@ hex (grub_uint8_t val)
 
 /* Open a file named NAME and initialize FILE.  */
 static char *
-luks_script_get (void)
+luks_script_get (grub_size_t *sz)
 {
   grub_cryptodisk_t i;
   grub_size_t size = 0;
   char *ptr, *ret;
 
+  *sz = 0;
+
   for (i = cryptodisk_list; i != NULL; i = i->next)
     if (grub_strcmp (i->modname, "luks") == 0)
       {
@@ -1098,6 +1100,7 @@ luks_script_get (void)
        *ptr++ = '\n';
       }
   *ptr = '\0';
+  *sz = ptr - ret;
   return ret;
 }