Date: Sun, 22 Jan 2017 21:08:05 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312650 - in head/usr.sbin/pw: . tests Message-ID: <20170122200805.l5vmo3nhodfl2m6q@ivaldir.etoilebsd.net> In-Reply-To: <201701222003.v0MK3JmF001620@repo.freebsd.org> References: <201701222003.v0MK3JmF001620@repo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Sun, Jan 22, 2017 at 08:03:19PM +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Sun Jan 22 20:03:18 2017 > New Revision: 312650 > URL: https://svnweb.freebsd.org/changeset/base/312650 > > Log: > Really restore the old behaviour for pw usermod -m > > It again reinstall missing skel files without overwriting changed one > Add a regression test about it > > Reported by: ae > MFC after: 3 days > > Modified: > head/usr.sbin/pw/psdate.c > head/usr.sbin/pw/pw_user.c > head/usr.sbin/pw/tests/pw_usermod.sh > > Modified: head/usr.sbin/pw/psdate.c > ============================================================================== > --- head/usr.sbin/pw/psdate.c Sun Jan 22 19:50:23 2017 (r312649) > +++ head/usr.sbin/pw/psdate.c Sun Jan 22 20:03:18 2017 (r312650) > @@ -41,12 +41,8 @@ static const char rcsid[] = > static int > numerics(char const * str) > { > - int rc = isdigit((unsigned char)*str); > > - if (rc) > - while (isdigit((unsigned char)*str) || *str == 'x') > - ++str; > - return rc && !*str; > + return (str[strspn(str, "0123456789x")] == '\0'); > } Oups that wasn't supposed to be there but anyway it is in now Bapt [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAliFESEACgkQY4mL3PG3 Plp5lxAAuezpGgmXLAynp5s9yUen99I4MNoElWgTHAWbjO1xHlGzjgNRKM6NpU3n 5vT5xsd/t2lKkdamBDbuK7P5paJMDQ9CtFywG4yujPpHmjTZnlDNHVyu1ToHi6jX FJS4u1JUk6jbOGh0VppLl7PnuwQuWaX7o6rwdybv4GMXd27FU6yJD2utI8p1jZFR PD/Wa/hYrr61QFAnGGTvn8ssKBHMa+YBrfF9LeWf9KbjU0JKlBO4WRHqhDK3BHFZ 8u6u3YDqO6ADJkOcFdSSqTuZ1awEh46peQVCqa4wqc8rxIRr1kWb8mQPBUjTaINJ mgzC3w1SWg7W2amcVCwH0LU6mGH/yLm1zbjL4ihCnsz+PyVVYSO3KccNBEjnZK93 6nfKIzB6aYl/vZXn/Jbhdrg9K3NFmmDab69NrcZxo9s5i3uTqtPCi8zfdGxSWTJ1 OJlM4gxdCn7BmrC5eeLe0V4KKNzeoBiHuQ64LX4kenvRWw/gVPx1tEzDZxdcIkkL RHI2lhbMJRYs9CPqEK72EWoX2xM5TrYBfNWuKU21T89tdpVIXRMmtAJWKnt0vNF4 ZgHKbMwrhXNPqBxKu99HbSvWFlLBRly+MQBYDbSTi2CKlpgEaDLmjclc/Tc6Ug7J MwTNTmkWHISY5Upx14XwGY2ju1yg3A/MFBLMDk3E6F1G7GX1sZA= =7n6b -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170122200805.l5vmo3nhodfl2m6q>