nkeynes@1239 | 1 | diff -ur libisofs-0.6.38/demo/demo.c libisofs-0.6.38/demo/demo.c
|
nkeynes@1239 | 2 | --- libisofs-0.6.38/demo/demo.c 2010-08-31 19:24:04.000000000 +1000
|
nkeynes@1239 | 3 | +++ libisofs-0.6.38/demo/demo.c 2012-02-16 18:07:47.000000000 +1000
|
nkeynes@1239 | 4 | @@ -311,7 +311,7 @@
|
nkeynes@1239 | 5 |
|
nkeynes@1239 | 6 | fp = fopen(argv[optind+1], "w");
|
nkeynes@1239 | 7 | if (fp == NULL) {
|
nkeynes@1239 | 8 | - err(1, "error opening output file");
|
nkeynes@1239 | 9 | + fprintf(stderr, "error opening output file");
|
nkeynes@1239 | 10 | goto ex;
|
nkeynes@1239 | 11 | }
|
nkeynes@1239 | 12 |
|
nkeynes@1239 | 13 | @@ -639,7 +639,7 @@
|
nkeynes@1239 | 14 |
|
nkeynes@1239 | 15 | fp = fopen(argv[3], "w");
|
nkeynes@1239 | 16 | if (fp == NULL) {
|
nkeynes@1239 | 17 | - err(1, "error opening output file");
|
nkeynes@1239 | 18 | + fprintf(stderr, "error opening output file");
|
nkeynes@1239 | 19 | goto ex;
|
nkeynes@1239 | 20 | }
|
nkeynes@1239 | 21 |
|
nkeynes@1239 | 22 | @@ -749,7 +749,7 @@
|
nkeynes@1239 | 23 |
|
nkeynes@1239 | 24 | fp = fopen(argv[5], "w");
|
nkeynes@1239 | 25 | if (!fp) {
|
nkeynes@1239 | 26 | - err(1, "error opening output file");
|
nkeynes@1239 | 27 | + fprintf(stderr, "error opening output file");
|
nkeynes@1239 | 28 | goto ex;
|
nkeynes@1239 | 29 | }
|
nkeynes@1239 | 30 |
|
nkeynes@1239 | 31 | diff -ur libisofs-0.6.38/libisofs/ecma119.c libisofs-0.6.38/libisofs/ecma119.c
|
nkeynes@1239 | 32 | --- libisofs-0.6.38/libisofs/ecma119.c 2010-10-19 20:41:15.000000000 +1000
|
nkeynes@1239 | 33 | +++ libisofs-0.6.38/libisofs/ecma119.c 2012-02-16 17:57:46.000000000 +1000
|
nkeynes@1239 | 34 | @@ -38,7 +38,7 @@
|
nkeynes@1239 | 35 | #include <time.h>
|
nkeynes@1239 | 36 | #include <string.h>
|
nkeynes@1239 | 37 | #include <locale.h>
|
nkeynes@1239 | 38 | -#include <langinfo.h>
|
nkeynes@1239 | 39 | +//#include <langinfo.h>
|
nkeynes@1239 | 40 | #include <stdio.h>
|
nkeynes@1239 | 41 |
|
nkeynes@1239 | 42 | #ifdef Xorriso_standalonE
|
nkeynes@1239 | 43 | diff -ur libisofs-0.6.38/libisofs/fs_image.c libisofs-0.6.38/libisofs/fs_image.c
|
nkeynes@1239 | 44 | --- libisofs-0.6.38/libisofs/fs_image.c 2010-08-31 20:05:09.000000000 +1000
|
nkeynes@1239 | 45 | +++ libisofs-0.6.38/libisofs/fs_image.c 2012-02-16 17:53:29.000000000 +1000
|
nkeynes@1239 | 46 | @@ -30,7 +30,7 @@
|
nkeynes@1239 | 47 | #include <stdlib.h>
|
nkeynes@1239 | 48 | #include <string.h>
|
nkeynes@1239 | 49 | #include <locale.h>
|
nkeynes@1239 | 50 | -#include <langinfo.h>
|
nkeynes@1239 | 51 | +//#include <langinfo.h>
|
nkeynes@1239 | 52 | #include <limits.h>
|
nkeynes@1239 | 53 | #include <stdio.h>
|
nkeynes@1239 | 54 |
|
nkeynes@1239 | 55 | diff -ur libisofs-0.6.38/libisofs/util.c libisofs-0.6.38/libisofs/util.c
|
nkeynes@1239 | 56 | --- libisofs-0.6.38/libisofs/util.c 2010-05-29 06:33:28.000000000 +1000
|
nkeynes@1239 | 57 | +++ libisofs-0.6.38/libisofs/util.c 2012-02-16 17:57:28.000000000 +1000
|
nkeynes@1239 | 58 | @@ -27,7 +27,7 @@
|
nkeynes@1239 | 59 | #include <limits.h>
|
nkeynes@1239 | 60 | #include <iconv.h>
|
nkeynes@1239 | 61 | #include <locale.h>
|
nkeynes@1239 | 62 | -#include <langinfo.h>
|
nkeynes@1239 | 63 | +//#include <langinfo.h>
|
nkeynes@1239 | 64 |
|
nkeynes@1239 | 65 | #include <unistd.h>
|
nkeynes@1239 | 66 |
|
nkeynes@1239 | 67 | @@ -185,7 +185,11 @@
|
nkeynes@1239 | 68 | {
|
nkeynes@1239 | 69 | if(libisofs_local_charset[0])
|
nkeynes@1239 | 70 | return libisofs_local_charset;
|
nkeynes@1239 | 71 | +#ifdef __ANDROID__
|
nkeynes@1239 | 72 | + return "UTF-8";
|
nkeynes@1239 | 73 | +#else
|
nkeynes@1239 | 74 | return nl_langinfo(CODESET);
|
nkeynes@1239 | 75 | +#endif
|
nkeynes@1239 | 76 | }
|
nkeynes@1239 | 77 |
|
nkeynes@1239 | 78 | int strconv(const char *str, const char *icharset, const char *ocharset,
|