Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/xgetcwd.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/xgetcwd.c (modified) (3 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * xgetcwd.c -- return current directory with unlimited length
@@ -7 +8 @@
 */
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/param.h>
 #include "libbb.h"
 
@@ -23 +19 @@
 
 char *
-xgetcwd (char *cwd)
+xrealloc_getcwd_or_warn(char *cwd)
 {
-  char *ret;
-  unsigned path_max;
+    char *ret;
+    unsigned path_max;
 
-  path_max = (unsigned) PATH_MAX;
-  path_max += 2;                /* The getcwd docs say to do this. */
+    path_max = (unsigned) PATH_MAX;
+    path_max += 2;                /* The getcwd docs say to do this. */
 
-  if(cwd==0)
-    cwd = xmalloc (path_max);
+    if (cwd == NULL)
+        cwd = xmalloc(path_max);
 
-  while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE) {
-      path_max += PATH_INCR;
-      cwd = xrealloc (cwd, 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;
-  }
+    if (ret == NULL) {
+        free(cwd);
+        bb_perror_msg("getcwd");
+        return NULL;
+    }
 
-  return cwd;
+    return cwd;
 }