diff --git a/configure.ac b/configure.ac

index 1511c9a..97a4689 100644

--- a/configure.ac

+++ b/configure.ac

@@ -159,7 +159,7 @@ dnl Checks for functions

 AC_CHECK_FUNCS(mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof fork)

 dnl Provide implementation of some required functions if necessary

-AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline)

+AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline pread)

 dnl Checks for libraries

 AC_CHECK_LIB(z,gzopen)

diff --git a/src/cdf.c b/src/cdf.c

index d05d279..3b2b79b 100644

--- a/src/cdf.c

+++ b/src/cdf.c

@@ -35,7 +35,7 @@

 #include "file.h"

 #ifndef lint

-FILE_RCSID("@(#)$File: cdf.c,v 1.50 2012/02/20 22:35:29 christos Exp $")

+FILE_RCSID("@(#)$File: cdf.c,v 1.51 2012/03/20 18:28:02 christos Exp $")

 #endif

 #include <assert.h>

@@ -296,10 +296,7 @@ cdf_read(const cdf_info_t *info, off_t off, void *buf, size_t len)

 	if (info->i_fd == -1)

 		return -1;

-	if (lseek(info->i_fd, off, SEEK_SET) == (off_t)-1)

-		return -1;

-

-	if (read(info->i_fd, buf, len) != (ssize_t)len)

+	if (pread(info->i_fd, buf, len, off) != (ssize_t)len)

 		return -1;

 	return (ssize_t)len;

diff --git a/src/elfclass.h b/src/elfclass.h

index 2e7741b..010958a 100644

--- a/src/elfclass.h

+++ b/src/elfclass.h

@@ -59,7 +59,8 @@

 		    (off_t)elf_getu(swap, elfhdr.e_shoff),

 		    elf_getu16(swap, elfhdr.e_shnum),

 		    (size_t)elf_getu16(swap, elfhdr.e_shentsize),

-		    fsize, &flags, elf_getu16(swap, elfhdr.e_machine)) == -1)

+		    fsize, &flags, elf_getu16(swap, elfhdr.e_machine),

+		    (int)elf_getu16(swap, elfhdr.e_shstrndx)) == -1)

 			return -1;

 		break;

diff --git a/src/file.h b/src/file.h

index 1b5f53f..28f9bc7 100644

--- a/src/file.h

+++ b/src/file.h

@@ -462,6 +462,9 @@ extern char *sys_errlist[];

 #define strtoul(a, b, c)	strtol(a, b, c)

 #endif

+#ifndef HAVE_PREAD

+ssize_t pread(int, void *, size_t, off_t);

+#endif

 #ifndef HAVE_VASPRINTF

 int vasprintf(char **, const char *, va_list);

 #endif

diff --git a/src/readelf.c b/src/readelf.c

index ce4832a..8d355c5 100644

--- a/src/readelf.c

+++ b/src/readelf.c

@@ -48,7 +48,7 @@ private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t,

 private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t,

     off_t, int *, int);

 private int doshn(struct magic_set *, int, int, int, off_t, int, size_t,

-    off_t, int *, int);

+    off_t, int *, int, int);

 private size_t donote(struct magic_set *, void *, size_t, size_t, int,

     int, size_t, int *);

@@ -129,19 +129,21 @@ getu64(int swap, uint64_t value)

 #define elf_getu32(swap, value) getu32(swap, value)

 #ifdef USE_ARRAY_FOR_64BIT_TYPES

 # define elf_getu64(swap, array) \

-	((swap ? ((uint64_t)elf_getu32(swap, array[0])) << 32 : elf_getu32(swap, array[0])) + \

-	 (swap ? elf_getu32(swap, array[1]) : ((uint64_t)elf_getu32(swap, array[1]) << 32)))

+    ((swap ? ((uint64_t)elf_getu32(swap, array[0])) << 32 \

+     : elf_getu32(swap, array[0])) + \

+     (swap ? elf_getu32(swap, array[1]) : \

+     ((uint64_t)elf_getu32(swap, array[1]) << 32)))

 #else

 # define elf_getu64(swap, value) getu64(swap, value)

 #endif

 #define xsh_addr	(clazz == ELFCLASS32			\

-			 ? (void *) &sh32			\

-			 : (void *) &sh64)

+			 ? (void *)&sh32			\

+			 : (void *)&sh64)

 #define xsh_sizeof	(clazz == ELFCLASS32			\

-			 ? sizeof sh32				\

-			 : sizeof sh64)

-#define xsh_size	(clazz == ELFCLASS32			\

+			 ? sizeof(sh32)				\

+			 : sizeof(sh64))

+#define xsh_size	(size_t)(clazz == ELFCLASS32		\

 			 ? elf_getu32(swap, sh32.sh_size)	\

 			 : elf_getu64(swap, sh64.sh_size))

 #define xsh_offset	(off_t)(clazz == ELFCLASS32		\

@@ -150,12 +152,15 @@ getu64(int swap, uint64_t value)

 #define xsh_type	(clazz == ELFCLASS32			\

 			 ? elf_getu32(swap, sh32.sh_type)	\

 			 : elf_getu32(swap, sh64.sh_type))

+#define xsh_name    	(clazz == ELFCLASS32			\

+			 ? elf_getu32(swap, sh32.sh_name)	\

+			 : elf_getu32(swap, sh64.sh_name))

 #define xph_addr	(clazz == ELFCLASS32			\

 			 ? (void *) &ph32			\

 			 : (void *) &ph64)

 #define xph_sizeof	(clazz == ELFCLASS32			\

-			 ? sizeof ph32				\

-			 : sizeof ph64)

+			 ? sizeof(ph32)				\

+			 : sizeof(ph64))

 #define xph_type	(clazz == ELFCLASS32			\

 			 ? elf_getu32(swap, ph32.p_type)	\

 			 : elf_getu32(swap, ph64.p_type))

@@ -171,8 +176,8 @@ getu64(int swap, uint64_t value)

 			 ? elf_getu32(swap, ph32.p_filesz)	\

 			 : elf_getu64(swap, ph64.p_filesz)))

 #define xnh_addr	(clazz == ELFCLASS32			\

-			 ? (void *) &nh32			\

-			 : (void *) &nh64)

+			 ? (void *)&nh32			\

+			 : (void *)&nh64)

 #define xph_memsz	(size_t)((clazz == ELFCLASS32		\

 			 ? elf_getu32(swap, ph32.p_memsz)	\

 			 : elf_getu64(swap, ph64.p_memsz)))

@@ -192,8 +197,8 @@ getu64(int swap, uint64_t value)

 			 ? prpsoffsets32[i]			\

 			 : prpsoffsets64[i])

 #define xcap_addr	(clazz == ELFCLASS32			\

-			 ? (void *) &cap32			\

-			 : (void *) &cap64)

+			 ? (void *)&cap32			\

+			 : (void *)&cap64)

 #define xcap_sizeof	(clazz == ELFCLASS32			\

 			 ? sizeof cap32				\

 			 : sizeof cap64)

@@ -296,7 +301,7 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 {

 	Elf32_Phdr ph32;

 	Elf64_Phdr ph64;

-	size_t offset;

+	size_t offset, len;

 	unsigned char nbuf[BUFSIZ];

 	ssize_t bufsize;

@@ -310,11 +315,7 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 	 * Loop through all the program headers.

 	 */

 	for ( ; num; num--) {

-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {

-			file_badseek(ms);

-			return -1;

-		}

-		if (read(fd, xph_addr, xph_sizeof) == -1) {

+		if (pread(fd, xph_addr, xph_sizeof, off) == -1) {

 			file_badread(ms);

 			return -1;

 		}

@@ -332,13 +333,8 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 		 * This is a PT_NOTE section; loop through all the notes

 		 * in the section.

 		 */

-		if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {

-			file_badseek(ms);

-			return -1;

-		}

-		bufsize = read(fd, nbuf,

-		    ((xph_filesz < sizeof(nbuf)) ? xph_filesz : sizeof(nbuf)));

-		if (bufsize == -1) {

+		len = xph_filesz < sizeof(nbuf) ? xph_filesz : sizeof(nbuf);

+		if ((bufsize = pread(fd, nbuf, len, xph_offset)) == -1) {

 			file_badread(ms);

 			return -1;

 		}

@@ -843,15 +839,16 @@ static const cap_desc_t cap_desc_386[] = {

 private int

 doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,

-    size_t size, off_t fsize, int *flags, int mach)

+    size_t size, off_t fsize, int *flags, int mach, int strtab)

 {

 	Elf32_Shdr sh32;

 	Elf64_Shdr sh64;

 	int stripped = 1;

 	void *nbuf;

-	off_t noff, coff;

+	off_t noff, coff, name_off;

 	uint64_t cap_hw1 = 0;	/* SunOS 5.x hardware capabilites */

 	uint64_t cap_sf1 = 0;	/* SunOS 5.x software capabilites */

+	char name[50];

 	if (size != xsh_sizeof) {

 		if (file_printf(ms, ", corrupted section header size") == -1)

@@ -859,12 +856,24 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,

 		return 0;

 	}

+	/* Read offset of name section to be able to read section names later */

+	if (pread(fd, xsh_addr, xsh_sizeof, off + size * strtab) == -1) {

+		file_badread(ms);

+		return -1;

+	}

+	name_off = xsh_offset;

+

 	for ( ; num; num--) {

-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {

-			file_badseek(ms);

+		/* Read the name of this section. */

+		if (pread(fd, name, sizeof(name), name_off + xsh_name) == -1) {

+			file_badread(ms);

 			return -1;

 		}

-		if (read(fd, xsh_addr, xsh_sizeof) == -1) {

+		name[sizeof(name) - 1] = '\0';

+		if (strcmp(name, ".debug_info") == 0)

+			stripped = 0;

+

+		if (pread(fd, xsh_addr, xsh_sizeof, off) == -1) {

 			file_badread(ms);

 			return -1;

 		}

@@ -889,39 +898,30 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,

 		/* Things we can determine when we seek */

 		switch (xsh_type) {

 		case SHT_NOTE:

-			if ((nbuf = malloc((size_t)xsh_size)) == NULL) {

+			if ((nbuf = malloc(xsh_size)) == NULL) {

 				file_error(ms, errno, "Cannot allocate memory"

 				    " for note");

 				return -1;

 			}

-			if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==

-			    (off_t)-1) {

+			if (pread(fd, nbuf, xsh_size, xsh_offset) == -1) {

 				file_badread(ms);

 				free(nbuf);

 				return -1;

 			}

-			if (read(fd, nbuf, (size_t)xsh_size) !=

-			    (ssize_t)xsh_size) {

-				free(nbuf);

-				file_badread(ms);

-				return -1;

-			}

 			noff = 0;

 			for (;;) {

 				if (noff >= (off_t)xsh_size)

 					break;

 				noff = donote(ms, nbuf, (size_t)noff,

-				    (size_t)xsh_size, clazz, swap, 4,

-				    flags);

+				    xsh_size, clazz, swap, 4, flags);

 				if (noff == 0)

 					break;

 			}

 			free(nbuf);

 			break;

 		case SHT_SUNW_cap:

-			if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==

-			    (off_t)-1) {

+			if (lseek(fd, xsh_offset, SEEK_SET) == (off_t)-1) {

 				file_badseek(ms);

 				return -1;

 			}

@@ -1043,7 +1043,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 	const char *shared_libraries = "";

 	unsigned char nbuf[BUFSIZ];

 	ssize_t bufsize;

-	size_t offset, align;

+	size_t offset, align, len;

 	if (size != xph_sizeof) {

 		if (file_printf(ms, ", corrupted program header size") == -1)

@@ -1052,13 +1052,8 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 	}

   	for ( ; num; num--) {

-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {

-			file_badseek(ms);

-			return -1;

-		}

-

-  		if (read(fd, xph_addr, xph_sizeof) == -1) {

-  			file_badread(ms);

+		if (pread(fd, xph_addr, xph_sizeof, off) == -1) {

+			file_badread(ms);

 			return -1;

 		}

@@ -1096,12 +1091,9 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,

 			 * This is a PT_NOTE section; loop through all the notes

 			 * in the section.

 			 */

-			if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {

-				file_badseek(ms);

-				return -1;

-			}

-			bufsize = read(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?

-			    xph_filesz : sizeof(nbuf)));

+			len = xph_filesz < sizeof(nbuf) ? xph_filesz

+			    : sizeof(nbuf);

+			bufsize = pread(fd, nbuf, len, xph_offset);

 			if (bufsize == -1) {

 				file_badread(ms);

 				return -1;