X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futf8.c;h=5af8456dd2964cb0daf27d30ac208db3d50be5dd;hb=87369861f9afc8380e866ead3348d630821bcc02;hp=3352cd1a55527a44e0aca51917035db62c5d32ca;hpb=120e96c480fbfc5fa31fba0f59ba1a45953b838e;p=chaz%2Ftar
diff --git a/src/utf8.c b/src/utf8.c
index 3352cd1..5af8456 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,20 +1,21 @@
/* Charset handling for GNU tar.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc.
- 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 2, or (at your option) any later
- version.
+ This file is part of GNU tar.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ GNU tar 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
+ (at your option) any later version.
- 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. */
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ 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 . */
#include
#include
@@ -28,7 +29,7 @@
# define ICONV_CONST
#endif
-#ifndef HAVE_ICONV
+#ifndef HAVE_ICONV
# undef iconv_open
# define iconv_open(tocode, fromcode) ((iconv_t) -1)
@@ -39,7 +40,7 @@
# undef iconv_close
# define iconv_close(cd) 0
-#endif
+#endif
@@ -88,11 +89,10 @@ utf8_convert (bool to_utf, char const *input, char **output)
bool
-string_ascii_p (const char *str)
+string_ascii_p (char const *p)
{
- const unsigned char *p = (const unsigned char *)str;
for (; *p; p++)
- if (*p > 127)
+ if (*p & ~0x7f)
return false;
return true;
}