This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hello, the attached patch makes the GETLOG intrinsic thread safe by using the POSIX getpwuid_r() function, if available. Regtested on x86_64-unknown-linux-gnu, Ok for trunk? -- Janne Blomqvist
Attachment:
ChangeLog
Description: Binary data
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 4f137e4..9b91f9a 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -249,7 +249,7 @@ AC_CHECK_FUNCS(chdir strerror getlogin gethostname kill link symlink perror) AC_CHECK_FUNCS(sleep time ttyname signal alarm ctime clock access fork execl) AC_CHECK_FUNCS(wait setmode execvp pipe dup2 close fdopen strcasestr getrlimit) AC_CHECK_FUNCS(gettimeofday stat fstat lstat getpwuid vsnprintf dup getcwd) -AC_CHECK_FUNCS(localtime_r gmtime_r strerror_r) +AC_CHECK_FUNCS(localtime_r gmtime_r strerror_r getpwuid_r) # Check for glibc backtrace functions AC_CHECK_FUNCS(backtrace backtrace_symbols) diff --git a/libgfortran/intrinsics/getlog.c b/libgfortran/intrinsics/getlog.c index e75aa1c..baacdf0 100644 --- a/libgfortran/intrinsics/getlog.c +++ b/libgfortran/intrinsics/getlog.c @@ -1,8 +1,8 @@ /* Implementation of the GETLOG g77 intrinsic. - Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009, 2011 Free Software Foundation, Inc. Contributed by FranÃois-Xavier Coudert <coudert@clipper.ens.fr> -This file is part of the GNU Fortran 95 runtime library (libgfortran). +This file is part of the GNU Fortran runtime library (libgfortran). Libgfortran is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -75,7 +75,22 @@ PREFIX(getlog) (char * login, gfc_charlen_type login_len) memset (login, ' ', login_len); /* Blank the string. */ -#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID) +#if defined(HAVE_GETPWUID_R) && defined(HAVE_GETEUID) + struct passwd pwd; + struct passwd *result; + char *buf; + int err; + /* To be pedantic, buflen should be determined by + sysconf(_SC_GETPW_R_SIZE_MAX), which is 1024 on some tested + targets; we do something simple in case the target doesn't + support sysconf. */ + static const size_t buflen = 1024; + buf = get_mem (buflen); + err = getpwuid_r (geteuid (), &pwd, buf, buflen, &result); + if (err != 0 || result == NULL) + goto cleanup; + p = pwd.pw_name; +#elif defined(HAVE_GETPWUID) && defined(HAVE_GETEUID) { struct passwd *pw = getpwuid (geteuid ()); if (pw) @@ -83,20 +98,22 @@ PREFIX(getlog) (char * login, gfc_charlen_type login_len) else return; } -#else -# ifdef HAVE_GETLOGIN +#elif HAVE_GETLOGIN p = getlogin(); # else return; -# endif #endif if (p == NULL) - return; + goto cleanup; p_len = strlen (p); if (login_len < p_len) - memcpy (login, p, login_len); - else - memcpy (login, p, p_len); + p_len = login_len; + memcpy (login, p, p_len); + + cleanup: +#ifdef HAVE_GETPWUID_R + free (buf); +#endif }
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |