From patchwork Sun May 27 09:31:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 10429293 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 98D7060362 for ; Sun, 27 May 2018 09:32:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D48C28D41 for ; Sun, 27 May 2018 09:32:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 714A428D4B; Sun, 27 May 2018 09:32:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE78428D41 for ; Sun, 27 May 2018 09:32:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935648AbeE0JcA (ORCPT ); Sun, 27 May 2018 05:32:00 -0400 Received: from orcrist.hmeau.com ([104.223.48.154]:40374 "EHLO deadmen.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933214AbeE0JcA (ORCPT ); Sun, 27 May 2018 05:32:00 -0400 Received: from gondobar.mordor.me.apana.org.au ([192.168.128.4] helo=gondobar) by deadmen.hmeau.com with esmtps (Exim 4.89 #2 (Debian)) id 1fMs1v-0001Rx-10; Sun, 27 May 2018 17:31:59 +0800 Received: from herbert by gondobar with local (Exim 4.89) (envelope-from ) id 1fMs1t-00049k-RQ; Sun, 27 May 2018 17:31:57 +0800 Date: Sun, 27 May 2018 17:31:57 +0800 From: Herbert Xu To: DASH Mailing List Subject: expand: Use HOME in tilde expansion when it is empty Message-ID: <20180527093157.pv3kuywvflnop6bc@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Sender: dash-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dash@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently if HOME is set to empty tilde expansion will fail, i.e., it will remain as a literal tilde. This patch changes it to return the empty string as required by POSIX. Signed-off-by: Herbert Xu diff --git a/src/expand.c b/src/expand.c index 45e9b79..eb50e15 100644 --- a/src/expand.c +++ b/src/expand.c @@ -385,7 +385,7 @@ done: } else { home = getpwhome(name); } - if (!home || !*home) + if (!home) goto lose; *p = c; strtodest(home, SQSYNTAX, quotes);