pwent = getpwnam(username);
- if( (tmp = malloc(strlen(pwent->pw_gecos) +1)) == NULL)
+ if( (tmp = (char *)malloc(strlen(pwent->pw_gecos) +1)) == NULL)
return strdup(username);
rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp);
while( ! ISSPACE(*ptr) )
ptr++;
- if( (*alias = malloc(ptr-tmp+1)) == NULL)
+ if( (*alias = (char *)malloc(ptr-tmp+1)) == NULL)
return 1;
strncpy(*alias, tmp, ptr-tmp);
db_enumerate_items(e) {
get_first_email(tmp, e.item);
- fprintf(out, "<tr>\n<td><a href=\"mailto:%s\">%s</a>\n",
- tmp,
- database[e.item][NAME] );
-
+ if (*tmp)
+ fprintf(out, "<tr>\n<td><a href=\"mailto:%s\">%s</a>\n",
+ tmp,
+ database[e.item][NAME] );
+ else
+ fprintf(out, "<tr>\n<td>%s>\n",
+ database[e.item][NAME] );
+
fprintf(out, "<td>%s\n<td>%s\n",
database[e.item][EMAIL],
safe_str(database[e.item][extra_column]) );
*tmp=0;
for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 )
- if( i > 3 ) {
+ if( i > MAX_EMAILS - 1 ) {
*tmp = 0;
break;
}
while(!feof(in)) {
for(i=2;;i++) {
- buf = realloc(buf, i*LINESIZE);
+ buf = (char *) realloc(buf, i*LINESIZE);
if(i==2)
strcpy(buf, line);
fgets(line, LINESIZE, in);
strcat(buf, ptr);
}
- if( *buf == '#' )
+ if( *buf == '#' ) {
+ my_free(buf);
continue;
+ }
pine_fixbuf(buf);
pine_parse_buf(buf);
if(database[i][CITY])
fprintf(out, "%s", database[i][CITY]);
- /*
- fprintf(out, "\n%s %s",
- safe_str(database[i][ZIP]),
- safe_str(database[i] [CITY]));
- */
}
-
if (database[i][STATE])
fprintf(out, "\n%s", database[i][STATE]);