hg/stx-libbasic: comparison UnixOperatingSystem.st

equal deleted inserted replaced

-:5b610781e787
+:8e90da896548
 extern void __signalIoInterrupt();
 #endif
 static int firstCall = 1;
 #if (defined(F_GETFL) && defined(F_SETFL) && defined(FASYNC)) || defined(SYSV4)
 /*
 * SIGIO/SIGPOLL - data available for I/O
 * (used to wake up waiting processes)
 */
-#ifdef SIGIO
+# ifdef SIGIO
-# define THESIGNAL SIGIO
+#  define THESIGNAL SIGIO
-#else
-# ifdef SIGPOLL
-#  define THESIGNAL SIGPOLL
 # else
-#  ifdef SIGURG
+#  ifdef SIGPOLL
-#   define THESIGNAL SIGURG
+#   define THESIGNAL SIGPOLL
+#  else
+#   ifdef SIGURG
+#    define THESIGNAL SIGURG
+#   endif
 #  endif
 # endif
-#endif
 if (__isSmallInteger(fd)) {
 	if (firstCall) {
-#ifdef HAS_SIGACTION
+# ifdef HAS_SIGACTION
-	    struct sigaction act = {0};
+	    struct sigaction act;
 	    /*
 	     * Do not add SA_RESTART here. A signal can cause a
 	     * thread switch, another thread can do a garbage collect
 	     * and restarted system calls may write into old
 	    act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
 	    sigemptyset(&act.sa_mask);
 	    act.sa_handler = __signalIoInterrupt;
 	    sigaction(THESIGNAL, &act, 0);
-#else
+# else
-# ifdef HAS_SIGVEC
+#  ifdef HAS_SIGVEC
 	    struct sigvec vec;
 	    vec.sv_flags = SV_INTERRUPT;
 	    sigemptyset(&vec.sv_mask);
 	    vec.sv_handler = __signalIoInterrupt;
 	    sigvec(THESIGNAL, &vec, NULL);
-# else
+#  else
 	    signal(THESIGNAL, __signalIoInterrupt);
-# endif
+#  endif /* SIGVEC */
-#endif
+# endif /* SIGACTION */
 	    firstCall = 0;
 	}
 #undef THESIGNAL
 	f = __intVal(fd);
 	    ret = fcntl(f, F_SETFL, flags | FASYNC);
 	    if (ret >= 0) ret = flags;
 	}
 # endif /*!SYSV4*/
-#if defined(F_SETOWN) || defined(FIOSETOWN)
+# if defined(F_SETOWN) || defined(FIOSETOWN)
 	{
 	    int pid;
 	    int ok;
 	    pid = getpid();
-# if defined(F_SETOWN)
+#  if defined(F_SETOWN)
 	    ok = fcntl(f, F_SETOWN, pid);
 	    /* printf("F_SETOWN returns %d (%d)\n", ret, errno); */
-# else
+#  else
 	    ok = ioctl(f, FIOSETOWN, &pid);
 	    /* printf("FIOSETOWN returns %d (%d)\n", ret, errno); */
-# endif
+#  endif
 	    if (ok < 0) {
 		ret = ok;
 	    }
 	}
-#endif
+# endif
 	RETURN ( __MKUINT(ret) );
 }
 #endif
 %}.
 "
 		break;
 	}
 	{
 #ifdef HAS_SIGACTION
-	    struct sigaction act = {0};
+	    struct sigaction act;
 	    /*
 	     * Do not add SA_RESTART here. A signal can cause a
 	     * thread switch, another thread can do a garbage collect
 	     * and restarted system calls may write into old
 	extern void __signalTimerInterrupt(SIGHANDLER_ARG);
 # endif
 	if (firstCall) {
 # ifdef HAS_SIGACTION
-	    struct sigaction act = {0};
+	    struct sigaction act;
 	    act.sa_flags = SA_SIGINFO; /* <- if you add more, remember dummys at the top */
 	    sigemptyset(&act.sa_mask);
 	    act.sa_handler = __signalTimerInterrupt;
 	    sigaction(SIGALRM, &act, 0);
 %{
 #ifndef NO_SOCKET
 int sock;
 int ret;
-struct sockaddr sockaddr = { AF_UNSPEC };
+struct sockaddr sockaddr;
 if (!__isSmallInteger(__INST(fd))) {
 	error = @symbol(badFd);
 	goto err;
 }
 /*
 * (dis-) connect by connecting to AF_UNSPEC socket
 */
 again:
+sockaddr.sa_family = AF_UNSPEC;
 ret = connect(sock, &sockaddr, sizeof(sockaddr));
 if (ret < 0) {
 switch(errno) {
 	   case EINTR:
 # ifdef EAGAIN
 ! !
 !UnixOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.207 2004-03-31 09:56:38 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.208 2004-04-08 12:47:30 cg Exp $'
 ! !
 UnixOperatingSystem initialize!
 UnixOperatingSystem::FileDescriptorHandle initialize!

changeset 8307	8e90da896548
parent 8279	e16a20ee2c6d
child 8337	1168b3ff3cdc