v[hp]error_msg have 2-3 callsites only -> incorporate there.

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

diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 54e9785ed24b61c7bf7f8f5bcab1b1e644da1c3b..ec1d8f7a4231669a6bff3534c311a28444d600b4 100644 (file)
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -1,16 +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 <sys/param.h>
 #include "libbb.h"
 
 /* Amount to increase buffer size by in each try. */
@@ -22,27 +18,27 @@
 */
 
 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);
-      perror_msg("getcwd()");
-      return NULL;
-  }
+       if (ret == NULL) {
+               free(cwd);
+               bb_perror_msg("getcwd");
+               return NULL;
+       }
 
-  return cwd;
+       return cwd;
 }