Merge branch 'maint'
* maint: imap-send: link against libcrypto for HMAC and others git-send-email.perl: Deduplicate "to:" and "cc:" entries with names mingw: do not set errno to 0 on success
This commit is contained in:
commit
c6caede7fd
2
Makefile
2
Makefile
@ -1936,7 +1936,7 @@ git-%$X: %.o $(GITLIBS)
|
||||
|
||||
git-imap-send$X: imap-send.o $(GITLIBS)
|
||||
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
||||
$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
|
||||
$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
|
||||
|
||||
git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS)
|
||||
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
||||
|
@ -198,9 +198,10 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
|
||||
*/
|
||||
static int do_lstat(int follow, const char *file_name, struct stat *buf)
|
||||
{
|
||||
int err;
|
||||
WIN32_FILE_ATTRIBUTE_DATA fdata;
|
||||
|
||||
if (!(errno = get_file_attr(file_name, &fdata))) {
|
||||
if (!(err = get_file_attr(file_name, &fdata))) {
|
||||
buf->st_ino = 0;
|
||||
buf->st_gid = 0;
|
||||
buf->st_uid = 0;
|
||||
@ -233,6 +234,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
errno = err;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -960,7 +960,7 @@ sub maildomain {
|
||||
sub send_message {
|
||||
my @recipients = unique_email_list(@to);
|
||||
@cc = (grep { my $cc = extract_valid_address($_);
|
||||
not grep { $cc eq $_ } @recipients
|
||||
not grep { $cc eq $_ || $_ =~ /<\Q${cc}\E>$/ } @recipients
|
||||
}
|
||||
map { sanitize_address($_) }
|
||||
@cc);
|
||||
|
Loading…
Reference in New Issue
Block a user