10.6 SDK compatibility

third_party/apple_cctools/cctools/libmacho/getsecbyname.c

Index: third_party/apple_cctools/cctools/libmacho/getsecbyname.c
diff --git a/third_party/apple_cctools/cctools/libmacho/getsecbyname.c b/third_party/apple_cctools/cctools/libmacho/getsecbyname.c
index 52620f5292dd568635e010acc28fa866882b01e1..1db1cbecce381cd1e0619f3dd83c5c6075b0e576 100644
--- a/third_party/apple_cctools/cctools/libmacho/getsecbyname.c
+++ b/third_party/apple_cctools/cctools/libmacho/getsecbyname.c
@@ -20,412 +20,50 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-#ifndef RLD
-#include <mach-o/ldsyms.h>
-#include <mach-o/swap.h>
-#include <string.h>
-#ifdef __DYNAMIC__
-#include <mach-o/dyld.h> /* defines _dyld_lookup_and_bind() */
-#endif /* defined(__DYNAMIC__) */
-#ifndef __OPENSTEP__
-#include <crt_externs.h>
-#else /* defined(__OPENSTEP__) */
 
-#if !defined(__DYNAMIC__)
-#define DECLARE_VAR(var, type) \
-extern type var
-#define SETUP_VAR(var)
-#define USE_VAR(var) var
-#else
-#define STRINGIFY(a) # a
-#define DECLARE_VAR(var, type)	\
-static type * var ## _pointer = NULL
-#define SETUP_VAR(var)						\
-if ( var ## _pointer == NULL) {				\
-    _dyld_lookup_and_bind( STRINGIFY(_ ## var),		\
-                           (uint32_t *) & var ## _pointer, NULL);	\
-}
-#define USE_VAR(var) (* var ## _pointer)
-#endif
-#endif /* __OPENSTEP__ */
+#include "third_party/apple_cctools/cctools/include/mach-o/getsect.h"
 
-/*
- * This routine returns the section structure for the named section in the
- * named segment for the mach_header pointer passed to it if it exist.
- * Otherwise it returns zero.
- */
-const struct section *
-getsectbynamefromheader(
-struct mach_header *mhp,
-const char *segname,
-const char *sectname)
-{
-	struct segment_command *sgp;
-	struct section *sp;
-	uint32_t i, j;
-        
-	sgp = (struct segment_command *)
-	      ((char *)mhp + sizeof(struct mach_header));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT)
-		if(strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0 ||
-		   mhp->filetype == MH_OBJECT){
-		    sp = (struct section *)((char *)sgp +
-			 sizeof(struct segment_command));
-		    for(j = 0; j < sgp->nsects; j++){
-			if(strncmp(sp->sectname, sectname,
-			   sizeof(sp->sectname)) == 0 &&
-			   strncmp(sp->segname, segname,
-			   sizeof(sp->segname)) == 0)
-			    return(sp);
-			sp = (struct section *)((char *)sp +
-			     sizeof(struct section));
-		    }
-		}
-	    sgp = (struct segment_command *)((char *)sgp + sgp->cmdsize);
-	}
-	return((struct section *)0);
-}
+#if !defined(MAC_OS_X_VERSION_10_7) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
 
-/*
- * This routine returns the section structure for the named section in the
- * named segment for the mach_header_64 pointer passed to it if it exist.
- * Otherwise it returns zero.
- */
-const struct section_64 *
-getsectbynamefromheader_64(
-struct mach_header_64 *mhp,
-const char *segname,
-const char *sectname)
-{
-	struct segment_command_64 *sgp;
-	struct section_64 *sp;
-	uint32_t i, j;
-        
-	sgp = (struct segment_command_64 *)
-	      ((char *)mhp + sizeof(struct mach_header_64));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT_64)
-		if(strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0 ||
-		   mhp->filetype == MH_OBJECT){
-		    sp = (struct section_64 *)((char *)sgp +
-			 sizeof(struct segment_command_64));
-		    for(j = 0; j < sgp->nsects; j++){
-			if(strncmp(sp->sectname, sectname,
-			   sizeof(sp->sectname)) == 0 &&
-			   strncmp(sp->segname, segname,
-			   sizeof(sp->segname)) == 0)
-			    return(sp);
-			sp = (struct section_64 *)((char *)sp +
-			     sizeof(struct section_64));
-		    }
-		}
-	    sgp = (struct segment_command_64 *)((char *)sgp + sgp->cmdsize);
-	}
-	return((struct section_64 *)0);
-}
-
-/*
- * This routine returns the section structure for the named section in the
- * named segment for the mach_header pointer passed to it if it exist.
- * Otherwise it returns zero.  If fSwap == YES (the mach header has been
- * swapped to the endiannes of the current machine, but the segments and
- * sections are different) then the segment and sections are swapped.
- */
-const struct section *
-getsectbynamefromheaderwithswap(
-    struct mach_header *mhp,
-    const char *segname,
-    const char *sectname, 
-    int fSwap)
-{
-	struct segment_command *sgp;
-	struct section *sp;
-	uint32_t i, j;
-
-	sgp = (struct segment_command *)
-	      ((char *)mhp + sizeof(struct mach_header));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == (fSwap ? OSSwapInt32(LC_SEGMENT) : LC_SEGMENT)) {
-	    
-		if (fSwap) {
-#ifdef __LITTLE_ENDIAN__
-		    swap_segment_command(sgp, NX_BigEndian);
-#else
-		    swap_segment_command(sgp, NX_LittleEndian);
-#endif /* __LITTLE_ENDIAN__ */
-		}
-	    
-		if(strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0 ||
-		   mhp->filetype == MH_OBJECT){
-		    sp = (struct section *)((char *)sgp +
-			 sizeof(struct segment_command));
-		
-		    if (fSwap) {
-#ifdef __LITTLE_ENDIAN__
-			swap_section(sp, sgp->nsects, NX_BigEndian);
-#else
-			swap_section(sp, sgp->nsects, NX_LittleEndian);
-#endif /* __LITTLE_ENDIAN__ */
-		    }
-		
-		    for(j = 0; j < sgp->nsects; j++){
-			if(strncmp(sp->sectname, sectname,
-			   sizeof(sp->sectname)) == 0 &&
-			   strncmp(sp->segname, segname,
-			   sizeof(sp->segname)) == 0)
-			    return(sp);
-			sp = (struct section *)((char *)sp +
-			     sizeof(struct section));
-		    }
-		}
-		sgp = (struct segment_command *)((char *)sgp + sgp->cmdsize);
-	    } else {
-		sgp = (struct segment_command *)((char *)sgp +
-		    (fSwap ? OSSwapInt32(sgp->cmdsize) : sgp->cmdsize));
-	    }
-	}
-	return((struct section *)0);
-}
-
-/*
- * This routine returns the section_64 structure for the named section in the
- * named segment for the mach_header_64 pointer passed to it if it exist.
- * Otherwise it returns zero.  If fSwap == YES (the mach header has been
- * swapped to the endiannes of the current machine, but the segments and
- * sections are different) then the segment and sections are swapped.
- */
-const struct section_64 *
-getsectbynamefromheaderwithswap_64(
-    struct mach_header_64 *mhp,
-    const char *segname,
-    const char *sectname, 
-    int fSwap)
-{
-	struct segment_command_64 *sgp;
-	struct section_64 *sp;
-	uint32_t i, j;
-
-	sgp = (struct segment_command_64 *)
-	      ((char *)mhp + sizeof(struct mach_header_64));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == (fSwap ? OSSwapInt32(LC_SEGMENT) : LC_SEGMENT)) {
-	    
-		if (fSwap) {
-#ifdef __LITTLE_ENDIAN__
-		    swap_segment_command_64(sgp, NX_BigEndian);
-#else
-		    swap_segment_command_64(sgp, NX_LittleEndian);
-#endif /* __LITTLE_ENDIAN__ */
-		}
-	    
-		if(strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0 ||
-		   mhp->filetype == MH_OBJECT){
-		    sp = (struct section_64 *)((char *)sgp +
-			 sizeof(struct segment_command_64));
-		
-		    if (fSwap) {
-#ifdef __LITTLE_ENDIAN__
-			swap_section_64(sp, sgp->nsects, NX_BigEndian);
-#else
-			swap_section_64(sp, sgp->nsects, NX_LittleEndian);
-#endif /* __LITTLE_ENDIAN__ */
-		    }
-		
-		    for(j = 0; j < sgp->nsects; j++){
-			if(strncmp(sp->sectname, sectname,
-			   sizeof(sp->sectname)) == 0 &&
-			   strncmp(sp->segname, segname,
-			   sizeof(sp->segname)) == 0)
-			    return(sp);
-			sp = (struct section_64 *)((char *)sp +
-			     sizeof(struct section_64));
-		    }
-		}
-		sgp = (struct segment_command_64 *)((char *)sgp + sgp->cmdsize);
-	    } else {
-		sgp = (struct segment_command_64 *)((char *)sgp +
-		    (fSwap ? OSSwapInt32(sgp->cmdsize) : sgp->cmdsize));
-	    }
-	}
-	return((struct section_64 *)0);
-}
-
-/*
- * This routine returns the a pointer the section structure of the named
- * section in the named segment if it exist in the mach executable it is
- * linked into.  Otherwise it returns zero.
- */
-#ifndef __LP64__
-
-const struct section *
-getsectbyname(
-const char *segname,
-const char *sectname)
-{
-#ifndef __OPENSTEP__
-    struct mach_header *mhp = _NSGetMachExecuteHeader();
-#else /* defined(__OPENSTEP__) */
-    static struct mach_header *mhp = NULL;
-	DECLARE_VAR(_mh_execute_header, struct mach_header);
-        SETUP_VAR(_mh_execute_header);
-	mhp = (struct mach_header *)(& USE_VAR(_mh_execute_header));
-#endif /* __OPENSTEP__ */
-	return(getsectbynamefromheader(mhp, segname, sectname));
-}
-
-#else /* defined(__LP64__) */
-
-const struct section_64 *
-getsectbyname(
-const char *segname,
-const char *sectname)
-{
-    struct mach_header_64 *mhp = _NSGetMachExecuteHeader();
-
-	return(getsectbynamefromheader_64(mhp, segname, sectname));
-}
-
-#endif /* defined(__LP64__) */
+#include <string.h>
 
-/*
- * This routine returns the a pointer to the data for the named section in the
- * named segment if it exist in the mach executable it is linked into.  Also
- * it returns the size of the section data indirectly through the pointer size.
- * Otherwise it returns zero for the pointer and the size.
- */
-char *
-getsectdata(
-const char *segname,
-const char *sectname,
-unsigned long *size)
-{
 #ifndef __LP64__
-    const struct section *sp;
+typedef struct mach_header mach_header_32_64;
+typedef struct segment_command segment_command_32_64;
+typedef struct section section_32_64;
+#define LC_SEGMENT_32_64 LC_SEGMENT
 #else /* defined(__LP64__) */
-    const struct section_64 *sp;
+typedef struct mach_header_64 mach_header_32_64;
+typedef struct segment_command_64 segment_command_32_64;
+typedef struct section_64 section_32_64;
+#define LC_SEGMENT_32_64 LC_SEGMENT_64
 #endif /* defined(__LP64__) */
 
-	sp = getsectbyname(segname, sectname);
-	if(sp == NULL){
-	    *size = 0;
-	    return(NULL);
-	}
-	*size = sp->size;
-	return((char *)(sp->addr));
-}
-
 /*
  * This routine returns the a pointer to the section contents of the named
  * section in the named segment if it exists in the image pointed to by the
  * mach header.  Otherwise it returns zero.
  */
-#ifndef __LP64__
-
-uint8_t * 
-getsectiondata(
-const struct mach_header *mhp,
-const char *segname,
-const char *sectname,
-unsigned long *size)
-{
-    struct segment_command *sgp, *zero;
-    struct section *sp, *find;
-    uint32_t i, j;
 
-	zero = 0;
-	find = 0;
-	sp = 0;
-	sgp = (struct segment_command *)
-	      ((char *)mhp + sizeof(struct mach_header));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT){
-		if(zero == 0 && sgp->fileoff == 0 && sgp->nsects != 0){
-		    zero = sgp;
-		    if(find != 0)
-			goto done;
-		}
-		if(find == 0 &&
-		   strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0){
-		    sp = (struct section *)((char *)sgp +
-			 sizeof(struct segment_command));
-		    for(j = 0; j < sgp->nsects; j++){
-			if(strncmp(sp->sectname, sectname,
-			   sizeof(sp->sectname)) == 0 &&
-			   strncmp(sp->segname, segname,
-			   sizeof(sp->segname)) == 0){
-			    find = sp;
-			    if(zero != 0)
-				goto done;
-			}
-			sp = (struct section *)((char *)sp +
-			     sizeof(struct section));
-		    }
-		}
-	    }
-	    sgp = (struct segment_command *)((char *)sgp + sgp->cmdsize);
-	}
-	return(0);
-done:
-	*size = sp->size;
-	return((uint8_t *)((uintptr_t)mhp - zero->vmaddr + sp->addr));
-}
-
-uint8_t * 
-getsegmentdata(
-const struct mach_header *mhp,
-const char *segname,
-unsigned long *size)
-{
-    struct segment_command *sgp, *zero, *find;
-    uint32_t i;
-
-	zero = 0;
-	find = 0;
-	sgp = (struct segment_command *)
-	      ((char *)mhp + sizeof(struct mach_header));
-	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT){
-		if(zero == 0 && sgp->fileoff == 0 && sgp->nsects != 0){
-		    zero = sgp;
-		    if(find != 0)
-			goto done;
-		}
-		if(find == 0 &&
-		   strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0){
-		    find = sgp;
-		    if(zero != 0)
-			goto done;
-		}
-	    }
-	    sgp = (struct segment_command *)((char *)sgp + sgp->cmdsize);
-	}
-	return(0);
-done:
-	*size = sgp->vmsize;
-	return((uint8_t *)((uintptr_t)mhp - zero->vmaddr + sgp->vmaddr));
-}
-
-#else /* defined(__LP64__) */
-
-uint8_t * 
-getsectiondata(
-const struct mach_header_64 *mhp,
+uint8_t *
+crashpad_getsectiondata(
+const mach_header_32_64 *mhp,
 const char *segname,
 const char *sectname,
 unsigned long *size)
 {
-    struct segment_command_64 *sgp, *zero;
-    struct section_64 *sp, *find;
+    segment_command_32_64 *sgp, *zero;
+    section_32_64 *sp, *find;
     uint32_t i, j;
 
 	zero = 0;
 	find = 0;
 	sp = 0;
-	sgp = (struct segment_command_64 *)
-	      ((char *)mhp + sizeof(struct mach_header_64));
+	sgp = (segment_command_32_64 *)
+	      ((char *)mhp + sizeof(mach_header_32_64));
 	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT_64){
+	    if(sgp->cmd == LC_SEGMENT_32_64){
 		if(zero == 0 && sgp->fileoff == 0 && sgp->nsects != 0){
 		    zero = sgp;
 		    if(find != 0)
@@ -433,8 +71,8 @@ unsigned long *size)
 		}
 		if(find == 0 &&
 		   strncmp(sgp->segname, segname, sizeof(sgp->segname)) == 0){
-		    sp = (struct section_64 *)((char *)sgp +
-			 sizeof(struct segment_command_64));
+		    sp = (section_32_64 *)((char *)sgp +
+			 sizeof(segment_command_32_64));
 		    for(j = 0; j < sgp->nsects; j++){
 			if(strncmp(sp->sectname, sectname,
 			   sizeof(sp->sectname)) == 0 &&
@@ -444,12 +82,12 @@ unsigned long *size)
 			    if(zero != 0)
 				goto done;
 			}
-			sp = (struct section_64 *)((char *)sp +
-			     sizeof(struct section_64));
+			sp = (section_32_64 *)((char *)sp +
+			     sizeof(section_32_64));
 		    }
 		}
 	    }
-	    sgp = (struct segment_command_64 *)((char *)sgp + sgp->cmdsize);
+	    sgp = (segment_command_32_64 *)((char *)sgp + sgp->cmdsize);
 	}
 	return(0);
 done:
@@ -457,21 +95,21 @@ done:
 	return((uint8_t *)((uintptr_t)mhp - zero->vmaddr + sp->addr));
 }
 
-uint8_t * 
-getsegmentdata(
-const struct mach_header_64 *mhp,
+uint8_t *
+crashpad_getsegmentdata(
+const mach_header_32_64 *mhp,
 const char *segname,
 unsigned long *size)
 {
-    struct segment_command_64 *sgp, *zero, *find;
+    segment_command_32_64 *sgp, *zero, *find;
     uint32_t i;
 
 	zero = 0;
 	find = 0;
-	sgp = (struct segment_command_64 *)
-	      ((char *)mhp + sizeof(struct mach_header_64));
+	sgp = (segment_command_32_64 *)
+	      ((char *)mhp + sizeof(mach_header_32_64));
 	for(i = 0; i < mhp->ncmds; i++){
-	    if(sgp->cmd == LC_SEGMENT_64){
+	    if(sgp->cmd == LC_SEGMENT_32_64){
 		if(zero == 0 && sgp->fileoff == 0 && sgp->nsects != 0){
 		    zero = sgp;
 		    if(find != 0)
@@ -484,7 +122,7 @@ unsigned long *size)
 			goto done;
 		}
 	    }
-	    sgp = (struct segment_command_64 *)((char *)sgp + sgp->cmdsize);
+	    sgp = (segment_command_32_64 *)((char *)sgp + sgp->cmdsize);
 	}
 	return(0);
 done:
@@ -492,106 +130,4 @@ done:
 	return((uint8_t *)((uintptr_t)mhp - zero->vmaddr + sgp->vmaddr));
 }
 
-#endif /* defined(__LP64__) */
-
-/*
- * This routine returns the a pointer to the data for the named section in the
- * named segment if it exist in the mach header passed to it.  Also it returns
- * the size of the section data indirectly through the pointer size.  Otherwise
- * it returns zero for the pointer and the size.
- */
-char *
-getsectdatafromheader(
-struct mach_header *mhp,
-const char *segname,
-const char *sectname,
-unsigned long *size)
-{
-    const struct section *sp;
-
-	sp = getsectbynamefromheader(mhp, segname, sectname);
-	if(sp == NULL){
-	    *size = 0;
-	    return(NULL);
-	}
-	*size = sp->size;
-	return((char *)((uintptr_t)(sp->addr)));
-}
-
-/*
- * This routine returns the a pointer to the data for the named section in the
- * named segment if it exist in the 64-bit mach header passed to it.  Also it
- * returns the size of the section data indirectly through the pointer size.
- * Otherwise it returns zero for the pointer and the size.
- */
-char *
-getsectdatafromheader_64(
-struct mach_header_64 *mhp,
-const char *segname,
-const char *sectname,
-unsigned long *size)
-{
-    const struct section_64 *sp;
-
-	sp = getsectbynamefromheader_64(mhp, segname, sectname);
-	if(sp == NULL){
-	    *size = 0;
-	    return(NULL);
-	}
-	*size = sp->size;
-	return((char *)((uintptr_t)(sp->addr)));
-}
-
-#ifdef __DYNAMIC__
-/*
- * This routine returns the a pointer to the data for the named section in the
- * named segment if it exist in the named Framework.  Also it returns the size
- * of the section data indirectly through the pointer size.  Otherwise it
- * returns zero for the pointer and the size.  The last component of the path
- * of the Framework is passed as FrameworkName.
- */
-void *
-getsectdatafromFramework(
-const char *FrameworkName,
-const char *segname,
-const char *sectname,
-unsigned long *size)
-{
-    uint32_t i, n;
-    uintptr_t vmaddr_slide;
-#ifndef __LP64__
-    struct mach_header *mh;
-    const struct section *s;
-#else /* defined(__LP64__) */
-    struct mach_header_64 *mh;
-    const struct section_64 *s;
-#endif /* defined(__LP64__) */
-    char *name, *p;
-
-        n = _dyld_image_count();
-        for(i = 0; i < n ; i++){
-            name = _dyld_get_image_name(i);
-            p = strrchr(name, '/');
-            if(p != NULL && p[1] != '\0')
-                name = p + 1;
-            if(strcmp(name, FrameworkName) != 0)
-                continue;
-            mh = _dyld_get_image_header(i);
-            vmaddr_slide = _dyld_get_image_vmaddr_slide(i);
-#ifndef __LP64__
-            s = getsectbynamefromheader(mh, segname, sectname);
-#else /* defined(__LP64__) */
-            s = getsectbynamefromheader_64(mh, segname, sectname);
-#endif /* defined(__LP64__) */
-            if(s == NULL){
-                *size = 0;
-                return(NULL);
-            }
-            *size = s->size;
-            return((void *)(s->addr + vmaddr_slide));
-        }
-        *size = 0;
-        return(NULL);
-}
-#endif /* __DYNAMIC__ */
-#endif /* !defined(RLD) */
+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 */