From f171eae2e690dcb79532a84876318f20906f1d65 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Nov 2004 19:58:52 +0000 Subject: [PATCH] Implement correctly also on Unix systems without lstat(). (#157038, Morten 2004-11-01 Tor Lillqvist * glib/gstdio.c (g_lstat): Implement correctly also on Unix systems without lstat(). (#157038, Morten Welinder) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gstdio.c | 9 +++++---- 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72bb90d2..7df23577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-01 Tor Lillqvist + + * glib/gstdio.c (g_lstat): Implement correctly also on Unix + systems without lstat(). (#157038, Morten Welinder) + 2004-11-01 Ray Strode * glib/gkeyfile.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 72bb90d2..7df23577 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-11-01 Tor Lillqvist + + * glib/gstdio.c (g_lstat): Implement correctly also on Unix + systems without lstat(). (#157038, Morten Welinder) + 2004-11-01 Ray Strode * glib/gkeyfile.c: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 72bb90d2..7df23577 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-11-01 Tor Lillqvist + + * glib/gstdio.c (g_lstat): Implement correctly also on Unix + systems without lstat(). (#157038, Morten Welinder) + 2004-11-01 Ray Strode * glib/gkeyfile.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 72bb90d2..7df23577 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-11-01 Tor Lillqvist + + * glib/gstdio.c (g_lstat): Implement correctly also on Unix + systems without lstat(). (#157038, Morten Welinder) + 2004-11-01 Ray Strode * glib/gkeyfile.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 72bb90d2..7df23577 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-11-01 Tor Lillqvist + + * glib/gstdio.c (g_lstat): Implement correctly also on Unix + systems without lstat(). (#157038, Morten Welinder) + 2004-11-01 Ray Strode * glib/gkeyfile.c: diff --git a/glib/gstdio.c b/glib/gstdio.c index d0c19416..1bb4cbb7 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -252,7 +252,7 @@ g_stat (const gchar *filename, * A wrapper for the POSIX lstat() function. The lstat() function is * like stat() except that in the case of symbolic links, it returns * information about the symbolic link itself and not the file that it - * refers to. On Windows where there are no symbolic links g_lstat() + * refers to. If the system does not support symbolic links g_lstat() * is identical to g_stat(). * * See the C library manual for more details about lstat(). @@ -266,10 +266,11 @@ int g_lstat (const gchar *filename, struct stat *buf) { -#ifdef G_OS_WIN32 - return g_stat (filename, buf); -#else +#ifdef HAVE_LSTAT + /* This can't be Win32, so don't do the widechar dance. */ return lstat (filename, buf); +#else + return g_stat (filename, buf); #endif } -- 2.34.1