max_len can't be initialized statically as it might call a function. So do

2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gutils.c (g_get_current_dir): max_len can't be initialized
	statically as it might call a function. So do it at first call.

diff --git a/ChangeLog b/ChangeLog
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 26a0a290843ff22bf0418c0669f01cb5fc2c6022..b754cc4737ebdeb6e3dd2b41f7c972b1f2a73ab8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): max_len can't be initialized
+       statically as it might call a function. So do it at first call.
+
 Tue Sep 26 2000 Elliot Lee <sopwith@redhat.com>
        * glib.h: Add G_GNUC_PURE macro (but don't use it anywhere).
 

diff --git a/glib/gutils.c b/glib/gutils.c
index 1f3c3a347a6026a1a6198534d0461aacfd7209e1..c7284ca2975c916c276f62c70199caeffa99afc4 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -425,7 +425,10 @@ g_get_current_dir (void)
 {
   gchar *buffer = NULL;
   gchar *dir = NULL;
-  static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
+  static gulong max_len = 0;
+
+  if (max_len == 0) 
+    max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
   
   /* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd")
    * and, if that wasn't bad enough, hangs in doing so.

diff --git a/gutils.c b/gutils.c
index 1f3c3a347a6026a1a6198534d0461aacfd7209e1..c7284ca2975c916c276f62c70199caeffa99afc4 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -425,7 +425,10 @@ g_get_current_dir (void)
 {
   gchar *buffer = NULL;
   gchar *dir = NULL;
-  static gulong max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
+  static gulong max_len = 0;
+
+  if (max_len == 0) 
+    max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH;
   
   /* We don't use getcwd(3) on SUNOS, because, it does a popen("pwd")
    * and, if that wasn't bad enough, hangs in doing so.