[gentoo-commits] gentoo-projects commit in pax-utils: paxelf.c

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      12/11/24 19:32:09

  Modified:             paxelf.c
  Log:
  scanelf: skip leading OLFOSABI_ when getting the osabi field so we do not skip UNKNOWN_TYPE

Revision  Changes    Path
1.75                 pax-utils/paxelf.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?r1=1.74&r2=1.75

Index: paxelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- paxelf.c	18 Nov 2012 07:39:45 -0000	1.74
+++ paxelf.c	24 Nov 2012 19:32:09 -0000	1.75
@@ -1,7 +1,7 @@
 /*
  * Copyright 2003-2012 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.74 2012/11/18 07:39:45 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.75 2012/11/24 19:32:09 vapier Exp $
  *
  * Copyright 2005-2012 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2012 Mike Frysinger  - <vapier@gentoo.org>
@@ -150,10 +150,9 @@
 const char *get_elfosabi(elfobj *elf)
 {
 	const char *str = get_elfeitype(EI_OSABI, elf->data[EI_OSABI]);
-	if (str)
-		if (strlen(str) > 9)
-			return str + 9;
-	return "";
+	if (strncmp(str, "ELFOSABI_", 9) == 0)
+		str += 9;
+	return str;
 }
 
 void print_etypes(FILE *stream)