Merge branch 'master' of http://exfat.googlecode.com/svn/trunk/ into cm-10.2

Change-Id: Iced8c56f8089a5b6dbfe913c23fb35c4a3c99b48

diff --cc fsck/main.c
index cb0082a,615aa9e..035c920
--- 1/fsck/main.c
--- 2/fsck/main.c
+++ b/fsck/main.c
@@@ -14,13 -15,14 +15,14 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 +#include <exfat.h>
  #include <stdio.h>
  #include <string.h>
 -#include <exfat.h>
  #include <exfatfs.h>
  #include <inttypes.h>
  #include <unistd.h>

diff --cc fuse/main.c
Simple merge

diff --cc libexfat/compiler.h
Simple merge

diff --cc libexfat/exfat.h
Simple merge

diff --cc libexfat/io.c
index 9bd1233,c9fde95..32172ce
--- 1/libexfat/io.c
--- 2/libexfat/io.c
+++ b/libexfat/io.c
@@@ -286,28 -286,20 +288,24 @@@ ssize_t exfat_pread(struct exfat_dev* d
                off_t offset)
  {
  #ifdef USE_UBLIO
-       if (ublio_pread(dev->ufh, buffer, size, offset) != size)
+       return ublio_pread(dev->ufh, buffer, size, offset);
 +#elif defined(__ANDROID__)
-     if (pread64(dev->fd, buffer, size, offset) != size)
++    return pread64(dev->fd, buffer, size, offset);
  #else
-       if (pread(dev->fd, buffer, size, offset) != size)
+       return pread(dev->fd, buffer, size, offset);
  #endif
-               exfat_bug("failed to read %zu bytes from file at %"PRIu64, size,
-                               (uint64_t) offset);
  }
  
- void exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
+ ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
                off_t offset)
  {
  #ifdef USE_UBLIO
-       if (ublio_pwrite(dev->ufh, buffer, size, offset) != size)
+       return ublio_pwrite(dev->ufh, buffer, size, offset);
 +#elif defined(__ANDROID__)
-     if (pwrite64(dev->fd, buffer, size, offset) != size)
++    return pwrite64(dev->fd, buffer, size, offset);
  #else
-       if (pwrite(dev->fd, buffer, size, offset) != size)
+       return pwrite(dev->fd, buffer, size, offset);
  #endif
-               exfat_bug("failed to write %zu bytes to file at %"PRIu64, size,
-                               (uint64_t) offset);
  }
  
  ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,

diff --cc libexfat/log.c
Simple merge

diff --cc libexfat/platform.h
Simple merge

diff --cc mkfs/cbm.c
index 8abdad0,865ce90..7f22a8c
--- 1/mkfs/cbm.c
--- 2/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@@ -14,10 -15,12 +15,11 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 -#include <limits.h>
  #include "cbm.h"
  #include "fat.h"
  #include "uct.h"

diff --cc mkfs/fat.c
index 2cfed58,7c036b8..0f7287a
--- 1/mkfs/fat.c
--- 2/mkfs/fat.c
+++ b/mkfs/fat.c
@@@ -14,11 -15,11 +15,12 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 +#include <exfat.h>
  #include <unistd.h>
  #include "fat.h"
  #include "cbm.h"

diff --cc mkfs/main.c
index d39344c,8473a73..dafe970
--- 1/mkfs/main.c
--- 2/mkfs/main.c
+++ b/mkfs/main.c
@@@ -14,11 -15,11 +15,12 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 +#include <exfat.h>
  #include <sys/types.h>
  #include <sys/time.h>
  #include <unistd.h>

diff --cc mkfs/mkexfat.c
index dd7d404,ebda920..e7f8aac
--- 1/mkfs/mkexfat.c
--- 2/mkfs/mkexfat.c
+++ b/mkfs/mkexfat.c
@@@ -14,11 -15,11 +15,12 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 +#include "mkexfat.h"
  #include <sys/types.h>
  #include <unistd.h>
  #include <inttypes.h>

diff --cc mkfs/rootdir.c
index 6370565,ccecf66..55385a0
--- 1/mkfs/rootdir.c
--- 2/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@@ -14,10 -15,12 +15,11 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 -#include <string.h>
  #include "rootdir.h"
  #include "uct.h"
  #include "cbm.h"

diff --cc mkfs/vbr.c
index 42c70f4,da5be7b..299ee1f
--- 1/mkfs/vbr.c
--- 2/mkfs/vbr.c
+++ b/mkfs/vbr.c
@@@ -14,10 -15,12 +15,11 @@@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
  
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  
 -#include <string.h>
  #include "vbr.h"
  #include "fat.h"
  #include "cbm.h"