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 }
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);
+ free(line);
break;
}
- ptr = (char *)&line;
+ ptr = line;
while( *ptr == ' ')
ptr++;
tmp = buf;
buf = strconcat(buf, ptr, NULL);
free(tmp);
+ free(line);
}
if( *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;
}
* 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;
}
while( ! ISSPACE(*ptr) )
ptr++;
- if( (*alias = (char *)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]);
-
- 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]) )
- 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;
}
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",
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++) {
+ for(i = 2;;i++) {
buf = (char *) realloc(buf, i*LINESIZE);
- if(i==2)
+ 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);
}
memset(item, 0, sizeof(item));
for(p = start = line, field = 0; *p; p++) {
- if(!in_quote) {
+ 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;
- } else {
- if(csv_is_valid_quote_end(p))
- in_quote = FALSE;
}
if( *p == ',' && !in_quote) {
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