xnu-792.10.96.tar.gz

[apple/xnu.git] / bsd / isofs / cd9660 / cd9660_util.c

diff --git a/bsd/isofs/cd9660/cd9660_util.c b/bsd/isofs/cd9660/cd9660_util.c
index a858d848b508a1059466d0d703abec675e818668..89e0cd57a279989d114f96acc1b08db8eece334f 100644 (file)
--- a/bsd/isofs/cd9660/cd9660_util.c
+++ b/bsd/isofs/cd9660/cd9660_util.c
@@ -85,7 +85,6 @@
 #include <sys/dir.h>
 #include <sys/attr.h>
 #include <kern/assert.h>
-#include <architecture/byte_order.h>
 
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_node.h>
@@ -156,6 +155,10 @@ isofncmp(u_char *fn, int fnlen, u_char *isofn, int isolen)
 /*
  * translate and compare a UCS-2 filename
  * Note: Version number plus ';' may be omitted.
+ *
+ * The name pointed to by "fn" is the search name, whose characters are
+ * in native endian order.  The name "ucsfn" is the on-disk name, whose
+ * characters are in big endian order.
  */
 
 int
@@ -171,7 +174,7 @@ ucsfncmp(u_int16_t *fn, int fnlen, u_int16_t *ucsfn, int ucslen)
        while (--fnlen >= 0) {
                if (--ucslen < 0)
                        return *fn;
-               if ((c = *ucsfn++) == UCS_SEPARATOR2) {
+               if ((c = OSSwapBigToHostInt16(*ucsfn++)) == UCS_SEPARATOR2) {
                        switch (*fn++) {
                        default:
                                return *--fn;
@@ -185,7 +188,7 @@ ucsfncmp(u_int16_t *fn, int fnlen, u_int16_t *ucsfn, int ucslen)
                                        return -1;
                                }
                        }
-                       for (j = 0; --ucslen >= 0; j = j * 10 + *ucsfn++ - '0');
+                       for (j = 0; --ucslen >= 0; j = j * 10 + OSSwapBigToHostInt16(*ucsfn++) - '0');
                        return i - j;
                }
                if (c != *fn)
@@ -196,10 +199,10 @@ ucsfncmp(u_int16_t *fn, int fnlen, u_int16_t *ucsfn, int ucslen)
                switch (*ucsfn) {
                default:
                        return -1;
-               case UCS_SEPARATOR1:
-                       if (ucsfn[1] != UCS_SEPARATOR2)
+               case OSSwapHostToBigConstInt16(UCS_SEPARATOR1):
+                       if (ucsfn[1] != OSSwapHostToBigConstInt16(UCS_SEPARATOR2))
                                return -1;
-               case UCS_SEPARATOR2:
+               case OSSwapHostToBigConstInt16(UCS_SEPARATOR2):
                        return 0;
                }
        }
@@ -286,9 +289,9 @@ ucsfntrans(u_int16_t *infn, int infnlen, u_char *outfn, u_short *outfnlen,
                        /* strip file version number */
                        for (fnidx--; fnidx > 0; fnidx--) {
                                /* stop when ';' is found */
-                               if (infn[fnidx] == UCS_SEPARATOR2) {
+                               if (infn[fnidx] == OSSwapHostToBigConstInt16(UCS_SEPARATOR2)) {
                                        /* drop dangling dot */
-                                       if (fnidx > 0 && infn[fnidx-1] == UCS_SEPARATOR1)
+                                       if (fnidx > 0 && infn[fnidx-1] == OSSwapHostToBigConstInt16(UCS_SEPARATOR1))
                                                fnidx--;
                                        break;
                                }