fixed table formatting for non-ACSII characters (bsc#1051901)

::mbrtowc behavior has been changed in glibc-2.22

- version 0.5.1

diff --git a/VERSION b/VERSION
index 8f0916f768f0487bcf8d33827ce2c8dcecb645c1..4b9fcbec101a6ff8ec68e0f95131ccda4861407f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0
+0.5.1

diff --git a/client/utils/text.cc b/client/utils/text.cc
index a51697c5ceee5e13c35a9eec71ed961c5da8bc12..e454110a0664208c33aeb89452b860f6c99986c5 100644 (file)
--- a/client/utils/text.cc
+++ b/client/utils/text.cc
@@ -65,6 +65,9 @@ int mbs_width_e (const string & str)
 
     s_bytes -= c_bytes;
     ptr += c_bytes;
+
+    // end of string
+    if (s_bytes == 0) break;
   }
 
   return s_cols;
@@ -142,6 +145,9 @@ std::string mbs_substr_by_width(
 
     s_bytes -= c_bytes;
     ptr += c_bytes;
+
+    // end of string
+    if (s_bytes == 0) break;
   }
 
   if (eptr == NULL)

diff --git a/dists/debian/changelog b/dists/debian/changelog
index 64951bcb00dcd77f767622dcff5ee315d5905efd..baec0fa1804cd92bae14d9aa7f733e9abd1c9d63 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,9 @@
+snapper (0.5.1) stable; urgency=low
+
+  * Updated to version 0.5.1
+
+ -- Ladislav Slezák <lslezak@suse.cz>  Thu, 03 Aug 2017 20:10:49 +0200
+
 snapper (0.5.0-0) stable; urgency=low
 
   * Updated to version 0.5.0

diff --git a/package/snapper.changes b/package/snapper.changes
index 4ef96b591ebe1163459f5244cb40842dd72931f6..2ed98f50ef9325ba5504154f741810800331d617 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  3 18:12:17 UTC 2017 - lslezak@suse.com
+
+- fixed table formatting for non-ACSII characters (bsc#1051901)
+  (::mbrtowc behavior has been changed in glibc-2.22)
+- version 0.5.1
+
 -------------------------------------------------------------------
 Tue May 09 13:52:46 CEST 2017 - aschnell@suse.com