Changeset 63 for trunk/src/helpers/configsys.c

Timestamp:

Apr 25, 2001, 8:55:35 PM (24 years ago)

Author:

umoeller

Message:

Misc. fixes.

File:

• trunk/src/helpers/configsys.c (modified) (4 diffs)

trunk/src/helpers/configsys.c

@@ -163 +163 @@
  *@@changed V0.9.7 (2001-01-15) [umoeller]: moved this here from stringh.c; renamed from strhFindKey
  *@@changed V0.9.7 (2001-01-15) [umoeller]: now checking for tabs too
+ *@@changed V0.9.11 (2001-04-25) [umoeller]: this never found lines which had leading spaces, fixed
  */
 
@@ -180 +181 @@
         p = strhistr(p, pcszKey);
 
-        if ((p) && (p >= pcszSearchIn))
+        if (    (p)
+             && (p >= pcszSearchIn)
+           )
         {
             // make sure the key is at the beginning of a line
             // by going backwards until we find a char != " "
             const char *pStartOfLine = p;
-            while (     (   (*pStartOfLine == ' ')
-                         || (*pStartOfLine == '\t')       // allow tabs too
-                        )
-                     && (pStartOfLine > pcszSearchIn)
+
+            // fixed this V0.9.11 (2001-04-25) [umoeller]
+            while (    (pStartOfLine > pcszSearchIn)
+                    && (    (*(pStartOfLine - 1) == ' ')
+                         || (*(pStartOfLine - 1) == '\t')       // allow tabs too
+                       )
                   )
-                pStartOfLine--;
+                --pStartOfLine;
 
             // if we're at the beginning of a line or
@@ -368 +373 @@
                         ulOldParamOfs,
                         ulToReplace,
-                        &strReplaceWith);
+                        strReplaceWith.psz,
+                        strReplaceWith.ulLength);      // adjusted V0.9.11 (2001-04-22) [umoeller]
 
                 xstrClear(&strReplaceWith);
@@ -1006 +1012 @@
 }
 
-
+// testcase
+
+/* int main()
+{
+    PSZ pszContents = NULL;
+    if (0 == csysLoadConfigSys(NULL, &pszContents))
+    {
+        CHAR    szValue[1000];
+        PSZ pszValue = csysGetParameter(pszContents,
+                                        "IFS=",
+                                        szValue,
+                                        sizeof(szValue));
+        if (pszValue)
+            printf("Value: %s", szValue);
+    }
+
+    return (0);
+} */