Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/expand.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/expand.c (modified) (2 diffs)

branches/3.3/mindi-busybox/coreutils/expand.c

@@ -79 +79 @@
                 *ptr = '\0';
 # if ENABLE_UNICODE_SUPPORT
-                {
-                    uni_stat_t uni_stat;
-                    printable_string(&uni_stat, ptr_strbeg);
-                    len = uni_stat.unicode_width;
-                }
+                len = unicode_strwidth(ptr_strbeg);
 # else
                 len = ptr - ptr_strbeg;
@@ -139 +135 @@
 # if ENABLE_UNICODE_SUPPORT
             {
-                char c;
-                uni_stat_t uni_stat;
-                c = ptr[n];
+                char c = ptr[n];
                 ptr[n] = '\0';
-                printable_string(&uni_stat, ptr);
-                len = uni_stat.unicode_width;
+                len = unicode_strwidth(ptr);
                 ptr[n] = c;
             }