Changeset 449

Timestamp:

Sep 5, 2020, 7:17:44 PM (5 years ago)

Author:

pr

Message:

Add BSUString copy constructor for codepaged C strings.
Substitute "(C)" for copyright symbol on unsupported codepages.

Location:

trunk

Files:

• include/cppbase/bs_string.h (modified) (2 diffs)
• src/cppbase/bs_string.cpp (modified) (1 diff)
• src/cppbase/bs_string_conv.cpp (modified) (3 diffs)
• src/cppbase/bs_string_uni.cpp (modified) (3 diffs)

trunk/include/cppbase/bs_string.h

@@ -23 +23 @@
 
 /*
- *      This file Copyright (C) 1999-2015 Ulrich M”ller.
+ *      This file Copyright (C) 1999-2020 Ulrich M”ller.
  *      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
@@ -910 +910 @@
             BSUString(BSUniCodec *pCodec,
                       const BSString &str);
+            BSUString(BSUniCodec *pCodec,
+                      const char *psz);
 
             /********************************************

trunk/src/cppbase/bs_string.cpp

@@ -366 +366 @@
 
 /*
- *@@ appendCP:
+ *@@ appendUtf8:
  *      assigns the given UTF-8 BSUString to this,
  *      using the specified BSUniCodec for conversion

trunk/src/cppbase/bs_string_conv.cpp

@@ -48 +48 @@
 #pragma hdrstop
 
-#define CP_UTF8         1208
+#define CP_UTF8         1208
+#define UNI_COPYRIGHT   0xA9
 
 DEFINE_CLASS(BSUniCodec, BSRoot);
@@ -255 +256 @@
  *
  *@@changed WarpIN V1.0.18 (2008-09-24) [pr]: added codepage 1208 support @@fixes 1127
+ *@@changed WarpIN V1.0.25 (2020-09-05) [pr]: added copyright symbol substitution
  */
 
@@ -282 +284 @@
         {
             if (us == 0xFFFF)
-                us = '?';
+                if (ulUni == UNI_COPYRIGHT)
+                {
+                    xstrcat(&xstrNew, "(C)", 3);
+                    continue;
+                }
+                else
+                    us = '?';
             else if (_fDouble)
             {

trunk/src/cppbase/bs_string_uni.cpp

@@ -9 +9 @@
 
 /*
- *      This file Copyright (C) 2002 Ulrich M”ller.
+ *      This file Copyright (C) 2020 Ulrich M”ller.
  *      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
@@ -104 +104 @@
 
 /*
+ *@@ BSUString:
+ *      copy constructor to convert from a
+ *      codepaged C string, using the
+ *      specified BSUniCodec for conversion.
+ *
+ *@@added WarpIN V1.0.25 (2020-09-05) [pr]
+ */
+
+BSUString::BSUString(BSUniCodec *pCodec,
+                     const char *psz)
+    : BSStringBase(tBSUString)
+{
+    STRINGLOCK;
+
+    if (!pCodec)
+        throw BSExcptBase("pCodec is NULL.");
+
+    size_type st;
+    if (st = strlen(psz))
+    {
+        pCodec->Codepage2Uni(*this,
+                             psz,
+                             st);
+    }
+}
+
+/*
  *@@ operator[]:
  *      returns the ul'th character of the
@@ -235 +262 @@
     FreeBuf();
 
+    if (!pCodec)
+        throw BSExcptBase("pCodec is NULL.");
+
     size_type st;
     if (st = strlen(psz))