Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/xgetcwd.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/xgetcwd.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/libbb/xgetcwd.c

@@ -6 +6 @@
  *
  * Special function for busybox written by Vladimir Oleynik <dzo@simtreas.ru>
-*/
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 
 #include "libbb.h"
-
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
 
 /* Return the current directory, newly allocated, arbitrarily long.
@@ -18 +17 @@
 */
 
-char *
+char* FAST_FUNC
 xrealloc_getcwd_or_warn(char *cwd)
 {
+#define PATH_INCR 64
+
     char *ret;
     unsigned path_max;
 
-    path_max = (unsigned) PATH_MAX;
-    path_max += 2;                /* The getcwd docs say to do this. */
+    path_max = 128; /* 128 + 64 should be enough for 99% of cases */
 
-    if (cwd == NULL)
-        cwd = xmalloc(path_max);
-
-    while ((ret = getcwd(cwd, path_max)) == NULL && errno == ERANGE) {
+    while (1) {
         path_max += PATH_INCR;
         cwd = xrealloc(cwd, path_max);
+        ret = getcwd(cwd, path_max);
+        if (ret == NULL) {
+            if (errno == ERANGE)
+                continue;
+            free(cwd);
+            bb_perror_msg("getcwd");
+            return NULL;
+        }
+        cwd = xrealloc(cwd, strlen(cwd) + 1);
+        return cwd;
     }
-
-    if (ret == NULL) {
-        free(cwd);
-        bb_perror_msg("getcwd");
-        return NULL;
-    }
-
-    return cwd;
 }