From 90dc568baeeb474ff0326347fe53e409781011f7 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Mon, 1 Apr 2024 19:52:56 -0700 Subject: [PATCH] COMPAREDIRECTORIES makes directory filedate consistent with internal date of Tedit files (#1637) --- lispusers/COMPAREDIRECTORIES | 75 ++++++++++++++++-------------- lispusers/COMPAREDIRECTORIES.LCOM | Bin 41380 -> 41268 bytes 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 28dd4f77..d8b23f7a 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,18 +1,14 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Sep-2023 17:25:57" {WMEDLEY}COMPAREDIRECTORIES.;257 130870 +(FILECREATED "26-Mar-2024 21:42:47" {WMEDLEY}COMPAREDIRECTORIES.;259 131082 :EDIT-BY rmk - :CHANGES-TO (FNS COMPAREDIRECTORIES COMPAREDIRECTORIES.INFOS) + :CHANGES-TO (FNS FIX-DIRECTORY-DATES) - :PREVIOUS-DATE "28-Sep-2023 23:20:57" {WMEDLEY}COMPAREDIRECTORIES.;256) + :PREVIOUS-DATE "29-Sep-2023 17:25:57" {WMEDLEY}COMPAREDIRECTORIES.;257) -(* ; " -Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corporation. -") - (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS) (RPAQQ COMPAREDIRECTORIESCOMS @@ -1514,7 +1510,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (DEFINEQ (FIX-DIRECTORY-DATES - [LAMBDA (FILES MARGIN) (* ; "Edited 29-Nov-2021 20:30 by rmk:") + [LAMBDA (FILES MARGIN) (* ; "Edited 26-Mar-2024 21:42 by rmk") + (* ; "Edited 29-Nov-2021 20:30 by rmk:") (* ; "Edited 23-Nov-2021 12:16 by rmk:") (* ; "Edited 30-Oct-2020 22:01 by rmk:") @@ -1536,13 +1533,23 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp (* ;; "Stop if directory date is more than 2 minutes earlier than the filecreated date. Earlier could be because the dates are asserted at different points in the filing process. But 2 minutes is worth thinking about. Returning from HELP will get them aligned.") + (* ;; "") + + (* ;; "Doesn't descend into subdirectories.") + + (* ;; "") + + (* ;; "Also fixes dates of Tedit files, if they carry an internal creation date.") + (SETQ MARGIN (ITIMES (OR MARGIN 2) 60 ONESECOND)) (FOR F DIDATE FCDATE IN (OR (LISTP FILES) - (FILDIR FILES)) WHEN (SETQ FCDATE (OR (FILEDATE F T) - (FILEDATE F))) - UNLESS (IEQP (SETQ DIDATE (GETFILEINFO F 'ICREATIONDATE)) - (SETQ FCDATE (IDATE FCDATE))) + (FILDIR FILES)) UNLESS (DIRECTORYNAMEP F) + WHEN (SETQ FCDATE (OR (FILEDATE F T) + (FILEDATE F) + (TEDIT.FILEDATE F))) UNLESS (IEQP (SETQ DIDATE (GETFILEINFO F + 'ICREATIONDATE)) + (SETQ FCDATE (IDATE FCDATE))) COLLECT (CL:WHEN (IGREATERP (IDIFFERENCE FCDATE DIDATE) MARGIN) @@ -2189,28 +2196,26 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp COMPARESOURCES COMPARETEXT) (MOVD? 'NILL 'TEDIT.FILEDATE) -(PUTPROPS COMPAREDIRECTORIES COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1994 1998 - 2018 2020 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2651 22769 (COMPAREDIRECTORIES 2661 . 7751) (COMPAREDIRECTORIES.INFOS 7753 . 10711) ( -COMPAREDIRECTORIES.CANDIDATES 10713 . 14098) (CDENTRIES.SELECT 14100 . 18875) ( -COMPAREDIRECTORIES.INFOS.TYPE 18877 . 20003) (MATCHNAME 20005 . 20685) (CD.INSURECDVALUE 20687 . 22301 -) (CD.UPDATEWIDTHS 22303 . 22767)) (22770 33392 (CDFILES 22780 . 28794) (CDFILES.MATCH 28796 . 30421) -(CDFILES.PATS 30423 . 33390)) (33393 51214 (CDPRINT 33403 . 35920) (CDPRINT.HEADER 35922 . 36819) ( -CDPRINT.LINE 36821 . 40053) (CDPRINT.MAXWIDTHS 40055 . 44170) (CDPRINT.COLHEADERS 44172 . 45457) ( -CDPRINT.COLUMNS 45459 . 50579) (CDTEDIT 50581 . 51212)) (51215 60336 (CDMAP 51225 . 52657) (CDENTRY -52659 . 52968) (CDSUBSET 52970 . 54409) (CDMERGE 54411 . 58395) (CDMERGE.COMMON 58397 . 59712) ( -CD.SORT 59714 . 60334)) (60337 67875 (BINCOMP 60347 . 64636) (EOLTYPE 64638 . 67200) (EOLTYPE.SHOW -67202 . 67873)) (68403 80930 (FIND-UNCOMPILED-FILES 68413 . 72056) (FIND-UNSOURCED-FILES 72058 . 74442 -) (FIND-SOURCE-FILES 74444 . 76182) (FIND-COMPILED-FILES 76184 . 78061) (FIND-UNLOADED-FILES 78063 . -78916) (FIND-LOADED-FILES 78918 . 79346) (FIND-MULTICOMPILED-FILES 79348 . 80928)) (80931 89362 ( -CREATED-AS 80941 . 85738) (SOURCE-FOR-COMPILED-P 85740 . 88667) (COMPILE-SOURCE-DATE-DIFF 88669 . -89360)) (89363 99669 (FIX-DIRECTORY-DATES 89373 . 92366) (FIX-EQUIV-DATES 92368 . 93893) ( -COPY-COMPARED-FILES 93895 . 95716) (COPY-MISSING-FILES 95718 . 97875) (COMPILED-ON-SAME-SOURCE 97877 - . 99667)) (99863 107701 (CDBROWSER 99873 . 103800) (CDBROWSER.STRINGS 103802 . 107699)) (107863 -109599 (CD.TABLEITEM 107873 . 108093) (CD.TABLEITEM.PRINTFN 108095 . 108294) (CD.TABLEITEM.COPYFN -108296 . 109354) (CDTABLEBROWSER.HEADING.REPAINTFN 109356 . 109597)) (109600 130255 ( -CDTABLEBROWSER.WHENSELECTEDFN 109610 . 110078) (CD.COMMANDSELECTEDFN 110080 . 115181) (CD-MENUFN -115183 . 119494) (CD-COMPARE-FILES 119496 . 122848) (CDBROWSER-COPY 122850 . 126519) ( -CDBROWSER-DELETE-FILE 126521 . 129734) (CD-SWAPDIRS 129736 . 130253))))) + (FILEMAP (NIL (2527 22645 (COMPAREDIRECTORIES 2537 . 7627) (COMPAREDIRECTORIES.INFOS 7629 . 10587) ( +COMPAREDIRECTORIES.CANDIDATES 10589 . 13974) (CDENTRIES.SELECT 13976 . 18751) ( +COMPAREDIRECTORIES.INFOS.TYPE 18753 . 19879) (MATCHNAME 19881 . 20561) (CD.INSURECDVALUE 20563 . 22177 +) (CD.UPDATEWIDTHS 22179 . 22643)) (22646 33268 (CDFILES 22656 . 28670) (CDFILES.MATCH 28672 . 30297) +(CDFILES.PATS 30299 . 33266)) (33269 51090 (CDPRINT 33279 . 35796) (CDPRINT.HEADER 35798 . 36695) ( +CDPRINT.LINE 36697 . 39929) (CDPRINT.MAXWIDTHS 39931 . 44046) (CDPRINT.COLHEADERS 44048 . 45333) ( +CDPRINT.COLUMNS 45335 . 50455) (CDTEDIT 50457 . 51088)) (51091 60212 (CDMAP 51101 . 52533) (CDENTRY +52535 . 52844) (CDSUBSET 52846 . 54285) (CDMERGE 54287 . 58271) (CDMERGE.COMMON 58273 . 59588) ( +CD.SORT 59590 . 60210)) (60213 67751 (BINCOMP 60223 . 64512) (EOLTYPE 64514 . 67076) (EOLTYPE.SHOW +67078 . 67749)) (68279 80806 (FIND-UNCOMPILED-FILES 68289 . 71932) (FIND-UNSOURCED-FILES 71934 . 74318 +) (FIND-SOURCE-FILES 74320 . 76058) (FIND-COMPILED-FILES 76060 . 77937) (FIND-UNLOADED-FILES 77939 . +78792) (FIND-LOADED-FILES 78794 . 79222) (FIND-MULTICOMPILED-FILES 79224 . 80804)) (80807 89238 ( +CREATED-AS 80817 . 85614) (SOURCE-FOR-COMPILED-P 85616 . 88543) (COMPILE-SOURCE-DATE-DIFF 88545 . +89236)) (89239 100002 (FIX-DIRECTORY-DATES 89249 . 92699) (FIX-EQUIV-DATES 92701 . 94226) ( +COPY-COMPARED-FILES 94228 . 96049) (COPY-MISSING-FILES 96051 . 98208) (COMPILED-ON-SAME-SOURCE 98210 + . 100000)) (100196 108034 (CDBROWSER 100206 . 104133) (CDBROWSER.STRINGS 104135 . 108032)) (108196 +109932 (CD.TABLEITEM 108206 . 108426) (CD.TABLEITEM.PRINTFN 108428 . 108627) (CD.TABLEITEM.COPYFN +108629 . 109687) (CDTABLEBROWSER.HEADING.REPAINTFN 109689 . 109930)) (109933 130588 ( +CDTABLEBROWSER.WHENSELECTEDFN 109943 . 110411) (CD.COMMANDSELECTEDFN 110413 . 115514) (CD-MENUFN +115516 . 119827) (CD-COMPARE-FILES 119829 . 123181) (CDBROWSER-COPY 123183 . 126852) ( +CDBROWSER-DELETE-FILE 126854 . 130067) (CD-SWAPDIRS 130069 . 130586))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index c43948b1f5baee9c5c32d89eb4937eacd5c7d61c..331f7dde6e8e2f5f8d8876c490c7c411966c3371 100644 GIT binary patch delta 488 zcmZuu-AV#M7^uj2iSc->srDl}{x7JJg^v;>{@dAIYw*pO1OWP#Z<=hCc4^B|GG?*5S= zuULQ;j7;K>1mJ!fJ1NN2TzbHqMqSQxEtgtyy*mtoD}ap*(fp}^1Y?54w_{=AfA$jb zXoR1eapcnO$Aa=<&5rts{>jB^xwqYVEQ!tWbXeYfy8DPEv8F+tdOS6opMT>flNde^!@>r4d?YCT(VtowR8?7@Cl@Qr#7dSkbl=1zm{X6If>B z(uEIDe>RFB=vsXO-@~Oz5L9sUapums=gytGXZ7kuJ#Wb;Wp=o4&odp6My*^J^>Y+c z0|>J*vkSwgIeCMoZO4D`Ww=tj3Yp~Tmh_>Lr0H*0ETM@2P3Y^u3Q`!60-R$!t-tctB_YYL4pzAw{UB@dR7n%Az3B z5@(Qfq}pWPMH55yS5m?J@fbYScG^Hmawv-+-kBH#M7p%_>gjE<__q+7fM9wX?tYk) zS-;uv1J4iTHJWKd$@4b?QLQx~tF1@f!w53aiUz$SDD?*Y-k^QZ>2)!>bV^aWeehUNeO