This commit is contained in:
Anthony Minessale 2012-01-27 14:18:19 -06:00
parent 7471ec17ed
commit 29f66f994c

View File

@ -604,17 +604,8 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
char *newfile = NULL; char *newfile = NULL;
switch_bool_t rval = SWITCH_FALSE; switch_bool_t rval = SWITCH_FALSE;
const char *err = NULL; const char *err = NULL;
const char *stipped_file;
const char *new_type;
char *xext;
if (zstr(file)) { if (!zstr(file) && !zstr(convert_cmd) && !zstr(convert_ext)) {
err = "Missing file";
rval = SWITCH_FALSE;
goto end;
}
if (!zstr(convert_cmd) && !zstr(convert_ext)) {
if ((ext = strrchr(file, '.'))) { if ((ext = strrchr(file, '.'))) {
dupfile = strdup(file); dupfile = strdup(file);
if ((ext = strrchr(dupfile, '.'))) { if ((ext = strrchr(dupfile, '.'))) {
@ -639,118 +630,120 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff); switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff);
if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) { if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) > -1) {
err = "Failed to open temp file"; if (file) {
rval = SWITCH_FALSE; if ((ifd = open(file, O_RDONLY | O_BINARY)) < 0) {
goto end; rval = SWITCH_FALSE;
} err = "Cannot open tmp file\n";
goto end;
}
}
switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if ((ifd = open(file, O_RDONLY | O_BINARY)) < 0) { if (headers && !write_buf(fd, headers)) {
rval = SWITCH_FALSE; rval = SWITCH_FALSE;
err = "Failed to open source file\n"; err = "write error.";
goto end; goto end;
} }
switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); if (!write_buf(fd, "\n\n")) {
if (!write_buf(fd, buf)) { rval = SWITCH_FALSE;
rval = SWITCH_FALSE; err = "write error.";
err = "write error."; goto end;
goto end; }
}
if (headers && !write_buf(fd, headers)) { if (body && switch_stristr("content-type", body)) {
rval = SWITCH_FALSE; switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound);
err = "write error."; } else {
goto end; switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound);
} }
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (!write_buf(fd, "\n\n")) { if (body) {
rval = SWITCH_FALSE; if (!write_buf(fd, body)) {
err = "write error."; rval = SWITCH_FALSE;
goto end; err = "write error.";
} goto end;
}
}
if (body && switch_stristr("content-type", body)) { if (file) {
switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound); const char *stipped_file = switch_cut_path(file);
} else { const char *new_type;
switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); char *ext;
}
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (body) { if ((ext = strrchr(stipped_file, '.'))) {
if (!write_buf(fd, body)) { ext++;
if ((new_type = switch_core_mime_ext2type(ext))) {
mime_type = new_type;
}
}
switch_snprintf(buf, B64BUFFLEN,
"\n\n--%s\nContent-Type: %s; name=\"%s\"\n"
"Content-ID: <ATTACHED@freeswitch.org>\n"
"Content-Transfer-Encoding: base64\n"
"Content-Description: Sound attachment.\n"
"Content-Disposition: attachment; filename=\"%s\"\n\n", bound, mime_type, stipped_file, stipped_file);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
while ((ilen = read(ifd, in, B64BUFFLEN))) {
for (x = 0; x < ilen; x++) {
b = (b << 8) + in[x];
l += 8;
while (l >= 6) {
out[bytes++] = switch_b64_table[(b >> (l -= 6)) % 64];
if (++y != 72)
continue;
out[bytes++] = '\n';
y = 0;
}
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
break;
} else {
bytes = 0;
}
}
if (l > 0) {
out[bytes++] = switch_b64_table[((b % 16) << (6 - l)) % 64];
}
if (l != 0)
while (l < 6) {
out[bytes++] = '=', l += 2;
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
}
}
switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE; rval = SWITCH_FALSE;
err = "write error."; err = "write error.";
goto end; goto end;
} }
} }
stipped_file = switch_cut_path(file);
if ((xext = strrchr(stipped_file, '.'))) {
xext++;
if ((new_type = switch_core_mime_ext2type(xext))) {
mime_type = new_type;
}
}
switch_snprintf(buf, B64BUFFLEN,
"\n\n--%s\nContent-Type: %s; name=\"%s\"\n"
"Content-ID: <ATTACHED@freeswitch.org>\n"
"Content-Transfer-Encoding: base64\n"
"Content-Description: Sound attachment.\n"
"Content-Disposition: attachment; filename=\"%s\"\n\n", bound, mime_type, stipped_file, stipped_file);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
while ((ilen = read(ifd, in, B64BUFFLEN))) {
for (x = 0; x < ilen; x++) {
b = (b << 8) + in[x];
l += 8;
while (l >= 6) {
out[bytes++] = switch_b64_table[(b >> (l -= 6)) % 64];
if (++y != 72)
continue;
out[bytes++] = '\n';
y = 0;
}
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
break;
} else {
bytes = 0;
}
}
if (l > 0) {
out[bytes++] = switch_b64_table[((b % 16) << (6 - l)) % 64];
}
if (l != 0)
while (l < 6) {
out[bytes++] = '=', l += 2;
}
if (write(fd, &out, bytes) != bytes) {
rval = -1;
}
switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound);
if (!write_buf(fd, buf)) {
rval = SWITCH_FALSE;
err = "write error.";
goto end;
}
if (zstr(from)) { if (zstr(from)) {
from = "freeswitch"; from = "freeswitch";
} }
@ -781,13 +774,14 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
end: end:
if (fd > -1) { if (fd < 0) {
close(fd); close(fd);
} }
if (ifd > -1) { if (ifd < 0) {
close(ifd); close(ifd);
} }
if (newfile) { if (newfile) {
unlink(newfile); unlink(newfile);
free(newfile); free(newfile);