]> git.deb.at Git - pkg/abook.git/blobdiff - abook.c
improved options error reporting
[pkg/abook.git] / abook.c
diff --git a/abook.c b/abook.c
index 7b119b9b6c8b9174fbd0316e1660ede2c0881450..e1a7dac67aebdf0a5788cec3dc22321ac2329a37 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <errno.h>
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
@@ -33,7 +34,6 @@
 static void             init_abook();
 static void            quit_abook_sig(int i);
 static void             set_filenames();
-static void            free_filenames();
 static void             parse_command_line(int argc, char **argv);
 static void             show_usage();
 static void             mutt_query(char *str);
@@ -45,40 +45,93 @@ static void         add_email(int);
 char *datafile = NULL;
 char *rcfile = NULL;
 
+bool alternative_datafile = FALSE;
+bool alternative_rcfile = FALSE;
+
+static int
+datafile_writeable()
+{
+       FILE *f;
+
+       assert(datafile != NULL);
+
+       if( (f = fopen(datafile, "a")) == NULL)
+               return FALSE;
+
+       fclose(f);
+
+       return TRUE;
+}
+
+static void
+check_abook_directory()
+{
+       struct stat s;
+       char *dir;
+
+       assert(!is_ui_initialized());
+
+       if(alternative_datafile)
+               return;
+
+       dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL);
+       assert(dir != NULL);
+
+       if(stat(dir, &s) == -1) {
+               if(errno != ENOENT) {
+                       perror(dir);
+                        free(dir);
+                        exit(1);
+               }
+               if(mkdir(dir, 0700) == -1) {
+                       printf("Cannot create directory %s\n", dir);
+                       perror(dir);
+                       free(dir);
+                       exit(1);
+               }
+       } else if(!S_ISDIR(s.st_mode)) {
+               printf("%s is not a directory\n", dir);
+               free(dir);
+               exit(1);
+       }
+
+       free(dir);
+}
+
 static void
 init_abook()
 {
        set_filenames();
-       init_options();
+       check_abook_directory();
+       init_opts();
+       if(load_opts(rcfile)) {
+               printf("Press enter to continue...\n");
+               fgetc(stdin);
+       }
 
        signal(SIGKILL, quit_abook_sig);
        signal(SIGTERM, quit_abook_sig);
-       
+
        if( init_ui() )
                exit(1);
-       
+
        umask(DEFAULT_UMASK);
 
-       /*
-        * this is very ugly for now
-        */
-       /*if( options_get_int("datafile", "autosave") )*/
-
-       if( load_database(datafile) == 2 ) {
-               char *tmp = strconcat(getenv("HOME"),
-                               "/" DATAFILE, NULL);
-
-               if( safe_strcmp(tmp, datafile) ) {
-                       refresh_screen();
-                       statusline_msg("Sorry, the specified file does "
-                               "not appear to be a valid abook addressbook");
-                       statusline_msg("Will open default addressbook...");
-                       free(datafile);
-                       datafile = tmp;
-                       load_database(datafile);
-               } else
-                       free(tmp);
-       }
+       if(!datafile_writeable()) {
+               char *s = mkstr("File %s is not writeable", datafile);
+               refresh_screen();
+               statusline_msg(s);
+               free(s);
+               if(load_database(datafile) || !statusline_ask_boolean(
+                                       "If you continue all changes will "
+                               "be lost. Do you want to continue?", FALSE)) {
+                       free_opts();
+                       /*close_database();*/
+                       close_ui();
+                       exit(1);
+               }
+       } else
+               load_database(datafile);
 
        refresh_screen();
 }
@@ -86,16 +139,16 @@ init_abook()
 void
 quit_abook()
 {
-       if( options_get_int("autosave") )
+       if( opt_get_bool(BOOL_AUTOSAVE) )
                save_database();
        else if( statusline_ask_boolean("Save database", TRUE) )
                save_database();
 
-       close_config();
+       free_opts();
        close_database();
 
        close_ui();
-       
+
        exit(0);
 }
 
@@ -111,18 +164,26 @@ main(int argc, char **argv)
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
        setlocale(LC_ALL, "" );
 #endif
-               
+
        parse_command_line(argc, argv);
-       
+
        init_abook();
 
        get_commands(); 
-       
+
        quit_abook();
 
        return 0;
 }
 
+static void
+free_filenames()
+{
+       my_free(rcfile);
+       my_free(datafile);
+}
+
+
 static void
 set_filenames()
 {
@@ -134,21 +195,16 @@ set_filenames()
        }
 
        if(!datafile)
-               datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
+               datafile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
+                               DATAFILE, NULL);
 
        if(!rcfile)
-               rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
+               rcfile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
+                               RCFILE, NULL);
 
        atexit(free_filenames);
 }
 
-static void
-free_filenames()
-{
-       my_free(rcfile);
-       my_free(datafile);
-}
-
 /*
  * CLI
  */
@@ -178,11 +234,11 @@ void
 set_filename(char **var, char *path)
 {
        char *cwd;
-       
+
        assert(var != NULL);
        assert(*var == NULL); /* or else we probably leak memory */
        assert(path != NULL);
-       
+
        if(*path == '/') {
                *var = strdup(path);
                return;
@@ -190,7 +246,7 @@ set_filename(char **var, char *path)
 
        cwd = my_getcwd();
 
-       *var = strconcat(cwd, path, NULL);
+       *var = strconcat(cwd, "/", path, NULL);
 
        free(cwd);
 }
@@ -261,6 +317,7 @@ parse_command_line(int argc, char **argv)
                                break;
                        case 'f':
                                set_filename(&datafile, optarg);
+                               alternative_datafile = TRUE;
                                break;
                        case OPT_MUTT_QUERY:
                                query_string = optarg;
@@ -268,6 +325,7 @@ parse_command_line(int argc, char **argv)
                                break;
                        case 'C':
                                set_filename(&rcfile, optarg);
+                               alternative_rcfile = TRUE;
                                break;
                        case OPT_CONVERT:
                                change_mode(&mode, MODE_CONVERT);
@@ -350,7 +408,7 @@ static void
 quit_mutt_query(int status)
 {
        close_database();
-       close_config();
+       free_opts();
 
        exit(status);
 }
@@ -362,8 +420,8 @@ muttq_print_item(FILE *file, int item)
        int i;
 
        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],
@@ -404,8 +462,9 @@ static void
 init_mutt_query()
 {
        set_filenames();
-       init_options();
-       
+       init_opts();
+       load_opts(rcfile);
+
        if( load_database(datafile) ) {
                printf("Cannot open database\n");
                quit_mutt_query(1);
@@ -428,7 +487,7 @@ make_mailstr(int item)
                strdup(name);
 
        free(name);
-       
+
        return ret;
 }
 
@@ -452,7 +511,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;
@@ -479,7 +538,7 @@ launch_mutt(int item)
 #endif
        system(cmd);    
        free(cmd);
-       
+
        /*
         * we need to make sure that curses settings are correct
         */
@@ -496,7 +555,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;
@@ -549,18 +608,18 @@ FILE *
 abook_fopen (const char *path, const char *mode)
 {      
        struct stat s;
+       bool stat_ok;
+
+       stat_ok = (stat(path, &s) != -1);
        
-       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;
+       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)
 {
@@ -580,7 +639,8 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 #endif
 
        set_filenames();
-       init_options();
+       init_opts();
+       load_opts(rcfile);
 
        switch( import_file(srcformat, srcfile) ) {
                case -1:
@@ -610,7 +670,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
                }
 
        close_database();
-       close_config();
+       free_opts();
        exit(ret);
 }
 
@@ -647,9 +707,10 @@ init_add_email()
 {
        set_filenames();
        atexit(free_filenames);
-       init_options();
-       atexit(close_config);
-       
+       init_opts();
+       load_opts(rcfile);
+       atexit(free_opts);
+
        /*
         * we don't actually care if loading fails or not
         */
@@ -665,6 +726,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;
@@ -701,7 +772,13 @@ 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();
 
        do {