}
if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
perror("fseek");
+ procmime_fclose(infp);
return FALSE;
}
}
if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
return;
}
procheader_get_header_fields(fp, hentry);
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return;
}
- fseek(fp, mimeinfo->offset, SEEK_SET);
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
+ FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
+ return;
+ }
if (original_msgid && disposition_notification_hdr) {
hentry[0].body = g_strdup(original_msgid);
if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(fp);
return;
}
}
if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(infp);
return -1;
}
while (SC_FGETS(buf, sizeof(buf), infp) == buf) {
}
if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+ procmime_fclose(infp);
return -1;
}
while (SC_FGETS(buf, sizeof(buf), infp) == buf) {
gchar *tmp = NULL, *new = NULL; \
if (str != NULL) { \
tmp = g_strdup(str); \
- if (strstr(str, "$USERNAME")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$USERNAME")) { \
*strstr(tmp, "$USERNAME") = '\0'; \
new = g_strconcat(tmp, g_get_real_name(), \
strstr(str, "$USERNAME")+strlen("$USERNAME"), \
str = new; \
new = NULL; \
} \
- if (strstr(str, "$LOGIN")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$LOGIN")) { \
*strstr(tmp, "$LOGIN") = '\0'; \
new = g_strconcat(tmp, g_get_user_name(), \
strstr(str, "$LOGIN")+strlen("$LOGIN"), \
str = new; \
new = NULL; \
} \
- if (strstr(str, "$EMAIL")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$EMAIL")) { \
*strstr(tmp, "$EMAIL") = '\0'; \
new = g_strconcat(tmp, tmpl.email, \
strstr(str, "$EMAIL")+strlen("$EMAIL"), \
str = new; \
new = NULL; \
} \
- if (strstr(str, "$NAME_MAIL")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$NAME_MAIL")) { \
*strstr(tmp, "$NAME_MAIL") = '\0'; \
new = g_strconcat(tmp, get_name_for_mail(), \
strstr(str, "$NAME_MAIL")+strlen("$NAME_MAIL"), \
str = new; \
new = NULL; \
} \
- if (strstr(str, "$DEFAULTDOMAIN")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$DEFAULTDOMAIN")) { \
*strstr(tmp, "$DEFAULTDOMAIN") = '\0'; \
new = g_strconcat(tmp, wizard_get_default_domain_name(), \
strstr(str, "$DEFAULTDOMAIN")+strlen("$DEFAULTDOMAIN"), \
str = new; \
new = NULL; \
} \
- if (strstr(str, "$DOMAIN")) { \
- tmp = g_strdup(str); \
+ if (strstr(tmp, "$DOMAIN")) { \
*strstr(tmp, "$DOMAIN") = '\0'; \
new = g_strconcat(tmp, tmpl.domain, \
strstr(str, "$DOMAIN")+strlen("$DOMAIN"), \
address = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
- if (strchr(address, '@') < 0) {
+ if (strchr(address, '@') == NULL) {
g_free(address);
gtk_label_set_text(GTK_LABEL(wizard->auto_configure_lbl),
_("Failed (wrong address)"));