commit 470a3f93eb293363adab184224eacc7f11d28dad
author Andreas Mohr <andi@rhlx01.fht-esslingen.de> Sat May 11 22:59:41 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 11 22:59:41 2002 +0000
tree c931350808ba8f1f93e3741265cc358eedbb2478
parent 7f9cc2e4dce1613aa4b92c54f81972fc507c4753

Make PROFILE_GetString account for default value in all cases.

files/profile.c

diff --git a/files/profile.c b/files/profile.c
index a15e165..836da14 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -846,8 +846,11 @@
     if(!buffer) return 0;
 
     if (!def_val) def_val = "";
-    if (key_name && key_name[0])
+    if (key_name)
     {
+	if (!key_name[0])
+            /* Win95 returns 0 on keyname "". Tested with Likse32 bon 000227 */
+            return 0;
         key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE);
         PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val,
                            len, FALSE );
@@ -855,12 +858,15 @@
                          section, key_name, def_val, buffer );
         return strlen( buffer );
     }
-    if (key_name && !(key_name[0]))
-      /* Win95 returns 0 on keyname "". Tested with Likse32 bon 000227 */
-      return 0;
+    /* no "else" here ! */
     if (section && section[0])
-        return PROFILE_GetSection(CurProfile->section, section, buffer, len,
+    {
+        PROFILE_GetSection(CurProfile->section, section, buffer, len,
 				FALSE, FALSE);
+	if (!buffer[0]) /* no luck -> def_val */
+	    PROFILE_CopyEntry(buffer, def_val, len, FALSE);
+	return strlen(buffer);
+    }
     buffer[0] = '\0';
     return 0;
 }