1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/android/deps/libisofs-0.6.38.diff	Fri Mar 02 23:49:10 2012 +1000
     1.3 @@ -0,0 +1,78 @@
     1.4 +diff -ur libisofs-0.6.38/demo/demo.c libisofs-0.6.38/demo/demo.c
     1.5 +--- libisofs-0.6.38/demo/demo.c	2010-08-31 19:24:04.000000000 +1000
     1.6 ++++ libisofs-0.6.38/demo/demo.c	2012-02-16 18:07:47.000000000 +1000
     1.7 +@@ -311,7 +311,7 @@
     1.8 + 
     1.9 +     fp = fopen(argv[optind+1], "w");
    1.10 +     if (fp == NULL) {
    1.11 +-        err(1, "error opening output file");
    1.12 ++        fprintf(stderr, "error opening output file");
    1.13 +         goto ex;
    1.14 +     }
    1.15 + 
    1.16 +@@ -639,7 +639,7 @@
    1.17 +     
    1.18 +     fp = fopen(argv[3], "w");
    1.19 +     if (fp == NULL) {
    1.20 +-        err(1, "error opening output file");
    1.21 ++        fprintf(stderr, "error opening output file");
    1.22 +         goto ex;
    1.23 +     }
    1.24 + 
    1.25 +@@ -749,7 +749,7 @@
    1.26 + 
    1.27 +     fp = fopen(argv[5], "w");
    1.28 +     if (!fp) {
    1.29 +-        err(1, "error opening output file");
    1.30 ++        fprintf(stderr, "error opening output file");
    1.31 +         goto ex;
    1.32 +     }
    1.33 + 
    1.34 +diff -ur libisofs-0.6.38/libisofs/ecma119.c libisofs-0.6.38/libisofs/ecma119.c
    1.35 +--- libisofs-0.6.38/libisofs/ecma119.c	2010-10-19 20:41:15.000000000 +1000
    1.36 ++++ libisofs-0.6.38/libisofs/ecma119.c	2012-02-16 17:57:46.000000000 +1000
    1.37 +@@ -38,7 +38,7 @@
    1.38 + #include <time.h>
    1.39 + #include <string.h>
    1.40 + #include <locale.h>
    1.41 +-#include <langinfo.h>
    1.42 ++//#include <langinfo.h>
    1.43 + #include <stdio.h>
    1.44 + 
    1.45 + #ifdef Xorriso_standalonE
    1.46 +diff -ur libisofs-0.6.38/libisofs/fs_image.c libisofs-0.6.38/libisofs/fs_image.c
    1.47 +--- libisofs-0.6.38/libisofs/fs_image.c	2010-08-31 20:05:09.000000000 +1000
    1.48 ++++ libisofs-0.6.38/libisofs/fs_image.c	2012-02-16 17:53:29.000000000 +1000
    1.49 +@@ -30,7 +30,7 @@
    1.50 + #include <stdlib.h>
    1.51 + #include <string.h>
    1.52 + #include <locale.h>
    1.53 +-#include <langinfo.h>
    1.54 ++//#include <langinfo.h>
    1.55 + #include <limits.h>
    1.56 + #include <stdio.h>
    1.57 + 
    1.58 +diff -ur libisofs-0.6.38/libisofs/util.c libisofs-0.6.38/libisofs/util.c
    1.59 +--- libisofs-0.6.38/libisofs/util.c	2010-05-29 06:33:28.000000000 +1000
    1.60 ++++ libisofs-0.6.38/libisofs/util.c	2012-02-16 17:57:28.000000000 +1000
    1.61 +@@ -27,7 +27,7 @@
    1.62 + #include <limits.h>
    1.63 + #include <iconv.h>
    1.64 + #include <locale.h>
    1.65 +-#include <langinfo.h>
    1.66 ++//#include <langinfo.h>
    1.67 + 
    1.68 + #include <unistd.h>
    1.69 + 
    1.70 +@@ -185,7 +185,11 @@
    1.71 + {
    1.72 +    if(libisofs_local_charset[0])
    1.73 +      return libisofs_local_charset;
    1.74 ++#ifdef __ANDROID__
    1.75 ++   return "UTF-8";
    1.76 ++#else
    1.77 +    return nl_langinfo(CODESET);
    1.78 ++#endif
    1.79 + }
    1.80 + 
    1.81 + int strconv(const char *str, const char *icharset, const char *ocharset,