Merge branch 'master' of git://github.com/relan/exfat into marshmallow-x86

Conflicts:
	libexfat/io.c

diff --cc libexfat/android_config.h
index 8587913,0000000..b3b37ec
mode 100644,000000..100644
--- 1/libexfat/android_config.h
--- /dev/null
+++ b/libexfat/android_config.h
@@@ -1,37 -1,0 +1,37 @@@
- #define PACKAGE_STRING "Free exFAT implementation 1.2.3"
 +/* libexfat/config.h.  Generated from config.h.in by configure.  */
 +/* libexfat/config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Name of package */
 +#define PACKAGE "exfat"
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#define PACKAGE_BUGREPORT "relan@users.noreply.github.com"
 +
 +/* Define to the full name of this package. */
 +#define PACKAGE_NAME "Free exFAT implementation"
 +
 +/* Define to the full name and version of this package. */
- #define PACKAGE_VERSION "1.2.3"
++#define PACKAGE_STRING "Free exFAT implementation 1.2.4"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "exfat"
 +
 +/* Define to the home page for this package. */
 +#define PACKAGE_URL "https://github.com/relan/exfat"
 +
 +/* Define to the version of this package. */
- #define VERSION "1.2.3"
++#define PACKAGE_VERSION "1.2.4"
 +
 +/* Version number of package */
++#define VERSION "1.2.4"
 +
 +/* Enable large inode numbers on Mac OS X 10.5.  */
 +#ifndef _DARWIN_USE_64_BIT_INODE
 +# define _DARWIN_USE_64_BIT_INODE 1
 +#endif
 +
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +/* #undef _FILE_OFFSET_BITS */
 +
 +/* Define for large files, on AIX-style hosts. */
 +/* #undef _LARGE_FILES */

diff --cc libexfat/compiler.h
Simple merge

diff --cc libexfat/exfat.h
Simple merge

diff --cc libexfat/io.c
index 8b1c2c5,60f28e2..9762aa6
--- 1/libexfat/io.c
--- 2/libexfat/io.c
+++ b/libexfat/io.c
@@@ -294,14 -251,7 +251,11 @@@ off_t exfat_get_size(const struct exfat
  
  off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence)
  {
- #ifdef USE_UBLIO
-       /* XXX SEEK_CUR will be handled incorrectly */
-       return dev->pos = lseek(dev->fd, offset, whence);
- #elif defined(__ANDROID__)
++#if defined(__ANDROID__)
 +      return lseek64(dev->fd, offset, whence);
 +#else
        return lseek(dev->fd, offset, whence);
 +#endif
  }
  
  ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size)
@@@ -331,25 -267,13 +271,21 @@@ ssize_t exfat_write(struct exfat_dev* d
  ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
                off_t offset)
  {
- #ifdef USE_UBLIO
-       return ublio_pread(dev->ufh, buffer, size, offset);
- #elif defined(__ANDROID__)
++#if defined(__ANDROID__)
 +      return pread64(dev->fd, buffer, size, offset);
 +#else
        return pread(dev->fd, buffer, size, offset);
 +#endif
  }
  
  ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
                off_t offset)
  {
- #ifdef USE_UBLIO
-       return ublio_pwrite(dev->ufh, buffer, size, offset);
- #elif defined(__ANDROID__)
++#if defined(__ANDROID__)
 +      return pwrite64(dev->fd, buffer, size, offset);
 +#else
        return pwrite(dev->fd, buffer, size, offset);
 +#endif
  }
  
  ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,

diff --cc libexfat/log.c
Simple merge

diff --cc libexfat/lookup.c
Simple merge

diff --cc libexfat/node.c
Simple merge

diff --cc libexfat/platform.h
Simple merge

diff --cc libexfat/utf.h
Simple merge

diff --cc libexfat/utils.c
Simple merge

diff --cc mkfs/main.c
Simple merge

diff --cc mkfs/rootdir.c
Simple merge