Imported Upstream version 1.2.1

[sven/exfat-utils.git] / libexfat / log.c

diff --git a/libexfat/log.c b/libexfat/log.c
index 7a2b35d90005f172605e3286a7dfb3f288cb65d4..fd8982bff7430901114ea4bbea428240c8a822bb 100644 (file)
--- a/libexfat/log.c
+++ b/libexfat/log.c
@@ -2,11 +2,12 @@
        log.c (02.09.09)
        exFAT file system implementation library.
 
        log.c (02.09.09)
        exFAT file system implementation library.
 

-       Copyright (C) 2009, 2010  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2010-2015  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
        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,
        (at your option) any later version.
 
        This program is distributed in the hope that it will be useful,


@@ -14,13 +15,15 @@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
 
        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>
 #include <syslog.h>
 */
 
 #include "exfat.h"
 #include <stdarg.h>
 #include <syslog.h>

+#include <unistd.h>

 
 int exfat_errors;
 
 
 int exfat_errors;
 


@@ -40,7 +43,8 @@ void exfat_bug(const char* format, ...)
        va_end(ap);
        fputs(".\n", stderr);
 
        va_end(ap);
        fputs(".\n", stderr);
 

-       vsyslog(LOG_CRIT, format, aq);
+       if (!isatty(STDERR_FILENO))
+               vsyslog(LOG_CRIT, format, aq);

        va_end(aq);
 
        abort();
        va_end(aq);
 
        abort();


@@ -63,7 +67,8 @@ void exfat_error(const char* format, ...)
        va_end(ap);
        fputs(".\n", stderr);
 
        va_end(ap);
        fputs(".\n", stderr);
 

-       vsyslog(LOG_ERR, format, aq);
+       if (!isatty(STDERR_FILENO))
+               vsyslog(LOG_ERR, format, aq);

        va_end(aq);
 }
 
        va_end(aq);
 }
 


@@ -84,7 +89,8 @@ void exfat_warn(const char* format, ...)
        va_end(ap);
        fputs(".\n", stderr);
 
        va_end(ap);
        fputs(".\n", stderr);
 

-       vsyslog(LOG_WARNING, format, aq);
+       if (!isatty(STDERR_FILENO))
+               vsyslog(LOG_WARNING, format, aq);

        va_end(aq);
 }
 
        va_end(aq);
 }