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);
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);
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