aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2008-12-10 20:05:20 +0000
committerFabian Groffen <grobian@gentoo.org>2008-12-10 20:05:20 +0000
commitad7a2e5f2a99a06acc76803359cc2a275b2a2661 (patch)
tree95d7eba248a8e13271d41858f1eedf3964dd72bd
parentRemove the half-assed versioned_symname support. (diff)
downloadpax-utils-ad7a2e5f2a99a06acc76803359cc2a275b2a2661.tar.gz
pax-utils-ad7a2e5f2a99a06acc76803359cc2a275b2a2661.tar.bz2
pax-utils-ad7a2e5f2a99a06acc76803359cc2a275b2a2661.zip
Fix manpage, thanks pipping
-rw-r--r--man/scanmacho.docbook2
-rw-r--r--scanelf.c9
2 files changed, 4 insertions, 7 deletions
diff --git a/man/scanmacho.docbook b/man/scanmacho.docbook
index 6d78e5d..11fdf2e 100644
--- a/man/scanmacho.docbook
+++ b/man/scanmacho.docbook
@@ -202,7 +202,7 @@
<para>
You can narrow your search by specifying the Mach-O object file type.
The commandline option takes the symbolic type name.
- Multiple values can be passed comma separated. Example -E MH_EXECUTABLE,MH_DYLIB
+ Multiple values can be passed comma separated. Example -E MH_EXECUTE,MH_DYLIB
</para>
<para>
Here is the normal list available for your pleasure.
diff --git a/scanelf.c b/scanelf.c
index bca9b4e..28178c6 100644
--- a/scanelf.c
+++ b/scanelf.c
@@ -1,13 +1,13 @@
/*
* Copyright 2003-2007 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.198 2008/11/17 18:09:55 flameeyes Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.199 2008/12/10 20:05:20 grobian Exp $
*
* Copyright 2003-2007 Ned Ludd - <solar@gentoo.org>
* Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org>
*/
-static const char *rcsid = "$Id: scanelf.c,v 1.198 2008/11/17 18:09:55 flameeyes Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.199 2008/12/10 20:05:20 grobian Exp $";
const char * const argv0 = "scanelf";
#include "paxinc.h"
@@ -1039,7 +1039,7 @@ static char *scanelf_file_sym(elfobj *elf, char *found_sym)
while (next_sym) { \
this_sym = next_sym; \
if ((next_sym = strchr(this_sym, ','))) \
- next_sym += 1; /* Skip the comma */ \
+ *next_sym++ = '\0'; /* Skip the comma */ \
/* do we want a defined symbol ? */ \
if (*this_sym == '+') { \
if (sym->st_shndx == SHN_UNDEF) \
@@ -1051,8 +1051,6 @@ static char *scanelf_file_sym(elfobj *elf, char *found_sym)
continue; \
++this_sym; \
} \
- if (next_sym) /* Copy it so that we don't have to worry about the final , */ \
- this_sym = strndup(this_sym, next_sym-this_sym); \
/* ok, lets compare the name now */ \
if (scanelf_match_symname(this_sym, symname)) { \
if (be_semi_verbose) { \
@@ -1065,7 +1063,6 @@ static char *scanelf_file_sym(elfobj *elf, char *found_sym)
(*found_sym)++; \
goto break_out; \
} \
- if (next_sym) free(this_sym); \
} \
} \
} \