From owner-svn-src-head@freebsd.org Mon Jan 1 23:05:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD0F1E89FE7 for ; Mon, 1 Jan 2018 23:05:17 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yb0-x22b.google.com (mail-yb0-x22b.google.com [IPv6:2607:f8b0:4002:c09::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 930A02F18 for ; Mon, 1 Jan 2018 23:05:17 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yb0-x22b.google.com with SMTP id f201so6201938ybg.6 for ; Mon, 01 Jan 2018 15:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=aDMRSEmxdr8Bj6mMh0fb14D/Bay01YZngOSCQ6YBtvg=; b=m9wMLd+KEfwpRcU+c/V+E8zyOZQ2eQwhSbDBsJRuoKattWTgPbaiugOkbSWIxp4kCd gCGwTKRiFKx0+WwnSf+czs12xxwxQykdaFq6gKR0k/jPisBl2IkooK26dA7lA3n1TvEf QsxSzL6uTh5kEXKibGXwJVUkXCRkPrUcq42hE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=aDMRSEmxdr8Bj6mMh0fb14D/Bay01YZngOSCQ6YBtvg=; b=0P86y3RPPaL2O4CJKr6mFM1Ci43free64KQ7zzQeEjwIiLP/d4A/NckuJey2W0/W3T JEiqGqPYz7b33Xp4Gj045XRbkfnRYA+mVnQHajfggBV0FttdeAaZj5Dw9qXej7aW8utO Va86U0xlq9wkNA1QyrXj8fpn6Bt13DAn0Ec8O4xR4GQcswG+eMEVII/fGv49LHGHSb1X 2kLxy6+V3JtZseMWQlRYShQrZPtewRjWgFndt8LAxXLyg4RKjAaDPRDtmz7eD26fEwry NV9llsXv3mweD+75SbrcUxS8caKVvbFQ2+YcNIcvGenEbGnHIu1FIVWJJhDG3Rwx/Ern 6ZhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=aDMRSEmxdr8Bj6mMh0fb14D/Bay01YZngOSCQ6YBtvg=; b=FeI4xPvIrYla13em5vy2Kx8ki5LeyzF7hoD4yD+1RnueMhnjRMHyM89eMRLXz1GZ9o 7isIus8HGzlWSYRZla/lOwZneY2a5MM4zP0HhY8+OsaxDlDLv1NOTUNyBm941mFKgKbg RNiHvcdl1VTdTksVT9zKuFPGN5CtCryFoFJOSX9T88yq8EGxwAavF9ZD5jAYZsrWZMz9 0sKb3RSEL0BNAa1mcQdnEtwnIqWt5E/SanWk30RfUojoNTXaaWcRINhkcbff6KrWWL+b jcjpXbHrQa6scZt49ictpKbolXYkAtWU6Odr+fCnpcGR8yB71W7gSHrm6JM2Ph3fkhQ8 RxXA== X-Gm-Message-State: AKGB3mI1nJ4SUDUxRDWRFX1cWAqP73c7VsMrpfDz5qKaTLqFMLJag6rT 9ctOUEJ0gvvtJQYHSSe8qbI/FX9g5qPrzRBqa+LYXg== X-Google-Smtp-Source: ACJfBot+hPPpzgY5uexrg1WhtXS0UcW9TH4zTv2+OKKfTtWYCl/spGg1aeSCg4UMufxw9ZLahQCRV9LkXJLd+YymFh8= X-Received: by 10.37.210.216 with SMTP id j207mr24073907ybg.517.1514847916762; Mon, 01 Jan 2018 15:05:16 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.37.217.21 with HTTP; Mon, 1 Jan 2018 15:05:16 -0800 (PST) In-Reply-To: <1514846430.12000.44.camel@freebsd.org> References: <201801012233.w01MXvXw087382@repo.freebsd.org> <1514846430.12000.44.camel@freebsd.org> From: Eitan Adler Date: Mon, 1 Jan 2018 15:05:16 -0800 X-Google-Sender-Auth: O-3yNZWon1b2bkUaRcAf1FC88yM Message-ID: Subject: Re: svn commit: r327476 - head/sbin/shutdown To: Ian Lepore Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jan 2018 23:05:18 -0000 On Monday, 1 January 2018, Ian Lepore wrote: > On Mon, 2018-01-01 at 22:33 +0000, Eitan Adler wrote: > > Author: eadler > > Date: Mon Jan 1 22:33:57 2018 > > New Revision: 327476 > > URL: https://svnweb.freebsd.org/changeset/base/327476 > > > > Log: > > shutdown: Assume absolute time is in the future > > > [...] > > Modified: head/sbin/shutdown/shutdown.c > > ============================================================ > ================== > > --- head/sbin/shutdown/shutdown.c Mon Jan 1 22:31:52 2018 > (r327475) > > +++ head/sbin/shutdown/shutdown.c Mon Jan 1 22:33:57 2018 > (r327476) > > @@ -431,7 +431,7 @@ getoffset(char *timearg) > > struct tm *lt; > > char *p; > > time_t now; > > - int this_year; > > + int this_year, maybe_today; > > char *timeunit; > > > > (void)time(&now); > > @@ -503,6 +503,7 @@ getoffset(char *timearg) > > badtime(); > > /* FALLTHROUGH */ > > case 6: > > + maybe_today = 0; > > lt->tm_mday = ATOI2(timearg); > > if (lt->tm_mday < 1 || lt->tm_mday > 31) > > badtime(); > > @@ -517,8 +518,23 @@ getoffset(char *timearg) > > lt->tm_sec = 0; > > if ((shuttime = mktime(lt)) == -1) > > badtime(); > > - if ((offset = shuttime - now) < 0) > > - errx(1, "that time is already past."); > > + > > + if ((offset = shuttime - now) < 0) { > > + if (!maybe_today) > > + errx(1, "that time is already past."); > > + > > + /* > > + * If the user only gave a time, assume that > > + * any time earlier than the current time > > + * was intended to be that time tomorrow. > > + */ > > + lt->tm_mday++; > > + if ((shuttime = mktime(lt)) == -1) > > + badtime(); > > + if ((offset = shuttime - now) < 0) { > > + errx(1, "tomorrow is before today?"); > > + } > > + } > > break; > > default: > > badtime(); > > > > Where does maybe_today ever get set to non-zero? Baah. This is what happens when my build/test and commit box are not the same. Will fix later when I get back home. > > -- Ian > -- Sent from my Turing Machine