From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15035 invoked by alias); 11 Mar 2017 02:24:30 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40825 Received: (qmail 3308 invoked from network); 11 Mar 2017 02:24:30 -0000 X-Qmail-Scanner-Diagnostics: from mail-vk0-f46.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.213.46):SA:0(0.5/5.0):. Processed in 0.679011 secs); 11 Mar 2017 02:24:30 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.5 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_SPAM,SPF_PASS, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.213.46 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:date:to:subject:mime-version; bh=yanwjz+FpY8poUIt+GQZGC0WozVRv1vfU21dWHFaPk4=; b=EoO/VFCYc3YjQlAXeN/mUS/6ZEn/a70VZrmQI0Z5zdrOtrp76jEplZ+IsPnlXS+duh OEVCmEDpMzJBs+/sYIV03S++NpmgtfpsLSxBOYD4g8hoHu3s4yhlPZR6UNKbQgzkCLrb UJMzsO+A6y7XjBQgU9j3dPrfd+iS6K/lA9DY0hoszw9HoaDRn198yIB4I+T0tiJOVmUe R46nv+EwfkHBMGpGnKVtUyzDz7i3CEMSmogI/6Iz1IxlxTLUDVNc6TNzWw0PpwqHFsu2 2osCtIgXsKgOKwEEl2hOZ5kFBKOKTwrSml5RlPgLRbggw3uFbSnWwGvUzy1B6lDBjKWy 4LYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:date:to:subject:mime-version; bh=yanwjz+FpY8poUIt+GQZGC0WozVRv1vfU21dWHFaPk4=; b=LpLNL7rXcq9Tc8Y+/SSjsWRPTH9bTdpeGJaUYm/dhf8D09cs9BJao3CzjCiRKxxunA JfRD2cyFNie5RCuvLsiAVwl3O1dso429pLoiZON2BNH24YsPWhGm4Aucpa73FRjYOOes HLcGdr/FkDotQxRKqymdmu7ldtSL2PCaNlh6/BeNHpmLUDqdHNk+A1pGUC+2Ipx/m+UV Db2zBt7m2CarRyGFGPFSKVuKDrxFChVc5EbNRzv/1T3Fd85MJLsuGX5gJ9N8tz2DHIYs 05d/r0bEClYN42AMSvxvu8UDPz7fxknRAceGDl8igCAmuKSyePSJjHyikdffne23l4cH zNBw== X-Gm-Message-State: AMke39mbv5hfuZXl3pEvUA3/VAcTXRmSQih4PUrAei74kqiW+bvcyJkNbMGFwijYExQpYQ== X-Received: by 10.31.235.6 with SMTP id j6mr9053901vkh.75.1489199066841; Fri, 10 Mar 2017 18:24:26 -0800 (PST) From: Bart Schaefer Message-Id: <170310182501.ZM17524@torch.brasslantern.com> Date: Fri, 10 Mar 2017 18:25:01 -0800 X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh-workers@zsh.org Subject: Bug with :P modifier when current directory is the root MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Debugging in another thread, I added this line to _canonical_paths_add_paths -- : curpref is $curpref and :P is $curpref:P and _complete_debug (with "$PWD" == "/") says +_canonical_paths_add_paths:11> : curpref is m and :P is //m I can't think of any case [*] where the :P modifier should add a double leading slash. [*] Except on weird OSs where you refer to auto-mount points with //host/ but that's definitely not the case here. Does this need an extra test that (here[strlen(here)-1] != '/') or some such, or are we safe enough this way? Can zgetcwd() ever return "//" or "///" etc.? diff --git a/Src/subst.c b/Src/subst.c index 2214b3d..d68f16b 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -4336,7 +4336,11 @@ modify(char **str, char **ptr) break; case 'P': if (*copy != '/') { - copy = zhtricat(metafy(zgetcwd(), -1, META_HEAPDUP), "/", copy); + char *here = zgetcwd(); + if (here[1]) + copy = zhtricat(metafy(here, -1, META_HEAPDUP), "/", copy); + else + copy = dyncat(here, copy); } copy = xsymlink(copy, 1); break; @@ -4418,7 +4422,11 @@ modify(char **str, char **ptr) break; case 'P': if (**str != '/') { - *str = zhtricat(metafy(zgetcwd(), -1, META_HEAPDUP), "/", *str); + char *here = zgetcwd(); + if (here[1]) + *str = zhtricat(metafy(here, -1, META_HEAPDUP), "/", *str); + else + *str = dyncat(here, *str); } *str = xsymlink(*str, 1); break;