luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite not to look at errno' if library call succeeds, since errno' is

Browse Source 
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
This commit is contained in:
Raja R Harinath 1999-01-24 03:18:36 +00:00
parent d041a48618
commit c9e92e124e
10 changed files with 102 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
1999-01-23 Raja R Harinath <harinath@cs.umn.edu>
* gutils.c (g_get_any_init) [HAVE_GETPWUID_R]:
Rewrite not to look at `errno' if library call succeeds, since
`errno' is not reset to 0.
Sat Jan 23 16:17:04 1999 Tor Lillqvist <tml@iki.fi>
* glibconfig.h.win32: Update the magic values for

41
glib/gutils.c
View File

@ -443,29 +443,42 @@ g_get_any_init (void)
# ifdef HAVE_GETPWUID_R
struct passwd pwd;
guint bufsize = 1; // sizeof (struct passwd);
guint bufsize = 1; /* sizeof (struct passwd); */
gint error;
do
{
g_free (buffer);
buffer = g_malloc (bufsize);
pw_retry:
buffer = g_malloc (bufsize);
# ifdef HAVE_GETPWUID_R_POSIX
error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw);
error = error ? errno : 0;
error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw);
if (!error)
goto pw_out;
/* error = errno; According to the Solaris man page,
this is not necessary. */
# else /* !HAVE_GETPWUID_R_POSIX */
pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
error = errno;
pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
if (pw == NULL)
goto pw_out;
error = errno;
# endif /* !HAVE_GETPWUID_R_POSIX */
/* If it came here, there's some kind of error. */
g_free (buffer);
if (error == ERANGE)
{
bufsize *= 2;
goto pw_retry;
}
while (error == ERANGE);
if (error)
g_warning ("getpwuid_r(): failed due to: %s", g_strerror (error));
g_warning ("getpwuid_r(): failed due to: %s", g_strerror (error));
/* Make any subsequent g_free (buffer) a no-op. */
buffer = NULL;
pw_out:
;
# else /* !HAVE_GETPWUID_R */
# ifdef G_THREADS_ENABLED

41
gutils.c
View File

@ -443,29 +443,42 @@ g_get_any_init (void)
# ifdef HAVE_GETPWUID_R
struct passwd pwd;
guint bufsize = 1; // sizeof (struct passwd);
guint bufsize = 1; /* sizeof (struct passwd); */
gint error;
do
{
g_free (buffer);
buffer = g_malloc (bufsize);
pw_retry:
buffer = g_malloc (bufsize);
# ifdef HAVE_GETPWUID_R_POSIX
error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw);
error = error ? errno : 0;
error = getpwuid_r (getuid (), &pwd, buffer, bufsize, &pw);
if (!error)
goto pw_out;
/* error = errno; According to the Solaris man page,
this is not necessary. */
# else /* !HAVE_GETPWUID_R_POSIX */
pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
error = errno;
pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
if (pw == NULL)
goto pw_out;
error = errno;
# endif /* !HAVE_GETPWUID_R_POSIX */
/* If it came here, there's some kind of error. */
g_free (buffer);
if (error == ERANGE)
{
bufsize *= 2;
goto pw_retry;
}
while (error == ERANGE);
if (error)
g_warning ("getpwuid_r(): failed due to: %s", g_strerror (error));
g_warning ("getpwuid_r(): failed due to: %s", g_strerror (error));
/* Make any subsequent g_free (buffer) a no-op. */
buffer = NULL;
pw_out:
;
# else /* !HAVE_GETPWUID_R */
# ifdef G_THREADS_ENABLED