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

diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 274668166..0ac450d3b 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -1,15 +1,12 @@
+/* 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>
 */
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <limits.h>
 #include "libbb.h"
 
 /* Amount to increase buffer size by in each try. */
@@ -21,32 +18,27 @@
 */
 
 char *
-xgetcwd (char *cwd)
+xgetcwd(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;
+	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;
 }