--- a/Win32OS.st Wed Jun 23 13:57:10 1999 +0200
+++ b/Win32OS.st Wed Jun 23 14:40:39 1999 +0200
@@ -1795,7 +1795,7 @@
msg = "Not a DOS disk";
sym = @symbol(ERROR_NOT_DOS_DISK);
break;
-
+
case ERROR_OUT_OF_PAPER:
msg = "Printer is out of paper";
sym = @symbol(ERROR_OUT_OF_PAPER);
@@ -3743,7 +3743,7 @@
Notice: if symbolic links are involved, the result may look different
from what you expect."
- |p path command|
+ |p path|
"some systems have a convenient function for this ..."
path := self primPathNameOf:pathName.
@@ -4246,7 +4246,7 @@
}
/*
- * maybe, we should return the old enable-status
+ * maybe, we should Return the old enable-status
* as boolean here ...
*/
RETURN (self);
@@ -4382,7 +4382,7 @@
See ExternalStream>>makePipe for a more user-friendly, public interface."
|fd1 fd2|
-
+
%{
HANDLE pipeRead = (HANDLE)0;
HANDLE pipeWrite = (HANDLE)0;
@@ -6108,17 +6108,11 @@
"return a dictionary filled with userinfo. The argument can be either
a string with the users name or its numeric id.
- Notice, that not all systems provide (all of) this info;
- DOS systems return nothing;
- non-SYSV4 systems have no age/comment.
+ Notice, that DOS systems only provide a very limited set of information.
Portable applications may want to check the systemType and NOT depend
- on all keys to be present in the returned dictionary.
- Another notice: on some systems (SYSV4), the gecos field includes multiple
- entries (i.e. not just the name), separated by commas. You may want to
- extract any substring, up to the first comma to get the real life name."
-
- |info name passw uid gid age comment
- gecos dir shell|
+ on all keys to be present in the returned dictionary."
+
+ |info name uid gid dir|
info := IdentityDictionary new.
name isNil ifTrue:[
@@ -6189,7 +6183,7 @@
else {
status = @symbol(continue);
#ifdef PROCESS1DEBUGWIN32
- printf("return nil\n");
+ printf("ret nil\n");
#endif
RETURN(nil);
}
@@ -6290,7 +6284,7 @@
if (ioctlsocket((SOCKET)h, FIONREAD, &res)==0) {
if (res > 0) {
#ifdef SELECT2DEBUGWIN32
- printf("wait Handles1 l=%d return this is a Socket %x\n", res, fd);
+ printf("wait Handles1 l=%d ret this is a Socket %x\n", res, fd);
#endif
RETURN (fd);
}
@@ -6303,7 +6297,7 @@
if (PeekNamedPipe((HANDLE)h, 0, 0, 0, &res, 0)) {
if (1 /*res > 0*/) {
#ifdef SELECT1DEBUGWIN32
- printf("wait Handles2 l=%d return this is a Pipe %x\n", res, fd);
+ printf("wait Handles2 l=%d ret this is a Pipe %x\n", res, fd);
#endif
RETURN (fd);
}
@@ -6385,7 +6379,7 @@
if (res == WAIT_FAILED) {
#ifdef SELECT2DEBUGWIN32
- printf("- error %d; return nil\n",GetLastError());
+ printf("- error %d; ret nil\n",GetLastError());
#endif
if (errno == EINTR) {
errno = 0;
@@ -6402,7 +6396,7 @@
if (res == WAIT_TIMEOUT) {
#ifdef SELECT2DEBUGWIN32
- printf("- timeOut; return nil\n");
+ printf("- timeOut; ret nil\n");
#endif
goto polling;
// @global(LastErrorNumber) = nil;
@@ -6424,7 +6418,7 @@
#ifdef SELECTDEBUGWIN32
if (ret)
- printf("wait Handles %d %d return\n",ret,retArray[ret]);
+ printf("wait Handles %d %d ret\n",ret,retArray[ret]);
#endif
if (retArray[ret] < 10000) {
RETURN ( __ArrayInstPtr(readFdArray)->a_element[retArray[ret]] );
@@ -6952,7 +6946,7 @@
]
[exEnd]
-
+
"
! !
@@ -7007,7 +7001,7 @@
key:aKeyNamePath
"retrieve an entry by full path name (starting at a root)"
- |idx path first rest root|
+ |idx first rest root|
idx :=
idx := aKeyNamePath indexOf:(self separator).
@@ -7587,7 +7581,7 @@
if (mustFreeData) {
free(dataPointer);
}
- return ((ret == ERROR_SUCCESS) ? true : false);
+ RETURN ((ret == ERROR_SUCCESS) ? true : false);
}
}
%}.
@@ -7757,6 +7751,6 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/Win32OS.st,v 1.72 1999-06-18 12:49:32 ps Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/Win32OS.st,v 1.73 1999-06-23 12:40:39 cg Exp $'
! !
Win32OperatingSystem initialize!
--- a/Win32OperatingSystem.st Wed Jun 23 13:57:10 1999 +0200
+++ b/Win32OperatingSystem.st Wed Jun 23 14:40:39 1999 +0200
@@ -1795,7 +1795,7 @@
msg = "Not a DOS disk";
sym = @symbol(ERROR_NOT_DOS_DISK);
break;
-
+
case ERROR_OUT_OF_PAPER:
msg = "Printer is out of paper";
sym = @symbol(ERROR_OUT_OF_PAPER);
@@ -3743,7 +3743,7 @@
Notice: if symbolic links are involved, the result may look different
from what you expect."
- |p path command|
+ |p path|
"some systems have a convenient function for this ..."
path := self primPathNameOf:pathName.
@@ -4246,7 +4246,7 @@
}
/*
- * maybe, we should return the old enable-status
+ * maybe, we should Return the old enable-status
* as boolean here ...
*/
RETURN (self);
@@ -4382,7 +4382,7 @@
See ExternalStream>>makePipe for a more user-friendly, public interface."
|fd1 fd2|
-
+
%{
HANDLE pipeRead = (HANDLE)0;
HANDLE pipeWrite = (HANDLE)0;
@@ -6108,17 +6108,11 @@
"return a dictionary filled with userinfo. The argument can be either
a string with the users name or its numeric id.
- Notice, that not all systems provide (all of) this info;
- DOS systems return nothing;
- non-SYSV4 systems have no age/comment.
+ Notice, that DOS systems only provide a very limited set of information.
Portable applications may want to check the systemType and NOT depend
- on all keys to be present in the returned dictionary.
- Another notice: on some systems (SYSV4), the gecos field includes multiple
- entries (i.e. not just the name), separated by commas. You may want to
- extract any substring, up to the first comma to get the real life name."
-
- |info name passw uid gid age comment
- gecos dir shell|
+ on all keys to be present in the returned dictionary."
+
+ |info name uid gid dir|
info := IdentityDictionary new.
name isNil ifTrue:[
@@ -6189,7 +6183,7 @@
else {
status = @symbol(continue);
#ifdef PROCESS1DEBUGWIN32
- printf("return nil\n");
+ printf("ret nil\n");
#endif
RETURN(nil);
}
@@ -6290,7 +6284,7 @@
if (ioctlsocket((SOCKET)h, FIONREAD, &res)==0) {
if (res > 0) {
#ifdef SELECT2DEBUGWIN32
- printf("wait Handles1 l=%d return this is a Socket %x\n", res, fd);
+ printf("wait Handles1 l=%d ret this is a Socket %x\n", res, fd);
#endif
RETURN (fd);
}
@@ -6303,7 +6297,7 @@
if (PeekNamedPipe((HANDLE)h, 0, 0, 0, &res, 0)) {
if (1 /*res > 0*/) {
#ifdef SELECT1DEBUGWIN32
- printf("wait Handles2 l=%d return this is a Pipe %x\n", res, fd);
+ printf("wait Handles2 l=%d ret this is a Pipe %x\n", res, fd);
#endif
RETURN (fd);
}
@@ -6385,7 +6379,7 @@
if (res == WAIT_FAILED) {
#ifdef SELECT2DEBUGWIN32
- printf("- error %d; return nil\n",GetLastError());
+ printf("- error %d; ret nil\n",GetLastError());
#endif
if (errno == EINTR) {
errno = 0;
@@ -6402,7 +6396,7 @@
if (res == WAIT_TIMEOUT) {
#ifdef SELECT2DEBUGWIN32
- printf("- timeOut; return nil\n");
+ printf("- timeOut; ret nil\n");
#endif
goto polling;
// @global(LastErrorNumber) = nil;
@@ -6424,7 +6418,7 @@
#ifdef SELECTDEBUGWIN32
if (ret)
- printf("wait Handles %d %d return\n",ret,retArray[ret]);
+ printf("wait Handles %d %d ret\n",ret,retArray[ret]);
#endif
if (retArray[ret] < 10000) {
RETURN ( __ArrayInstPtr(readFdArray)->a_element[retArray[ret]] );
@@ -6952,7 +6946,7 @@
]
[exEnd]
-
+
"
! !
@@ -7007,7 +7001,7 @@
key:aKeyNamePath
"retrieve an entry by full path name (starting at a root)"
- |idx path first rest root|
+ |idx first rest root|
idx :=
idx := aKeyNamePath indexOf:(self separator).
@@ -7587,7 +7581,7 @@
if (mustFreeData) {
free(dataPointer);
}
- return ((ret == ERROR_SUCCESS) ? true : false);
+ RETURN ((ret == ERROR_SUCCESS) ? true : false);
}
}
%}.
@@ -7757,6 +7751,6 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.72 1999-06-18 12:49:32 ps Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.73 1999-06-23 12:40:39 cg Exp $'
! !
Win32OperatingSystem initialize!