Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Apr 2014 02:57:49 +0000 (UTC)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r264186 - head/usr.sbin/makefs
Message-ID:  <201404060257.s362vnpB035846@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcel
Date: Sun Apr  6 02:57:49 2014
New Revision: 264186
URL: http://svnweb.freebsd.org/changeset/base/264186

Log:
  Timestamps may not have a decimal point.
  While here, consistently use sbuf_new_auto().

Modified:
  head/usr.sbin/makefs/mtree.c

Modified: head/usr.sbin/makefs/mtree.c
==============================================================================
--- head/usr.sbin/makefs/mtree.c	Sun Apr  6 02:44:37 2014	(r264185)
+++ head/usr.sbin/makefs/mtree.c	Sun Apr  6 02:57:49 2014	(r264186)
@@ -157,7 +157,7 @@ mtree_file_path(fsnode *node)
 		rp[++depth] = pnode->name;
 	}
 	
-	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
+	sb = sbuf_new_auto();
 	if (sb == NULL) {
 		errno = ENOMEM;
 		return (NULL);
@@ -667,6 +667,8 @@ read_mtree_keywords(FILE *fp, fsnode *no
 				st->st_atime = num;
 				st->st_ctime = num;
 				st->st_mtime = num;
+				if (p == NULL)
+					break;
 				error = read_number(p, 10, &num, 0,
 				    INTMAX_MAX);
 				if (error)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404060257.s362vnpB035846>