* Copyright (C) Jaakko Heinonen
*/
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <stdlib.h>
#include <sys/stat.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
# include <locale.h>
#endif
+#include <assert.h>
#include "abook.h"
#include "ui.h"
#include "database.h"
#include "options.h"
#include "getname.h"
#include "getopt.h"
-#include <assert.h>
+#include "xmalloc.h"
static void init_abook();
static void quit_abook_sig(int i);
static void add_email(int);
char *datafile = NULL;
-char *rcfile = NULL;
+static char *rcfile = NULL;
bool alternative_datafile = FALSE;
bool alternative_rcfile = FALSE;
if(errno != ENOENT) {
perror(dir);
free(dir);
- exit(1);
+ exit(EXIT_FAILURE);
}
if(mkdir(dir, 0700) == -1) {
printf("Cannot create directory %s\n", dir);
perror(dir);
free(dir);
- exit(1);
+ exit(EXIT_FAILURE);
}
} else if(!S_ISDIR(s.st_mode)) {
printf("%s is not a directory\n", dir);
free(dir);
- exit(1);
+ exit(EXIT_FAILURE);
}
free(dir);
}
+static void
+xmalloc_error_handler(int err)
+{
+ /*
+ * We don't try to save addressbook here because we don't know
+ * if it's fully loaded to memory.
+ */
+ if(is_ui_initialized())
+ close_ui();
+
+ fprintf(stderr, "Memory allocation failure: %s\n", strerror(err));
+ exit(EXIT_FAILURE);
+}
+
static void
init_abook()
{
set_filenames();
check_abook_directory();
init_opts();
- load_opts(rcfile);
+ 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);
+ if(init_ui())
+ exit(EXIT_FAILURE);
umask(DEFAULT_UMASK);
free_opts();
/*close_database();*/
close_ui();
- exit(1);
+ exit(EXIT_FAILURE);
}
} else
load_database(datafile);
}
void
-quit_abook()
+quit_abook(int save_db)
{
- if( opt_get_bool(BOOL_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;
free_opts();
close_database();
close_ui();
- exit(0);
+ exit(EXIT_SUCCESS);
}
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
+ xmalloc_set_error_handler(xmalloc_error_handler);
parse_command_line(argc, argv);
init_abook();
- get_commands();
+ get_commands();
- quit_abook();
+ quit_abook(QUIT_SAVE);
return 0;
}
static void
free_filenames()
{
- my_free(rcfile);
- my_free(datafile);
+ xfree(rcfile);
+ xfree(datafile);
}
if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
- exit(1);
+ exit(EXIT_FAILURE);
}
if(!datafile)
fprintf(stderr, "Cannot combine options --mutt-query, "
"--convert, "
"--add-email or --add-email-quiet\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
*current = mode;
assert(path != NULL);
if(*path == '/') {
- *var = strdup(path);
+ *var = xstrdup(path);
return;
}
#define set_convert_var(X) do { if(mode != MODE_CONVERT) {\
fprintf(stderr, "please use option --%s after --convert option\n",\
long_options[option_index].name);\
- exit(1);\
+ exit(EXIT_FAILURE);\
} else\
X = optarg;\
} while(0)
switch(c) {
case 'h':
show_usage();
- exit(1);
+ exit(EXIT_SUCCESS);
case OPT_ADD_EMAIL:
change_mode(&mode, MODE_ADD_EMAIL);
break;
break;
case OPT_FORMATS:
print_filters();
- exit(0);
+ exit(EXIT_SUCCESS);
default:
- exit(1);
+ exit(EXIT_FAILURE);
}
}
if (optind < argc) {
fprintf(stderr, "%s: unrecognized arguments on command line\n",
argv[0]);
- exit(1);
+ exit(EXIT_FAILURE);
}
switch(mode) {
{
puts (PACKAGE " v " VERSION "\n");
puts (" -h --help show usage");
- puts (" -C --config <file> use an alternative configuration file");
+ puts (" -C --config <file> use an alternative configuration file");
puts (" --datafile <file> use an alternative addressbook file");
puts (" --mutt-query <string> make a query for mutt");
puts (" --add-email "
int i;
if( (i = find_item(str, 0, search_fields)) < 0 ) {
printf("Not found\n");
- quit_mutt_query(1);
+ quit_mutt_query(EXIT_FAILURE);
}
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);
}
}
- quit_mutt_query(0);
+ quit_mutt_query(EXIT_SUCCESS);
}
static void
if( load_database(datafile) ) {
printf("Cannot open database\n");
- quit_mutt_query(1);
- exit(1);
+ quit_mutt_query(EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
}
ret = *database[item][EMAIL] ?
mkstr("%s <%s>", name, email) :
- strdup(name);
+ xstrdup(name);
free(name);
}
}
- 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);
+ system(cmd);
free(cmd);
/*
ui_init_curses();
}
-void *
-abook_malloc(size_t size)
-{
- void *ptr;
-
- if ( (ptr = malloc(size)) == NULL ) {
- if( is_ui_initialized() )
- quit_abook();
- perror("malloc() failed");
- exit(1);
- }
-
- return ptr;
-}
-
-void *
-abook_realloc(void *ptr, size_t size)
-{
- ptr = realloc(ptr, size);
-
- if( size == 0 )
- return NULL;
-
- if( ptr == NULL ) {
- if( is_ui_initialized() )
- quit_abook();
- perror("realloc() failed");
- exit(1);
- }
-
- return ptr;
-}
-
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 (stat_ok && S_ISREG(s.st_mode)) ?
fopen(path, mode) : NULL;
if( !strcasecmp(srcformat, dstformat) ) {
printf( "input and output formats are the same\n"
"exiting...\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
#endif
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",
if(add_email_count > 0) {
if(save_database() < 0) {
fprintf(stderr, "cannot open %s\n", datafile);
- exit(1);
+ exit(EXIT_FAILURE);
}
printf("%d item(s) added to %s\n", add_email_count, datafile);
} else {
puts("Valid sender address not found");
}
- exit(0);
+ exit(EXIT_SUCCESS);
}
static void
init_add_email()
{
set_filenames();
- atexit(free_filenames);
+ check_abook_directory();
init_opts();
load_opts(rcfile);
atexit(free_opts);
return 0;
}
}
-
+
if(!quiet) {
FILE *in = fopen("/dev/tty", "r");
char c;
if(!in) {
fprintf(stderr, "cannot open /dev/tty\n"
"you may want to use --add-email-quiet\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
- printf("Add ``%s <%s>'' to %s ? (y/n)\n",
- name,
- email,
- datafile
- );
+
do {
- c = fgetc(in);
+ printf("Add ``%s <%s>'' to %s ? (y/n)\n",
+ name,
+ email,
+ datafile);
+ c = getc(in);
if(c == 'n' || c == 'N') {
fclose(in);
return 0;
}
memset(item, 0, sizeof(item));
- item[NAME] = strdup(name);
- item[EMAIL] = strdup(email);
+ item[NAME] = xstrdup(name);
+ item[EMAIL] = xstrdup(email);
add_item2database(item);
return 1;
char *name = NULL, *email = NULL;
struct stat s;
- if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode)) {
+ if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode) ) {
fprintf(stderr, "stdin is a directory or cannot stat stdin\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
init_add_email();
getname(line, &name, &email);
add_email_count += add_email_add_item(quiet,
name, email);
- my_free(name);
- my_free(email);
+ xfree(name);
+ xfree(email);
}
- my_free(line);
+ xfree(line);
} while( !feof(stdin) );
quit_add_email();
projects / pkg / abook.git / blobdiff