X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=libexfat%2Flog.c;h=dd2063b406cdb0bd7f4b5d17cf08f0b1834dd75a;hb=d42e06ebb41ea4656d7331792cdefcab517f11ce;hp=034cc09f4553fbe7bfc46be32b10272e5a2b3328;hpb=c1c45856c432c68749276ecbeff56c88f85bcd3e;p=sven%2Ffuse-exfat.git
diff --git a/libexfat/log.c b/libexfat/log.c
index 034cc09..dd2063b 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-2023 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 .
+ 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
+#ifdef __ANDROID__
+#include
+#else
#include
+#endif
#include
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);
}
@@ -97,12 +115,22 @@ void exfat_warn(const char* format, ...)
*/
void exfat_debug(const char* format, ...)
{
- va_list ap;
+ va_list ap, aq;
+
+ va_start(ap, format);
+ va_copy(aq, ap);
fflush(stdout);
fputs("DEBUG: ", stderr);
- va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
fputs(".\n", stderr);
+
+#ifdef __ANDROID__
+ __android_log_vprint(ANDROID_LOG_DEBUG, PACKAGE, format, aq);
+#else
+ if (!isatty(STDERR_FILENO))
+ vsyslog(LOG_DEBUG, format, aq);
+#endif
+ va_end(aq);
}