jaromail

commit 4253b833e3c9467a4c8688505313d52ff34ca3d4
parent 49ace00ada77546987b21111a0b8f688dc26c012
Author: Jaromil <jaromil@dyne.org>
Date:   Fri, 29 Mar 2013 15:06:39 +0100

dropped use of tempfiles in ram for addressbook edit

Diffstat:
M
src/zlibs/addressbook
 | 
17
++++-------------

1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/zlibs/addressbook b/src/zlibs/addressbook
@@ -389,11 +389,8 @@ edit_abook() {
     tmp=$TMPDIR/abook.$datestamp.$RANDOM
     newlock $tmp
 
-    tmpread=$TMPDIR/abook.read.$datestamp.$RANDOM
-    newlock $tmpread
-    cp ${addressbook} $tmpread
     func "launching SELECT email,name sqlite3 query"
-    cat <<EOF | ${SQL} -column -header -batch $tmpread \
+    cat <<EOF | ${SQL} -column -header -batch $addressbook \
 	| grep -v '^email' > $tmp
 .width 40 100
 .mode list
@@ -402,11 +399,10 @@ SELECT email, name FROM $list;
 EOF
     func "query returned"
 
-    addresses=`cat $tmp`
+    addresses="$(<$tmp)"
+    # no need to wipe, will be rewritten
     rm -f $tmp
 
-    unlink $tmpread
-
     func "converting database into abook format"
     cat <<EOF > $tmp
 # abook addressbook file
@@ -505,14 +501,9 @@ EOF
 
     done
     func "Inserting the updated addressbook"
-    tmpwrite=$TMPDIR/abook.write.$datestamp.$RANDOM
-    newlock $tmpwrite
-    cp ${addressbook} $tmpwrite
-    cat $tmp | ${SQL} -batch $tmpwrite 2> /dev/null
+    cat $tmp | ${SQL} -batch $addressbook 2> /dev/null
     unlink $tmp
-    cp $tmpwrite ${addressbook}
     unlock ${addressbook}
-    unlink $tmpwrite
     notice "Addressbook updated"
 }
 ###################