X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Fxgetcwd.c;h=71720d323f0b1c2a2e5821c20e623da4dd5c0305;hb=8172d054db64bc80a355db111b484719930045bc;hp=0ac450d3bbed94d61d96d8f0698f944940650a4d;hpb=c290563319b61c8230deca52ab625d8dc335e2d3;p=oweals%2Fbusybox.git

diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 0ac450d3b..71720d323 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -5,40 +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 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.
    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)
 {
+#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==0)
-		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;
 }