minor (filter) fixes

diff --git a/BUGS b/BUGS
index 626f34596c960d1773bf5cb819c65a914c94d3e8..f583e90d3a8160aa3fba9738c20d8ac035bd98f6 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -15,3 +15,4 @@ known bugs in abook
 misc:
 * Cursor disappears in some cases with abook_readline() on Solaris. If
   you have problems it is recommended to use ncurses library
+* fseek in ldif import filter should be eliminated

diff --git a/ChangeLog b/ChangeLog
index 776ee467d4dfb3735382e5503bb46ee8faab4a77..9c9d0710e1a45c25c222eb0159dfdff1029fb128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+0.5.1
+ - minor filter fixes
+ - added bbdb2xx translator source to contrib
+
 0.5.0
  - tried to work around some problems with readline
  - some documentation update

diff --git a/filter.c b/filter.c
index 7dcfa329c42392141090b77c9d3928d578affe4f..880213a7d00a352d5ae08a55b8b7388991dfd6e9 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -490,7 +490,7 @@ ldif_read_line(FILE *in)
                }
 
                if(*line != ' ') {
-                       fseek(in, pos, SEEK_SET);
+                       fseek(in, pos, SEEK_SET); /* fixme ! */
                        free(line);
                        break;
                }
@@ -913,7 +913,8 @@ pine_parse_buf(char *buf)
                                && pine_conv_table[i] >= 0) {
                        strncpy(tmp, start, len);
                        tmp[len] = 0;
-                       item[pine_conv_table[i]] = strdup(tmp);
+                       if(*tmp)
+                               item[pine_conv_table[i]] = strdup(tmp);
                }
                start = end + 1;
        }
@@ -1512,7 +1513,7 @@ text_export_database(FILE * out, struct db_enumerator e)
                fprintf(out,
                        "-----------------------------------------\n\n");
                fprintf(out, "%s", database[e.item][NAME]);
-               if (database[e.item][NICK])
+               if (database[e.item][NICK] && *database[e.item][NICK])
                        fprintf(out, "\n(%s)", database[e.item][NICK]);
                fprintf(out, "\n");