/*
* $Id$
*
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
*
* Copyright (C) Jaakko Heinonen
*/
#include <string.h>
#include <ctype.h>
#include <pwd.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include "abook_curses.h"
#include "filter.h"
#include "list.h"
#include "misc.h"
#include "options.h"
+#include <assert.h>
extern int items;
extern list_item *database;
static int ldif_parse_file(FILE *handle);
static int mutt_parse_file(FILE *in);
static int pine_parse_file(FILE *in);
+static int csv_parse_file(FILE *in);
/*
* export filter prototypes
static int html_export_database(FILE *out, struct db_enumerator e);
static int pine_export_database(FILE *out, struct db_enumerator e);
static int csv_export_database(FILE *out, struct db_enumerator e);
+static int palm_export_database(FILE *out, struct db_enumerator e);
static int gcrd_export_database(FILE *out, struct db_enumerator e);
static int mutt_alias_export(FILE *out, struct db_enumerator e);
static int elm_alias_export(FILE *out, struct db_enumerator e);
struct abook_input_filter i_filters[] = {
{ "abook", "abook native format", parse_database },
{ "ldif", "ldif / Netscape addressbook", ldif_parse_file },
- { "mutt", "mutt alias (beta)", mutt_parse_file },
+ { "mutt", "mutt alias", mutt_parse_file },
{ "pine", "pine addressbook", pine_parse_file },
+ { "csv", "comma separated values", csv_parse_file },
{ "\0", NULL, NULL }
};
{ "pine", "pine addressbook", pine_export_database },
{ "gcrd", "GnomeCard (VCard) addressbook", gcrd_export_database },
{ "csv", "comma separated values", csv_export_database },
+ { "palmcsv", "Palm comma separated values", palm_export_database},
{ "elm", "elm alias", elm_alias_export },
{ "text", "plain text", text_export_database },
{ "spruce", "Spruce address book", spruce_export_database },
pwent = getpwnam(username);
- if( (tmp = malloc(strlen(pwent->pw_gecos) +1)) == NULL)
+ if( (tmp = (char *)malloc(strlen(pwent->pw_gecos) +1)) == NULL)
return strdup(username);
rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp);
mvaddstr(5+filter, 2, "->");
- filename = ask_filename("Filename: ", 1);
+ filename = ask_filename("Filename: ");
if( !filename ) {
refresh_screen();
return 2;
if( i_read_file(filename, i_filters[filter].func ) )
statusline_msg("Error occured while opening the file");
- else
- if( tmp == items )
+ else if( tmp == items )
statusline_msg("Hmm.., file seems not to be a valid file");
refresh_screen();
FILE *in;
int ret = 0;
- if( ( in = fopen( filename, "r" ) ) == NULL )
+ if( ( in = abook_fopen( filename, "r" ) ) == NULL )
return 1;
ret = (*func) (in);
}
int
-import(char filtname[FILTNAME_LEN], char *filename)
+import_file(char filtname[FILTNAME_LEN], char *filename)
{
int i;
int tmp = items;
int ret = 0;
for(i=0;; i++) {
- if( ! strncmp(i_filters[i].filtname, filtname, FILTNAME_LEN) )
+ if( ! strncasecmp(i_filters[i].filtname, filtname,
+ FILTNAME_LEN) )
break;
if( ! *i_filters[i].filtname ) {
i = -1;
if( i<0 )
return -1;
- if( !strcmp(filename, "-") )
- ret = (*i_filters[i].func) (stdin);
- else
+ if( !strcmp(filename, "-") ) {
+ struct stat s;
+ if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
+ ret = 1;
+ else
+ ret = (*i_filters[i].func) (stdin);
+ } else
ret = i_read_file(filename, i_filters[i].func);
if( tmp == items )
filter = getch() - 'a';
if(filter == 'x' - 'a' ||
- filter >= number_of_output_filters(e_filters) || filter < 0) {
+ filter >= number_of_output_filters() || filter < 0) {
refresh_screen();
return 1;
}
clear_statusline();
}
- filename = ask_filename("Filename: ", 0);
+ filename = ask_filename("Filename: ");
if( !filename ) {
refresh_screen();
return 2;
struct db_enumerator e = init_db_enumerator(enum_mode);
for(i=0;; i++) {
- if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+ if( ! strncasecmp(e_filters[i].filtname, filtname,
+ FILTNAME_LEN) )
break;
if( ! *e_filters[i].filtname ) {
i = -1;
return (e_filters[i].func) (handle, e);
}
-
+
int
-export(char filtname[FILTNAME_LEN], char *filename)
+export_file(char filtname[FILTNAME_LEN], char *filename)
{
const int mode = ENUM_ALL;
int i;
struct db_enumerator e = init_db_enumerator(mode);
for(i=0;; i++) {
- if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+ if( ! strncasecmp(e_filters[i].filtname, filtname,
+ FILTNAME_LEN) )
break;
if( ! *e_filters[i].filtname ) {
i = -1;
static void ldif_fix_string(char *str);
-#ifndef LINESIZE
-# define LINESIZE 1024
-#endif
-
-#define LDIF_ITEM_FIELDS 15
+#define LDIF_ITEM_FIELDS 16
typedef char* ldif_item[LDIF_ITEM_FIELDS];
"cn",
"mail",
"streetaddress",
+ "streetaddress2",
"locality",
"st",
"postalcode",
NAME, /* "cn" */
EMAIL, /* "mail" */
ADDRESS, /* "streetaddress" */
+ ADDRESS2, /* "streetaddress2" */
CITY, /* "locality" */
STATE, /* "st" */
ZIP, /* "postalcode" */
static char *
ldif_read_line(FILE *in)
{
- char line[LINESIZE];
- char *buf=NULL;
+ char *buf = NULL;
char *ptr, *tmp;
long pos;
int i;
- for(i=1;;i++) {
+ for(i = 1;;i++) {
+ char *line;
+
pos = ftell(in);
- fgets(line, LINESIZE, in);
+ line = getaline(in);
- if( feof(in) )
+ if( feof(in) || !line )
break;
if(i == 1) {
- buf = strdup(line);
+ buf = line;
continue;
}
-
+
if(*line != ' ') {
- fseek(in, pos, SEEK_SET);
+ fseek(in, pos, SEEK_SET); /* fixme ! */
+ free(line);
break;
}
- ptr = (char *)&line;
+ ptr = line;
while( *ptr == ' ')
ptr++;
tmp = buf;
buf = strconcat(buf, ptr, NULL);
free(tmp);
+ free(line);
}
- if( *buf == '#' ) {
+ if(buf && *buf == '#' ) {
free(buf);
return NULL;
}
-
- if(buf) {
- int i,j;
- for(i=0,j=0; j < strlen(buf); i++, j++)
- buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
- }
return buf;
}
int i;
memset(abook_item, 0, sizeof(abook_item));
-
+
if( !ldif_item[LDIF_ITEM_FIELDS -1] )
goto bail_out;
-
+
for(i=0; i < LDIF_ITEM_FIELDS; i++) {
if(ldif_conv_table[i] >= 0 && ldif_item[i] && *ldif_item[i] )
my_free(line);
continue; /* just skip the errors */
}
-
+
ldif_fix_string(value);
ldif_convert(item, type, value);
{
int i, j;
- for( i = 0, j = 0; j < strlen(str); i++, j++)
+ for( i = 0, j = 0; j < (int)strlen(str); i++, j++)
str[i] = ( str[j] == (char)0xc3 ?
(char) str[++j] + (char) 0x40 :
str[j] );
* mutt alias import filter
*/
-enum {
- MUTT_ALIAS,
- MUTT_NAME,
- MUTT_EMAIL
-};
-
-static void
-remove_newlines(char *buf)
-{
- int i,j;
-
- for(i=0,j=0; j < strlen(buf); i++, j++)
- buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
-}
+#include "getname.h"
static int
mutt_read_line(FILE *in, char **alias, char **rest)
{
- char line[LINESIZE];
- char *ptr=(char *)&line;
- char *tmp;
+ char *line, *ptr, *tmp;
- fgets(line, LINESIZE, in);
- remove_newlines(line);
+ if( !(line = ptr = getaline(in)) )
+ return 1; /* error / EOF */
while( ISSPACE(*ptr) )
ptr++;
if( strncmp("alias", ptr, 5) ) {
+ free(line);
return 1;
}
-
+
ptr += 5;
while( ISSPACE(*ptr) )
while( ! ISSPACE(*ptr) )
ptr++;
- if( (*alias = malloc(ptr-tmp+1)) == NULL)
+ if( (*alias = (char *)malloc(ptr-tmp+1)) == NULL) {
+ free(line);
return 1;
+ }
strncpy(*alias, tmp, ptr-tmp);
- *(*alias+(ptr-tmp)) = 0;
+ *(*alias + (ptr - tmp)) = 0;
while( ISSPACE(*ptr) )
ptr++;
*rest = strdup(ptr);
-
+
+ free(line);
return 0;
}
static void
-mutt_parse_email(char *mutt_item[3])
+mutt_parse_email(list_item item)
{
- char *tmp;
- int i;
-
- if( (tmp = strchr(mutt_item[MUTT_NAME], '<')) )
- *tmp = 0;
- else
- return;
-
- mutt_item[MUTT_EMAIL] = strdup(tmp+1);
-
- if( (tmp = strchr(mutt_item[MUTT_EMAIL], '>')) )
- *tmp = 0;
-
- tmp = mutt_item[MUTT_NAME];
-
- for(i=strlen(tmp)-1; i>0; i--)
- if(ISSPACE(tmp[i]))
- tmp[i] = 0;
- else
- break;
-
- mutt_item[MUTT_NAME] = strdup(tmp);
+ char *line = item[NAME];
+ char *start = line, *tmp;
+ char *name, *email;
+ int i = 0;
+ tmp = strconcat("From: ", line, NULL);
+ getname(tmp, &name, &email);
free(tmp);
-}
-static void
-mutt_add_mutt_item(char *mutt_item[3])
-{
- list_item abook_item;
-
- memset(abook_item, 0, sizeof(abook_item));
-
- abook_item[NAME] = safe_strdup(mutt_item[MUTT_NAME]);
- abook_item[EMAIL] = safe_strdup(mutt_item[MUTT_EMAIL]);
- abook_item[NICK] = safe_strdup(mutt_item[MUTT_ALIAS]);
+ if(name)
+ item[NAME] = name;
+ else
+ return;
+ if(email)
+ item[EMAIL] = email;
+ else
+ return;
- add_item2database(abook_item);
+ while( (start = strchr(start, ',')) && i++ < MAX_EMAILS - 1) {
+ tmp = strconcat("From: ", ++start, NULL);
+ getname(tmp, &name, &email);
+ free(tmp);
+ free(name);
+ if(email) {
+ if(*email) {
+ tmp = strconcat(item[EMAIL], ",", email, NULL);
+ free(item[EMAIL]);
+ item[EMAIL] = tmp;
+ } else {
+ my_free(email);
+ }
+ }
+ }
}
static int
mutt_parse_file(FILE *in)
{
- char *mutt_item[3];
+ list_item item;
for(;;) {
+ memset(item, 0, sizeof(item));
- memset(mutt_item, 0, sizeof(mutt_item) );
-
- if( mutt_read_line(in, &mutt_item[MUTT_ALIAS],
- &mutt_item[MUTT_NAME]) )
- continue;
-
- mutt_parse_email(mutt_item);
+ if( !mutt_read_line(in, &item[NICK],
+ &item[NAME]) )
+ mutt_parse_email(item);
if( feof(in) ) {
- free(mutt_item[MUTT_ALIAS]);
- free(mutt_item[MUTT_NAME]);
- free(mutt_item[MUTT_EMAIL]);
+ free_list_item(item);
break;
}
- mutt_add_mutt_item(mutt_item);
-
- free(mutt_item[MUTT_ALIAS]);
- free(mutt_item[MUTT_NAME]);
- free(mutt_item[MUTT_EMAIL]);
+ add_item2database(item);
}
-
return 0;
}
static void html_export_write_head(FILE *out, int extra_column);
static void html_export_write_tail(FILE *out);
+extern int extra_column;
+
static int
html_export_database(FILE *out, struct db_enumerator e)
{
char tmp[MAX_EMAILSTR_LEN];
- int extra_column = options_get_int("extra_column");
if( items < 1 )
return 2;
tmp,
database[e.item][NAME] );
else
- fprintf(out, "<tr>\n<td>%s>\n",
+ fprintf(out, "<tr>\n<td>%s\n",
database[e.item][NAME] );
fprintf(out, "<td>%s\n<td>%s\n",
{
char *realname = get_real_name();
- fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n");
- fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>",
- realname );
+ fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
+ fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>", realname );
fprintf(out, "\n</head>\n<body>\n");
fprintf(out, "\n<h2>%s's addressbook</h2>\n", realname );
fprintf(out, "<br><br>\n\n");
- fprintf(out, "<center><table border>\n");
+ fprintf(out, "<table border=\"1\" align=\"center\">\n");
fprintf(out, "\n<tr><th>Name<th>E-mail address(es)<th>%s</tr>\n\n",
abook_fields[extra_column].name);
static void
html_export_write_tail(FILE *out)
{
- fprintf(out, "\n</table></center>\n");
+ fprintf(out, "\n</table>\n");
fprintf(out, "\n</body>\n</html>\n");
}
* pine addressbook import filter
*/
+#define PINE_BUF_SIZE 2048
+
static void
pine_fixbuf(char *buf)
{
int i,j;
- for(i=0,j=0; j < strlen(buf); i++, j++)
+ for(i=0,j=0; j < (int)strlen(buf); i++, j++)
buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
}
if( ( tmp = strchr(s,')')) )
*tmp=0;
-
+
for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 )
if( i > MAX_EMAILS - 1 ) {
*tmp = 0;
list_item item;
char *start = buf;
char *end;
- char tmp[400];
+ char tmp[PINE_BUF_SIZE];
int i, len, last;
int pine_conv_table[]= {NICK, NAME, EMAIL, -1, NOTES};
for(i=0, last=0; !last ; i++) {
if( ! (end = strchr(start, '\t')) )
last=1;
-
+
len = last ? strlen(start) : (int) (end-start);
- len = min(len, 400-1);
-
- if(i < sizeof(pine_conv_table) / sizeof(*pine_conv_table)
+ len = min(len, PINE_BUF_SIZE - 1);
+
+ if(i < (int)(sizeof(pine_conv_table) / sizeof(*pine_conv_table))
&& pine_conv_table[i] >= 0) {
strncpy(tmp, start, len);
tmp[len] = 0;
- item[pine_conv_table[i]] = strdup(tmp);
+ if(*tmp)
+ item[pine_conv_table[i]] = strdup(tmp);
}
start = end + 1;
}
-
+
pine_convert_emails(item[EMAIL]);
add_item2database(item);
}
-
+
#define LINESIZE 1024
pine_parse_file(FILE *in)
{
char line[LINESIZE];
- char *buf=NULL;
+ char *buf = NULL;
char *ptr;
int i;
fgets(line, LINESIZE, in);
-
+
while(!feof(in)) {
- for(i=2;;i++) {
- buf = realloc(buf, i*LINESIZE);
- if(i==2)
+ for(i = 2;;i++) {
+ buf = (char *) realloc(buf, i*LINESIZE);
+ if(i == 2)
strcpy(buf, line);
fgets(line, LINESIZE, in);
ptr=(char *)&line;
if(*ptr != ' ' || feof(in) )
break;
else
- while( *ptr == ' ') ptr++;
-
+ while( *ptr == ' ')
+ ptr++;
+
strcat(buf, ptr);
}
if( *buf == '#' ) {
/*
- * csv addressbook export filter
+ * csv import filter
+ */
+
+/* FIXME
+ * these files should be parsed according to a certain
+ * lay out, or the default if layout is not given, at
+ * the moment only default is done...
+ */
+
+#define CSV_COMMENT_CHAR '#'
+
+static int csv_conv_table[] = {
+ NAME,
+ EMAIL,
+ PHONE,
+ NOTES,
+ NICK
+};
+
+static void
+csv_convert_emails(char *s)
+{
+ int i;
+ char *tmp;
+
+ if( s == NULL )
+ return;
+
+ for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1 )
+ if( i > MAX_EMAILS - 1 ) {
+ *tmp = 0;
+ break;
+ }
+
+}
+
+static char *
+csv_remove_quotes(char *s)
+{
+ char *copy, *trimmed;
+ int len;
+
+ copy = trimmed = strdup(s);
+ strtrim(trimmed);
+
+ len = strlen(trimmed);
+ if(trimmed[len - 1] == '\"' && *trimmed == '\"') {
+ if(len < 3) {
+ my_free(copy);
+ return NULL;
+ }
+ trimmed[len - 1] = 0;
+ trimmed++;
+ trimmed = strdup(trimmed);
+ free(copy);
+ return trimmed;
+ }
+
+ my_free(copy);
+ return strdup(s);
+}
+
+static void
+csv_store_field(list_item item, char *s, int field)
+{
+ char *newstr = NULL;
+
+ if(!s || !*s)
+ return;
+
+ if( !(newstr = csv_remove_quotes(s)) )
+ return;
+
+ if(field < (int)(sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+ && csv_conv_table[field] >= 0) {
+ item[csv_conv_table[field]] = newstr;
+ } else {
+ my_free(newstr);
+ }
+}
+
+static int
+csv_is_valid_quote_end(char *p)
+{
+ if(*p != '\"')
+ return FALSE;
+
+ for(p++; *p; p++) {
+ if(*p == ',')
+ return TRUE;
+ else if(!ISSPACE(*p))
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static int
+csv_is_valid_quote_start(char *p)
+{
+ for(; *p; p++) {
+ if(*p == '\"')
+ return TRUE;
+ else if(!ISSPACE(*p))
+ return FALSE;
+ }
+
+ return FALSE;
+}
+
+static void
+csv_parse_line(char *line)
+{
+ char *p, *start;
+ int field;
+ bool in_quote = FALSE;
+ list_item item;
+
+ memset(item, 0, sizeof(item));
+
+ for(p = start = line, field = 0; *p; p++) {
+ if(in_quote) {
+ if(csv_is_valid_quote_end(p))
+ in_quote = FALSE;
+ } else {
+ if ( (((p - start) / sizeof (char)) < 2 ) &&
+ csv_is_valid_quote_start(p) )
+ in_quote = TRUE;
+ }
+
+ if( *p == ',' && !in_quote) {
+ *p = 0;
+ csv_store_field(item, start, field);
+ field++;
+ start = p + 1;
+ }
+ }
+ /*
+ * store last field
+ */
+ csv_store_field(item, start, field);
+
+ csv_convert_emails(item[EMAIL]);
+ add_item2database(item);
+}
+
+
+static int
+csv_parse_file(FILE *in)
+{
+ char *line = NULL;
+
+ while(!feof(in)) {
+ line = getaline(in);
+
+ if(line && *line && *line != CSV_COMMENT_CHAR)
+ csv_parse_line(line);
+
+ my_free(line);
+ }
+
+ return 0;
+}
+
+/*
+ * end of csv import filter
*/
+/*
+ * csv addressbook export filters
+ */
+
+#define CSV_LAST (-1)
+#define CSV_UNDEFINED (-2)
+#define CSV_SPECIAL(X) (-3 - (X))
+#define CSV_IS_SPECIAL(X) ((X) <= -3)
+
+static int
+csv_export_common(FILE *out, struct db_enumerator e,
+ int fields[], void (*special_func)(FILE *, int, int))
+{
+ int i;
+
+ db_enumerate_items(e) {
+ for(i = 0; fields[i] != CSV_LAST; i++) {
+ if(fields[i] == CSV_UNDEFINED)
+ fprintf(out, "\"\"");
+ else if(CSV_IS_SPECIAL(fields[i])) {
+ if(special_func)
+ (*special_func)(out, e.item, fields[i]);
+ } else
+ /*fprintf(out,(
+ strchr(safe_str(database[e.item][fields[i]]), ',') ||
+ strchr(safe_str(database[e.item][fields[i]]), '\"')) ?
+ "\"%s\"" : "%s",
+ safe_str(database[e.item][fields[i]])
+ );*/
+ fprintf(out, "\"%s\"",
+ safe_str(database[e.item][fields[i]]));
+
+ if(fields[i + 1] != CSV_LAST)
+ fputc(',', out);
+ }
+ fputc('\n', out);
+ }
+
+ return 0;
+}
+
static int
csv_export_database(FILE *out, struct db_enumerator e)
{
- int j;
int csv_export_fields[] = {
NAME,
EMAIL,
PHONE,
NOTES,
- -1
+ NICK,
+ CSV_LAST
};
- db_enumerate_items(e) {
- for(j = 0; csv_export_fields[j] >= 0; j++) {
- fprintf(out, strchr(safe_str(database[e.item][csv_export_fields[j]]), ',') ?
- "\"%s\"" : "%s",
- safe_str(database[e.item][csv_export_fields[j]])
- );
- if(csv_export_fields[j+1] >= 0)
- fputc(',', out);
- }
- fputc('\n', out);
+ csv_export_common(out, e, csv_export_fields, NULL);
+
+ return 0;
+}
+
+/*
+ * palm csv
+ */
+
+#define PALM_CSV_NAME CSV_SPECIAL(0)
+#define PALM_CSV_END CSV_SPECIAL(1)
+#define PALM_CSV_CAT CSV_SPECIAL(2)
+
+static void
+palm_split_and_write_name(FILE *out, char *name)
+{
+ char *p;
+
+ assert(name);
+
+ if ( (p = strchr(name, ' ')) ) {
+ /*
+ * last name first
+ */
+ fprintf(out, "\"%s\",\"" , p + 1);
+ fwrite((void *)name, p - name, sizeof(char), out);
+ fputc('\"', out);
+ } else {
+ fprintf(out, "\"%s\"", safe_str(name));
}
-
+}
+static void
+palm_csv_handle_specials(FILE *out, int item, int field)
+{
+ switch(field) {
+ case PALM_CSV_NAME:
+ palm_split_and_write_name(out, database[item][NAME]);
+ break;
+ case PALM_CSV_CAT:
+ fprintf(out, "\"abook\"");
+ break;
+ case PALM_CSV_END:
+ fprintf(out, "\"0\"");
+ break;
+ default:
+ assert(0);
+ }
+}
+
+static int
+palm_export_database(FILE *out, struct db_enumerator e)
+{
+ int palm_export_fields[] = {
+ PALM_CSV_NAME, /* LASTNAME, FIRSTNAME */
+ CSV_UNDEFINED, /* TITLE */
+ CSV_UNDEFINED, /* COMPANY */
+ WORKPHONE, /* WORK PHONE */
+ PHONE, /* HOME PHONE */
+ FAX, /* FAX */
+ MOBILEPHONE, /* OTHER */
+ EMAIL, /* EMAIL */
+ ADDRESS, /* ADDRESS */
+ CITY, /* CITY */
+ STATE, /* STATE */
+ ZIP, /* ZIP */
+ COUNTRY, /* COUNTRY */
+ NICK, /* DEFINED 1 */
+ URL, /* DEFINED 2 */
+ CSV_UNDEFINED, /* DEFINED 3 */
+ CSV_UNDEFINED, /* DEFINED 4 */
+ NOTES, /* NOTE */
+ PALM_CSV_END, /* "0" */
+ PALM_CSV_CAT, /* CATEGORY */
+ CSV_LAST
+ };
+
+ csv_export_common(out, e, palm_export_fields, palm_csv_handle_specials);
return 0;
}
/*
- * end of csv export filter
+ * end of csv export filters
*/
-
/*
* GnomeCard (VCard) addressbook export filter
*/
free(name);
if ( database[e.item][ADDRESS] )
- fprintf(out, "ADR:;;%s;%s;%s;%s;%s\n",
+ fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
safe_str(database[e.item][ADDRESS]),
+ safe_str(database[e.item][ADDRESS2]),
safe_str(database[e.item][CITY]),
safe_str(database[e.item][STATE]),
safe_str(database[e.item][ZIP]),
static void
text_write_address_us(FILE *out, int i) {
fprintf(out, "\n%s", database[i][ADDRESS]);
-
+
+ if (database[i][ADDRESS2])
+ fprintf(out, "\n%s", database[i][ADDRESS2]);
+
if (database[i][CITY])
fprintf(out, "\n%s", database[i][CITY]);
static void
text_write_address_eu(FILE *out, int i) {
fprintf(out, "\n%s", database[i][ADDRESS]);
-
+
+ if (database[i][ADDRESS2])
+ fprintf(out, "\n%s", database[i][ADDRESS2]);
+
if (database[i][ZIP] || database[i][CITY]) {
fputc('\n', out);
char emails[MAX_EMAILS][MAX_EMAIL_LEN];
int j;
char *realname = get_real_name();
- char *style = options_get_str("address_style");
+ char *style = opt_get_str(STR_ADDRESS_STYLE);
fprintf(out,
"-----------------------------------------\n%s's address book\n"
fprintf(out,
"-----------------------------------------\n\n");
fprintf(out, "%s", database[e.item][NAME]);
- if (database[e.item][NICK])
+ if (database[e.item][NICK] && *database[e.item][NICK])
fprintf(out, "\n(%s)", database[e.item][NICK]);
fprintf(out, "\n");