From owner-svn-src-all@freebsd.org Thu Jun 28 01:45:54 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DA911026E13; Thu, 28 Jun 2018 01:45:54 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E6DF27F4E6; Thu, 28 Jun 2018 01:45:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C964F3298; Thu, 28 Jun 2018 01:45:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5S1jrcD046719; Thu, 28 Jun 2018 01:45:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5S1jrWE046718; Thu, 28 Jun 2018 01:45:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201806280145.w5S1jrWE046718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 28 Jun 2018 01:45:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335756 - head/sbin/devd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sbin/devd X-SVN-Commit-Revision: 335756 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 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: Thu, 28 Jun 2018 01:45:54 -0000 Author: imp Date: Thu Jun 28 01:45:53 2018 New Revision: 335756 URL: https://svnweb.freebsd.org/changeset/base/335756 Log: We're not, yet, at C++11 capable on all our plaforms. Use a possibly slower, but C++98 compatibe way to iterate through the string. Noticed by: g++ 4.2.1 and Mark Millard Modified: head/sbin/devd/devd.cc Modified: head/sbin/devd/devd.cc ============================================================================== --- head/sbin/devd/devd.cc Thu Jun 28 01:32:37 2018 (r335755) +++ head/sbin/devd/devd.cc Thu Jun 28 01:45:53 2018 (r335756) @@ -640,6 +640,8 @@ string config::shell_quote(const string &s) { string buffer; + const char *cs, *ce; + char c; /* * Enclose the string in $' ' with escapes for ' and / characters making @@ -649,7 +651,10 @@ config::shell_quote(const string &s) buffer.reserve(s.length() * 3 / 2); buffer += '$'; buffer += '\''; - for (const char &c : s) { + cs = s.c_str(); + ce = cs + strlen(cs); + for (; cs < ce; cs++) { + c = *cs; if (c == '\'' || c == '\\') { buffer += '\\'; }