Allocate only up to 128KB for a pathname. While this is an arbitrary value

2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gutils.c (g_get_current_dir): Allocate only up to 128KB for a
	pathname. While this is an arbitrary value just like 2048, it
	seems to be enough (after all, even 4GB is an arbitrary value).

diff --git a/ChangeLog b/ChangeLog
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f9d9690..83d15ab 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2000-03-21  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gutils.c (g_get_current_dir): Allocate only up to 128KB for a
+       pathname. While this is an arbitrary value just like 2048, it
+       seems to be enough (after all, even 4GB is an arbitrary value).
+
 2000-03-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c (g_main_poll): Warn in case of an error during the call

diff --git a/glib/gutils.c b/glib/gutils.c
index b858a7d..a6784fe 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -346,7 +346,7 @@ g_get_current_dir (void)
   *buffer = 0;
   dir = getwd (buffer);
 #else  /* !sun */
-  while (1)
+  while (max_len < 128 * 1024)
     {
       buffer = g_new (gchar, max_len + 1);
       *buffer = 0;

diff --git a/gutils.c b/gutils.c
index b858a7d..a6784fe 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -346,7 +346,7 @@ g_get_current_dir (void)
   *buffer = 0;
   dir = getwd (buffer);
 #else  /* !sun */
-  while (1)
+  while (max_len < 128 * 1024)
     {
       buffer = g_new (gchar, max_len + 1);
       *buffer = 0;