From 9024bca255ea4e2a083fbe0963155f6b3002fa45 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 12 Aug 2001 20:11:39 +0000 Subject: [PATCH] (xgetcwd) [defined __GLIBC__ && __GLIBC__ >= 2]: Simply `return getcwd (NULL, 0);'. [! (defined __GLIBC__ && __GLIBC__ >= 2)]: Use 1300 as initial value for length, not PATH_MAX. --- lib/xgetcwd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index 896be5d6aa..95d0ab96cd 100644 --- a/lib/xgetcwd.c +++ b/lib/xgetcwd.c @@ -1,5 +1,5 @@ /* xgetcwd.c -- return current directory with unlimited length - Copyright (C) 1992, 1996, 2000 Free Software Foundation, Inc. + Copyright (C) 1992, 1996, 2000, 2001 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 @@ -47,6 +47,9 @@ extern void free (); char * xgetcwd () { +#if defined __GLIBC__ && __GLIBC__ >= 2 + return getcwd (NULL, 0); +#else char *ret; unsigned path_max; char buf[1024]; @@ -58,7 +61,7 @@ xgetcwd () if (errno != ERANGE) return NULL; - path_max = (unsigned) PATH_MAX; + path_max = 1300; path_max += 2; /* The getcwd docs say to do this. */ for (;;) @@ -82,4 +85,5 @@ xgetcwd () path_max += path_max / 16; path_max += 32; } +#endif } -- 2.30.2