From nobody Wed Mar 16 04:06:53 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A10721A2161B; Wed, 16 Mar 2022 04:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJGtj435Kz3qnY; Wed, 16 Mar 2022 04:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647403613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LhAIYzvnvhpTy5Ij+YVpmcfRPeffP3Ym0L1gKqohmgU=; b=AphvojJqdf8DLtV0uAjItBBhJrPGjfdzd151cD5Eee0Zfv/W2MeVKX4SFV+OSwAhsnCtLg 33tPB3GoiqiZpqX8Sk5d+Edg0H26d0fF3h+CUH5jueHy0vhu/UhU1f5YZwGICU+ropmYRG Amlf2dyQ3VE9X0MlQ/IlOJuEAJlov4q+9ZVMEqmQ8qAjwGBV3QN9H/aDCDk/QRohzaDoDx 354ba5YIWUCYu2p50JWVCfRg9PwBWwwnPGB3TezjIFyzwYNZKMAgIdDOdtnUf1t5HKRRpt wuZumTj86ijZgnqn8PmDwQWQzUAZI1F0B7ybqMxuWnTzzgdyIjszjef27Q87Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C992733A; Wed, 16 Mar 2022 04:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22G46rjM070786; Wed, 16 Mar 2022 04:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22G46r6b070785; Wed, 16 Mar 2022 04:06:53 GMT (envelope-from git) Date: Wed, 16 Mar 2022 04:06:53 GMT Message-Id: <202203160406.22G46r6b070785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: bd0f3d34fa20 - main - GEOM: Fix regression after 7f16b501e25. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd0f3d34fa20686bac9a418d3a37a3f59c25ab19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647403613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LhAIYzvnvhpTy5Ij+YVpmcfRPeffP3Ym0L1gKqohmgU=; b=xEApZvTXaRPfi558dhq8RSgerVbMmTtcv0V6crZAG9k1FzV6Q/6gv1trXi9qJWPzK3bJQv 1EFgZ5cqs3SgEF3vHEaJPuhAxbE8TboI6kMxDDElzC/3ptvLI9eYhVVZt8lQcqIdIB2Os7 ILi0ejjnEKKjjFtPPlLOfdzpSWLmPITwe/fivQe0qJz6NBFYghM4ocWRtz/UPYANa+QDRE cjTPXfdTwe0VPNDkvey0X5YBhri23hU5krRETljitOYbzXr9vNjuysnrCxTOljEGs/Xc7u a+Ri/TemK7wMerTqsYT9iPJ1/VlW/qXu0c9Gt2xGXAVfBYcO25KlAKXOcE6qng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647403613; a=rsa-sha256; cv=none; b=rl6r0UOa3xGEWAirwr51vQKSgUq2LiNC3ad20MqTlZ/K7so9DuNAccgx9GCgxXkrxN7ZOQ Ff07c5/yXnv8VgnthUWjbQtfak41HdA+ivu0eKFZ9FTCOJBMBTpUwZpAErGY3p43kl+dyu yubNgBkhHE+undEMySV3vfsdE8VI5xZrPqqxLxfY0gkIFjNmfoMGojFNhnDHmb9/2OI99V 1h4ZrbTs4WVsM8V4BUh/Am+ER2fLsg94ff92ECr1lITzyd4MGNOZB5pQ6ha2JJIshQlfJ0 Mpv9wpGRAFazvUpdLsrmiBql/hoxZ/IeQyyK8JxPWrBUHbS2+PYgKV03vbOPmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=bd0f3d34fa20686bac9a418d3a37a3f59c25ab19 commit bd0f3d34fa20686bac9a418d3a37a3f59c25ab19 Author: Alexander Motin AuthorDate: 2022-03-16 03:58:09 +0000 Commit: Alexander Motin CommitDate: 2022-03-16 04:06:49 +0000 GEOM: Fix regression after 7f16b501e25. find_geom() in some classes trim leading "/dev/" from geom names. Lack of that in geom_gettree_geom() broke some existing scripts. PR: 262554 MFC after: 2 months --- lib/libgeom/geom_xml2tree.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index a6da0e6d163f..52d21790101e 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -481,6 +482,8 @@ geom_gettree_geom(struct gmesh *gmp, const char *c, const char *g, int parents) char *p; int error; + if (g != NULL && strncmp(g, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) + g += sizeof(_PATH_DEV) - 1; p = geom_getxml_geom(c, g, parents); if (p == NULL) return (errno);