From owner-svn-src-user@FreeBSD.ORG Sun Sep 28 19:55:22 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A47C9145; Sun, 28 Sep 2014 19:55:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91311E4A; Sun, 28 Sep 2014 19:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SJtM37029895; Sun, 28 Sep 2014 19:55:22 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SJtM2C029894; Sun, 28 Sep 2014 19:55:22 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201409281955.s8SJtM2C029894@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 28 Sep 2014 19:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r272268 - user/marcel/mkimg X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2014 19:55:22 -0000 Author: marcel Date: Sun Sep 28 19:55:21 2014 New Revision: 272268 URL: http://svnweb.freebsd.org/changeset/base/272268 Log: When SEEK_HOLE and SEEK_DATA return -1, then the entire file is data. Set hole and data accordingly and before acting on them. While here: remove some debugging printfs; we're good so far. Modified: user/marcel/mkimg/image.c Modified: user/marcel/mkimg/image.c ============================================================================== --- user/marcel/mkimg/image.c Sun Sep 28 19:17:33 2014 (r272267) +++ user/marcel/mkimg/image.c Sun Sep 28 19:55:21 2014 (r272268) @@ -86,7 +86,6 @@ image_swap_alloc(size_t size) image_swap_size = ofs; ofs = -1LL; } - fprintf(stderr, "SWAP: off=%jd, size=%zu\n", (intmax_t)ofs, size); return (ofs); } @@ -338,17 +337,19 @@ image_copyin_mapped(lba_t blk, int fd, u hole = lseek(fd, cur, SEEK_HOLE); data = lseek(fd, cur, SEEK_DATA); - fprintf(stderr, "XXX: %s: cur=%jd, pos=%jd, hole=%jd, " - "data=%jd\n", __func__, (intmax_t)cur, (intmax_t)pos, - (intmax_t)hole, (intmax_t)data); + /* + * Treat the entire file as data if sparse files + * are not supported by the underlying file system. + */ + if (hole == -1 && data == -1) { + data = cur; + hole = end; + } if (cur == hole && data > hole) { hole = pos; pos = data & ~(secsz - 1); - fprintf(stderr, "GAP %jd-%jd\n", - (intmax_t)hole, (intmax_t)pos); - blk += (pos - hole) / secsz; error = image_chunk_skipto(blk); @@ -358,9 +359,6 @@ image_copyin_mapped(lba_t blk, int fd, u data = pos; pos = (hole + secsz - 1) & ~(secsz - 1); - fprintf(stderr, "DATA %jd-%jd data\n", - (intmax_t)data, (intmax_t)pos); - /* Sloppy... */ sz = pos - data; assert((off_t)sz == pos - data);