X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fxgetcwd.c;h=10febe32d44c8964b6e11e299357ab67a14aaff6;hb=d7171c114028815df4e92f9c26875f1d60c6af2a;hp=27466816650e2a6e5e571eae070d54689a9ec18e;hpb=e5dfced23a904d08afa5dcee190c3c3d845d9f50;p=oweals%2Fbusybox.git

diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 274668166..10febe32d 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -1,52 +1,43 @@
+/* vi: set sw=4 ts=4: */
 /*
  * xgetcwd.c -- return current directory with unlimited length
  * Copyright (C) 1992, 1996 Free Software Foundation, Inc.
  * Written by David MacKenzie <djm@gnu.ai.mit.edu>.
  *
- * Special function for busybox written by Vladimir Oleynik <vodz@usa.net>
-*/
+ * 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 "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;
-
-  errno = 0;
-  path_max = (unsigned) PATH_MAX;
-  path_max += 2;                /* The getcwd docs say to do this. */
-
-  if(cwd==0)
-	cwd = xmalloc (path_max);
-
-  errno = 0;
-  while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE) {
-      path_max += PATH_INCR;
-      cwd = xrealloc (cwd, path_max);
-      errno = 0;
-  }
-
-  if (ret == NULL) {
-      int save_errno = errno;
-      free (cwd);
-      errno = save_errno;
-      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;
+	}
 }