X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=8d0faa95a01b3a9f6cae2850a4a5392d57c4d1bf;hb=04c907b27265cf95ac543240cc6322044a3c5bbf;hp=9f62171f0f93e4ad122e63494fea928fcb4b7af1;hpb=9d82930091c8cce4fc56c6f9e3cf46e68ca0bcb3;p=pkg%2Fabook.git diff --git a/filter.c b/filter.c index 9f62171..8d0faa9 100644 --- a/filter.c +++ b/filter.c @@ -1,6 +1,6 @@ /* - * $Id: filter.c,v 1.31 2004/06/30 19:48:28 jheinonen Exp $ + * $Id: filter.c,v 1.48.2.1.2.2 2006/04/10 16:02:10 jheinonen Exp $ * * by JH * @@ -19,9 +19,12 @@ #include "abook.h" #include "database.h" #include "edit.h" +#include "gettext.h" #include "list.h" #include "misc.h" #include "options.h" +#include "ui.h" +#include "xmalloc.h" #include extern int items; @@ -41,6 +44,7 @@ static int mutt_parse_file(FILE *in); static int pine_parse_file(FILE *in); static int csv_parse_file(FILE *in); static int allcsv_parse_file(FILE *in); +static int palmcsv_parse_file(FILE *in); /* * export filter prototypes @@ -57,34 +61,37 @@ static int mutt_alias_export(FILE *out, struct db_enumerator e); static int elm_alias_export(FILE *out, struct db_enumerator e); static int text_export_database(FILE *out, struct db_enumerator e); static int spruce_export_database(FILE *out, struct db_enumerator e); +static int wl_export_database(FILE *out, struct db_enumerator e); /* * end of function declarations */ struct abook_input_filter i_filters[] = { - { "abook", "abook native format", parse_database }, - { "ldif", "ldif / Netscape addressbook", ldif_parse_file }, - { "mutt", "mutt alias", mutt_parse_file }, - { "pine", "pine addressbook", pine_parse_file }, - { "csv", "comma separated values", csv_parse_file }, - { "allcsv", "comma separated all values", allcsv_parse_file }, + { "abook", N_("abook native format"), parse_database }, + { "ldif", N_("ldif / Netscape addressbook"), ldif_parse_file }, + { "mutt", N_("mutt alias"), mutt_parse_file }, + { "pine", N_("pine addressbook"), pine_parse_file }, + { "csv", N_("comma separated values"), csv_parse_file }, + { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, + { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, { "\0", NULL, NULL } }; struct abook_output_filter e_filters[] = { - { "abook", "abook native format", write_database }, - { "ldif", "ldif / Netscape addressbook (.4ld)", ldif_export_database }, - { "mutt", "mutt alias", mutt_alias_export }, - { "html", "html document", html_export_database }, - { "pine", "pine addressbook", pine_export_database }, - { "gcrd", "GnomeCard (VCard) addressbook", gcrd_export_database }, - { "csv", "comma separated values", csv_export_database }, - { "allcsv", "comma separated all values", allcsv_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 }, + { "abook", N_("abook native format"), write_database }, + { "ldif", N_("ldif / Netscape addressbook (.4ld)"), ldif_export_database }, + { "mutt", N_("mutt alias"), mutt_alias_export }, + { "html", N_("html document"), html_export_database }, + { "pine", N_("pine addressbook"), pine_export_database }, + { "gcrd", N_("GnomeCard (VCard) addressbook"), gcrd_export_database }, + { "csv", N_("comma separated values"), csv_export_database }, + { "allcsv", N_("comma separated values (all fields)"), allcsv_export_database }, + { "palmcsv", N_("Palm comma separated values"), palm_export_database}, + { "elm", N_("elm alias"), elm_alias_export }, + { "text", N_("plain text"), text_export_database }, + { "wl", N_("Wanderlust address book"), wl_export_database }, + { "spruce", N_("Spruce address book"), spruce_export_database }, { "\0", NULL, NULL } }; @@ -96,18 +103,18 @@ void print_filters() { int i; - - puts("input:"); + + puts(_("input:")); for(i=0; *i_filters[i].filtname ; i++) printf("\t%s\t%s\n", i_filters[i].filtname, - i_filters[i].desc); + gettext(i_filters[i].desc)); putchar('\n'); - - puts("output:"); + + puts(_("output:")); for(i=0; *e_filters[i].filtname ; i++) printf("\t%s\t%s\n", e_filters[i].filtname, - e_filters[i].desc); + gettext(e_filters[i].desc)); putchar('\n'); } @@ -144,13 +151,13 @@ get_real_name() pwent = getpwnam(username); - if((tmp = strdup(pwent->pw_gecos)) == NULL) - return strdup(username); + if((tmp = xstrdup(pwent->pw_gecos)) == NULL) + return xstrdup(username); rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp); if (rtn == EOF || rtn == 0) { free(tmp); - return strdup(username); + return xstrdup(username); } else return tmp; } @@ -158,28 +165,28 @@ get_real_name() /* * import */ - + static int i_read_file(char *filename, int (*func) (FILE *in)); static void import_screen() { int i; - + clear(); refresh_statusline(); - headerline("import database"); + headerline(_("import database")); + + mvaddstr(3, 1, _("please select a filter")); - mvaddstr(3, 1, "please select a filter"); - for(i=0; *i_filters[i].filtname ; i++) mvprintw(5 + i, 6, "%c -\t%s\t%s\n", 'a' + i, i_filters[i].filtname, - i_filters[i].desc); + gettext(i_filters[i].desc)); - mvprintw(6 + i, 6, "x -\tcancel"); + mvprintw(6 + i, 6, _("x -\tcancel")); } int @@ -190,27 +197,27 @@ import_database() int tmp = items; import_screen(); - + filter = getch() - 'a'; if(filter == 'x' - 'a' || filter >= number_of_input_filters() || filter < 0) { refresh_screen(); return 1; } - + mvaddstr(5+filter, 2, "->"); - - filename = ask_filename("Filename: "); - if( !filename ) { + + 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 ) - statusline_msg("Hmm.., file seems not to be a valid file"); - + + if(i_read_file(filename, i_filters[filter].func )) + statusline_msg(_("Error occured while opening the file")); + else if(tmp == items) + statusline_msg(_("File does not seem to be a valid addressbook")); + refresh_screen(); free(filename); @@ -225,14 +232,14 @@ i_read_file(char *filename, int (*func) (FILE *in)) FILE *in; int ret = 0; - if( ( in = abook_fopen( filename, "r" ) ) == NULL ) + if( (in = abook_fopen( filename, "r" )) == NULL ) return 1; ret = (*func) (in); fclose(in); - return ret; + return ret; } int @@ -243,30 +250,30 @@ import_file(char filtname[FILTNAME_LEN], char *filename) int ret = 0; for(i=0;; i++) { - if( ! strncasecmp(i_filters[i].filtname, filtname, + if(! strncasecmp(i_filters[i].filtname, filtname, FILTNAME_LEN) ) break; - if( ! *i_filters[i].filtname ) { + if(! *i_filters[i].filtname) { i = -1; break; } } - if( i<0 ) + if(i < 0) return -1; - if( !strcmp(filename, "-") ) { + if(!strcmp(filename, "-")) { 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)) ret = 1; else ret = (*i_filters[i].func) (stdin); } else ret = i_read_file(filename, i_filters[i].func); - - if( tmp == items ) + + if(tmp == items) ret = 1; - + return ret; } @@ -281,22 +288,22 @@ static void export_screen() { int i; - + clear(); refresh_statusline(); - headerline("export database"); + headerline(_("export database")); - mvaddstr(3, 1, "please select a filter"); - + mvaddstr(3, 1, _("please select a filter")); - for(i=0; *e_filters[i].filtname ; i++) + + for(i = 0; *e_filters[i].filtname ; i++) mvprintw(5 + i, 6, "%c -\t%s\t%s\n", 'a' + i, e_filters[i].filtname, - e_filters[i].desc); + gettext(e_filters[i].desc)); - mvprintw(6 + i, 6, "x -\tcancel"); + mvprintw(6 + i, 6, _("x -\tcancel")); } int @@ -307,38 +314,42 @@ export_database() char *filename; export_screen(); - + filter = getch() - 'a'; if(filter == 'x' - 'a' || filter >= number_of_output_filters() || filter < 0) { refresh_screen(); return 1; } - - mvaddstr(5+filter, 2, "->"); - if( selected_items() ) { - statusline_addstr("Export All/Selected/Cancel (A/s/c)"); - switch( tolower(getch()) ) { - case 's': + mvaddstr(5 + filter, 2, "->"); + + if(selected_items()) { + switch(statusline_askchoice( + _("Export ll, export elected, or ancel?"), + S_("keybindings:all/selected/cancel|asc"), 3)) { + case 1: + break; + case 2: enum_mode = ENUM_SELECTED; break; - case 'c': - clear_statusline(); + case 0: + case 3: + refresh_screen(); return 1; } clear_statusline(); } - - filename = ask_filename("Filename: "); - if( !filename ) { + + filename = ask_filename(_("Filename: ")); + if(!filename) { refresh_screen(); return 2; } - - if( e_write_file(filename, e_filters[filter].func, enum_mode ) ) - statusline_msg("Error occured while exporting"); - + + if( e_write_file(filename, e_filters[filter].func, enum_mode)) + statusline_msg(_("Error occured while exporting")); + refresh_screen(); free(filename); @@ -353,16 +364,16 @@ e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e), int ret = 0; struct db_enumerator enumerator = init_db_enumerator(mode); - if( (out = fopen(filename, "a")) == NULL ) + if((out = fopen(filename, "a")) == NULL) return 1; - if( ftell(out) ) + if(ftell(out)) return 1; ret = (*func) (out, enumerator); - + fclose(out); - + return ret; } @@ -373,10 +384,10 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode) struct db_enumerator e = init_db_enumerator(enum_mode); for(i=0;; i++) { - if( ! strncasecmp(e_filters[i].filtname, filtname, - FILTNAME_LEN) ) + if(!strncasecmp(e_filters[i].filtname, filtname, + FILTNAME_LEN)) break; - if( ! *e_filters[i].filtname ) { + if(!*e_filters[i].filtname) { i = -1; break; } @@ -394,21 +405,21 @@ export_file(char filtname[FILTNAME_LEN], char *filename) int i; int ret = 0; struct db_enumerator e = init_db_enumerator(mode); - + for(i=0;; i++) { - if( ! strncasecmp(e_filters[i].filtname, filtname, - FILTNAME_LEN) ) + if(!strncasecmp(e_filters[i].filtname, filtname, + FILTNAME_LEN)) break; - if( ! *e_filters[i].filtname ) { + if(!*e_filters[i].filtname) { i = -1; break; } } - if( i<0 ) + if(i < 0) return -1; - if( !strcmp(filename, "-") ) + if(!strcmp(filename, "-")) ret = (e_filters[i].func) (stdout, e); else ret = e_write_file(filename, e_filters[i].func, mode); @@ -430,10 +441,10 @@ static void ldif_fix_string(char *str); #define LDIF_ITEM_FIELDS 16 -typedef char* ldif_item[LDIF_ITEM_FIELDS]; +typedef char *ldif_item[LDIF_ITEM_FIELDS]; static ldif_item ldif_field_names = { - "cn", + "cn", "mail", "streetaddress", "streetaddress2", @@ -455,7 +466,7 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = { NAME, /* "cn" */ EMAIL, /* "mail" */ ADDRESS, /* "streetaddress" */ - ADDRESS2, /* "streetaddress2" */ + ADDRESS2, /* "streetaddress2" */ CITY, /* "locality" */ STATE, /* "st" */ ZIP, /* "postalcode" */ @@ -471,7 +482,7 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = { }; -static char * +static char * ldif_read_line(FILE *in) { char *buf = NULL; @@ -484,10 +495,10 @@ ldif_read_line(FILE *in) pos = ftell(in); line = getaline(in); - - if( feof(in) || !line ) + + if(feof(in) || !line) break; - + if(i == 1) { buf = line; continue; @@ -518,27 +529,27 @@ ldif_read_line(FILE *in) } static void -ldif_add_item(ldif_item ldif_item) +ldif_add_item(ldif_item li) { list_item abook_item; int i; memset(abook_item, 0, sizeof(abook_item)); - if( !ldif_item[LDIF_ITEM_FIELDS -1] ) + if(!li[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] ) - abook_item[ldif_conv_table[i]] = strdup(ldif_item[i]); + if(ldif_conv_table[i] >= 0 && li[i] && *li[i]) + abook_item[ldif_conv_table[i]] = xstrdup(li[i]); } add_item2database(abook_item); bail_out: for(i=0; i < LDIF_ITEM_FIELDS; i++) - my_free(ldif_item[i]); + xfree(li[i]); } @@ -547,19 +558,19 @@ ldif_convert(ldif_item item, char *type, char *value) { int i; - if( !strcmp(type, "dn") ) { + if(!strcmp(type, "dn")) { ldif_add_item(item); return; } for(i=0; i < LDIF_ITEM_FIELDS; i++) { - if( !safe_strcmp(ldif_field_names[i], type) && *value ) { - if( i == LDIF_ITEM_FIELDS -1) /* this is a dirty hack */ - if( safe_strcmp("person", value)) + if(!safe_strcmp(ldif_field_names[i], type) && *value) { + if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */ + if(safe_strcmp("person", value)) break; if(item[i]) - my_free(item[i]); - item[i] = strdup(value); + xfree(item[i]); + item[i] = xstrdup(value); } } } @@ -575,11 +586,11 @@ ldif_parse_file(FILE *handle) memset(item, 0, sizeof(item)); do { - if( ! (line = ldif_read_line(handle)) ) + if( !(line = ldif_read_line(handle)) ) continue; - if( -1 == ( str_parse_line(line, &type, &value, &vlen)) ) { - my_free(line); + if(-1 == (str_parse_line(line, &type, &value, &vlen))) { + xfree(line); continue; /* just skip the errors */ } @@ -587,7 +598,7 @@ ldif_parse_file(FILE *handle) ldif_convert(item, type, value); - my_free(line); + xfree(line); } while ( !feof(handle) ); ldif_convert(item, "dn", ""); @@ -600,7 +611,7 @@ ldif_fix_string(char *str) { int i, j; - for( i = 0, j = 0; j < (int)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] ); @@ -630,7 +641,7 @@ mutt_read_line(FILE *in, char **alias, char **rest) while( ISSPACE(*ptr) ) ptr++; - if( strncmp("alias", ptr, 5) ) { + if(strncmp("alias", ptr, 5)) { free(line); return 1; } @@ -645,21 +656,17 @@ mutt_read_line(FILE *in, char **alias, char **rest) while( ! ISSPACE(*ptr) ) ptr++; - /* includes also the trailing zero */ - alias_len = (size_t)(ptr - tmp + 1); + alias_len = (size_t)(ptr - tmp); - if( (*alias = (char *)malloc(alias_len)) == NULL) { - free(line); - return 1; - } + *alias = xmalloc_inc(alias_len, 1); - strncpy(*alias, tmp, alias_len - 1); - *(*alias + alias_len - 1) = 0; + strncpy(*alias, tmp, alias_len); + *(*alias + alias_len) = 0; while(ISSPACE(*ptr)) ptr++; - *rest = strdup(ptr); + *rest = xstrdup(ptr); free(line); return 0; @@ -725,7 +732,7 @@ mutt_parse_email(list_item item) free(item[EMAIL]); item[EMAIL] = tmp; } else { - my_free(email); + xfree(email); } } } @@ -740,11 +747,11 @@ mutt_parse_file(FILE *in) for(;;) { memset(item, 0, sizeof(item)); - if( !mutt_read_line(in, &item[NICK], + if(!mutt_read_line(in, &item[NICK], &item[NAME]) ) mutt_parse_email(item); - if( feof(in) ) { + if(feof(in)) { free_list_item(item); break; } @@ -788,11 +795,11 @@ ldif_export_database(FILE *out, struct db_enumerator e) int j; get_first_email(email, e.item); - tmp = mkstr("cn=%s,mail=%s", database[e.item][NAME], email); + tmp = strdup_printf("cn=%s,mail=%s", database[e.item][NAME], email); ldif_fput_type_and_value(out, "dn", tmp); free(tmp); - for(j=0; j < LDIF_ITEM_FIELDS; j++) { + for(j = 0; j < LDIF_ITEM_FIELDS; j++) { if(ldif_conv_table[j] >= 0) { if(ldif_conv_table[j] == EMAIL) ldif_fput_type_and_value(out, @@ -819,7 +826,7 @@ ldif_export_database(FILE *out, struct db_enumerator e) * html export filter */ -static void html_export_write_head(FILE *out, int extra_column); +static void html_export_write_head(FILE *out, int extra); static void html_export_write_tail(FILE *out); extern int extra_column; @@ -828,14 +835,15 @@ static int html_export_database(FILE *out, struct db_enumerator e) { char tmp[MAX_EMAILSTR_LEN]; + int extra; - if( items < 1 ) + if(items < 1) return 2; - extra_column = (extra_column > 2 && extra_column < ITEM_FIELDS) ? + extra = (extra_column > 2 && extra_column < ITEM_FIELDS) ? extra_column : PHONE; - html_export_write_head(out, extra_column); + html_export_write_head(out, extra); db_enumerate_items(e) { get_first_email(tmp, e.item); @@ -849,7 +857,7 @@ html_export_database(FILE *out, struct db_enumerator e) fprintf(out, "%s\n%s\n", database[e.item][EMAIL], - safe_str(database[e.item][extra_column]) ); + safe_str(database[e.item][extra]) ); fprintf(out, "\n\n"); } @@ -860,7 +868,7 @@ html_export_database(FILE *out, struct db_enumerator e) static void -html_export_write_head(FILE *out, int extra_column) +html_export_write_head(FILE *out, int extra) { char *realname = get_real_name(); @@ -872,7 +880,7 @@ html_export_write_head(FILE *out, int extra_column) fprintf(out, "\n"); fprintf(out, "\n\n\n", - abook_fields[extra_column].name); + abook_fields[extra].name); free(realname); } @@ -883,7 +891,7 @@ html_export_write_tail(FILE *out) fprintf(out, "\n
NameE-mail address(es)%s
\n"); fprintf(out, "\n\n\n"); } - + /* * end of html export filter */ @@ -900,7 +908,7 @@ pine_fixbuf(char *buf) { int i,j; - for(i=0,j=0; j < (int)strlen(buf); i++, j++) + for(i = 0,j = 0; j < (int)strlen(buf); i++, j++) buf[i] = buf[j] == '\n' ? buf[++j] : buf[j]; } @@ -910,21 +918,20 @@ pine_convert_emails(char *s) int i; char *tmp; - if( s == NULL || *s != '(' ) + if(s == NULL || *s != '(') return; - for(i=0; s[i]; i++ ) - s[i] = s[i+1]; + for(i = 0; s[i]; i++) + s[i] = s[i + 1]; if( ( tmp = strchr(s,')')) ) - *tmp=0; + *tmp = '\0'; - for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 ) - if( i > MAX_EMAILS - 1 ) { - *tmp = 0; - break; + for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1) + if(i > MAX_EMAILS - 1) { + *tmp = '\0'; + break; } - } static void @@ -935,12 +942,12 @@ pine_parse_buf(char *buf) char *end; char tmp[PINE_BUF_SIZE]; int i, len, last; - int pine_conv_table[]= {NICK, NAME, EMAIL, -1, NOTES}; + int pine_conv_table[] = {NICK, NAME, EMAIL, -1, NOTES}; + + memset(&item, 0, sizeof(item)); - memset(&item, 0, sizeof(item) ); - - for(i=0, last=0; !last ; i++) { - if( ! (end = strchr(start, '\t')) ) + for(i = 0, last=0; !last ; i++) { + if( !(end = strchr(start, '\t')) ) last=1; len = last ? strlen(start) : (int) (end-start); @@ -951,7 +958,7 @@ pine_parse_buf(char *buf) strncpy(tmp, start, len); tmp[len] = 0; if(*tmp) - item[pine_conv_table[i]] = strdup(tmp); + item[pine_conv_table[i]] = xstrdup(tmp); } start = end + 1; } @@ -971,32 +978,32 @@ pine_parse_file(FILE *in) char *ptr; int i; - fgets(line, LINESIZE, in); + fgets(line, LINESIZE, in); while(!feof(in)) { for(i = 2;;i++) { - buf = (char *) realloc(buf, i*LINESIZE); + buf = xrealloc(buf, i*LINESIZE); if(i == 2) strcpy(buf, line); fgets(line, LINESIZE, in); ptr=(char *)&line; - if(*ptr != ' ' || feof(in) ) + if(*ptr != ' ' || feof(in)) break; else - while( *ptr == ' ') + while(*ptr == ' ') ptr++; strcat(buf, ptr); } - if( *buf == '#' ) { - my_free(buf); + if(*buf == '#') { + xfree(buf); continue; } pine_fixbuf(buf); pine_parse_buf(buf); - my_free(buf); + xfree(buf); } return 0; @@ -1041,11 +1048,13 @@ pine_export_database(FILE *out, struct db_enumerator e) /* FIXME * these files should be parsed according to a certain - * lay out, or the default if layout is not given, at + * lay out, or the default if layout is not given, at * the moment only default is done... - */ + */ #define CSV_COMMENT_CHAR '#' +#define CSV_DUPLICATE_SEPARATOR " " +#define CSV_TABLE_SIZE(t) (sizeof (t) / sizeof *(t)) static int csv_conv_table[] = { NAME, @@ -1078,19 +1087,41 @@ static int allcsv_conv_table[] = { CUSTOM5, }; +static int palmcsv_conv_table[] = { + NAME, /* Last name */ + NAME, /* First name */ + NOTES, /* Title */ + NICK, /* Company */ + WORKPHONE, + PHONE, + FAX, + MOBILEPHONE, + EMAIL, + ADDRESS, + CITY, + STATE, + ZIP, + COUNTRY, + CUSTOM1, + CUSTOM2, + CUSTOM3, + CUSTOM4, + CUSTOM5, +}; + static void csv_convert_emails(char *s) { int i; char *tmp; - if( s == NULL ) + if(s == NULL) return; - for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1 ) - if( i > MAX_EMAILS - 1 ) { + for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1) + if(i > MAX_EMAILS - 1) { *tmp = 0; - break; + break; } } @@ -1101,47 +1132,37 @@ csv_remove_quotes(char *s) char *copy, *trimmed; int len; - copy = trimmed = strdup(s); + copy = trimmed = xstrdup(s); strtrim(trimmed); len = strlen(trimmed); if(trimmed[len - 1] == '\"' && *trimmed == '\"') { if(len < 3) { - my_free(copy); + xfree(copy); return NULL; } trimmed[len - 1] = 0; trimmed++; - trimmed = strdup(trimmed); + trimmed = xstrdup(trimmed); free(copy); return trimmed; } - my_free(copy); - return strdup(s); + xfree(copy); + return xstrdup(s); } -static void -csv_store_field(list_item item, char *s, int field) +static int +csv_field_to_item(int *table_base, size_t table_size, int field) { - char *newstr = NULL; - - if(!s || !*s) - return; + if(field < table_size) + return table_base[field]; - 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); - } + return -1; } static void -allcsv_store_field(list_item item, char *s, int field) +csv_store_item(list_item item, int i, char *s) { char *newstr = NULL; @@ -1151,11 +1172,19 @@ allcsv_store_field(list_item item, char *s, int field) if( !(newstr = csv_remove_quotes(s)) ) return; - if(field < (int)(sizeof(allcsv_conv_table) / sizeof(*allcsv_conv_table)) - && allcsv_conv_table[field] >= 0) { - item[allcsv_conv_table[field]] = newstr; + if(i >= 0) { + if (item[i] != NULL) { + char *oldstr = item[i]; + + item[i] = strconcat(newstr, CSV_DUPLICATE_SEPARATOR, + oldstr, NULL); + xfree(newstr); + xfree(oldstr); + } else { + item[i] = newstr; + } } else { - my_free(newstr); + xfree(newstr); } } @@ -1189,43 +1218,7 @@ csv_is_valid_quote_start(char *p) } 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 void -allcsv_parse_line(char *line) +csv_parse_line(char *line, int *table_base, size_t table_size) { char *p, *start; int field; @@ -1244,9 +1237,13 @@ allcsv_parse_line(char *line) in_quote = TRUE; } - if( *p == ',' && !in_quote) { + if(*p == ',' && !in_quote) { *p = 0; - allcsv_store_field(item, start, field); + csv_field_to_item(table_base, table_size, field); + csv_store_item(item, + csv_field_to_item(table_base, + table_size, field), + start); field++; start = p + 1; } @@ -1254,15 +1251,15 @@ allcsv_parse_line(char *line) /* * store last field */ - allcsv_store_field(item, start, field); + csv_store_item(item, csv_field_to_item(table_base, table_size, field), + start); csv_convert_emails(item[EMAIL]); add_item2database(item); } - static int -csv_parse_file(FILE *in) +csv_parse_file_common(FILE *in, int *conv_table, size_t table_size) { char *line = NULL; @@ -1270,29 +1267,33 @@ csv_parse_file(FILE *in) line = getaline(in); if(line && *line && *line != CSV_COMMENT_CHAR) - csv_parse_line(line); + csv_parse_line(line, conv_table, table_size); - my_free(line); + xfree(line); } return 0; } static int -allcsv_parse_file(FILE *in) +csv_parse_file(FILE *in) { - char *line = NULL; - - while(!feof(in)) { - line = getaline(in); - - if(line && *line && *line != CSV_COMMENT_CHAR) - allcsv_parse_line(line); + return csv_parse_file_common(in, csv_conv_table, + CSV_TABLE_SIZE(csv_conv_table)); +} - my_free(line); - } +static int +allcsv_parse_file(FILE *in) +{ + return csv_parse_file_common(in, allcsv_conv_table, + CSV_TABLE_SIZE(allcsv_conv_table)); +} - return 0; +static int +palmcsv_parse_file(FILE *in) +{ + return csv_parse_file_common(in, palmcsv_conv_table, + CSV_TABLE_SIZE(palmcsv_conv_table)); } /* @@ -1353,7 +1354,7 @@ csv_export_database(FILE *out, struct db_enumerator e) }; csv_export_common(out, e, csv_export_fields, NULL); - + return 0; } @@ -1411,7 +1412,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e) fprintf(out, "\"CUSTOM5\"\n"); csv_export_common(out, e, allcsv_export_fields, NULL); - + return 0; } @@ -1423,7 +1424,7 @@ allcsv_export_database(FILE *out, struct db_enumerator e) #define PALM_CSV_END CSV_SPECIAL(1) #define PALM_CSV_CAT CSV_SPECIAL(2) -static void +static void palm_split_and_write_name(FILE *out, char *name) { char *p; @@ -1442,7 +1443,7 @@ palm_split_and_write_name(FILE *out, char *name) } } -static void +static void palm_csv_handle_specials(FILE *out, int item, int field) { switch(field) { @@ -1472,7 +1473,7 @@ palm_export_database(FILE *out, struct db_enumerator e) FAX, /* FAX */ MOBILEPHONE, /* OTHER */ EMAIL, /* EMAIL */ - ADDRESS, /* ADDRESS */ + ADDRESS, /* ADDRESS */ CITY, /* CITY */ STATE, /* STATE */ ZIP, /* ZIP */ @@ -1508,57 +1509,60 @@ gcrd_export_database(FILE *out, struct db_enumerator e) char *name; db_enumerate_items(e) { - fprintf(out, "BEGIN:VCARD\nFN:%s\n", + fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n", safe_str(database[e.item][NAME])); name = get_surname(database[e.item][NAME]); for( j = strlen(database[e.item][NAME]) - 1; j >= 0; j-- ) { if(database[e.item][NAME][j] == ' ') break; - } - fprintf(out, "N:%s;%.*s\n", + } + fprintf(out, "N:%s;%.*s\r\n", safe_str(name), j, safe_str(database[e.item][NAME]) - ); + ); free(name); if ( database[e.item][ADDRESS] ) - fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n", + fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n", safe_str(database[e.item][ADDRESS]), - safe_str(database[e.item][ADDRESS2]), + safe_str(database[e.item][ADDRESS2]), safe_str(database[e.item][CITY]), safe_str(database[e.item][STATE]), safe_str(database[e.item][ZIP]), safe_str(database[e.item][COUNTRY]) ); - + if (database[e.item][PHONE]) - fprintf(out, "TEL;HOME:%s\n", database[e.item][PHONE]); + fprintf(out, "TEL;HOME:%s\r\n", + database[e.item][PHONE]); if (database[e.item][WORKPHONE]) - fprintf(out, "TEL;WORK:%s\n", database[e.item][WORKPHONE]); + fprintf(out, "TEL;WORK:%s\r\n", + database[e.item][WORKPHONE]); + if (database[e.item][FAX]) - fprintf(out, "TEL;FAX:%s\n", database[e.item][FAX]); + fprintf(out, "TEL;FAX:%s\r\n", database[e.item][FAX]); if (database[e.item][MOBILEPHONE]) - fprintf(out, "TEL;CELL:%s\n", database[e.item][MOBILEPHONE]); + fprintf(out, "TEL;CELL:%s\r\n", database[e.item][MOBILEPHONE]); if ( database[e.item][EMAIL] ) { split_emailstr(e.item, emails); for(j=0; j < MAX_EMAILS ; j++) { - if ( *emails[j] ) - fprintf(out, "EMAIL;INTERNET:%s\n", + if ( *emails[j] ) + fprintf(out, "EMAIL;INTERNET:%s\r\n", emails[j]); } } - - if ( database[e.item][NOTES] ) - fprintf(out, "NOTE:%s\n", database[e.item][NOTES]); + + if ( database[e.item][NOTES] ) + fprintf(out, "NOTE:%s\r\n", database[e.item][NOTES]); if (database[e.item][URL]) - fprintf(out, "URL:%s\n", database[e.item][URL]); + fprintf(out, "URL:%s\r\n", database[e.item][URL]); + + fprintf(out, "END:VCARD\r\n\r\n"); - fprintf(out, "END:VCARD\n\n"); - } return 0; @@ -1577,18 +1581,18 @@ static char * mutt_alias_genalias(int i) { char *tmp, *pos; - + if(database[i][NICK]) - return strdup(database[i][NICK]); + return xstrdup(database[i][NICK]); - tmp = strdup(database[i][NAME]); + tmp = xstrdup(database[i][NAME]); if( ( pos = strchr(tmp, ' ') ) ) *pos = 0; strlower(tmp); - return tmp; + return tmp; } static int @@ -1605,7 +1609,7 @@ mutt_alias_export(FILE *out, struct db_enumerator e) alias, database[e.item][NAME], email); - my_free(alias); + xfree(alias); } return 0; @@ -1630,10 +1634,10 @@ text_write_address_us(FILE *out, int i) { if (database[i][CITY]) fprintf(out, "\n%s", database[i][CITY]); - + if (database[i][STATE] || database[i][ZIP]) { fputc('\n', out); - + if(database[i][STATE]) { fprintf(out, "%s", database[i][STATE]); if(database[i][ZIP]) @@ -1677,7 +1681,7 @@ text_write_address_eu(FILE *out, int i) { if(database[i][CITY]) fprintf(out, "%s", database[i][CITY]); } - + if (database[i][STATE]) fprintf(out, "\n%s", database[i][STATE]); @@ -1772,7 +1776,7 @@ elm_alias_export(FILE *out, struct db_enumerator e) alias, database[e.item][NAME], email); - my_free(alias); + xfree(alias); } return 0; @@ -1815,3 +1819,34 @@ spruce_export_database (FILE *out, struct db_enumerator e) * end of Spruce export filter */ +/* + * wanderlust addressbook export filter + */ + +static int +wl_export_database(FILE *out, struct db_enumerator e) +{ + char emails[MAX_EMAILS][MAX_EMAIL_LEN]; + + fprintf (out, "# Wanderlust address book written by %s\n\n", PACKAGE); + db_enumerate_items(e) { + split_emailstr(e.item, emails); + if (**emails) { + fprintf(out, + "%s\t\"%s\"\t\"%s\"\n", + *emails, + safe_str(database[e.item][NICK]), + safe_str(database[e.item][NAME]) + ); + } + } + + fprintf (out, "\n# End of address book file.\n"); + + return 0; +} + +/* + * end of wanderlust addressbook export filter + */ +