* Copyright (C) Jaakko Heinonen
*/
+#include <errno.h>
+#include <fcntl.h>
+#include <ctype.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 "gettext.h"
#include "ui.h"
#include "database.h"
#include "list.h"
#include "options.h"
#include "getname.h"
#include "getopt.h"
-#include <assert.h>
+#include "views.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;
+
+// custom formatting
+char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
+struct abook_output_item_filter selected_item_filter;
bool alternative_datafile = FALSE;
bool alternative_rcfile = FALSE;
+
static int
datafile_writeable()
{
if(errno != ENOENT) {
perror(dir);
free(dir);
- exit(1);
+ exit(EXIT_FAILURE);
}
if(mkdir(dir, 0700) == -1) {
- printf("Cannot create directory %s\n", dir);
+ 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);
+ 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_options();
+ init_opts();
+ if(load_opts(rcfile) > 0) {
+ printf(_("Press enter to continue...\n"));
+ fgetc(stdin);
+ }
+ init_default_views();
- signal(SIGKILL, quit_abook_sig);
signal(SIGTERM, quit_abook_sig);
- if( init_ui() )
- exit(1);
+ init_index();
+
+ if(init_ui())
+ exit(EXIT_FAILURE);
umask(DEFAULT_UMASK);
if(!datafile_writeable()) {
- char *s = mkstr("File %s is not writeable", datafile);
+ char *s = strdup_printf(_("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)) {
- close_config();
+ _("If you continue all changes will "
+ "be lost. Do you want to continue?"), FALSE)) {
+ free_opts();
/*close_database();*/
close_ui();
- exit(1);
+ exit(EXIT_FAILURE);
}
} else
load_database(datafile);
}
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);
+ 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_MESSAGES, "");
+ setlocale(LC_TIME, "");
+ setlocale(LC_CTYPE, "");
+ setlocale(LC_COLLATE, "");
#endif
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ xmalloc_set_error_handler(xmalloc_error_handler);
+
+ prepare_database_internals();
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);
}
struct stat s;
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);
+ fprintf(stderr,_("%s is not a valid HOME directory\n"), getenv("HOME") );
+ exit(EXIT_FAILURE);
}
if(!datafile)
change_mode(int *current, int mode)
{
if(*current != MODE_CONT) {
- fprintf(stderr, "Cannot combine options --mutt-query, "
+ fprintf(stderr, _("Cannot combine options --mutt-query, "
"--convert, "
- "--add-email or --add-email-quiet\n");
- exit(1);
+ "--add-email or --add-email-quiet\n"));
+ 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",\
+ 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)
*infile = "-",
*outfile = "-";
int c;
+ selected_item_filter = select_output_item_filter("muttq");
for(;;) {
int option_index = 0;
OPT_CONVERT,
OPT_INFORMAT,
OPT_OUTFORMAT,
+ OPT_OUTFORMAT_STR,
OPT_INFILE,
OPT_OUTFILE,
OPT_FORMATS
{ "convert", 0, 0, OPT_CONVERT },
{ "informat", 1, 0, OPT_INFORMAT },
{ "outformat", 1, 0, OPT_OUTFORMAT },
+ { "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
{ "infile", 1, 0, OPT_INFILE },
{ "outfile", 1, 0, OPT_OUTFILE },
{ "formats", 0, 0, OPT_FORMATS },
{ 0, 0, 0, 0 }
};
- c = getopt_long(argc, argv, "hC:",
+ c = getopt_long(argc, argv, "hC:f:",
long_options, &option_index);
if(c == -1)
switch(c) {
case 'h':
show_usage();
- exit(1);
+ exit(EXIT_SUCCESS);
case OPT_ADD_EMAIL:
change_mode(&mode, MODE_ADD_EMAIL);
break;
set_convert_var(informat);
break;
case OPT_OUTFORMAT:
- set_convert_var(outformat);
+ if(mode != MODE_CONVERT && mode != MODE_QUERY) {
+ fprintf(stderr,
+ _("please use option --outformat after --convert or --mutt-query option\n"));
+ exit(EXIT_FAILURE);
+ }
+ // ascii-name is stored, it's used to traverse
+ // e_filters[] in MODE_CONVERT (see export_file())
+ outformat = optarg;
+ // but in case a query-compatible filter is requested
+ // try to guess right now which one it is, from u_filters[]
+ selected_item_filter = select_output_item_filter(outformat);
+ break;
+ case OPT_OUTFORMAT_STR:
+ strncpy(custom_format, optarg, FORMAT_STRING_LEN);
+ custom_format[FORMAT_STRING_LEN - 1] = 0;
break;
case OPT_INFILE:
set_convert_var(infile);
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",
+ // if the output format requested does not allow filtered querying
+ // (not in u_filter[]) and --convert has not been specified; bailout
+ if(! selected_item_filter.func && mode != MODE_CONVERT) {
+ printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
+ exit(EXIT_FAILURE);
+ }
+ if(! selected_item_filter.func)
+ selected_item_filter = select_output_item_filter("muttq");
+ else if (! strcmp(outformat, "custom")) {
+ if(! *custom_format) {
+ fprintf(stderr, _("Invalid custom format string\n"));
+ exit(EXIT_FAILURE);
+ }
+ }
+ if(optind < argc) {
+ fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
argv[0]);
- exit(1);
+ exit(EXIT_FAILURE);
}
switch(mode) {
static void
show_usage()
{
- puts (PACKAGE " v " VERSION "\n");
- puts (" -h --help show usage");
- 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 "
+ puts (PACKAGE " v" VERSION "\n");
+ puts (_(" -h --help show usage"));
+ puts (_(" -C --config <file> use an alternative configuration file"));
+ puts (_(" -f --datafile <file> use an alternative addressbook file"));
+ puts (_(" --mutt-query <string> make a query for mutt"));
+ puts (_(" --add-email "
"read an e-mail message from stdin and\n"
" "
- "add the sender to the addressbook");
- puts (" --add-email-quiet "
+ "add the sender to the addressbook"));
+ puts (_(" --add-email-quiet "
"same as --add-email but doesn't\n"
- " confirm adding");
+ " require to confirm adding"));
putchar('\n');
- puts (" --convert convert address book files");
- puts (" options to use with --convert:");
- puts (" --informat <format> format for input file");
- puts (" (default: abook)");
- puts (" --infile <file> source file");
- puts (" (default: stdin)");
- puts (" --outformat <format> format for output file");
- puts (" (default: text)");
- puts (" --outfile <file> destination file");
- puts (" (default: stdout)");
- puts (" --formats list available formats");
+ puts (_(" --convert convert address book files"));
+ puts (_(" options to use with --convert:"));
+ puts (_(" --informat <format> format for input file"));
+ puts (_(" (default: abook)"));
+ puts (_(" --infile <file> source file"));
+ puts (_(" (default: stdin)"));
+ puts (_(" --outformat <format> format for output file"));
+ puts (_(" (default: text)"));
+ puts (_(" --outfile <file> destination file"));
+ puts (_(" (default: stdout)"));
+ puts (_(" --outformatstr <str> format to use for \"custom\" --outformat"));
+ puts (_(" (default: \"{nick} ({name}): {mobile}\")"));
+ puts (_(" --formats list available formats"));
}
/*
* end of CLI
*/
-extern list_item *database;
static void
quit_mutt_query(int status)
{
close_database();
- close_config();
+ free_opts();
exit(status);
}
-static void
-muttq_print_item(FILE *file, int item)
-{
- char emails[MAX_EMAILS][MAX_EMAIL_LEN];
- int i;
-
- split_emailstr(item, emails);
-
- for(i = 0; i < (options_get_int("mutt_return_all_emails") ?
- MAX_EMAILS : 1) ; i++)
- if( *emails[i] )
- fprintf(file, "%s\t%s\t%s\n", emails[i],
- database[item][NAME],
- database[item][NOTES] == NULL ? " " :
- database[item][NOTES]
- );
-}
-
static void
mutt_query(char *str)
{
init_mutt_query();
if( str == NULL || !strcasecmp(str, "all") ) {
- struct db_enumerator e = init_db_enumerator(ENUM_ALL);
- printf("All items\n");
- db_enumerate_items(e)
- muttq_print_item(stdout, e.item);
+ export_file("muttq", "-");
} else {
int search_fields[] = {NAME, EMAIL, NICK, -1};
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');
+ // mutt expects a leading line containing
+ // a message about the query.
+ // Others output filter supporting query (vcard, custom)
+ // don't needs this.
+ if(!strcmp(selected_item_filter.filtname, "muttq"))
+ putchar('\n');
while(i >= 0) {
- muttq_print_item(stdout, i);
- i = find_item(str, i+1, search_fields);
+ e_write_item(stdout, i, selected_item_filter.func);
+ i = find_item(str, i + 1, search_fields);
}
}
- quit_mutt_query(0);
+ quit_mutt_query(EXIT_SUCCESS);
}
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);
- exit(1);
+ printf(_("Cannot open database\n"));
+ quit_mutt_query(EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
}
{
char email[MAX_EMAIL_LEN];
char *ret;
- char *name = mkstr("\"%s\"", database[item][NAME]);
+ char *name = strdup_printf("\"%s\"", db_name_get(item));
get_first_email(email, item);
- ret = *database[item][EMAIL] ?
- mkstr("%s <%s>", name, email) :
- strdup(name);
+ ret = *email ?
+ strdup_printf("%s <%s>", name, email) :
+ xstrdup(name);
free(name);
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);
+ system(cmd);
free(cmd);
/*
if( !is_valid_item(item) )
return;
- if( database[item][URL] )
- cmd = mkstr("%s '%s'",
- options_get_str("www_command"),
- safe_str(database[item][URL]));
+ if(db_fget(item, URL))
+ cmd = strdup_printf("%s '%s'",
+ opt_get_str(STR_WWW_COMMAND),
+ safe_str(db_fget(item, URL)));
else
return;
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((stat(path, &s)) == -1)
- return NULL;
-
if(strchr(mode, 'r'))
- return S_ISREG(s.st_mode) ? fopen(path, mode) : NULL;
+ return (stat_ok && S_ISREG(s.st_mode)) ?
+ fopen(path, mode) : NULL;
else
- return S_ISDIR(s.st_mode) ? NULL : fopen(path, mode);
+ return (stat_ok && S_ISDIR(s.st_mode)) ?
+ NULL : fopen(path, mode);
}
-
static void
convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
{
int ret=0;
if( !srcformat || !srcfile || !dstformat || !dstfile ) {
- fprintf(stderr, "too few argumets to make conversion\n");
- fprintf(stderr, "try --help\n");
+ fprintf(stderr, _("too few arguments to make conversion\n"));
+ fprintf(stderr, _("try --help\n"));
}
#ifndef DEBUG
if( !strcasecmp(srcformat, dstformat) ) {
- printf( "input and output formats are the same\n"
- "exiting...\n");
- exit(1);
+ printf( _("input and output formats are the same\n"
+ "exiting...\n"));
+ exit(EXIT_FAILURE);
}
#endif
set_filenames();
- init_options();
+ init_opts();
+ load_opts(rcfile);
+ init_standard_fields();
- switch( import_file(srcformat, srcfile) ) {
+ switch(import_file(srcformat, srcfile)) {
case -1:
fprintf(stderr,
- "input format %s not supported\n", srcformat);
+ _("input format %s not supported\n"), srcformat);
ret = 1;
break;
case 1:
- fprintf(stderr, "cannot read file %s\n", srcfile);
+ fprintf(stderr, _("cannot read file %s\n"), srcfile);
ret = 1;
break;
}
if(!ret)
- switch( export_file(dstformat, dstfile) ) {
+ switch(export_file(dstformat, dstfile)) {
case -1:
fprintf(stderr,
- "output format %s not supported\n",
+ _("output format %s not supported\n"),
dstformat);
ret = 1;
break;
case 1:
fprintf(stderr,
- "cannot write file %s\n", dstfile);
+ _("cannot write file %s\n"), dstfile);
ret = 1;
break;
}
close_database();
- close_config();
+ free_opts();
exit(ret);
}
* --add-email handling
*/
-static int add_email_count = 0;
+static int add_email_count = 0, add_email_found = 0;
static void
quit_add_email()
{
if(add_email_count > 0) {
if(save_database() < 0) {
- fprintf(stderr, "cannot open %s\n", datafile);
- exit(1);
+ fprintf(stderr, _("cannot open %s\n"), datafile);
+ exit(EXIT_FAILURE);
}
- printf("%d item(s) added to %s\n", add_email_count, datafile);
- } else {
- puts("Valid sender address not found");
+ printf(_("%d item(s) added to %s\n"), add_email_count, datafile);
+ } else if (add_email_found == 0) {
+ puts(_("Valid sender address not found"));
}
- exit(0);
+ exit(EXIT_SUCCESS);
}
static void
init_add_email()
{
set_filenames();
- atexit(free_filenames);
- init_options();
- atexit(close_config);
+ check_abook_directory();
+ init_opts();
+ load_opts(rcfile);
+ init_standard_fields();
+ 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;
if(!in) {
- fprintf(stderr, "cannot open /dev/tty\n"
- "you may want to use --add-email-quiet\n");
- exit(1);
+ fprintf(stderr, _("cannot open /dev/tty\n"
+ "you may want to use --add-email-quiet\n"));
+ exit(EXIT_FAILURE);
}
- printf("Add ``%s <%s>'' to %s ? (y/n)\n",
- name,
- email,
- datafile
- );
+
do {
- c = fgetc(in);
- if(c == 'n' || c == 'N') {
+ printf(_("Add \"%s <%s>\" to %s? (%c/%c)\n"),
+ name,
+ email,
+ datafile,
+ *S_("keybinding for yes|y"),
+ *S_("keybinding for no|n"));
+ c = tolower(getc(in));
+ if(c == *S_("keybinding for no|n")) {
fclose(in);
return 0;
}
- } while(c != 'y' && c != 'Y');
+ } while(c != *S_("keybinding for yes|y"));
fclose(in);
}
- memset(item, 0, sizeof(item));
- item[NAME] = strdup(name);
- item[EMAIL] = strdup(email);
+ item = item_create();
+ item_fput(item, NAME, xstrdup(name));
+ item_fput(item, EMAIL, xstrdup(email));
add_item2database(item);
+ item_free(&item);
return 1;
}
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);
+ if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode) ) {
+ fprintf(stderr, _("stdin is a directory or cannot stat stdin\n"));
+ exit(EXIT_FAILURE);
}
init_add_email();
do {
line = getaline(stdin);
if(line && !strncasecmp("From:", line, 5) ) {
+ add_email_found++;
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