X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futf8.c;h=5af8456dd2964cb0daf27d30ac208db3d50be5dd;hb=5cb79ed51999e36add131116d3d3db586be9870e;hp=fc1521779f6345fbba69b4f6172c00217d16f811;hpb=8ff11f27c18a6a69268644d2e97c8d090ffc7a0c;p=chaz%2Ftar diff --git a/src/utf8.c b/src/utf8.c index fc15217..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., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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; }