Fix default wstring length

Signed-off-by: Anthony Welte <[email protected]>

Author: TonyWelte

rosidl_generator_c/resource/full__description.c.em

@@ -2,6 +2,7 @@
 @{
 from collections import OrderedDict
 from rosidl_generator_c import escape_string
+from rosidl_generator_c import escape_utf8
 from rosidl_generator_c import idl_structure_type_to_c_include_prefix
 from rosidl_generator_c import type_hash_to_c_definition
 from rosidl_parser.definition import NamespacedType
@@ -23,14 +24,12 @@ def static_seq_n(varname, n):
 def static_seq(varname, values):
   """Statically define a runtime Sequence or String type."""
   if values:
-    return f'{{{varname}, {len(values)}, {len(values)}}}'
+    if isinstance(values, str):
+      return f'{{{varname}, {len(values.encode('utf-8'))}, {len(values.encode('utf-8'))}}}'
+    else:
+      return f'{{{varname}, {len(values)}, {len(values)}}}'
   return '{NULL, 0, 0}'
 
-def utf8_encode(value_string):
-  from rosidl_generator_c import escape_string
-  # Slice removes the b'' from the representation.
-  return escape_string(repr(value_string.encode('utf-8'))[2:-1])
-
 implicit_type_names = set(td['type_description']['type_name'] for td, _ in implicit_type_descriptions)
 includes = OrderedDict()
 toplevel_msg, _ = toplevel_type_description
@@ -98,7 +97,7 @@ ref_tds = msg['referenced_type_descriptions']
 @[  for field in itype_description['fields']]@
 static char @(td_c_typename)__FIELD_NAME__@(field['name'])[] = "@(field['name'])";
 @[    if field['default_value']]@
-static char @(td_c_typename)__DEFAULT_VALUE__@(field['name'])[] = "@(utf8_encode(field['default_value']))";
+static char @(td_c_typename)__DEFAULT_VALUE__@(field['name'])[] = "@(escape_utf8(escape_string(field['default_value'])))";
 @[    end if]@
 @[  end for]@
 
@@ -167,9 +166,9 @@ c_typename = typename_to_c(ref_td['type_name'])
 @[if raw_source_content]@
 static char toplevel_type_raw_source[] =@
 @[  for line in raw_source_content.splitlines()[:-1]]
-  "@(utf8_encode(line))\n"@
+  "@(escape_utf8(escape_string(line)))\n"@
 @[  end for]
-  "@(utf8_encode(raw_source_content.splitlines()[-1]))";
+  "@(escape_utf8(escape_string(raw_source_content.splitlines()[-1])))";
 @[end if]@
 
 static char @(toplevel_encoding)_encoding[] = "@(toplevel_encoding)";

rosidl_generator_c/rosidl_generator_c/__init__.py

@@ -229,6 +229,18 @@ def escape_wstring(s):
     return escape_string(s)
 
 
+def escape_utf8(s):
+    result = ''
+    for c in s.encode('utf-8'):
+        # ASCII characters are encoded as-is
+        if c < 0x80:
+            result += chr(c)
+        # Non-ASCII characters are encoded as UTF-8
+        else:
+            result += '\\x%02x' % c
+    return result
+
+
 def type_hash_to_c_definition(hash_string, *, indent=2):
     """Generate empy for rosidl_type_hash_t instance with 8 bytes per line for readability."""
     bytes_per_row = 8