[Bluez-devel] [PATCH] Properly replace an existing key value pair in a text file

[Ville Nuorvala <vnuorval@tcs.hut.fi>]

[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]

Hi,

textfile_put() was unable to replace a key value pair if it happened to 
be the last entry in a file. I noticed this problem in bluez-utils-2.19, 
but it still seems to exist in the latest CVS code. The patch below 
should fix it...

Index: common/textfile.c
===================================================================
RCS file: /cvsroot/bluez/utils/common/textfile.c,v
retrieving revision 1.6
diff -u -r1.6 textfile.c
--- common/textfile.c   30 Aug 2005 00:35:39 -0000      1.6
+++ common/textfile.c   7 Sep 2005 11:06:43 -0000
@@ -180,8 +180,14 @@
         end += len;

         len = size - (end - map);
-
-       if (len <= 0 || len > size) {
+       if (!len) {
+               munmap(map, size);
+               ftruncate(fd, base);
+               pos = lseek(fd, base, SEEK_SET);
+               err = write_key_value(fd, key, value);
+               goto unlock;
+       }
+       if (len < 0 || len > size) {
                 err = EILSEQ;
                 goto unmap;
         }

Regards,
Ville
-- 
Ville Nuorvala
Research Assistant,
Laboratory for Theoretical Computer Science,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257

[-- Attachment #2: vnuorval.vcf --]
[-- Type: text/x-vcard, Size: 248 bytes --]

begin:vcard
fn:Ville Nuorvala
n:Nuorvala;Ville
adr:;;Helsinginkatu 17 A 18;Helsinki;;FIN-00500;Finland
email;internet:vnuorval@tcs.hut.fi
tel;work:+35894515257
tel;fax:+35894513369
tel;cell:+358405835323
x-mozilla-html:FALSE
version:2.1
end:vcard