}
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;
{
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] );
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));