Changeset 279 for trunk/src/cppbase

Timestamp:

Mar 6, 2005, 9:02:21 PM (20 years ago)

Author:

pr

Message:

Fix for CLEARPROFILE and WRITEPROFILE. Bug 633.

File:

• trunk/src/cppbase/bs_config.cpp (modified) (5 diffs)

trunk/src/cppbase/bs_config.cpp

@@ -1804 +1804 @@
  *      Syntax:
  *
- +          CLEARPROFILE="profile[\application[\key]]"
+ +          CLEARPROFILE="profile\application[\key]"
  *
  *@@added V0.9.1 (2000-02-07) [umoeller]
+ *@@changed V1.0.5 (2005-03-06) [pr]: Improved parsing of profiles with path names. @@fixes 633
  */
 
@@ -1821 +1822 @@
         _ustrProfile.assignUtf8(pcszClearProfile, pFirstBackslash);
 
+        if (   _ustrProfile.compareUtf8("USER")
+            && _ustrProfile.compareUtf8("SYSTEM")
+           )
+        {
+            while (pFirstBackslash)
+            {
+                ULONG cbProfile = pFirstBackslash - pcszClearProfile;
+                if (   (cbProfile > 4)
+                    && (!strnicmp(pFirstBackslash - 4, ".INI", 4))
+                   )
+                {
+                    _ustrProfile.assignUtf8(pcszClearProfile, pFirstBackslash);
+                    break;
+                }
+
+                pFirstBackslash = strchr(pFirstBackslash + 1, '\\');
+            }
+        }
+    }
+
+    if (pFirstBackslash)
+    {
         // get application
         PCSZ pSecondBackslash;
@@ -1837 +1860 @@
     }
 
-    if (    (!_ustrProfile())
-         || (!_ustrApplication())
-       )
+    if (!_ustrApplication())
         // any error:
         throw BSConfigExcpt(PRFEXCPT_SYNTAX, ustrClearProfile);
@@ -1972 +1993 @@
  *@@added V0.9.1 (2000-02-07) [umoeller]
  *@@changed V0.9.19 (2002-05-07) [umoeller]: added missing class init, now writeprofiles work again
+ *@@changed V1.0.5 (2005-03-06) [pr]: Improved parsing of profiles with path names. @@fixes 633
  */
 
@@ -1997 +2019 @@
             _ustrProfile.assignUtf8(pcszWriteProfile, pFirstBackslash);
 
+            if (   _ustrProfile.compareUtf8("USER")
+                && _ustrProfile.compareUtf8("SYSTEM")
+               )
+            {
+                while (pFirstBackslash)
+                {
+                    ULONG cbProfile = pFirstBackslash - pcszWriteProfile;
+                    if (   (cbProfile > 4)
+                        && (!strnicmp(pFirstBackslash - 4, ".INI", 4))
+                        && (pFirstBackslash < pSlash)
+                       )
+                    {
+                        _ustrProfile.assignUtf8(pcszWriteProfile, pFirstBackslash);
+                        break;
+                    }
+
+                    pFirstBackslash = strchr(pFirstBackslash + 1, '\\');
+                }
+            }
+        }
+
+        if (pFirstBackslash)
+        {
             // get application
             PCSZ pSecondBackslash;