add support for SIZE extension (RfC 1870) #191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Implementing extensions for qmail-remote often requires the usage of EHLO and checking if the server supports the extension. Every patch therefore usually comes with it's own version of EHLO parsing. Add yet another one that the patches can easily hook into. For the moment it will just send mails using ESMTP instead of SMTP for basically all cases, but not use any of the new information.
DerDakon
requested review from
leahneukirchen,
schmonz,
jlmuir,
mbhangui,
xenotrope and
josuah
DerDakon
force-pushed
the
Dakon-remote-SIZE
branch
from
130be56
to
bce502e
Compare
josuah
approved these changes
Nov 25, 2020
qmail-remote.c
Outdated
Comment on lines
288
to
302
| if (remotesize >= 0) { | ||
| struct stat st; | ||
| /* in case the input is e.g. a pipe or socket we can't use the size */ | ||
| if (fstat(0, &st) != 0 || !S_ISREG(st.st_mode)) { | ||
| substdio_puts(&smtpto,">\r\n"); | ||
| } else { | ||
| char buf[FMT_ULONG + 10] = "> SIZE="; | ||
| unsigned int off = 7 + fmt_ulong(buf + 7, st.st_size); | ||
| buf[off++] = '\r'; | ||
| buf[off++] = '\n'; | ||
| buf[off] = '\0'; | ||
| } | ||
| } else { | ||
| substdio_puts(&smtpto,">\r\n"); | ||
| } |
There was a problem hiding this comment.
[up-there]
struct stat st;
[...]
substdio_puts(&smtpto,">");
/* in case the input is e.g. a pipe or socket we can't use the size */
if (fstat(0, &st) == 0 && S_ISREG(st.st_mode)) {
substdio_puts(&smtpto," SIZE=");
substdio_putn(&smtpto,st.st_size);
}
substdio_puts(&smtpto,"\r\n");
This look shorter, but does not mean it is better...
I really like your single fstat() call to check the file descriptor, the file type, and the file size at the same time.
There was a problem hiding this comment.
That would be a nice addition to the API and a general cleanup through the code. For the moment I don't want to invent that just for one place.
DerDakon
force-pushed
the
Dakon-remote-SIZE
branch
from
bce502e
to
23d9022
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #173.