Changed error handling again, as the error is not always set in errno, it

1999-01-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gutils.c (g_get_any_init): Changed error handling again, as the
	error is not always set in errno, it is the return value on some
	systems. What an evil world.

1 files changed, 12 insertions, 8 deletions

diff --git a/gutils.c b/gutils.c
index c5b7e2474..5ca27b7b5 100644
--- a/gutils.c
+++ b/gutils.c
@@ -443,26 +443,30 @@ g_get_any_init (void)
 	while (TRUE)
 	  {
 	    int error = 0;
+	    errno = 0;
 	    buffer = g_realloc (buffer, bufsize);
 #    ifdef HAVE_GETPWUID_R_POSIX
 	    error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw);
-	    if (error == 0)
-	      break;
+	    if (errno == 0) /* The errorcode is in error (might be 0, too) */
+	      errno = error;
 #    else /* HAVE_GETPWUID_R_POSIX */
 	    pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
-	    if (pw)
-	      break;
 #    endif /* HAVE_GETPWUID_R_POSIX */
-	    error = errno;
-	    if (error != ERANGE)
+	    if (errno == 0)
+	      {
+		g_assert (pw);
+		break;
+	      }
+
+	    if (errno != ERANGE)
 	      g_error ("Could not read account information: %s", 
-		       g_strerror (error));
+		       g_strerror (errno));
 	    bufsize *= 2;
 	  }
 #  else /* HAVE_GETPWUID_R */
 #    if defined(G_THREADS_ENABLED) && defined(__GNUC__)
 #    warning "the `g_get_(user_name|real_name|home_dir|tmp_dir)'"
-#    warning "functions will not be MT-safe at their first call"
+#    warning "functions will not be MT-safe during their first call"
 #    warning "because there is no `getpwuid_r' on your system."
 #    endif
 	setpwent ();