diff options
| -rw-r--r-- | imap/ChangeLog | 7 | ||||
| -rw-r--r-- | imap/imapd.c | 4 | ||||
| -rw-r--r-- | makedat/makedat.in | 12 |
3 files changed, 17 insertions, 6 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index 463d4ae..c5f3f62 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,10 @@ +2021-03-25 Sam Varshavchik <mrsam@courier-mta.com> + + * make*: Individual files that did not end in a newline were + not handled correctly. + + * imap: adjust error message. + 5.1.1 2021-03-20 Arjen de Korte <build+github@de-korte.org> diff --git a/imap/imapd.c b/imap/imapd.c index f2f4bbd..8c2723b 100644 --- a/imap/imapd.c +++ b/imap/imapd.c @@ -4318,8 +4318,6 @@ int uid=0; } if (strcmp(curtoken->tokenbuf, "IDLE") == 0) { - const char *p; - if (nexttoken()->tokentype != IT_EOL) return (-1); read_eol(); @@ -6967,7 +6965,7 @@ int main(int argc, char **argv) if ((w=maildirwatch_alloc(".")) == NULL) { - writes("* OK [ALERT] Filesystem notification initialization error -- contact your mail administrator (check for configuration errors with the FAM/Gamin library)\r\n"); + writes("* OK [ALERT] Inotify initialization error\r\n"); } else { diff --git a/makedat/makedat.in b/makedat/makedat.in index 53259ab..4278a3a 100644 --- a/makedat/makedat.in +++ b/makedat/makedat.in @@ -1,7 +1,7 @@ #! @SHELL@ # # -# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2021 Double Precision, Inc. See COPYING for # distribution information. # # Generic wrapper for makedat. @@ -83,10 +83,16 @@ get_access() { then if test "$srcfile" != "CVS" then - find -L "$srcfile" -maxdepth 1 -type f -not -name "*~" -not -regex ".*\.dpkg-[a-z]*" -exec cat {} \; + find -L "$srcfile" -maxdepth 1 -type f -not -name "*~" -not -regex ".*\.dpkg-[a-z]*" -print | + while read F + do + @CAT@ "$F" + echo + done fi else - cat "$srcfile" || return + @CAT@ "$srcfile" || return + echo fi echo "." } |