[Python-checkins] CVS: python/dist/src/Mac/Contrib/osam OSAm.prj,1.1,1.2 ScriptRunner.c,1.1.1.1,1.2

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Contrib/osam
In directory usw-pr-cvs1:/tmp/cvs-serv5116/Contrib/osam

Modified Files:
	OSAm.prj ScriptRunner.c 
Log Message:
Merging appropriate 2.1.1 fixes back into the main trunk.


Index: OSAm.prj
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Contrib/osam/OSAm.prj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvstWyra5 and /tmp/cvsEwNBCZ differ

Index: ScriptRunner.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Contrib/osam/ScriptRunner.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScriptRunner.c	1998/08/18 14:56:35	1.1.1.1
--- ScriptRunner.c	2001/08/03 13:31:34	1.2
***************
*** 22,26 ****
--- 22,45 ----
  #include <resources.h>
  
+ #ifdef TARGET_API_MAC_CARBON
+ static
+ p2cstr(StringPtr p)
+ {
+     unsigned char *c = p;
+     int len = c[0];
+     strncpy((char *)c+1, (char *)c, len);
+     c[len] = 0;
+ }
  
+ static c2pstr(const char *cc)
+ {
+     char *c = (char *)cc; /* Ouch */
+     int len = strlen(c);
+     
+     if ( len > 255 ) len = 255;
+     strncpy(c, c+1, len);
+     c[0] = len;
+ }
+ #endif
  
  OSAError LoadScriptingComponent (ComponentInstance * scriptingComponent);