From owner-svn-src-user@FreeBSD.ORG Fri Mar 28 04:42:35 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DDAA2D3; Fri, 28 Mar 2014 04:42:35 +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 5B14776E; Fri, 28 Mar 2014 04:42:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2S4gZVb073929; Fri, 28 Mar 2014 04:42:35 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2S4gZ5h073928; Fri, 28 Mar 2014 04:42:35 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201403280442.s2S4gZ5h073928@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 28 Mar 2014 04:42:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263864 - 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.17 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: Fri, 28 Mar 2014 04:42:35 -0000 Author: marcel Date: Fri Mar 28 04:42:34 2014 New Revision: 263864 URL: http://svnweb.freebsd.org/changeset/base/263864 Log: Use :- and not :! for pipes. ! needs to be escaped, which adds to the hassle. Modified: user/marcel/mkimg/mkimg.c Modified: user/marcel/mkimg/mkimg.c ============================================================================== --- user/marcel/mkimg/mkimg.c Fri Mar 28 04:19:06 2014 (r263863) +++ user/marcel/mkimg/mkimg.c Fri Mar 28 04:42:34 2014 (r263864) @@ -106,7 +106,7 @@ usage(const char *why) "size\n"); fprintf(stderr, "\t[/]:=\t- partition content and size " "are determined\n\t\t\t\t by the named file\n"); - fprintf(stderr, "\t[/]:!\t- partition content and size " + fprintf(stderr, "\t[/]:-\t- partition content and size " "are taken from\n\t\t\t\t the output of the command to run\n"); fprintf(stderr, "\t where:\n"); fprintf(stderr, "\t\t\t- scheme neutral partition type\n"); @@ -144,7 +144,7 @@ pwr_of_two(u_int nr) * kind the interpretation of the contents specification * ':' contents holds the size of an empty partition * '=' contents holds the name of a file to read - * '!' contents holds a command to run; the output of + * '-' contents holds a command to run; the output of * which is the contents of the partition. * contents the specification of a partition's contents */ @@ -185,7 +185,7 @@ parse_part(const char *spec) case '=': part->kind = PART_KIND_FILE; break; - case '!': + case '-': part->kind = PART_KIND_PIPE; break; default: