RE: [Axiom-developer] RE: [Gcl-devel] Re: axiom porting

[Mike Thomas]

Hi Camm/Bill.

Positive results on some basic tests per Cam's directory fix yesterday.

| > >(probe-file "/msys/1.0")
| >
| > #p"c:/msys/1.0"
| >
| > >(probe-file "/msys/1.0/")
| >
| > #p"c:/msys/1.0/"
| >
| > >(probe-file "c:/msys/1.0/")
| >
| > #p"c:/msys/1.0/"
| >
| > >(probe-file "c:/msys/1.0")
| >
| > #p"c:/msys/1.0"
| >
|
| With the commits to 2.6.7pre I made yesterday, all these probe-files
| to directories should return nil.

Positive result on those changes thanks:

>(probe-file "/msys/1.0")

NIL

>(probe-file "c:/msys/1.0")

NIL

>(probe-file "c:/msys/1.0/msys.bat")

#p"c:/msys/1.0/msys.bat"

>(probe-file "c:/msys/1.0/")

NIL



| > >(bar 8085 #'foo)
| >
| > Error in LET [or a callee]: Error "No such file or directory"
| on accepting
| > conne
| > ction to #<two-way stream 104c969c>
| >
|
| At least on Linux, accept might fail with a EAGAIN or similar if no
| connections are pending.  It is critical to this example that the call
| to #'listen in #'bar correctly return t iff a connection has been
| made.  You can test this with telnet from a separate shell window.
| I.e.
|
| (setq s (si::socket 8085 :server #'foo))
| (listen s) -> nil (no telnet localhost 8085)
| (listen s) -> t (after telnet localhost 8085)

Using the local current state of the Windows socket code as I have no time
to revert to the original state (ie these tests after I fixed the winsock
return values and types; day of meetings ahead) these two tests work OK.

I probably won't have time to insert these patches (below) into CVS today
but hopefully over the weekend although I'm looking rather tight there too
at present.


cvs diff: Diffing o
Index: o/file.d
===================================================================
RCS file: /cvsroot/gcl/gcl/o/file.d,v
retrieving revision 1.21.4.1.2.8.10.5
diff -r1.21.4.1.2.8.10.5 file.d
2245a2246,2248
> #ifdef _WIN32
> SOCKET fd;
> #else
2246a2250
> #endif
2254c2258,2262
<   if (fd < 0 )
---
> #ifdef _WIN32
>   if ( INVALID_SOCKET == fd )
> #else
>   if ( fd < 0 )
> #endif
2290c2298,2303
<   int fd,n;
---
> #ifdef _WIN32
>   SOCKET fd;
> #else
>   int fd;
> #endif
>   int n;
2299c2312,2316
<   if (fd <0) {
---
> #ifdef _WIN32
>   if ( INVALID_SOCKET == fd ) {
> #else
>   if ( fd < 0 ) {
> #endif
2338a2356,2358
> #ifdef _WIN32
> SOCKET fd;
> #else
2339a2360
> #endif
2470c2491,2495
<
---
> #ifdef _WIN32
>     if ( INVALID_SOCKET == fd ) {
>          FEerror("CreateSocket returned an invalid socket", 0);
>     }
> #endif
Index: o/mingwin.c
===================================================================
RCS file: /cvsroot/gcl/gcl/o/mingwin.c,v
retrieving revision 1.8.6.3.2.1
diff -r1.8.6.3.2.1 mingwin.c
406c406
< int
---
> SOCKET
432c432
<       return -1;
---
>       return INVALID_SOCKET;
562c562
<     return -1;
---
>     return INVALID_SOCKET;

address@hidden /c/cvs/stable/gcl-2.6.7pre
$ export CVS_RSH=ssh; cvs diff h
Enter passphrase for key '/home/miketh/.ssh/id_dsa':
? h/cmpinclude.h
? h/config.h
? h/gclincl.h
? h/new_decl.h
cvs diff: Diffing h
Index: h/protoize.h
===================================================================
RCS file: /cvsroot/gcl/gcl/h/protoize.h,v
retrieving revision 1.26.4.1.2.1.2.11.6.1.6.1.2.3
diff -r1.26.4.1.2.1.2.11.6.1.6.1.2.3 protoize.h
319a320,322
> #ifdef _WIN32
> /* mingwin.c:190:OF */ extern unsigned int CreateSocket (int port, char
*hos
 int server, char *myaddr, int myport, int async); /* (port, host, server,
mya
r, myport, async) int port; char *host; int server; char *myaddr; int
myport;
t async; */
> #else
320a324
> #endif