From owner-svn-src-all@FreeBSD.ORG Fri Jan 30 05:49:27 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8948A106566B; Fri, 30 Jan 2009 05:49:27 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7776F8FC14; Fri, 30 Jan 2009 05:49:27 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0U5nRYL080566; Fri, 30 Jan 2009 05:49:27 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0U5nRpu080565; Fri, 30 Jan 2009 05:49:27 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200901300549.n0U5nRpu080565@svn.freebsd.org> From: Tim Kientzle Date: Fri, 30 Jan 2009 05:49:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187910 - head/usr.sbin/mtree X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jan 2009 05:49:27 -0000 Author: kientzle Date: Fri Jan 30 05:49:27 2009 New Revision: 187910 URL: http://svn.freebsd.org/changeset/base/187910 Log: Accept integer times. Previously, the field "time=1233294539" would be rejected as invalid. Modified: head/usr.sbin/mtree/spec.c Modified: head/usr.sbin/mtree/spec.c ============================================================================== --- head/usr.sbin/mtree/spec.c Fri Jan 30 03:41:45 2009 (r187909) +++ head/usr.sbin/mtree/spec.c Fri Jan 30 05:49:27 2009 (r187910) @@ -254,14 +254,15 @@ set(char *t, NODE *ip) break; case F_TIME: ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10); - if (*ep != '.') - errx(1, "line %d: invalid time %s", - lineno, val); - val = ep + 1; - ip->st_mtimespec.tv_nsec = strtoul(val, &ep, 10); + if (*ep == '.') { + val = ep + 1; + ip->st_mtimespec.tv_nsec + = strtoul(val, &ep, 10); + } else + ip->st_mtimespec.tv_nsec = 0; if (*ep) errx(1, "line %d: invalid time %s", - lineno, val); + lineno, val); break; case F_TYPE: switch(*val) {