pwent = getpwnam(username);
- if( (tmp = (char *)malloc(strlen(pwent->pw_gecos) +1)) == NULL)
+ if((tmp = strdup(pwent->pw_gecos)) == NULL)
return strdup(username);
rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp);
return (e_filters[i].func) (handle, e);
}
-
+
int
export_file(char filtname[FILTNAME_LEN], char *filename)
buf = line;
continue;
}
-
+
if(*line != ' ') {
- fseek(in, pos, SEEK_SET);
+ fseek(in, pos, SEEK_SET); /* fixme ! */
free(line);
break;
}
free(buf);
return NULL;
}
-
+
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);
free(line);
return 1;
}
-
+
ptr += 5;
while( ISSPACE(*ptr) )
while( ! ISSPACE(*ptr) )
ptr++;
- if( (*alias = (char *)malloc(ptr-tmp+1)) == NULL) {
+ if( (*alias = (char *)malloc(ptr - tmp)) == NULL) {
free(line);
return 1;
}
- strncpy(*alias, tmp, ptr-tmp);
+ strncpy(*alias, tmp, ptr - tmp - 1);
*(*alias + (ptr - tmp)) = 0;
- while( ISSPACE(*ptr) )
+ while(ISSPACE(*ptr))
ptr++;
*rest = strdup(ptr);
return 0;
}
+static void
+mutt_fix_quoting(char *p)
+{
+ char *escape = 0;
+
+ for(; *p; p++) {
+ switch(*p) {
+ case '\"':
+ if(escape)
+ *escape = ' ';
+ break;
+ case '\\':
+ escape = p;
+ break;
+ default:
+ escape = 0;
+ }
+ }
+}
+
static void
mutt_parse_email(list_item item)
{
char *line = item[NAME];
- char *start = line, *tmp;
+ char *tmp;
char *name, *email;
+#if 0
+ char *start = line;
int i = 0;
+#endif
+ mutt_fix_quoting(line);
tmp = strconcat("From: ", line, NULL);
getname(tmp, &name, &email);
free(tmp);
item[EMAIL] = email;
else
return;
-
+
+ /*
+ * this is completely broken
+ */
+#if 0
while( (start = strchr(start, ',')) && i++ < MAX_EMAILS - 1) {
tmp = strconcat("From: ", ++start, NULL);
getname(tmp, &name, &email);
}
}
}
+#endif
}
static int
for(;;) {
memset(item, 0, sizeof(item));
-
+
if( !mutt_read_line(in, &item[NICK],
&item[NAME]) )
mutt_parse_email(item);
* pine addressbook import filter
*/
+#define PINE_BUF_SIZE 2048
+
static void
pine_fixbuf(char *buf)
{
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);
-
+ 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
int i;
fgets(line, LINESIZE, in);
-
+
while(!feof(in)) {
for(i = 2;;i++) {
buf = (char *) realloc(buf, i*LINESIZE);
else
while( *ptr == ' ')
ptr++;
-
+
strcat(buf, ptr);
}
if( *buf == '#' ) {
{
char *copy, *trimmed;
int len;
-
+
copy = trimmed = strdup(s);
strtrim(trimmed);
-
+
len = strlen(trimmed);
if(trimmed[len - 1] == '\"' && *trimmed == '\"') {
if(len < 3) {
* csv addressbook export filters
*/
-#define CSV_LAST (-2)
-#define CSV_UNDEFINED (-3)
-#define CSV_SPECIAL(X) (-4 - (X))
-#define CSV_IS_SPECIAL(X) ((X) <= -4)
-#define CSV_GET_SPECIAL(X) (-4 + (X))
+#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,
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");