Libc-825.24.tar.gz

[apple/libc.git] / gen / nlist.c

diff --git a/gen/nlist.c b/gen/nlist.c
index 6961da37821b175f8fd25136a4e4bca83b1c8140..a4f7c537d5ecff83a9e1d71788c0941c65e0535c 100644 (file)
--- a/gen/nlist.c
+++ b/gen/nlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -21,7 +21,8 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 /*
- *
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -52,6 +53,8 @@
  * SUCH DAMAGE.
  */
 
+/* temporarily comment this file out for LP64, until code can be modified */
+#ifndef __LP64__
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -148,13 +151,13 @@ __fdnlist(fd, list)
                        maxlen = n;
        }
        if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) ||
-           (N_BADMAG(buf) && *((long *)&buf) != MH_MAGIC &&
-            NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC)) {
+           (N_BADMAG(buf) && *((uint32_t *)&buf) != MH_MAGIC &&
+            OSSwapBigToHostInt32(*((uint32_t *)&buf)) != FAT_MAGIC)) {
                return (-1);
        }
 
        /* Deal with fat file if necessary */
-       if (NXSwapBigLongToHost(*((long *)&buf)) == FAT_MAGIC) {
+       if (OSSwapBigToHostInt32(*((uint32_t *)&buf)) == FAT_MAGIC) {
                struct host_basic_info hbi;
                struct fat_header fh;
                struct fat_arch *fat_archs, *fap;
@@ -177,7 +180,7 @@ __fdnlist(fd, list)
                }
 
                /* Convert fat_narchs to host byte order */
-               fh.nfat_arch = NXSwapBigLongToHost(fh.nfat_arch);
+               fh.nfat_arch = OSSwapBigToHostInt32(fh.nfat_arch);
 
                /* Read in the fat archs */
                fat_archs = (struct fat_arch *)malloc(fh.nfat_arch *
@@ -198,15 +201,15 @@ __fdnlist(fd, list)
                 */
                for (i = 0; i < fh.nfat_arch; i++) {
                        fat_archs[i].cputype =
-                               NXSwapBigLongToHost(fat_archs[i].cputype);
+                               OSSwapBigToHostInt32(fat_archs[i].cputype);
                        fat_archs[i].cpusubtype =
-                             NXSwapBigLongToHost(fat_archs[i].cpusubtype);
+                             OSSwapBigToHostInt32(fat_archs[i].cpusubtype);
                        fat_archs[i].offset =
-                               NXSwapBigLongToHost(fat_archs[i].offset);
+                               OSSwapBigToHostInt32(fat_archs[i].offset);
                        fat_archs[i].size =
-                               NXSwapBigLongToHost(fat_archs[i].size);
+                               OSSwapBigToHostInt32(fat_archs[i].size);
                        fat_archs[i].align =
-                               NXSwapBigLongToHost(fat_archs[i].align);
+                               OSSwapBigToHostInt32(fat_archs[i].align);
                }
 
 #if    CPUSUBTYPE_SUPPORT
@@ -236,7 +239,7 @@ __fdnlist(fd, list)
                }
        }
                
-       if (*((long *)&buf) == MH_MAGIC) {
+       if (*((uint32_t *)&buf) == MH_MAGIC) {
            struct mach_header mh;
            struct load_command *load_commands, *lcp;
            struct symtab_command *stp;
@@ -258,7 +261,7 @@ __fdnlist(fd, list)
                stp = NULL;
                lcp = load_commands;
                for (i = 0; i < mh.ncmds; i++) {
-                       if (lcp->cmdsize % sizeof(long) != 0 ||
+                       if (lcp->cmdsize % sizeof(uint32_t) != 0 ||
                            lcp->cmdsize <= 0 ||
                            (char *)lcp + lcp->cmdsize >
                            (char *)load_commands + mh.sizeofcmds) {
@@ -294,7 +297,7 @@ __fdnlist(fd, list)
 
        lseek(fd, sa, SEEK_SET);
        while (n) {
-               long savpos;
+               off_t savpos;
 
                m = sizeof (space);
                if (n < m)
@@ -333,3 +336,5 @@ __fdnlist(fd, list)
        }
        return (nreq);
 }
+
+#endif /* !__LP64__ */