File git-37-dfc5b8af96bec249e44a83d573af1f95a661a85c... of Package aaa_base

Overview Repositories Revisions Requests Users Attributes Meta

File git-37-dfc5b8af96bec249e44a83d573af1f95a661a85c.patch of Package aaa_base (Revision ca262adb6ba0ba8b505e71be734f7fb3)

Currently displaying revision ca262adb6ba0ba8b505e71be734f7fb3 , Show latest

commit dfc5b8af96bec249e44a83d573af1f95a661a85c
Author: Michal Suchanek <msuchanek@suse.de>
Date:   Thu Feb 27 12:53:05 2020 +0100

get_kernel_version: support xz compressed kernel (boo#1162581).
    
    Signed-off-by: Michal Suchanek <msuchanek@suse.de>

diff --git a/get_kernel_version.c b/get_kernel_version.c
index 236b749..c042487 100644
--- a/get_kernel_version.c
+++ b/get_kernel_version.c
@@ -47,7 +47,8 @@ main (int argc, char *argv[])
 
   /* check if file exist and is compressed */
   {
-    unsigned char  buf [2];
+#define DETECT_SIZE 6
+    unsigned char  buf [DETECT_SIZE];
     int fd = open (argv[1], O_RDONLY | O_CLOEXEC);
     if (fd == -1)
       {
@@ -55,16 +56,30 @@ main (int argc, char *argv[])
 	return 1;
       }
 
-    if (read (fd, buf, 2) != 2)
+    if (read (fd, buf, DETECT_SIZE) != DETECT_SIZE)
       {
 	fprintf (stderr, "Short read\n");
 	close (fd);
 	return 1;
       }
 
+    /* \xFD7zXZ\x00 */
+    if ((buf [0] == 0xfd) &&
+	(buf [1] == '7') &&
+	(buf [2] == 'z') &&
+	(buf [3] == 'X') &&
+	(buf [4] == 'Z') &&
+	(buf [5] == 0))
+      {
+	snprintf (command, sizeof (command), "/usr/bin/xz -dc %s 2>/dev/null", argv[1]);
+      }
+
     if (buf [0] == 037 && (buf [1] == 0213 || buf [1] == 0236))
       {
 	snprintf (command, sizeof (command), "/bin/gzip -dc %s 2>/dev/null", argv[1]);
+      }
+
+    if (*command) {
 	fp = popen (command, "re");
 	if (fp == NULL)
 	  {

Places

File git-37-dfc5b8af96bec249e44a83d573af1f95a661a85c.patch of Package aaa_base (Revision ca262adb6ba0ba8b505e71be734f7fb3)

Places