X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Flog.c;h=f29f74b1d68c22f7702532a5bb933ea8709edc3b;hp=034cc09f4553fbe7bfc46be32b10272e5a2b3328;hb=HEAD;hpb=4efb596cee7f7cc961990f8dffc3b210e579e49c

diff --git a/libexfat/log.c b/libexfat/log.c
index 034cc09..f29f74b 100644
--- a/libexfat/log.c
+++ b/libexfat/log.c
@@ -2,11 +2,12 @@
 	log.c (02.09.09)
 	exFAT file system implementation library.
 
-	Copyright (C) 2010-2013  Andrew Nayenko
+	Free exFAT implementation.
+	Copyright (C) 2010-2018  Andrew Nayenko
 
-	This program is free software: you can redistribute it and/or modify
+	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
+	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
@@ -14,13 +15,18 @@
 	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 <stdarg.h>
+#ifdef __ANDROID__
+#include <android/log.h>
+#else
 #include <syslog.h>
+#endif
 #include <unistd.h>
 
 int exfat_errors;
@@ -41,8 +47,12 @@ void exfat_bug(const char* format, ...)
 	va_end(ap);
 	fputs(".\n", stderr);
 
+#ifdef __ANDROID__
+	__android_log_vprint(ANDROID_LOG_FATAL, PACKAGE, format, aq);
+#else
 	if (!isatty(STDERR_FILENO))
 		vsyslog(LOG_CRIT, format, aq);
+#endif
 	va_end(aq);
 
 	abort();
@@ -65,8 +75,12 @@ void exfat_error(const char* format, ...)
 	va_end(ap);
 	fputs(".\n", stderr);
 
+#ifdef __ANDROID__
+	__android_log_vprint(ANDROID_LOG_ERROR, PACKAGE, format, aq);
+#else
 	if (!isatty(STDERR_FILENO))
 		vsyslog(LOG_ERR, format, aq);
+#endif
 	va_end(aq);
 }
 
@@ -87,8 +101,12 @@ void exfat_warn(const char* format, ...)
 	va_end(ap);
 	fputs(".\n", stderr);
 
+#ifdef __ANDROID__
+	__android_log_vprint(ANDROID_LOG_WARN, PACKAGE, format, aq);
+#else
 	if (!isatty(STDERR_FILENO))
 		vsyslog(LOG_WARNING, format, aq);
+#endif
 	va_end(aq);
 }