projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
xgetcwd.c
diff --git
a/lib/xgetcwd.c
b/lib/xgetcwd.c
index
84164ac
..
896be5d
100644
(file)
--- a/
lib/xgetcwd.c
+++ b/
lib/xgetcwd.c
@@
-1,5
+1,5
@@
/* xgetcwd.c -- return current directory with unlimited length
/* xgetcwd.c -- return current directory with unlimited length
- Copyright (C) 1992 Free Software Foundation, Inc.
+ Copyright (C) 1992
, 1996, 2000
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#if
def
HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-26,22
+26,20
@@
#ifndef errno
extern int errno;
#endif
#ifndef errno
extern int errno;
#endif
+
#include <sys/types.h>
#include "pathmax.h"
#include <sys/types.h>
#include "pathmax.h"
-#ifndef HAVE_GETCWD
-char *getwd ();
-# define getcwd(buf, max) getwd (buf)
-#else
+#if HAVE_GETCWD
char *getcwd ();
char *getcwd ();
+#else
+char *getwd ();
+# define getcwd(Buf, Max) getwd (Buf)
#endif
#endif
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
-
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+extern void *xmalloc ();
+extern char *xstrdup ();
+extern void free ();
/* Return the current directory, newly allocated, arbitrarily long.
Return NULL and set errno on error. */
/* Return the current directory, newly allocated, arbitrarily long.
Return NULL and set errno on error. */
@@
-49,30
+47,39
@@
void free ();
char *
xgetcwd ()
{
char *
xgetcwd ()
{
- char *cwd;
char *ret;
unsigned path_max;
char *ret;
unsigned path_max;
+ char buf[1024];
errno = 0;
errno = 0;
+ ret = getcwd (buf, sizeof (buf));
+ if (ret != NULL)
+ return xstrdup (buf);
+ if (errno != ERANGE)
+ return NULL;
+
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. */
- cwd = xmalloc (path_max);
-
- errno = 0;
- while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE)
+ for (;;)
{
{
-
path_max += PATH_INCR
;
- cwd = xrealloc (cwd, path_max);
+
char *cwd = (char *) xmalloc (path_max)
;
+
errno = 0;
errno = 0;
- }
+ ret = getcwd (cwd, path_max);
+ if (ret != NULL)
+ return ret;
+ if (errno != ERANGE)
+ {
+ int save_errno = errno;
+ free (cwd);
+ errno = save_errno;
+ return NULL;
+ }
- if (ret == NULL)
- {
- int save_errno = errno;
free (cwd);
free (cwd);
- errno = save_errno;
- return NULL;
+
+ path_max += path_max / 16;
+ path_max += 32;
}
}
- return cwd;
}
}