From 75975c70ab13cc3e763da36b90006cb86112643d Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sun, 29 Jul 2001 21:23:18 +0000 Subject: [PATCH] If you double-click a file with creator Pyth but owner != TEXT exit with a warning that this is not a script but an auxiliary document such as a preferrences file or an aplication template. This is a lot better than giving syntax errors on binary data:-) --- Mac/Include/pythonresources.h | 3 +++ Mac/Python/macmain.c | 5 +++++ Mac/Resources/dialogs.rsrc | Bin 18027 -> 18570 bytes 3 files changed, 8 insertions(+) diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h index 29026a88c408..9f8b2c452a98 100644 --- a/Mac/Include/pythonresources.h +++ b/Mac/Include/pythonresources.h @@ -95,6 +95,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* No preferences file name resource */ #define NOPREFNAME_ID BASE_ID+9 +/* Not a script */ +#define NOTASCRIPT_ID BASE_ID+10 + /* EditPythonPrefs range. Needed here to forestall conflicts with applets */ #define EDITPYTHONPREFS_MIN 508 #define EDITPYTHONPREFS_MAX 511 diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index 10c5a5ff7480..b82395c9f439 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -486,6 +486,11 @@ PyMac_InitApplication() PyMac_FixGUSIcd(); #endif } + /* Check that the first argument is a text file */ + if ( PyMac_getfiletype(argv[1]) != 'TEXT' ) { + Alert(NOTASCRIPT_ID, NULL); + exit(0); + } } Py_Main(argc, argv); } diff --git a/Mac/Resources/dialogs.rsrc b/Mac/Resources/dialogs.rsrc index 52efd23a576a169559bf7632cab5368d063bc3e2..1e219b267459e6d12be38550b2231784da26634e 100644 GIT binary patch delta 1807 zc-mc+T}&KR6vxlKyL?&11dT?m%}s-Kq03TssWg=G;Vu^1Eo=%z#U?O2JCs@W%b9@| zG+DxnjcFR`);?Af?SmU*Vp@x-Pm-9JsF*aSKGA5EQmN&^+CJ1+Jag}*7oB8se|P5I zbN=Ul&(7XDN#2^T^0H6)TMFn^Jajd{Gi6aAWmvl4$wBud&&zyDV!foW8$b;#c#Shz;gS)^BA`;9`PZ#H>j~#>mU5_L+ zeLSgUY$JoS%7m$v34xv~2_5vDj;2W*K&N!qN?v(b7hO4G*U^Gc!CK&@k2+nIuYTV1$f4 z%uxv)5Fx1(HqVjAJCk)Vo~>JE&fz)mSlR{;v ztMF~(*1~yzHz9>Je@*_s2i4zqcz|BP6WZ$i6Sj0l4-Y^I#KXM*J&*H{W&bQz(e13rQZQgQ2oY&}02Cer%^vK5yYG2|^ z;1cpMXG+rynwB_w=nV2YXD_+VAb15JkCPH|mq94OUzE}k$_#ZLhQxQkfu z3&`#-2J)no?7_)JQ89@EG*pU;2?lA1$coPZ?A|UaUdNzq{h~^jTXqQ1F1HSC2*ovD z38606eIbOpymN;T$~pguQ0h+VpAbr2Za68Fa=tH)#^qfzLa57))j}v|vA)9P7rpX0 zcC(FdzzRjT_KwKo=wd+Tgy=l|2~~e1ExnF*wMk1?k%y$EcaSHAP_hMuo|2YM0R*e1 zr6?d65JCy|Oz?nobRKzBI=YBFD;+(L{XyOS!^CcPH%*De^mXL-c&{wD=k2W)O5uHg zl8=;iO`j>}nhq(4LVJ`ep&$6(8G09+v|Jro@Z3fm%wM~pZ1)$H?e&*b(E10;cHaY) zpmti>9=xyO_`Xwdd{_4p%)NdBLsuBc(DnV^< zlh999{N`;gSM_FNmQk1uHx!n_+b%4HPtm&4PW~rQ*}Lf*T@|ykNkez=3mefKO)i;h GWB&rK(tkhz delta 1466 zc-mEzUuauZ9LK-sBu$&^>R=ARKZ7GoFvbz48%i6M~bXJ*W>D?O1lA7FV zhr>vPIm;N9O&^9nIEKj3K3JKsCz;g;@u?yR?rGRR+v*ro#D}o>z2^jPeE8k_IVb1* z&iDJx;m*#9Tc^bbTOJDn=wd0B#X7|Dvn1;<&=)-W+JM?@CWN~-4?M?e{$y_O&x)hx zfV~*SE12`kp}l%+VH3Ksaw`2|aY|(~g+kF$_OzXya%|;H{|1!s4t@=YJeEgB7P`br zvhsg*2Zr{i{RJ+1)ISfaJGDPeTVuNi(uhtO{@g+nCc;oxn{z z0{CugzJ-mPU()=C`;gb&Ck20_5c*NGz#@57vy^WswA-3}@(lSs&3ee@;mJPF^Dq2%l&L+K!M@bon?CU9zfE5z!K?B>*QQQX6A`0Z6D%^aHE-wJ>m&jjWwN?Y3nb(fjT~5|xcX`_`6T9Yl6T8ci zgo)kdwvSEhEou%e=zF_4{#$f_|vqkAKLzUYJc{xLdUl$a6GB>0Y9HcAB@ z#+Hmy@jdyr5h|_$ajSkm7J$xKbFe(f6oolh=Ez%IzHzlyQ}CZRLczNfi2Rpa1?@Y% z=n}tp5yijtQb~*&_j>*bFZS>YUes+dFY0KQ*C%?i9yK|1((4&^zg4K1sN*wUqfpvw z6guQJ3QaULDtV1UC%nHbe%TY+dEFD*_ORDK+9-5KsX^(Lh6AoNDDChL==|*LOT9ZI qfo}a(+jzjv+gYb4SK_l+I^H^5Dju73`faC=U&{KTg|B+g$bSJnE=4y0 -- 2.47.3