init: fix logically inverted FEATURE_EXTRA_QUIET check

[oweals/busybox.git] / libbb / xgetcwd.c

diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index f6cfb34a75fa871202dfa34d9113668cb8d4eee5..10febe32d44c8964b6e11e299357ab67a14aaff6 100644 (file)
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -5,45 +5,39 @@
  * Written by David MacKenzie <djm@gnu.ai.mit.edu>.
  *
  * Special function for busybox written by Vladimir Oleynik <dzo@simtreas.ru>
-*/
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/param.h>
 #include "libbb.h"
 
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
-
 /* Return the current directory, newly allocated, arbitrarily long.
    Return NULL and set errno on error.
    If argument is not NULL (previous usage allocate memory), call free()
 */
 
-char *
-xgetcwd (char *cwd)
+char* FAST_FUNC
+xrealloc_getcwd_or_warn(char *cwd)
 {
-  char *ret;
-  unsigned path_max;
-
-  path_max = (unsigned) PATH_MAX;
-  path_max += 2;                /* The getcwd docs say to do this. */
-
-  if(cwd==0)
-       cwd = xmalloc (path_max);
-
-  while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE) {
-      path_max += PATH_INCR;
-      cwd = xrealloc (cwd, path_max);
-  }
-
-  if (ret == NULL) {
-      free (cwd);
-      bb_perror_msg("getcwd()");
-      return NULL;
-  }
-
-  return cwd;
+#define PATH_INCR 64
+
+       char *ret;
+       unsigned path_max;
+
+       path_max = 128; /* 128 + 64 should be enough for 99% of cases */
+
+       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;
+       }
 }