From b1957a8e9001df1f8002f0b080311dfd2c294287 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 27 Apr 2026 11:17:11 -0700 Subject: [PATCH] Fix bug introduced into SLASHIT whereby which it would go into an infinite loop if a filename had two or more spaces in it. --- library/UNIXUTILS | 16 ++++++++-------- library/UNIXUTILS.DFASL | Bin 8128 -> 8129 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/UNIXUTILS b/library/UNIXUTILS index 76f08d72..fa1c2260 100644 --- a/library/UNIXUTILS +++ b/library/UNIXUTILS @@ -1,6 +1,6 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "27-Apr-2026 10:15:21" {DSK}frank>il>medley>library>UNIXUTILS.;6 21771 +(FILECREATED "27-Apr-2026 11:10:07" {DSK}frank>il>medley>library>UNIXUTILS.;7 21772 :EDIT-BY "FGH" @@ -148,7 +148,7 @@ "true"]) (ShellOpen - [LAMBDA (FilenameOrURL) (* ; "Edited 27-Apr-2026 10:14 by FGH") + [LAMBDA (FilenameOrURL) (* ; "Edited 27-Apr-2026 11:08 by FGH") (* ; "Edited 28-Dec-2025 18:26 by rmk") (* ; "Edited 10-Sep-2025 15:29 by rmk") (* ; "Edited 4-May-2025 11:14 by rmk") @@ -247,7 +247,7 @@ 0))) DO (BLOCK) FINALLY (RETURN CODE]) (SLASHIT - [LAMBDA (X LCASEDIRS NOHOST KEEPDOT NO.QUOTE.SPACE) (* ; "Edited 26-Apr-2026 22:48 by FGH") + [LAMBDA (X LCASEDIRS NOHOST KEEPDOT NO.QUOTE.SPACE) (* ; "Edited 27-Apr-2026 11:00 by FGH") (* ; "Edited 17-Jan-2026 23:15 by rmk") (* ; "Edited 4-Nov-2025 10:10 by rmk") (* ; "Edited 22-Oct-2025 13:05 by rmk") @@ -264,7 +264,7 @@ 0))) (REPLACE.SPACE (if NO.QUOTE.SPACE then (CONS (CHARCODE SPACE)) - else (APPEND (CHARCODE (\ SPACE] + else (CHARCODE (\ SPACE] [SETQ SLASHED (CONCATCODES (for I C from DIRPOS while (SETQ C (NTHCHARCODE X I)) join (SELCHARQ C ((< >) @@ -272,7 +272,7 @@ (CONS (CHARCODE /))) (/ (SETQ LASTDIRPOS I) (CONS C)) - (SPACE REPLACE.SPACE) + (SPACE (APPEND REPLACE.SPACE)) (CONS C] (CL:WHEN (AND LCASEDIRS LASTDIRPOS) (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS))) @@ -373,8 +373,8 @@ (PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1207 1580 (ShellCommand 1207 . 1580)) (1582 1979 (ShellWhich 1582 . 1979)) (2089 21693 + (FILEMAP (NIL (1207 1580 (ShellCommand 1207 . 1580)) (1582 1979 (ShellWhich 1582 . 1979)) (2089 21694 (ShellBrowser 2099 . 3871) (ShellBrowse 3873 . 4558) (ShellOpener 4560 . 6248) (ShellOpen 6250 . 12197 -) (PROCESS-COMMAND 12199 . 12812) (SLASHIT 12814 . 16125) (UNIX-FILE-NAME 16127 . 20012) ( -UNIX-TMP-FILE-NAME 20014 . 21691))))) +) (PROCESS-COMMAND 12199 . 12812) (SLASHIT 12814 . 16126) (UNIX-FILE-NAME 16128 . 20013) ( +UNIX-TMP-FILE-NAME 20015 . 21692))))) STOP diff --git a/library/UNIXUTILS.DFASL b/library/UNIXUTILS.DFASL index e6828da841912a7219b43bc68ffc13735ade08f9..6135779e237e13d44a2d81ae66288b563ee25bfe 100644 GIT binary patch delta 432 zcmX?Lf6#tHD5LqrFeP?FD?Bfz-n7N?BQ+xC$s_QYDZ*E~JXJj%p z-Tar8mx;;Ld@~P+9UGI0*=8TUP8KFpi^U|J1EmcncZ>EhnHfx$7E5Ln zpIk2{E!C3G00e?cEEzjI1qIn0e7QjUxP=?MC+`xI(pT}z(f=^hcaI+@NO*&&Uyj0u z>0TLNMXeA)Fnfn@_LaRG)@}YHmcUrgKeGv_cps2pWSv<9V*iGVFub2JwTIg;#KYOc zG0559#T6v|2qeuY0AgN-XgG_|uoWV*93e6f%$x;MJ`*9@3^Lf+-_JS5F$83Aa4}GT zJ;o0tWRy3fzlR0L3Qh+Ka>O_W1i1RS7)63~GYWe_C|ximAP(WNgD8fX3@jie3^RHd W^+5a$o6RNHGc%bPZGIthg9!j?#&>i8 delta 452 zcmX?Tf53i1D5KfLFeP>aD??K&Bg2XH+7PCR#m0@Zn7N?BQ+xC$s_QYDZEj&HXJj%l z-u#!9mx;;5bTbc!9UGIe;btGcP8KE;v&q+mdYMejH>U|JGcg&PPVN@%V=}RrEG?GI zC^orXOggD6p8*ImxImc6HwDWAi>Bo zvj)We1s7p>H)CoKw_k{dvxj4lv%iZgNctg2no$76yads32BBdKL}VF4WG8Y57NLW8~~w=!IXe9P$frF^f2my80$A%NUmpQGBw!zQsxE|0AsR$bpQYW