RE: [Axiom-developer] RE: gcl-2.6.8pre on MAC OSX 10.2

[Bill Page]

Waldek,

Thank you! Your patch to openpty for MAC OSX worked perfectly.
clef now compiles correctly. :-)

I think this change should go in.

Cheers,
Bill Page.



On November 2, 2006 4:50 AM Waldek Hebisch wrote:
> > ... 
> > > OTOH this security problem is solved by Unix 98 pty's (in
> > > other words Linux /dev/ptmx and /dev/pts), so we can infer
> > > that Mac OS X has only legacy pty (so you should use BSD
> > > branch). 
> > >
> Bill Page asked:
> > 
> > What do you mean by "BSD branch"?
> >
> 
> To change openpty.c.pamphlet like below (untested, I took oportunity
> to remove some obfuscation).
> 

--- openpty.c.pamphlet.bb       2006-11-02 11:25:27.000000000 +0100
+++ openpty.c.pamphlet  2006-11-02 11:33:03.243288784 +0100
@@ -10,17 +10,9 @@
 \tableofcontents
 \eject
 \section{MAC OSX and BSD platform changes}
-Since we have no other information we are adding the [[MACOSXplatform]]
variable
-to the list everywhere we find [[LINUXplatform]]. This may not be correct
but
-we have no way to know yet. We have also added the [[BSDplatform]]
variable.
-MAC OSX is some variant of BSD. These should probably be merged but we
-cannot yet prove that.
-<<mac osx platform change 1>>=
-#if defined(SUN4OS5platform) ||defined(ALPHAplatform) ||
defined(HP10platform) || defined(LINUXplatform) || defined(MACOSXplatform)
|| defined(BSDplatform)
-@
-<<mac osx platform change 2>>=
-#if defined(SUNplatform) || defined(HP9platform) || defined(LINUXplatform)
|| defined(MACOSXplatform) || defined(BSDplatform)
-@
+We should really use autotools to check for Unix 98 pty support.
+Before this is done below we hardcode information about each platform.
+
 \section{License}
 <<license>>=
 /*
@@ -104,7 +96,7 @@
 #endif
 
 {
-#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform)
||defined(AIX370platform) || defined(BSDplatform)
+#if defined(SUNplatform) || defined (HP9platform) || defined(RTplatform)
||defined(AIX370platform) || defined(BSDplatform) || defined(MACOSXplatform)
   int looking = 1, i;
   int oflag = O_RDWR;                  /* flag for opening the pty */
   
@@ -147,7 +139,8 @@
   return(fdm);
 #endif
 
-<<mac osx platform change 1>>
+/* MAC OS X 10.3 does not support Unix 98 pty's */
+#if defined(SUN4OS5platform) ||defined(ALPHAplatform) ||
defined(HP10platform) || defined(LINUXplatform) || defined(BSDplatform)
 extern int grantpt(int);
 extern int unlockpt(int);
 extern char* ptsname(int);
@@ -216,7 +209,7 @@
        sprintf(serv, "/dev/ttyp%02x", channelNo);
        channelNo++;
 #endif
-<<mac osx platform change 2>>
+#if defined(SUNplatform) || defined(HP9platform) || defined(LINUXplatform)
|| defined(MACOSXplatform) || defined(BSDplatform)
        static int channelNo = 0;
        static char group[] = "pqrstuvwxyzPQRST";
        static int groupNo = 0;
  
> ...