* 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>
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()
{
struct stat s;
char *dir;
-
+
assert(!is_ui_initialized());
if(alternative_datafile)
dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL);
assert(dir != NULL);
-
+
if(stat(dir, &s) == -1) {
if(errno != ENOENT) {
perror(dir);
{
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);
-
+
if( init_ui() )
exit(1);
-
+
umask(DEFAULT_UMASK);
if(!datafile_writeable()) {
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()
+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();
-
+
exit(0);
}
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);
-
+
init_abook();
get_commands();
-
- quit_abook();
+
+ quit_abook(QUIT_SAVE);
return 0;
}
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;
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);
}
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],
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);
}
}
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);
strdup(name);
free(name);
-
+
return ret;
}
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;
}
}
- cmd = strconcat(mutt_command, " \'", mailstr,
- "\'", NULL);
+ cmd = strconcat(mutt_command, " \'", mailstr, "\'", NULL);
free(mailstr);
#ifdef DEBUG
fprintf(stderr, "cmd: %s\n", cmd);
#endif
system(cmd);
free(cmd);
-
+
/*
* we need to make sure that curses settings are correct
*/
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;
if ( (ptr = malloc(size)) == NULL ) {
if( is_ui_initialized() )
- quit_abook();
+ quit_abook(QUIT_SAVE);
perror("malloc() failed");
exit(1);
}
{
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);
}
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)
{
#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);
}
if(!ret)
- switch( export_file(dstformat, dstfile) ) {
+ switch(export_file(dstformat, dstfile)) {
case -1:
fprintf(stderr,
"output format %s not supported\n",
}
close_database();
- close_config();
+ free_opts();
exit(ret);
}
{
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
*/
{
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;
{
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 {
projects / pkg / abook.git / blobdiff