From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 560881DDF8 for ; Tue, 25 Jun 2024 19:29:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719343745; cv=none; b=YjcVaxKuA6Q+kE9uuyT4CCgO+CwTA5FX7hqrTnk7YbhllquOP/4alJOL8mEsYWgboYcAr3BipcI5fflG3b9/O1ypTsZ1mqasicrwPBzZwAmAXLF8TMpfjsRQs/yl+rBjGpG3RXkhthODhmBtWsikySpj3EzXxNgAOuo0jqmen8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719343745; c=relaxed/simple; bh=57oZNTDSwhNmGdZxcu1p56BKpqyHbfD80sAWf5h07X4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=pPuQccVl185XOS8iMdXkMHKqAOJcXtOkB1lI3avQriR3IssLzgCm7oB3v5OoSsGmgdfpT1c2fqQGBUZ9dnNPsnioWBkKHyPgH/FauwICRZ3BmFBO9olRX3MTRzqYpyMaPr7iR7/Rbngo3k2HXhPecitmZ7CW9udw2+DagA/YeLA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cEYu4BxN; arc=none smtp.client-ip=209.85.166.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cEYu4BxN" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-3764dd53b5aso1220875ab.2 for ; Tue, 25 Jun 2024 12:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1719343741; x=1719948541; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=AdqgHQbiLKX0GrfKsc8VRA3Aa5aj9Gv3ZmL9WC7EReU=; b=cEYu4BxN/rKB4rhFZXap3oX6IPmnGoVX9bOnAJGjD6FRAjwcL3E35Utwyuxe1uC+n8 YA9Q2mYoELKMGGazDZgPldDSvfUQTniqEvo4yNzIz31rk4i1wPp8DI8v3gZo+nZa9p6E wTAUx+Jr6UAizImaGcdqbIr6vcLATY2SvPHRA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719343741; x=1719948541; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AdqgHQbiLKX0GrfKsc8VRA3Aa5aj9Gv3ZmL9WC7EReU=; b=kLo1MSUegQM4Q+fpQCQwlJMwM36gQKpwgOrMpoU/tZcdq/9n9GTM/zAsWy2uPrhFQe 95FzB2QAx+Q1mGP3IJHh/ulzmqkX163+Y1522QZm7fnV/3+rT2CZ6fZGakv5O5fi5ala wh6wlRUSKIM9wQF/SPmPxloj4eMzB0DGQMwbXKMzztQrBWHYCn8z6L6xqzGbCF8pOnMO rJzo6+VOGpQENXZApOom4hNRFcBnNzEfbmcA2w2WdtFKxp2bTDqFPhaNqVAp4dPpDGAH TKdMwNj15w/ppPtc3XYVX59ZWJdMoXP5DhhQA+B2PrxyWolFClp6dIjo32+CAH5uPJgc vbtg== X-Forwarded-Encrypted: i=1; AJvYcCW7UdkCJSaoF6aYpjRobwIIeNzuN3gkT2y8YJ0UgMcGjZWc7slkWJ83bu4ImvJOEzG1agpXetjVE6rHYaQLjipp1nh9dMQQfbY= X-Gm-Message-State: AOJu0YwUnMdt7+SrgGwlRYAhyvLJ4i2msDFQnMl5CWW65OZlQQN+Aloh eBIjhgTGOkevsDCDzhN0bLM7JONmEHuB8ZM0tgQqR/YOXUNjpt+JkTmiZZsz3GY= X-Google-Smtp-Source: AGHT+IG7zwOcPTRc9nkE8fl2fmrJ6wZJFFd+stNb7ZHqxTHswSk3KwlfCDW59o0lEqMqYOgxk0RRZg== X-Received: by 2002:a92:d28c:0:b0:376:2361:d2ac with SMTP id e9e14a558f8ab-37638b5136dmr75534975ab.2.1719343741315; Tue, 25 Jun 2024 12:29:01 -0700 (PDT) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3772b4c8b06sm1159875ab.53.2024.06.25.12.29.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Jun 2024 12:29:00 -0700 (PDT) Message-ID: <0a5ab4c0-e397-4dda-92f8-a23bcb42765c@linuxfoundation.org> Date: Tue, 25 Jun 2024 13:29:00 -0600 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] cpupower: Make help command available for custom install dir To: Roman Storozhenko , Thomas Renninger , Shuah Khan Cc: Javier Carrasco , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan References: <20240622-fix-help-issue-v2-1-6c19e28a4ec1@gmail.com> Content-Language: en-US From: Shuah Khan In-Reply-To: <20240622-fix-help-issue-v2-1-6c19e28a4ec1@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/22/24 07:01, Roman Storozhenko wrote: > When the 'cpupower' utility installed in the custom dir, it fails to > render appropriate help info for a particular subcommand: > $ LD_LIBRARY_PATH=lib64/ bin/cpupower help monitor > with error message like 'No manual entry for cpupower-monitor.1' > The issue is that under the hood it calls 'exec' function with > the following args: 'man cpupower-monitor.1'. In turn, 'man' search > path is defined in '/etc/manpath.config'. Of course it contains only > standard system man paths. > Make subcommands help available for a user by setting up 'MANPATH' > environment variable to the custom installation man pages dir. That > variable value will be prepended to the man pages standard search paths > as described in 'SEARCH PATH' section of MANPATH(5). > > Signed-off-by: Roman Storozhenko > --- > Changes in v2: > - Fixed spelling errors > - Simplified man pages search approach by the 'MANPATH' variable usage > - Link to v1: https://lore.kernel.org/r/20240621-fix-help-issue-v1-1-7906998d46eb@gmail.com > --- > tools/power/cpupower/utils/cpupower.c | 41 ++++++++++++++++++++++++++++++----- > 1 file changed, 35 insertions(+), 6 deletions(-) > > diff --git a/tools/power/cpupower/utils/cpupower.c b/tools/power/cpupower/utils/cpupower.c > index 9ec973165af1..1b1b79c572ad 100644 > --- a/tools/power/cpupower/utils/cpupower.c > +++ b/tools/power/cpupower/utils/cpupower.c > @@ -12,6 +12,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -80,14 +82,17 @@ static void print_help(void) > > static int print_man_page(const char *subpage) > { > - int len; > - char *page; > + char *page, *man_path, *exec_dir; > + char exec_path[PATH_MAX]; > + int subpage_len; > > - len = 10; /* enough for "cpupower-" */ > - if (subpage != NULL) > - len += strlen(subpage); > + if (!subpage) > + return -EINVAL; > > - page = malloc(len); > + subpage_len = 10; /* enough for "cpupower-" */ > + subpage_len += strlen(subpage); > + > + page = malloc(subpage_len); > if (!page) > return -ENOMEM; > > @@ -97,6 +102,30 @@ static int print_man_page(const char *subpage) > strcat(page, subpage); > } > > + /* Get current process image name full path */ > + if (readlink("/proc/self/exe", exec_path, PATH_MAX) > 0) { Using /proc/self/exe is Linux and platform specific and not a good solution. Did you loom into using argv[0]? thanks, -- Shuah