Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-20 18:29:54 +00:00
Code Issues Projects Releases Wiki Activity

reformime: small code and style fixes. no material changes in behavior.

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-07 07:52:34 +02:00
parent 7e7e08fb09
commit a51543a3a4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mailutils/mime.c
View File

@ -232,7 +232,7 @@ static int parse(const char *boundary, char **argv)
// N.B. to avoid false positives let us seek to the _last_ occurance // N.B. to avoid false positives let us seek to the _last_ occurance
p = NULL; p = NULL;
s = line; s = line;
while ((s=strcasestr(s, "Content-Type:")) != NULL) while ((s = strcasestr(s, "Content-Type:")) != NULL)
p = s++; p = s++;
if (!p) if (!p)
goto next; goto next;
@ -281,8 +281,8 @@ static int parse(const char *boundary, char **argv)
pid = vfork(); pid = vfork();
if (0 == pid) { if (0 == pid) {
// child reads from fd[0] // child reads from fd[0]
xdup2(fd[0], STDIN_FILENO); close(fd[1]);
close(fd[0]); close(fd[1]); xmove_fd(fd[0], STDIN_FILENO);
xsetenv("CONTENT_TYPE", type); xsetenv("CONTENT_TYPE", type);
xsetenv("CHARSET", charset); xsetenv("CHARSET", charset);
xsetenv("ENCODING", encoding); xsetenv("ENCODING", encoding);
@ -308,7 +308,8 @@ static int parse(const char *boundary, char **argv)
if (0 == strcasecmp(encoding, "base64")) { if (0 == strcasecmp(encoding, "base64")) {
decode_base64(stdin, fp); decode_base64(stdin, fp);
} else if (0 != strcasecmp(encoding, "7bit") } else if (0 != strcasecmp(encoding, "7bit")
&& 0 != strcasecmp(encoding, "8bit")) { && 0 != strcasecmp(encoding, "8bit")
) {
// quoted-printable, binary, user-defined are unsupported so far // quoted-printable, binary, user-defined are unsupported so far
bb_error_msg_and_die("no support of encoding '%s'", encoding); bb_error_msg_and_die("no support of encoding '%s'", encoding);
} else { } else {
@ -323,11 +324,15 @@ static int parse(const char *boundary, char **argv)
// no means to truncate what we already have sent to the helper. // no means to truncate what we already have sent to the helper.
p = xmalloc_fgets_str(stdin, "\r\n"); p = xmalloc_fgets_str(stdin, "\r\n");
while (p) { while (p) {
if ((s = xmalloc_fgets_str(stdin, "\r\n")) == NULL) s = xmalloc_fgets_str(stdin, "\r\n");
if (s == NULL)
break; break;
if ('-' == s[0] && '-' == s[1] if ('-' == s[0]
&& 0 == strncmp(s+2, boundary, boundary_len)) && '-' == s[1]
&& 0 == strncmp(s+2, boundary, boundary_len)
) {
break; break;
}
fputs(p, fp); fputs(p, fp);
p = s; p = s;
} }