- code cleanups and minor fixes

- call it rc3

diff --git a/ChangeLog b/ChangeLog
index 0ecaeb411ad7891586200b655bf3433109d6cdbe..60d654ad04196216ce5944f553d944f5a3fcc01e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - add show_cursor config option (idea from Cheryl Homiak)
  - autoconf/automake update
  - replace abook_malloc, abook_realloc and my_free with new xmalloc routines
+ - update for abook_rl (abook_readline)
+ - code cleanups and minor fixes
 
 0.5.3
  - add allcvs filters (Christoph Sobotka)

diff --git a/abook.c b/abook.c
index 4c9df4f1483465d1b320a8da7c652f4adc95f076..c754499260281e02a0dd4302797b2d10769b87fc 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -45,7 +45,7 @@ static void           convert(char *srcformat, char *srcfile,
 static void            add_email(int);
 
 char *datafile = NULL;
-char *rcfile = NULL;
+static char *rcfile = NULL;
 
 bool alternative_datafile = FALSE;
 bool alternative_rcfile = FALSE;
@@ -125,7 +125,6 @@ init_abook()
                fgetc(stdin);
        }
 
-       signal(SIGKILL, quit_abook_sig);
        signal(SIGTERM, quit_abook_sig);
 
        if(init_ui())
@@ -692,7 +691,6 @@ static void
 init_add_email()
 {
        set_filenames();
-       atexit(free_filenames);
        check_abook_directory();
        init_opts();
        load_opts(rcfile);

diff --git a/configure b/configure
index df8843cc51f560dfc677d46bca9faae07c846ade..4bfbde2ccecdd1bcbf224c2b83346671d8bbdd3c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1613,7 +1613,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=abook
- VERSION=0.5.4rc1
+ VERSION=0.5.4rc3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6811,7 +6811,7 @@ else
 fi;
 
 if test x$debug = xtrue; then
-       CPPFLAGS="-DDEBUG $CPPFLAGS"
+       CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
        CFLAGS="-g $CFLAGS"
 fi
 

diff --git a/configure.in b/configure.in
index 7d79dabc04b0d79062386ee2e24528d5f83b7b12..b2e409a0cb5c365bb326cc5d7844fe9b397e82cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.4rc1)
+AM_INIT_AUTOMAKE(abook, 0.5.4rc3)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -108,7 +108,7 @@ AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [cas
        esac], [debug=false])
 
 if test x$debug = xtrue; then
-       CPPFLAGS="-DDEBUG $CPPFLAGS"
+       CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
        CFLAGS="-g $CFLAGS"
 fi
 

diff --git a/database.c b/database.c
index f7bb7459373391db14a95a9f39a71886efcddc26..e8a4fa390f168185920dfaac61a205e209108a56 100644 (file)
--- a/database.c
+++ b/database.c
@@ -40,7 +40,6 @@ extern int curitem;
 extern char *selected;
 
 extern char *datafile;
-extern char *rcfile;
 
 /*
  * field definitions
@@ -198,7 +197,7 @@ save_database()
        if( (out = abook_fopen(datafile, "w")) == NULL )
                return -1;
 
-       if( list_is_empty() ) {
+       if(list_is_empty()) {
                fclose(out);
                unlink(datafile);
                return 1;

diff --git a/list.c b/list.c
index 31853a49e4a716d5539c08816c826919f7723caa..b208054d7cdfa71991a570d914f7c5273784fb3a 100644 (file)
--- a/list.c
+++ b/list.c
@@ -87,7 +87,7 @@ refresh_list()
 
        ui_print_number_of_items();
 
-       if(items < 1) {
+       if(list_is_empty()) {
                refresh();
                wrefresh(list);
                return;

diff --git a/ui.c b/ui.c
index 8db6b79e1c666c2d02b781f383461ff6bcc88e1a..3098b553435a4dd7ab1e14001b763a152080d1fb 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -45,7 +45,7 @@
 extern int items, curitem;
 extern char *datafile;
 
-extern int alternative_datafile;
+extern bool alternative_datafile;
 
 /*
  * internal variables
@@ -82,7 +82,7 @@ resize_abook()
 #ifdef TIOCGWINSZ
        struct winsize winsz;
 
-       ioctl (0, TIOCGWINSZ, &winsz);
+       ioctl(0, TIOCGWINSZ, &winsz);
 #ifdef DEBUG
        if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
                fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row);
@@ -265,11 +265,13 @@ statusline_ask_boolean(char *msg, int def)
 
        free(msg2);
 
-       switch( tolower(getch()) ) {
+       switch(tolower(getch())) {
                case 'n':
+               case 'N':
                        ret = FALSE;
                        break;
                case 'y':
+               case 'Y':
                        ret = TRUE;
                        break;
                default:
@@ -343,7 +345,7 @@ display_help(int help)
        erase();
        headerline("help");
 
-       for( i = 0; tbl[i] != NULL; i++) {
+       for(i = 0; tbl[i] != NULL; i++) {
                waddstr(helpw, tbl[i]);
                if( ( !( (i+1) % (LINES-8) ) ) ||
                        (tbl[i+1] == NULL) ) {
@@ -498,7 +500,7 @@ ui_find(int next)
        clear_statusline();
 
        if(next) {
-               if( !*findstr )
+               if(!*findstr)
                        return;
        } else {
                char *s;
@@ -548,12 +550,12 @@ ui_print_database()
        char *command = opt_get_str(STR_PRINT_COMMAND);
        int mode;
 
-       if( list_is_empty() )
+       if(list_is_empty())
                return;
 
        statusline_addstr("Print All/Selected/Cancel (a/s/C)?");
 
-       switch( tolower(getch()) ) {
+       switch(tolower(getch())) {
                case 'a':
                        mode = ENUM_ALL;
                        break;
@@ -587,13 +589,13 @@ ui_open_datafile()
 
        filename = ask_filename("File to open: ");
 
-       if( !filename || ! *filename) {
+       if(!filename || ! *filename) {
                free(filename);
                refresh_screen();
                return;
        }
 
-       if( opt_get_bool(BOOL_AUTOSAVE) )
+       if(opt_get_bool(BOOL_AUTOSAVE))
                save_database();
        else if(statusline_ask_boolean("Save current database", FALSE))
                save_database();
@@ -602,7 +604,7 @@ ui_open_datafile()
 
        load_database(filename);
 
-       if( items == 0 ) {
+       if(items == 0) {
                statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook");
                load_database(datafile);
        } else {

diff --git a/ui.h b/ui.h
index fdb4dcaeb1d8f9eb5ec0ab554a7bcca393fe580f..f7fd48dde2ae835759be230e46ab75b49ec87c15 100644 (file)
--- a/ui.h
+++ b/ui.h
@@ -33,7 +33,7 @@ void          ui_print_database();
 void           ui_open_datafile();
 
 
-#include "options.h" /* needed for options_get_int */
+#include "options.h" /* needed for options_get_bool */
 
 #define UI_HLINE_CHAR          opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
                                        '-' : ACS_HLINE

diff --git a/xmalloc.c b/xmalloc.c
index e76758488059fb4c1c7f57faea2996e8a2e6963e..d291f4dd76149b86679cb29e51691ca0fb72cbc6 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "xmalloc.h"
 
 static void
 xmalloc_default_error_handler(int err)