From 6eeccb40cb26f5ac3fb947926075d56fbd091b66 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Tue, 6 Feb 2024 20:49:51 -0800 Subject: [PATCH 1/4] DUMPDB annoyingly always asked COPYRIGHT owner when dumping DB (unless COPYRIGHTFLG suppressed). I added DEFAULTDATABASECOPYRIGHTOWNER (INITVARS to NIL; to preserve current behavior). If it is EQ to NEVER, then the COPYRIGHT property on the file.DATABASE is set to (NONE) to forever suppress asking about copyright. If any other non-NIL value, then COPYRIGHTFLG is bound to 'DEFAULT, and DEFAULTCOPYRIGHTOWNER is bound to the value of DEFAULTDATABASECOPYRIGHTOWNER. --- library/DATABASEFNS | 57 ++++++++++++++++++++++++--------------- library/DATABASEFNS.LCOM | Bin 6853 -> 7218 bytes 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index e40098d7..436c18d7 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,14 +1,17 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "27-Oct-2021 10:55:18" {DSK}larry>medley>library>DATABASEFNS.;7 16051 +(FILECREATED " 6-Feb-2024 20:46:33" {DSK}e>Interlisp>medley>library>DATABASEFNS.;4 16903 - changes to%: (FNS DUMPDB) + :EDIT-BY "mth" - previous date%: "24-Oct-2021 20:18:51" {DSK}larry>medley>library>DATABASEFNS.;6) + :CHANGES-TO (FNS DUMPDB) + (VARS DATABASEFNSCOMS) + + :PREVIOUS-DATE "27-Oct-2021 10:55:18" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) (* ; " -Copyright (c) 1986, 1990-1993 by Xerox Corporation. +Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. ") (PRETTYCOMPRINT DATABASEFNSCOMS) @@ -31,7 +34,8 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation. (INITVARS (LOADDBFLG 'ASK) (SAVEDBFLG 'ASK)) (ADDVARS (MAKEFILEFORMS (MAKEDB FILE))) - (INITVARS (MSFILETABLE)) + (INITVARS (MSFILETABLE) + (DEFAULTDATABASECOPYRIGHTOWNER)) (* ; "To permit MSHASH interface") (LOCALVARS . T) (BLOCKS (LOADDB LOADDB DBFILE DBFILE1 DBFILE2 (NOLINKFNS . T))) @@ -161,26 +165,35 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; - "Edited 27-Oct-2021 10:51 by larry") - (* ; - "Edited 24-Oct-2021 16:24 by rmk:") + [LAMBDA (FILE PROPFLG) (* ; "Edited 6-Feb-2024 20:46 by mth") + (* ; "Edited 27-Oct-2021 10:51 by larry") + (* ; "Edited 24-Oct-2021 16:24 by rmk:") (* ;; "Dumps a Masterscope database for functions in FILE. Checks the DATABASE property if PROPFLG=T which is how the MAKEFILE advice calls it. A user-level call would default PROPFLG to NIL.") - (* ;; - "The FILE check is because MAKEFILE returns a list when it doesn't understand the options") + (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options") - (DECLARE (GLOBALVARS MSFILETABLE SAVEDBFLG)) + (DECLARE (GLOBALVARS MSFILETABLE SAVEDBFLG) + (USEDFREE DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) (CL:WHEN (AND FILE (OR (LITATOM FILE) (STRINGP FILE))) - (PROG (DBFILE (FL (NAMEFIELD FILE)) - (FNS (FILEFNSLST FILE))) + (PROG (DBFILE DBFN DBCPR (FL (NAMEFIELD FILE)) + (FNS (FILEFNSLST FILE)) + (COPYRIGHTFLG COPYRIGHTFLG) + (DEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) + (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) + [COND + ([NULL (SETQ DBCPR (GETPROP DBFN 'COPYRIGHT] + (COND + [(EQ DEFAULTDATABASECOPYRIGHTOWNER 'NEVER) + (/PUT DBFN 'COPYRIGHT (LIST 'NONE] + (DEFAULTDATABASECOPYRIGHTOWNER (SETQ COPYRIGHTFLG 'DEFAULT) + (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER] (COND (FNS) ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) (* ; - "Always dump if this is a known file") + "Always dump if this is a known file") (SETQ PROPFLG NIL)) (T (COND (PROPFLG (/REMPROP FL 'DATABASE)) @@ -203,9 +216,9 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation. (PROPFLG (PRINT (FULLNAME DBFILE) T)) (T (/PUT FL 'DATABASEFILENAME DBFILE) (* ; - "Remember that we have this file valid already.") + "Remember that we have this file valid already.") (/PUT FL 'DATABASE 'YES] (* ; - "Take future note of the databae on a user call") + "Take future note of the databae on a user call") (RETURN DBFILE))))]) (LOADDB @@ -321,6 +334,8 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation. (RPAQ? MSFILETABLE ) +(RPAQ? DEFAULTDATABASECOPYRIGHTOWNER ) + (* ; "To permit MSHASH interface") @@ -337,9 +352,9 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation. (RESETSAVE DWIMIFYCOMPFLG T) ) -(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993)) +(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1679 6704 (DBFILE 1689 . 3334) (DBFILE1 3336 . 4846) (DBFILE2 4848 . 6070) (LOAD 6072 - . 6302) (LOADFROM 6304 . 6492) (MAKEFILE 6494 . 6702)) (6760 15499 (DUMPDB 6770 . 9534) (LOADDB 9536 - . 14411) (MAKEDB 14413 . 15497))))) + (FILEMAP (NIL (1802 6827 (DBFILE 1812 . 3457) (DBFILE1 3459 . 4969) (DBFILE2 4971 . 6193) (LOAD 6195 + . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16302 (DUMPDB 6893 . 10337) (LOADDB +10339 . 15214) (MAKEDB 15216 . 16300))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 41d456185a5ba778157c3121b980c5fb3117da4c..1108c0863e09e9b1a067192c0ee7fccfed9f76b9 100644 GIT binary patch delta 1318 zcmaJ=O;6Nd5VoQRD=}&y5u$NYVzNtIc)z;+2vNGb??Pd>Eo~RwctUmqB(fOTn=vGw zJd*SesCN&1T=c@pf1(#p{sgD{QI>?z!<(6T-p)Mp%sapI6Z7cR0u&3?_S*s@OaLRc zDB7HBkkdBzcHi&3Yqwyp0~)9wD$(l4h22i~Mf-)@>9+UZ?Hs&MeC5fZ$b-gMVP&J! zPeQ0oxXpD9-tM=vESuXKovrr4GaJ-OqaIXBu!DK4jam&xf1aD0)1bA{#kyA|HMG2% ztGYE=4y6;z3No9$lK(Yyffg;o!Il*_E|i)oXuI8Q4eau=<1NXk5c`m;dJ*(#<{`K4 zgy=c3Q*t7SNZGGPd9Z^}uDgCCDj+10tx@ndyQu^eD6w_jrsfs8-Ohwl=;?3e%e@e) zAfO_vPNNnNtCanq8M;f$vH!}GVIGtpx0D+<7hB(sm9tihFaG;}zIf*berIE!j+L){ zyMI2=#u8=x@$)yWt@MJL9;XoZy?-Z@=c~PV@7SKco5JU(XZKf>L%|K04;nEDMg|5c zLJ+zhh6sUlSe{dtz%7bl8OKee4V>x_IOWxJEIpW+Iz+LL7o1W}0y8XFl5r6F0We`f zETedU5RoC&Y?}y$SPrO}=65|5vS?)%&0w9wd?@R^jFgL!jFb+TkJKz0qx6!W4`;Dc z22B}ZqeeDZ5ERESobs?2ZZKGD_&8vWd3sM`a0R%~hmasyADrt@c0%Bs45Z^s2mGCw zQ1UBHG}s}m%P?|%512JVfLRRW>sWey$Pkc9n!c_GSkZ)fl==hdisZ5{*kvEfU%Jow z9W!b`bm*+hN~u~~!iBebLQu=fdIu`Z5eFq2O+=}6*~eA#d{2U9LiTFGG{KYDBw!O4 zQRLi{U{)8I0{9??qJt0@{o|ek*F{1mCdW7<$?`^?B;=Oc*$8FRx#01*WC_$DwcVZddN&cEIPsw>7&Y^@mCoUZL06u{eXHKk>G)+Z)ux9qny!U48{UX2f4-ey?##LA_H~Tw# zz3pxX`nzDlYd2hdb9bx1)4jjFF&Mmx{~9+AMIJIHip9p}!6Fi*Kx7elkunpW47yW- z&8>~yr``QqMQ~g7rdx)dW~{b64`zFpmX=KDY#eCC|43<}$hn!%EL3Zrsszf3lnZ8J z^wL?z9t)s0;S?syaM0J{y4w#Y7V@w+=)UarU+j-0HEN=DG6#|(l|@d^p4+g8*HRxZ zk~|pC({ppFQs>i=vEAvg(x1=YN*Ctz^ELhM$Y_t_@q7MqY8cEvFbS2;kRwCu;T#(bbmOoX`#}iYFL+Cr} z$}LyD6`)Lv7C})=X9r=Q#Ck!qG?ti6_3sQQF<#4N(`d=Km#wA<8y;nYb7_6C;@i1O c{496V$i(k+rT9ngcl_(RcRrub_%$!{53nWlg8%>k From 3ca4495c76c2074d071b3cfe78bc0eede92c6879 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Tue, 6 Feb 2024 21:31:30 -0800 Subject: [PATCH 2/4] Added NONE in addition to NEVER as DEFAULTDATABASECOPYRIGHTOWNER to preset to (NONE). The change from USEDFREE to SPECVARS may be irrelevant. I thought that was the issue when using NONE as DEFAULTDATABASECOPYRIGHTOWNER didn't do as expected. The DEFAULTCOPYRIGHTOWNER must be one of the "real" entry keys on COPYRIGHTOWNERS. --- library/DATABASEFNS | 12 ++++++------ library/DATABASEFNS.LCOM | Bin 7218 -> 7350 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index 436c18d7..7b5afabc 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,6 +1,6 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 6-Feb-2024 20:46:33" {DSK}e>Interlisp>medley>library>DATABASEFNS.;4 16903 +(FILECREATED " 6-Feb-2024 21:23:34" {DSK}e>Interlisp>medley>library>DATABASEFNS.;6 16912 :EDIT-BY "mth" @@ -165,7 +165,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 6-Feb-2024 20:46 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 6-Feb-2024 21:23 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") @@ -174,7 +174,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options") (DECLARE (GLOBALVARS MSFILETABLE SAVEDBFLG) - (USEDFREE DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) + (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) (CL:WHEN (AND FILE (OR (LITATOM FILE) (STRINGP FILE))) (PROG (DBFILE DBFN DBCPR (FL (NAMEFIELD FILE)) @@ -185,7 +185,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. [COND ([NULL (SETQ DBCPR (GETPROP DBFN 'COPYRIGHT] (COND - [(EQ DEFAULTDATABASECOPYRIGHTOWNER 'NEVER) + [(MEMQ DEFAULTDATABASECOPYRIGHTOWNER '(NONE NEVER)) (/PUT DBFN 'COPYRIGHT (LIST 'NONE] (DEFAULTDATABASECOPYRIGHTOWNER (SETQ COPYRIGHTFLG 'DEFAULT) (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER] @@ -355,6 +355,6 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY (FILEMAP (NIL (1802 6827 (DBFILE 1812 . 3457) (DBFILE1 3459 . 4969) (DBFILE2 4971 . 6193) (LOAD 6195 - . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16302 (DUMPDB 6893 . 10337) (LOADDB -10339 . 15214) (MAKEDB 15216 . 16300))))) + . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16311 (DUMPDB 6893 . 10346) (LOADDB +10348 . 15223) (MAKEDB 15225 . 16309))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 1108c0863e09e9b1a067192c0ee7fccfed9f76b9..47f391307a2410a85f597bb1718b1e5bacb87299 100644 GIT binary patch delta 1013 zcmZuwJBt%h6wYLEmyMta8bJ{~h(%JYoBNnMGmAwgn>*RyyfQOM3?eoGT@-9=HDITe zA&rfVy%-4e?dNdF>VLkR*Y|VyecO3E)n*HOarQ6ui>134CWX>X^YQR$ z8dOM+`9bex24-bXG3t1B<6=s@>wQ%4NAJ?XjOu{0=yFlzhgA_h2J*Y#~r0_g*4OarS1hixlMghtx1SB#}mJB6prlunkVL2dHn!oK6Af{MZhMCbu4Gtsesf0u) z8wm*!i_Wd90zBz;z+_nkgG^psF-F{ifsBE34ow^Tuw$HvkqoToFfHhGgG2%|F}CZ4 zSv(VTMd?OXfa&;J>uWBq0$eae&yB?LvyvcZVZHvmesnTRkH zb)ykNae~F(0KozLz?W$7^RM2ttvRg3M8dM7vV0dGl^0hoO dCZ}a5Z_&xLTrL#=)v2gjzQi=u`LFVe-M`wy@frXC delta 899 zcmY*WO>fgc5RD0ojR%8{4TGaY97U2$UWQM~K9c z6H(3_;EqI^3IUh=5pMi}{sh)*<0N}n&6_tnGw{B{^B{Vjkeq2v+ z5ytPy8Ut)_L}%}`M>q2hu*u_{-96BLUDa||D*dlh?V{hOmCJAQ%6d+oi~NVF_9cmv zd$X9I3~ui{c-ns%7i`4W459>Go^Q_&RbE{u_pdAZ=jJ_a^xOX2QauOi&G+2{Rnt-> z^8~1jO0;g}N{pJY=XWDu1f>Bozz>?POd$kLx7~K_jsVKBOp7S$)rA8T>)_k9L#Npm ziYAs0;VANCggbaV5@Vy0nE{%)BCN}wk~Db9qtE$7>z0EXEF-`N_O1fF!gNJ=v#+wJ&S z1!ekwilJ;-N_D8&0Z@ukgDBBKK1UW*y?Rdu1dc=yHa!;zUz$ib0dX7&H=#@h(zlV2 z^W<*Cu%HvhMyCE4XcaTEiskr~dXi`)*o4qN67{OnZU8}CDaV{Ilw)Qszz9oImK$Nr zS23dCdaeL&LCy1fL9=lXf&4L7NR=Q}EV6QEWr5Bz2jr(`hBCI$U*0GIm34(uDX~A6 puB<4Rff6+Nv+Wd29g1-B> Date: Wed, 7 Feb 2024 18:47:37 -0800 Subject: [PATCH 3/4] Made this "smarter": If COPYRIGHTFLG is NEVER or DEFAULTDATABASECOPYRIGHTOWNER is NIL or the .DATABASE file already has a COPYRIGHT property Then No need to do anything special (it already shouldn't ask) Else If DEFAULTDATABASECOPYRIGHTOWNER is NONE or NEVER Then Set the COPYRIGHT to NONE (I.e., never mention it again.) is SAME Then Same as the source file. If it doesn't have one, then just normal handling is DEFAULT Then Use the general default for copyright: DEFAULTCOPYRIGHTOWNER Otherwise: Enable the general copyright defaulting. Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys. --- library/DATABASEFNS | 46 ++++++++++++++++++++++++++------------- library/DATABASEFNS.LCOM | Bin 7350 -> 7420 bytes 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index 7b5afabc..c6ed0691 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,6 +1,6 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 6-Feb-2024 21:23:34" {DSK}e>Interlisp>medley>library>DATABASEFNS.;6 16912 +(FILECREATED " 7-Feb-2024 18:26:12" {DSK}e>Interlisp>medley>library>DATABASEFNS.;13 17643 :EDIT-BY "mth" @@ -165,7 +165,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 6-Feb-2024 21:23 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 7-Feb-2024 18:26 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") @@ -177,18 +177,35 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) (CL:WHEN (AND FILE (OR (LITATOM FILE) (STRINGP FILE))) - (PROG (DBFILE DBFN DBCPR (FL (NAMEFIELD FILE)) + (PROG (DBFILE DBFN FLCPR (FL (NAMEFIELD FILE)) (FNS (FILEFNSLST FILE)) (COPYRIGHTFLG COPYRIGHTFLG) (DEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) - [COND - ([NULL (SETQ DBCPR (GETPROP DBFN 'COPYRIGHT] - (COND - [(MEMQ DEFAULTDATABASECOPYRIGHTOWNER '(NONE NEVER)) - (/PUT DBFN 'COPYRIGHT (LIST 'NONE] - (DEFAULTDATABASECOPYRIGHTOWNER (SETQ COPYRIGHTFLG 'DEFAULT) - (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER] + (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) + (NULL DEFAULTDATABASECOPYRIGHTOWNER) + (GETPROP DBFN 'COPYRIGHT)) + (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER + ((NONE NEVER) + (* ;; "Set the COPYRIGHT to NONE (I.e., never mention it again.)") + + (/PUT DBFN 'COPYRIGHT (LIST 'NONE))) + (SAME + (* ;; + "Same as the source file. If it doesn't have one, then just normal handling") + + (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) + (/PUT DBFN 'COPYRIGHT (LIST (CAR FLCPR))))) + (DEFAULT + (* ;; "Use the general default for copyright") + + (SETQ COPYRIGHTFLG 'DEFAULT)) + (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) + + (* ;; + "Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys") + + (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) (COND (FNS) ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) @@ -206,8 +223,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] (CL:WHEN MSFILETABLE [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) - [SETQ DBFILE (PRETTYDEF NIL (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL - 'BODY FILE) + [SETQ DBFILE (PRETTYDEF NIL DBFN `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) (ERROR!))) (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] @@ -354,7 +370,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. ) (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1802 6827 (DBFILE 1812 . 3457) (DBFILE1 3459 . 4969) (DBFILE2 4971 . 6193) (LOAD 6195 - . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16311 (DUMPDB 6893 . 10346) (LOADDB -10348 . 15223) (MAKEDB 15225 . 16309))))) + (FILEMAP (NIL (1803 6828 (DBFILE 1813 . 3458) (DBFILE1 3460 . 4970) (DBFILE2 4972 . 6194) (LOAD 6196 + . 6426) (LOADFROM 6428 . 6616) (MAKEFILE 6618 . 6826)) (6884 17042 (DUMPDB 6894 . 11077) (LOADDB +11079 . 15954) (MAKEDB 15956 . 17040))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 47f391307a2410a85f597bb1718b1e5bacb87299..0663e6e410134d61a03ba17abe004b1e9b8c891c 100644 GIT binary patch delta 1058 zcmZuwOKTHR6z;T8u|l<}^;zT)H!adS_c3?o7KBckn>Hnx#FG%;7!Xr%1`|svoA(zowazPT^Q2}5*JdwmLJllg zDV1w(es#^y6;@FpA**tBrQj#}Qq@uJJZQgh*WVv#zv^|i-2HgCe0&7I&toqR zw4bpYpVd><)D#~Nwo|jsTkDTPqi*MUb+Y}e9)XEa)7hy`#<2ULcel?T79)e`*t&2c zwEL9lv+2XN!SmbgE3vJk^$pKQZ1-(+-FzKgW8bQi!PlwA>Gs;4(A%gM1rKu`c^BkU zpcR9csYcV#DO@dAeBhSR6HEeSH}9ZI7?7(J3XWY=zzuR&o3diGX;f^ zz^d}gZmA566Y!Pi#|)JsVW_1e^xDLv4%h-AAoPmQmDfb5L(vNry$%_47&AVM=|4Q-Q3Xtw;Mp50 zn+eC1=_JxpNs>~4a{UM(68$y@fhi$FfrzyFlMWF)g}+k3nFi|Nk#naAUQ0k{|h-~a#s delta 1005 zcmZuwOK;Oa5N=Y4AP8tf6QQC?qliO;6q=mL&fGb)MI0&tCoV`x{UwMWz=5%oI*x=7>zVmx_M7>3_pkm%Kis+{%8l)(Wm=&e zC|RX!mGPrjG9`{q_VfS2ig2_~=LHa<6AG)c-tx<}UiS1L_2_0=Kybdel!peWux2|w zx7A$t8|@|rwBXxZVOWCH&&=#hy4wGEochu4v+AEu->X+=@cTUb?l^TavPbLYjm^3F zyO&>t=w#W6%TShReQ1E;k6O3A00@VdHrSG`515^m`rRR?kN+w99t03ee z9S}X-zhx01nz*o3Er!(!thmyQb|eZ(>_~_hb&i~-G&ewFL1v*gPnV=VtqQ-qQg~FQQ0^{mfD#j^bIaQ!$*L%Q-4#Tc= zy_RjElW2fdbdX!Vv?7S=1j06u4?Crr0;U)GW2sbi+E?^xAL*y^*=SC+ z4pRv%FOS5H2Q8KG{-^;f$P&>h6k+Gd9_$X_`P From 60e390789cc3bcbad2bd5ecd66c59a2c092f2520 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Mon, 19 Feb 2024 16:34:26 -0800 Subject: [PATCH 4/4] Change the default value for DEFAULTDATABASECOPYRIGHTOWNER to 'NEVER. This is so dumping the database never asks about copyright. Copyright on these database files is pretty nonsensical. --- library/DATABASEFNS | 16 ++++++++-------- library/DATABASEFNS.LCOM | Bin 7420 -> 7383 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index c6ed0691..190d038b 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Feb-2024 18:26:12" {DSK}e>Interlisp>medley>library>DATABASEFNS.;13 17643 +(FILECREATED "19-Feb-2024 16:29:44" {LIB}DATABASEFNS.;15 17624 :EDIT-BY "mth" - :CHANGES-TO (FNS DUMPDB) - (VARS DATABASEFNSCOMS) + :CHANGES-TO (VARS DATABASEFNSCOMS) + (FNS DUMPDB) :PREVIOUS-DATE "27-Oct-2021 10:55:18" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) @@ -35,7 +35,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (SAVEDBFLG 'ASK)) (ADDVARS (MAKEFILEFORMS (MAKEDB FILE))) (INITVARS (MSFILETABLE) - (DEFAULTDATABASECOPYRIGHTOWNER)) + (DEFAULTDATABASECOPYRIGHTOWNER 'NEVER)) (* ; "To permit MSHASH interface") (LOCALVARS . T) (BLOCKS (LOADDB LOADDB DBFILE DBFILE1 DBFILE2 (NOLINKFNS . T))) @@ -350,7 +350,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (RPAQ? MSFILETABLE ) -(RPAQ? DEFAULTDATABASECOPYRIGHTOWNER ) +(RPAQ? DEFAULTDATABASECOPYRIGHTOWNER 'NEVER) @@ -370,7 +370,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. ) (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1803 6828 (DBFILE 1813 . 3458) (DBFILE1 3460 . 4970) (DBFILE2 4972 . 6194) (LOAD 6196 - . 6426) (LOADFROM 6428 . 6616) (MAKEFILE 6618 . 6826)) (6884 17042 (DUMPDB 6894 . 11077) (LOADDB -11079 . 15954) (MAKEDB 15956 . 17040))))) + (FILEMAP (NIL (1778 6803 (DBFILE 1788 . 3433) (DBFILE1 3435 . 4945) (DBFILE2 4947 . 6169) (LOAD 6171 + . 6401) (LOADFROM 6403 . 6591) (MAKEFILE 6593 . 6801)) (6859 17017 (DUMPDB 6869 . 11052) (LOADDB +11054 . 15929) (MAKEDB 15931 . 17015))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 0663e6e410134d61a03ba17abe004b1e9b8c891c..44c2991c81d6c2be9ee1ab226676b85859036f24 100644 GIT binary patch delta 317 zcmexkdEIhCc)g*eu3Ku7u91O}iGrb-m64^DiK&u;hEj5VZb4>FYKlUBo`RA>wU4J$ zt&3xbqmyH>tD9f2p0%N=rh<}@k*-%_9z?T&p_PHLl`&8=S5i?bTzhgxVqSV`v8t7V zOQ>&vi<3eo&^)(LA0Gv<=84}e46!)D1iO_AhUR8KcTR3(lu-(E3<_4@LUNO{zi+Un zf(FoaP^&iYW7L=AQ_u(u^$&4X@N*4w4bq(aR?1wA%gM*z**jQ4!^hvz1?VIQHF<-i g#N;4pb8fC6*I?I>V8<|5h0Rl>c^T1-SSS+>0CCw?l>h($ delta 205 zcmca^`NwiXxQc?gu3Ku7u91O}iGrbpm64g1p^=h;hEj5VZb4>FYKlUBp2FnCjAo3+ z6DLZFCl#f_C6Y4|^U_m`Rjm}bCLZ(^!*0;zWsJt0#tMe!W+ui8T$Ak?Wfa}~f)!js zeFI#aG!-<$9D{&7#}G#+$6!~WjI+OQ@a9@ZeaXqYq|61JeEglggB3J<{2g6foPhcn cr9-)cT!URhf*r$L6}UDhO7k*Ku91lb0FS;nW&i*H