From: Serge Hallyn <shallyn@cisco.com>
Date: Sat, 4 May 2019 02:40:02 +0000 (-0700)
Subject: libmisc/btrfs: no sense trying to calculate 'btrfs' string
X-Git-Tag: 4.7~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aff40d8515c66cc12fd4376f05e867700115304a;p=shadow

libmisc/btrfs: no sense trying to calculate 'btrfs' string

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
---

diff --git a/libmisc/btrfs.c b/libmisc/btrfs.c
index f6024bfb..cae93476 100644
--- a/libmisc/btrfs.c
+++ b/libmisc/btrfs.c
@@ -32,7 +32,7 @@ static int run_btrfs_subvolume_cmd(const char *subcmd, const char *arg1, const c
 	int status = 0;
 	const char *cmd = btrfs_cmd();
 	const char *argv[] = {
-		strrchr(cmd, '/'),
+		"btrfs",
 		"subvolume",
 		subcmd,
 		arg1,
@@ -40,11 +40,6 @@ static int run_btrfs_subvolume_cmd(const char *subcmd, const char *arg1, const c
 		NULL
 	};
 
-	if (argv[0] == NULL)
-		argv[0] = cmd;
-	else
-		argv[0] = argv[0] + 1;
-
 	if (access(cmd, X_OK)) {
 		return 1;
 	}