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 }
}
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;
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;
}
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;
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);
-#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" */
{
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
-};
+#include "getname.h"
static int
mutt_read_line(FILE *in, char **alias, char **rest)
{
- char *line;
- char *ptr;
- char *tmp;
+ char *line, *ptr, *tmp;
if( !(line = ptr = getaline(in)) )
return 1; /* error / EOF */
}
strncpy(*alias, tmp, ptr-tmp);
- *(*alias+(ptr-tmp)) = 0;
+ *(*alias + (ptr - tmp)) = 0;
while( ISSPACE(*ptr) )
ptr++;
}
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]);
-
- add_item2database(abook_item);
+ if(name)
+ item[NAME] = name;
+ else
+ return;
+ if(email)
+ item[EMAIL] = email;
+ else
+ return;
+
+ 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(mutt_item, 0, sizeof(mutt_item) );
+ memset(item, 0, sizeof(item));
- if( !mutt_read_line(in, &mutt_item[MUTT_ALIAS],
- &mutt_item[MUTT_NAME]) )
- 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;
}
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");
}
{
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];
}
len = last ? strlen(start) : (int) (end-start);
len = min(len, 400-1);
- if(i < sizeof(pine_conv_table) / sizeof(*pine_conv_table)
+ if(i < (int)(sizeof(pine_conv_table) / sizeof(*pine_conv_table))
&& pine_conv_table[i] >= 0) {
strncpy(tmp, start, len);
tmp[len] = 0;
if( !(newstr = csv_remove_quotes(s)) )
return;
- if(field < (sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+ 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);
}
}
{
char *p, *start;
int field;
- int in_quote = FALSE;
+ bool in_quote = FALSE;
list_item item;
memset(item, 0, sizeof(item));
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);
projects / pkg / abook.git / blobdiff