char *datafile = NULL;
char *rcfile = NULL;
-int alternative_datafile = FALSE;
-int alternative_rcfile = FALSE;
+bool alternative_datafile = FALSE;
+bool alternative_rcfile = FALSE;
static int
datafile_writeable()
{
set_filenames();
check_abook_directory();
- init_options();
+ init_opts();
+ load_opts(rcfile);
signal(SIGKILL, quit_abook_sig);
signal(SIGTERM, quit_abook_sig);
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);
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();
cwd = my_getcwd();
- *var = strconcat(cwd, path, NULL);
+ *var = strconcat(cwd, "/", path, NULL);
free(cwd);
}
quit_mutt_query(int status)
{
close_database();
- close_config();
+ free_opts();
exit(status);
}
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],
init_mutt_query()
{
set_filenames();
- init_options();
+ init_opts();
+ load_opts(rcfile);
if( load_database(datafile) ) {
printf("Cannot open database\n");
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;
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;
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)
{
#endif
set_filenames();
- init_options();
+ init_opts();
+ load_opts(rcfile);
switch( import_file(srcformat, srcfile) ) {
case -1:
}
close_database();
- close_config();
+ free_opts();
exit(ret);
}
{
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
{
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();