From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RQQWi-0003OB-Nd for garchives@archives.gentoo.org; Tue, 15 Nov 2011 21:26:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9783C21C035; Tue, 15 Nov 2011 21:26:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 61D5721C035 for ; Tue, 15 Nov 2011 21:26:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66C121B4031 for ; Tue, 15 Nov 2011 21:26:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CD93980042 for ; Tue, 15 Nov 2011 21:26:35 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <3f2e9c4e1fa5587ec4f7ff07fbc5b5066c2d281e.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/mountinfo.c X-VCS-Directories: src/rc/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 3f2e9c4e1fa5587ec4f7ff07fbc5b5066c2d281e Date: Tue, 15 Nov 2011 21:26:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f698dfdc-b855-4a62-8694-4eb0118dc844 X-Archives-Hash: 89fc687eb8bbc4db70a6474e4d81e493 commit: 3f2e9c4e1fa5587ec4f7ff07fbc5b5066c2d281e Author: Mike Frysinger gentoo org> AuthorDate: Tue Nov 15 20:36:55 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Nov 15 21:19:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D3f2e9c4e mountinfo: Do not error out if realpath fails Reported-By: Dennis Schridde gmx.net> X-Gentoo-Bug: 383333 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=3D383333 --- src/rc/mountinfo.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index 5bbee06..adce434 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -458,10 +458,10 @@ mountinfo(int argc, char **argv) if (argv[optind][0] !=3D '/') eerrorx("%s: `%s' is not a mount point", argv[0], argv[optind]); - if (realpath(argv[optind++], real_path) =3D=3D NULL) { - eerrorx("%s: realpath() failed: %s", argv[0], strerror(errno)); - } - rc_stringlist_add(args.mounts, real_path); + char *this_path =3D argv[optind++]; + if (realpath(this_path, real_path)) + this_path =3D real_path; + rc_stringlist_add(args.mounts, this_path); } nodes =3D find_mounts(&args); rc_stringlist_free(args.mounts);