aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-08-20 09:54:15 +0000
committerMike Frysinger <vapier@gentoo.org>2007-08-20 09:54:15 +0000
commiteadbddb031aa17d85d3e38921588c0b9a79c8b54 (patch)
tree64ef2f52bd4519b28d0891f6527eb1b8ea8fe9f5 /paxelf.c
parentas pointed out by swegner, dont scan PHDRs that dont actually have a filesize... (diff)
downloadpax-utils-eadbddb031aa17d85d3e38921588c0b9a79c8b54.tar.gz
pax-utils-eadbddb031aa17d85d3e38921588c0b9a79c8b54.tar.bz2
pax-utils-eadbddb031aa17d85d3e38921588c0b9a79c8b54.zip
split xfuncs off into a sep file for all utils to use, cleanup misc things, and add some more comments
Diffstat (limited to 'paxelf.c')
-rw-r--r--paxelf.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/paxelf.c b/paxelf.c
index b38095d..167adcb 100644
--- a/paxelf.c
+++ b/paxelf.c
@@ -1,7 +1,7 @@
/*
* Copyright 2003-2007 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.55 2007/06/29 17:09:12 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.56 2007/08/20 09:54:15 vapier Exp $
*
* Copyright 2005-2007 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2007 Mike Frysinger - <vapier@gentoo.org>
@@ -9,8 +9,6 @@
#include "paxinc.h"
-#define argv0 "paxelf"
-
/*
* Setup a bunch of helper functions to translate
* binary defines into readable strings.
@@ -405,7 +403,7 @@ elfobj *readelf_buffer(const char *filename, char *buffer, size_t buffer_len)
if (buffer == NULL || buffer_len < EI_NIDENT)
return NULL;
- elf = (elfobj*)malloc(sizeof(*elf));
+ elf = xmalloc(sizeof(*elf));
if (elf == NULL)
return NULL;
memset(elf, 0x00, sizeof(*elf));
@@ -607,7 +605,7 @@ unsigned long pax_pf2hf_flags(unsigned long paxflags)
char *pf_flags = pax_short_pf_flags(paxflags);
size_t x, len = strlen(pf_flags);
for (x = 0; x < len; x++) {
- switch(pf_flags[x]) {
+ switch (pf_flags[x]) {
case 'p':
flags |= HF_PAX_PAGEEXEC;
break;