INI: Only consider empty keys for INI sections

This commit closes #1697.
ElektraInitiative · Jan 24, 2018 · 808a53f · 808a53f
1 parent e5ca864
commit 808a53f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/plugins/ini/README.md b/src/plugins/ini/README.md
@@ -140,27 +140,6 @@ kdb rm -r user/examples/ini
 sudo kdb umount user/examples/ini
 ```
 
-## Directory Values
-
-By default the INI plugin does not store values in a directory key, if you create a leaf node below the directory key first.
-
-```sh
-sudo kdb mount config.ini /examples/ini ini
-
-kdb set /examples/ini/aimee/man 'Deathly'
-kdb file /examples/ini | xargs cat
-#> [aimee]
-#> man = Deathly
-kdb set /examples/ini/aimee 'Save Me'
-kdb get /examples/ini/aimee/man
-#> Deathly
-kdb get /examples/ini/aimee # 😭
-#>
-
-kdb rm -r /examples/ini
-sudo kdb umount /examples/ini
-```
-
 ## Binary Data
 
 By default the INI plugin does not support binary data. You can use the [Base64 plugin](../base64/) to remove this limitation.

diff --git a/src/plugins/ini/ini.c b/src/plugins/ini/ini.c
@@ -1253,7 +1253,7 @@ static int iniWriteKeySet (FILE * fh, Key * parentKey, KeySet * returned, IniPlu
 		}
 		else
 		{
-			if (isSectionKey (cur))
+			if (isSectionKey (cur) && keyGetValueSize (cur) <= 1)
 			{
 				if (keyIsBelow (parentKey, cur))
 				{

diff --git a/src/plugins/mathcheck/README.md b/src/plugins/mathcheck/README.md
@@ -29,7 +29,7 @@ Full example:
 ```sh
 # Backup-and-Restore:/examples/mathcheck
 
-sudo kdb mount mathcheck.dump /examples/mathcheck dump mathcheck
+sudo kdb mount mathcheck.dump /examples/mathcheck mathcheck
 
 kdb set /examples/mathcheck/a 3.1
 kdb set /examples/mathcheck/b 4.5
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		else
     		{
-    			if (isSectionKey (cur))
+    			if (isSectionKey (cur) && keyGetValueSize (cur) <= 1)
     			{
     				if (keyIsBelow (parentKey, cur))
     				{
@@ Expand Down @@