From bff3c2334b2d9a5a83c3e211dc1d40784a9a47f6 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Tue, 31 Mar 2026 11:15:14 -0700
Subject: [PATCH] UNIX-FILE-NAME wasn't dealing properly with {DSK} version 1,
 and making sure that other versions had a dot

---
 library/UNIXUTILS       |  25 ++++++++++++++++---------
 library/UNIXUTILS.DFASL | Bin 7972 -> 8023 bytes
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/library/UNIXUTILS b/library/UNIXUTILS
index 0c0553a4..d8dce663 100644
--- a/library/UNIXUTILS
+++ b/library/UNIXUTILS
@@ -1,12 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED "19-Jan-2026 14:09:03" {WMEDLEY}<library>UNIXUTILS.;55
 20711  
+
(FILECREATED "31-Mar-2026 00:14:19" {WMEDLEY}<library>UNIXUTILS.;58
 21269  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS UNIX-FILE-NAME)
 
-      :PREVIOUS-DATE "17-Jan-2026 23:16:17" {WMEDLEY}<library>UNIXUTILS.;54)
+      :PREVIOUS-DATE "29-Mar-2026 00:26:43" {WMEDLEY}<library>UNIXUTILS.;57)
 
 
 (PRETTYCOMPRINT UNIXUTILSCOMS)
@@ -287,7 +287,9 @@
          SLASHED])
 
 (UNIX-FILE-NAME

-  [LAMBDA (FILE ACCESS COPY EXTENSION)
                       (* ; "Edited 19-Jan-2026 14:05 by rmk")


+  [LAMBDA (FILE ACCESS COPY EXTENSION)
                       (* ; "Edited 31-Mar-2026 00:13 by rmk")


+                                                             (* ; "Edited 29-Mar-2026 00:26 by rmk")


+                                                             (* ; "Edited 19-Jan-2026 14:05 by rmk")


                                                              (* ; "Edited 17-Jan-2026 22:32 by rmk")


                                                              (* ; "Edited 11-Jan-2026 23:54 by rmk")


                                                              (* ; "Edited 27-Dec-2025 21:24 by rmk")


@@ -317,8 +319,13 @@
                                FILE))
                      (DSK [LET ((VERSION (FILENAMEFIELD FILE 'VERSION))
                                 (UNAME (PACKFILENAME 'VERSION NIL 'BODY FILE)))
-                               (CL:UNLESS (EQ VERSION 1)
-                                   (CONCAT UNAME (CONCAT "~" VERSION "~")))])
+                               (CL:IF (EQ VERSION 1)
+                                   UNAME
+                                   (CONCAT UNAME (CONCAT (CL:IF (EQ (CHARCODE %.)
+                                                                    (NTHCHARCODE UNAME -1))
+                                                             ""
+                                                             ".")
+                                                        "~" VERSION "~")))])
                      (LET (UNAME)
 
                           (* ;; "Catch the streams as well as other devices (CORE, servers)")

@@ -360,8 +367,8 @@
 
 (PUTPROPS UNIXUTILS
 FILETYPE
 CL:COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1170 1543 (ShellCommand 1170 . 1543)) (1545 1942 (ShellWhich 1545 . 1942)) (2052 20633 
+  (FILEMAP (NIL (1170 1543 (ShellCommand 1170 . 1543)) (1545 1942 (ShellWhich 1545 . 1942)) (2052 21191 
 (ShellBrowser 2062 . 3834) (ShellBrowse 3836 . 4521) (ShellOpener 4523 . 6211) (ShellOpen 6213 . 11982
-) (PROCESS-COMMAND 11984 . 12597) (SLASHIT 12599 . 15623) (UNIX-FILE-NAME 15625 . 18952) (
-UNIX-TMP-FILE-NAME 18954 . 20631)))))
+) (PROCESS-COMMAND 11984 . 12597) (SLASHIT 12599 . 15623) (UNIX-FILE-NAME 15625 . 19510) (
+UNIX-TMP-FILE-NAME 19512 . 21189)))))
 STOP
diff --git a/library/UNIXUTILS.DFASL b/library/UNIXUTILS.DFASL
index 8de673343f76efbdcedf375e6a59352c3096bb48..f4489675716c690696bdf097f7a9d6de5670af56 100644
GIT binary patch
delta 473
zcmZ2tcinD+Ym5a~aDHh~a;idFW=^U?a#3nxNotCMv7xSSVv(+qfsvVlfq|8wiIt%x
zmz!g-52~_|($wOV#7Z5YdIg~R<O~In4jl!s4kL?=i+h>Hu^BbBM}DHZ9HYhNG?sEk
zCR3Bm_gQ(Fm`u$!zhgINV=*!{x7e)7*U7?UYCd_3P%o3I#b#$=MJAwxh0){;(LN?q
z%gsMTKQggdJ1pABXg2x1L_DL@WPeFTMw!WllHvjz8KyXFWSHQQ&Hw}-HbqRHCaJ9M
zwL#x2N6#zwKNnbZYCec+0h3_D6HM|<J}LRmNwA55fzf!TEr{ZpX%D0r{?4ocQ9mHm
z?U^7cK9I<<8B=?B0vw&a-8_9<{TzK=L4sQ+zmqCbIRKPmaq@SG1PSc|X<;}CA~qnH
z%O|%;C$q5uMHw|Fzm?8oGBcbUE91$iFnPI*q3Y)uJ&biA9dBWb7eIy{NaWFs9tK8`
XHkr+DWH=caZ8m?C)n;V&|NkEV^k|86

delta 422
zcmca^x5RFOYn&-paDHh~a;idFW=^U?a#3nxNotCMp{1@@VxF#%fsvVlp^24&rImp(
zmz!g-52`ZX{JfOJN*$nb1)%cM#G*<CkQSf-RL{nRz0Bg+44c{`KT%zd(R6bPOF1Kx
zq1ooUth`K2h8COOu$!~77#JCuY*y#%WMMM2oV-b>m&wRrv!k#g6G*~ha++u#lab-(
zZ=xTW*pwU=ZDf?4{8l2K(P6T$q#~pA<a|kSz75q58!9}~8Gzu!CdbLsB$Wj+Hb{8o
zg9JRmB=_V8lJCp~niv=urDoa!DTa?T?LpL&nKdBlK7=|lV`>jifTOdwo2QSfpQEoU
zNN)3F0qG)@eLyJ|Cx4enkkF2qAo3)LSchOPoxDssnT-V~%E&*NUnY;q$ar$Sj3*=e
o<dZUnBDZGrFxG)|Tmdl{L8_QH%gb^yGFolcl+$Kp_Wl1K03LmLQ~&?~