X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu8-prev.c;h=5e97909144867d2f164c93f23edd49aa87f99b29;hb=5d706a3590ab4b393e845a1d73787faaae48d408;hp=2d8ae45930a541c84d3e309a50ec7e9f7ebbecd2;hpb=5973fdf3621d596452f3b9d8af3492ccc530600a;p=gnulib.git

diff --git a/lib/unistr/u8-prev.c b/lib/unistr/u8-prev.c
index 2d8ae4593..5e9790914 100644
--- a/lib/unistr/u8-prev.c
+++ b/lib/unistr/u8-prev.c
@@ -1,21 +1,19 @@
 /* Iterate over previous character in UTF-8 string.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2013 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -25,71 +23,71 @@
 const uint8_t *
 u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start)
 {
-  /* Keep in sync with unistr.h and utf8-ucs4.c.  */
+  /* Keep in sync with unistr.h and u8-mbtouc-aux.c.  */
   if (s != start)
     {
       uint8_t c_1 = s[-1];
 
       if (c_1 < 0x80)
-	{
-	  *puc = c_1;
-	  return s - 1;
-	}
+        {
+          *puc = c_1;
+          return s - 1;
+        }
 #if CONFIG_UNICODE_SAFETY
       if ((c_1 ^ 0x80) < 0x40)
 #endif
-	if (s - 1 != start)
-	  {
-	    uint8_t c_2 = s[-2];
+        if (s - 1 != start)
+          {
+            uint8_t c_2 = s[-2];
 
-	    if (c_2 >= 0xc2 && c_2 < 0xe0)
-	      {
-		*puc = ((unsigned int) (c_2 & 0x1f) << 6)
-		       | (unsigned int) (c_1 ^ 0x80);
-		return s - 2;
-	      }
+            if (c_2 >= 0xc2 && c_2 < 0xe0)
+              {
+                *puc = ((unsigned int) (c_2 & 0x1f) << 6)
+                       | (unsigned int) (c_1 ^ 0x80);
+                return s - 2;
+              }
 #if CONFIG_UNICODE_SAFETY
-	    if ((c_2 ^ 0x80) < 0x40)
+            if ((c_2 ^ 0x80) < 0x40)
 #endif
-	      if (s - 2 != start)
-		{
-		  uint8_t c_3 = s[-3];
+              if (s - 2 != start)
+                {
+                  uint8_t c_3 = s[-3];
 
-		  if (c_3 >= 0xe0 && c_3 < 0xf0
+                  if (c_3 >= 0xe0 && c_3 < 0xf0
 #if CONFIG_UNICODE_SAFETY
-		      && (c_3 >= 0xe1 || c_2 >= 0xa0)
-		      && (c_3 != 0xed || c_2 < 0xa0)
+                      && (c_3 >= 0xe1 || c_2 >= 0xa0)
+                      && (c_3 != 0xed || c_2 < 0xa0)
 #endif
-		     )
-		    {
-		      *puc = ((unsigned int) (c_3 & 0x0f) << 12)
-		             | ((unsigned int) (c_2 ^ 0x80) << 6)
-		             | (unsigned int) (c_1 ^ 0x80);
-		      return s - 3;
-		    }
+                     )
+                    {
+                      *puc = ((unsigned int) (c_3 & 0x0f) << 12)
+                             | ((unsigned int) (c_2 ^ 0x80) << 6)
+                             | (unsigned int) (c_1 ^ 0x80);
+                      return s - 3;
+                    }
 #if CONFIG_UNICODE_SAFETY
-		  if ((c_3 ^ 0x80) < 0x40)
+                  if ((c_3 ^ 0x80) < 0x40)
 #endif
-		    if (s - 3 != start)
-		      {
-			uint8_t c_4 = s[-4];
+                    if (s - 3 != start)
+                      {
+                        uint8_t c_4 = s[-4];
 
-			if (c_4 >= 0xf0 && c_4 < 0xf8
+                        if (c_4 >= 0xf0 && c_4 < 0xf8
 #if CONFIG_UNICODE_SAFETY
-			    && (c_4 >= 0xf1 || c_3 >= 0x90)
-			    && (c_4 < 0xf4 || (c_4 == 0xf4 && c_3 < 0x90))
+                            && (c_4 >= 0xf1 || c_3 >= 0x90)
+                            && (c_4 < 0xf4 || (c_4 == 0xf4 && c_3 < 0x90))
 #endif
-			   )
-			  {
-			    *puc = ((unsigned int) (c_4 & 0x07) << 18)
-			           | ((unsigned int) (c_3 ^ 0x80) << 12)
-			           | ((unsigned int) (c_2 ^ 0x80) << 6)
-			           | (unsigned int) (c_1 ^ 0x80);
-			    return s - 4;
-			  }
-		      }
-		}
-	  }
+                           )
+                          {
+                            *puc = ((unsigned int) (c_4 & 0x07) << 18)
+                                   | ((unsigned int) (c_3 ^ 0x80) << 12)
+                                   | ((unsigned int) (c_2 ^ 0x80) << 6)
+                                   | (unsigned int) (c_1 ^ 0x80);
+                            return s - 4;
+                          }
+                      }
+                }
+          }
     }
   return NULL;
 }