From 1211991144b4ca778f3bafbd3fa8a71679eebf8d Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@sbcglobal.net>
Date: Mon, 25 Nov 2024 13:34:38 -0800
Subject: [PATCH] Fix matchfiles for NULL path

---
 images/apple/DCGR-RGB.PO        | Bin 143360 -> 143360 bytes
 src/libsrc/apple/matchfiles.pla |   2 +-
 src/utilsrc/apple/dcgrshow.pla  |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/apple/DCGR-RGB.PO b/images/apple/DCGR-RGB.PO
index 157a12dfdbd1e420e2ad3cfd1650417a8d0b7c1f..fd7467d16e2b80b21474d73c7c313585d7ba8aec 100755
GIT binary patch
delta 228
zcmZp8z|ru4W5Z8Ymdfq&yqo{B%CWIBFfcIg+sw%HfU${h8y{n3({#~^jDjL}8JHQq
zGBJSEaWFh)05hh~o4{Dk$S_@OBBKJ>gzZ)n8IP%PYcVmUGB8LAurX*%=YGTZh<Obw
z!}iy27zG%a?tB9p{f}|k9!3M!4J-*-`qMrzny~H`WMKL*-SPvYvhH^VnTe{5GL3qS
z42@Pm>;%L)j0_V?82KjFG72@$2eOwk%1qn{#46J}KQM+0?iM_D^32g=m(HKPaPW!;
V#|Od9j9ffS%ib|EF8jdf005i#O3DBL

delta 833
zcma)4KWGzC82`SPOL|Sh^_s>@JNO5*0Ur-)2jvivIyj_M2-2)YBp!5;aHMCug{)>s
z!TN%O2udcA&=S)@&@3)4MsU(0=pqOz(lj_|`n}Y<1}AU%?)TmA{eJKFeOK!0rLNxi
z71q{UT59Ka_(UWe2Y|~v$hufIo*TGPo`uECGBtze&pSxKhf}cLnzMBH4D_O<<ijf7
zksDQ<l<7@0N${-Iy10q2)3VXW<jRr>{E@?4huO?y;F+Rk6BNC-j$uA1tF|k)0-(9P
zM!iTu^j`UdF(L$DTq(s!shG^p$K+%mEoUX86pus*G=l@0t3KP2Q4w8<L=QziM)Qg5
zDd6XeQ`zIdk5RFJ=cr6T=pK9-+=s7&8hjfJy>j^}hZT5d+i+N=AhtUGCI9hMG)lqS
zifE4!v+Xl|bH}K7hKjKm9ZIhzNm*R*FJ5u^G#w2U#9CmYQHTIgqN9|$E7k&sDA58C
zS6K~@1$J-7<+C21ymASb3{X?^mm``THOKeVQA=sIsgfftVmQ7mqe?!R5>>J=rM`zY
zn;*(umDhThMpG7hXeaLKj$XN~JCSYuX4#7qkQ05J=J^DFa%KTku!2}c8sX^LLawMP
zkFYED<<mW!v2uT@!2}e)BVX=gDm#)_{UAZ!!ykmwF59L@x&Jp+{RN(j%`$ciV8)EV
dX&KwaPpzN3XkfUZ-QaWe?}(30hV>t~Z~*U-{g40v

diff --git a/src/libsrc/apple/matchfiles.pla b/src/libsrc/apple/matchfiles.pla
index 11da710..f90cefa 100644
--- a/src/libsrc/apple/matchfiles.pla
+++ b/src/libsrc/apple/matchfiles.pla
@@ -48,7 +48,7 @@ export def matchList(pathstr, exp)#2
     if not dirbuf
         dirbuf = heapallocalign(512, 8, 0)
     fin
-    if not ^pathstr
+    if not (pathstr and ^pathstr)
         fileio:getpfx(@curpath)
         pathstr = @curpath
     fin
diff --git a/src/utilsrc/apple/dcgrshow.pla b/src/utilsrc/apple/dcgrshow.pla
index 942da71..95e568a 100644
--- a/src/utilsrc/apple/dcgrshow.pla
+++ b/src/utilsrc/apple/dcgrshow.pla
@@ -139,7 +139,7 @@ while ^arg
     struprcpy(@wildfile, arg)
     entrylist, entrycnt = matchList(NULL, @wildfile)
     if not entrylist
-        puts(arg); puts(" ???\n")
+        puts(@wildfile); puts(" ???\n")
     else
         if not srcfilelist
             srcfilelist = entrylist