Re: smtpd: nits to reduce the diff with -portable

[Omar Polo]

On 2023/05/09 19:41:51 -0600, "Todd C. Miller" <todd.mil...@sudo.ws> wrote:
> On Wed, 10 May 2023 00:55:54 +0200, Omar Polo wrote:
> 
> > As per subject, here's a few misc nits that would reduce the
> > difference with -portable.  There's some printing of time_t via
> > casting to long long, some missing includes (even if in tree it builds
> > nevertheless) and a const for a variable (no idea how it went there in
> > -portable but it's not wrong so including that too.)
> 
> OK millert@

thanks!

I forgot to include one off_t cast since it was in a different
directory and -even if off topic because it's not in portable- instead
of "const"-ify only tz why don't mark as const also the two arrays day
and month?

sorry for forgetting these in the previous mail,

diff /usr/src
commit - a2d3cb1e480c37eb6fb14cee9f2946606a0346bc
path + /usr/src
blob - a0d38b1a7c0c7f7016b7d3f69e1c5dad77227e2a
file + libexec/mail.local/mail.local.c
--- libexec/mail.local/mail.local.c
+++ libexec/mail.local/mail.local.c
@@ -243,7 +243,8 @@ retry:
        }
 
        curoff = lseek(mbfd, 0, SEEK_END);
-       (void)snprintf(biffmsg, sizeof biffmsg, "%s@%lld\n", name, curoff);
+       (void)snprintf(biffmsg, sizeof biffmsg, "%s@%lld\n", name,
+           (long long)curoff);
        if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
                mwarn("temporary file: %s", strerror(errno));
                goto bad;
blob - 6e340ccde1a521ff13805c6f31d38ee77eb5ad50
file + usr.sbin/smtpd/to.c
--- usr.sbin/smtpd/to.c
+++ usr.sbin/smtpd/to.c
@@ -140,10 +140,10 @@ time_to_text(time_t when)
 {
        struct tm *lt;
        static char buf[40];
-       char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-       char *month[] = {"Jan","Feb","Mar","Apr","May","Jun",
+       const char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+       const char *month[] = {"Jan","Feb","Mar","Apr","May","Jun",
                         "Jul","Aug","Sep","Oct","Nov","Dec"};
-       char *tz;
+       const char *tz;
        long offset;
 
        lt = localtime(&when);