wide character support

[pkg/abook.git] / abook.c

diff --git a/abook.c b/abook.c
index faa8055cbf1b4e668f652cf7e81fe83b0f099fc2..fe37f71469d861e444d1e3de3595af0daa99957e 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -6,9 +6,10 @@
  * Copyright (C) Jaakko Heinonen
  */
 
-#include <string.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -103,7 +104,11 @@ init_abook()
 {
        set_filenames();
        check_abook_directory();
-       init_options();
+       init_opts();
+       if(load_opts(rcfile) > 0) {
+               printf("Press enter to continue...\n");
+               fgetc(stdin);
+       }
 
        signal(SIGKILL, quit_abook_sig);
        signal(SIGTERM, quit_abook_sig);
@@ -121,7 +126,7 @@ init_abook()
                if(load_database(datafile) || !statusline_ask_boolean(
                                        "If you continue all changes will "
                                "be lost. Do you want to continue?", FALSE)) {
-                       close_config();
+                       free_opts();
                        /*close_database();*/
                        close_ui();
                        exit(1);
@@ -133,14 +138,17 @@ init_abook()
 }
 
 void
-quit_abook()
+quit_abook(int save_db)
 {
-       if( options_get_int("autosave") )
-               save_database();
-       else if( statusline_ask_boolean("Save database", TRUE) )
-               save_database();
+       if(save_db)  {
+               if(opt_get_bool(BOOL_AUTOSAVE))
+                       save_database();
+               else if(statusline_ask_boolean("Save database", TRUE))
+                       save_database();
+       } else if(!statusline_ask_boolean("Quit without saving", FALSE))
+               return;
 
-       close_config();
+       free_opts();
        close_database();
 
        close_ui();
@@ -151,14 +159,14 @@ quit_abook()
 static void
 quit_abook_sig(int i)
 {
-       quit_abook();
+       quit_abook(QUIT_SAVE);
 }
 
 int
 main(int argc, char **argv)
 {
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
-       setlocale(LC_ALL, "" );
+       setlocale(LC_ALL, "");
 #endif
 
        parse_command_line(argc, argv);
@@ -167,7 +175,7 @@ main(int argc, char **argv)
 
        get_commands(); 
 
-       quit_abook();
+       quit_abook(QUIT_SAVE);
 
        return 0;
 }
@@ -404,7 +412,7 @@ static void
 quit_mutt_query(int status)
 {
        close_database();
-       close_config();
+       free_opts();
 
        exit(status);
 }
@@ -417,7 +425,7 @@ muttq_print_item(FILE *file, int item)
 
        split_emailstr(item, emails);
 
-       for(i = 0; i < (options_get_int("mutt_return_all_emails") ?
+       for(i = 0; i < (opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS) ?
                        MAX_EMAILS : 1) ; i++)
                if( *emails[i] )
                        fprintf(file, "%s\t%s\t%s\n", emails[i],
@@ -447,7 +455,7 @@ mutt_query(char *str)
                putchar('\n');
                while(i >= 0) {
                        muttq_print_item(stdout, i);
-                       i = find_item(str, i+1, search_fields);
+                       i = find_item(str, i + 1, search_fields);
                }
        }
 
@@ -458,7 +466,8 @@ static void
 init_mutt_query()
 {
        set_filenames();
-       init_options();
+       init_opts();
+       load_opts(rcfile);
 
        if( load_database(datafile) ) {
                printf("Cannot open database\n");
@@ -506,7 +515,7 @@ void
 launch_mutt(int item)
 {
        char *cmd = NULL, *mailstr = NULL;
-       char *mutt_command = options_get_str("mutt_command");
+       char *mutt_command = opt_get_str(STR_MUTT_COMMAND);
 
        if(mutt_command == NULL || !*mutt_command)
                return;
@@ -525,8 +534,7 @@ launch_mutt(int item)
                }
        }
 
-       cmd = strconcat(mutt_command, " \'", mailstr,
-                               "\'", NULL);
+       cmd = strconcat(mutt_command, " \'", mailstr, "\'", NULL);
        free(mailstr);
 #ifdef DEBUG
        fprintf(stderr, "cmd: %s\n", cmd);
@@ -550,7 +558,7 @@ launch_wwwbrowser(int item)
 
        if( database[item][URL] )
                cmd = mkstr("%s '%s'",
-                               options_get_str("www_command"),
+                               opt_get_str(STR_WWW_COMMAND),
                                safe_str(database[item][URL]));
        else
                return;
@@ -573,7 +581,7 @@ abook_malloc(size_t size)
 
        if ( (ptr = malloc(size)) == NULL ) {
                if( is_ui_initialized() )
-                       quit_abook();
+                       quit_abook(QUIT_SAVE);
                perror("malloc() failed");
                exit(1);
        }
@@ -586,12 +594,12 @@ abook_realloc(void *ptr, size_t size)
 {
        ptr = realloc(ptr, size);
 
-       if( size == 0 )
+       if(size == 0)
                return NULL;
 
-       if( ptr == NULL ) {
-               if( is_ui_initialized() )
-                       quit_abook();
+       if(ptr == NULL) {
+               if(is_ui_initialized())
+                       quit_abook(QUIT_SAVE);
                perror("realloc() failed");
                exit(1);
        }
@@ -603,17 +611,18 @@ FILE *
 abook_fopen (const char *path, const char *mode)
 {      
        struct stat s;
+       bool stat_ok;
 
-       if( ! strchr(mode, 'r') )
-               return fopen(path, mode);
-
-       if ( (stat(path, &s)) == -1 )
-               return NULL;
-
-       return S_ISREG(s.st_mode) ? fopen(path, mode) : NULL;
+       stat_ok = (stat(path, &s) != -1);
+       
+       if(strchr(mode, 'r'))
+               return (stat_ok && S_ISREG(s.st_mode)) ?
+                       fopen(path, mode) : NULL;
+       else
+               return (stat_ok && S_ISDIR(s.st_mode)) ?
+                       NULL : fopen(path, mode);
 }
 
-
 static void
 convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 {
@@ -633,9 +642,10 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 #endif
 
        set_filenames();
-       init_options();
+       init_opts();
+       load_opts(rcfile);
 
-       switch( import_file(srcformat, srcfile) ) {
+       switch(import_file(srcformat, srcfile)) {
                case -1:
                        fprintf(stderr,
                                "input format %s not supported\n", srcformat);
@@ -648,7 +658,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
        }
 
        if(!ret)
-               switch( export_file(dstformat, dstfile) ) {
+               switch(export_file(dstformat, dstfile)) {
                        case -1:
                                fprintf(stderr,
                                        "output format %s not supported\n",
@@ -663,7 +673,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
                }
 
        close_database();
-       close_config();
+       free_opts();
        exit(ret);
 }
 
@@ -700,8 +710,10 @@ init_add_email()
 {
        set_filenames();
        atexit(free_filenames);
-       init_options();
-       atexit(close_config);
+       check_abook_directory();
+       init_opts();
+       load_opts(rcfile);
+       atexit(free_opts);
 
        /*
         * we don't actually care if loading fails or not
@@ -718,6 +730,16 @@ add_email_add_item(int quiet, char *name, char *email)
 {
        list_item item;
 
+       if(opt_get_bool(BOOL_ADD_EMAIL_PREVENT_DUPLICATES)) {
+               int search_fields[] = { EMAIL, -1 };
+               if(find_item(email, 0, search_fields) >= 0) {
+                       if(!quiet)
+                               printf("Address %s already in addressbook\n",
+                                               email);
+                       return 0;
+               }
+       }
+                                       
        if(!quiet) {
                FILE *in = fopen("/dev/tty", "r");
                char c;
@@ -754,6 +776,12 @@ add_email(int quiet)
 {
        char *line;
        char *name = NULL, *email = NULL;
+       struct stat s;
+
+       if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode) ) {
+               fprintf(stderr, "stdin is a directory or cannot stat stdin\n");
+               exit(1);
+       }
 
        init_add_email();