2003-02-25 Dick Porter <dick@ximian.com>

	* shared.c (_wapi_shm_attach): Return a failure code on system
	call errors, rather than exiting.

svn path=/trunk/mono/; revision=11966

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index b6a032f95833b0f4e576f1f29b2de6acecfbe253..bf88e25e326ac6633d056db1936f9234f316638d 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-25  Dick Porter  <dick@ximian.com>
+
+       * shared.c (_wapi_shm_attach): Return a failure code on system
+       call errors, rather than exiting.
+
 2003-02-21  Dick Porter  <dick@ximian.com>
 
        * processes.c (GetCurrentProcessId): Use the current process

diff --git a/mono/io-layer/shared.c b/mono/io-layer/shared.c
index 2406b03d1db8a531840a25136296b0ecaefe9b6f..0aed545d8424526002816db3a4dc2b1f3817a4da 100644 (file)
--- a/mono/io-layer/shared.c
+++ b/mono/io-layer/shared.c
@@ -113,6 +113,8 @@ gpointer _wapi_shm_attach (gboolean *success)
        int wanted_size=sizeof(struct _WapiHandleShared_list) +
                _WAPI_SHM_SCRATCH_SIZE;
        
+       *success=FALSE;
+
 try_again:
        /* No O_CREAT yet, because we need to initialise the file if
         * we have to create it.
@@ -134,7 +136,7 @@ try_again:
                        g_critical (G_GNUC_PRETTY_FUNCTION
                                    ": shared file [%s] open error: %s",
                                    shared_file (), g_strerror (errno));
-                       exit (-1);
+                       return(NULL);
                } else {
                        /* We created the file, so we need to expand
                         * the file and fork the handle daemon too
@@ -142,13 +144,13 @@ try_again:
                        if(lseek (fd, wanted_size, SEEK_SET)==-1) {
                                g_critical (G_GNUC_PRETTY_FUNCTION ": shared file [%s] lseek error: %s", shared_file (), g_strerror (errno));
                                _wapi_shm_destroy ();
-                               exit (-1);
+                               return(NULL);
                        }
                        
                        if(write (fd, "", 1)==-1) {
                                g_critical (G_GNUC_PRETTY_FUNCTION ": shared file [%s] write error: %s", shared_file (), g_strerror (errno));
                                _wapi_shm_destroy ();
-                               exit (-1);
+                               return(NULL);
                        }
                        
                        fork_daemon=TRUE;
@@ -163,7 +165,7 @@ try_again:
                g_critical (G_GNUC_PRETTY_FUNCTION
                            ": shared file [%s] open error: %s",
                            shared_file (), g_strerror (errno));
-               exit (-1);
+               return(NULL);
        } else {
                /* We dont need to fork the handle daemon */
        }
@@ -183,7 +185,7 @@ try_again:
                if(fork_daemon==TRUE) {
                        _wapi_shm_destroy ();
                }
-               exit (-1);
+               return(NULL);
        }
 
        if(statbuf.st_size < wanted_size) {
@@ -196,7 +198,7 @@ try_again:
                if(fork_daemon==TRUE) {
                        _wapi_shm_destroy ();
                }
-               exit (-1);
+               return(NULL);
        }
        
        shm_seg=mmap (NULL, statbuf.st_size, PROT_READ|PROT_WRITE, MAP_SHARED,
@@ -207,7 +209,7 @@ try_again:
                if(fork_daemon==TRUE) {
                        _wapi_shm_destroy ();
                }
-               exit (-1);
+               return(NULL);
        }
        close (fd);
                
@@ -221,7 +223,7 @@ try_again:
                        g_critical (G_GNUC_PRETTY_FUNCTION ": fork error: %s",
                                    strerror (errno));
                        _wapi_shm_destroy ();
-                       exit (-1);
+                       return(NULL);
                } else if (pid==0) {
                        int i;
                        
@@ -267,7 +269,6 @@ try_again:
                   (strncmp (data->daemon+1, "mono-handle-daemon-", 19)!=0)) {
 #endif
                        g_warning ("Shared memory sanity check failed.");
-                       *success=FALSE;
                        return(NULL);
                }
        }
@@ -291,7 +292,6 @@ try_again:
                        _wapi_shm_destroy ();
                }
                g_warning ("The handle daemon didnt start up properly");
-               *success=FALSE;
                return(NULL);
        }
        
@@ -301,7 +301,6 @@ try_again:
                        _wapi_shm_destroy ();
                }
                g_warning ("Handle daemon failed to start");
-               *success=FALSE;
                return(NULL);
        }
                

diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h
index b359973809c4439a8ed4c5014d927c77e55c857b..c0fadf430896f3ebafa91fb01427a9df5018ecab 100644 (file)
--- a/mono/io-layer/wapi-private.h
+++ b/mono/io-layer/wapi-private.h
@@ -20,6 +20,11 @@
 /* Shared threads don't seem to work yet */
 #undef _POSIX_THREAD_PROCESS_SHARED
 
+/* Catch this here rather than corrupt the shared data at runtime */
+#if MONO_SIZEOF_SUNPATH==0
+#error configure failed to discover size of unix socket path
+#endif
+
 /* Increment this whenever an incompatible change is made to the
  * shared handle structure.
  */