annotate lib/xgetcwd.c @ 3452:baf8d5fe777a

Fix the !HAVE_GETCWD_NULL code to behave more like the HAVE_GETCWD_NULL code. Include pathmax.h if not HAVE_GETCWD. Do not include xalloc.h. (INITIAL_BUFFER_SIZE): New symbol. Do not use xmalloc / xrealloc, since the caller is responsible for handling errors. Preserve errno around `free' during failure. Do not overrun buffer when using getwd.
author Jim Meyering <jim@meyering.net>
date Mon, 03 Sep 2001 18:21:53 +0000
parents 95da01de9977
children 45d73183ee54
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
1 /* xgetcwd.c -- return current directory with unlimited length
3343
1ff924ca3a9a (xgetcwd) [defined __GLIBC__ && __GLIBC__ >= 2]:
Jim Meyering <jim@meyering.net>
parents: 2627
diff changeset
2 Copyright (C) 1992, 1996, 2000, 2001 Free Software Foundation, Inc.
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
3
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
5 it under the terms of the GNU General Public License as published by
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
6 the Free Software Foundation; either version 2, or (at your option)
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
7 any later version.
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
8
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
12 GNU General Public License for more details.
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
650
b4ef1c1a0171 update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents: 212
diff changeset
15 along with this program; if not, write to the Free Software Foundation,
b4ef1c1a0171 update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents: 212
diff changeset
16 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
17
650
b4ef1c1a0171 update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents: 212
diff changeset
18 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
19
778
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
20 #if HAVE_CONFIG_H
653
b63f146fd963 indent cpp-directives
Jim Meyering <jim@meyering.net>
parents: 650
diff changeset
21 # include <config.h>
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
22 #endif
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
23
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
24 #include <stdio.h>
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
25 #include <errno.h>
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
26 #ifndef errno
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
27 extern int errno;
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
28 #endif
778
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
29
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
30 #include <sys/types.h>
3431
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
31
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
32 #if HAVE_STDLIB_H
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
33 # include <stdlib.h>
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
34 #endif
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
35 #if HAVE_UNISTD_H
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
36 # include <unistd.h>
2d4af41566eb Don't include pathmax.h.
Jim Meyering <jim@meyering.net>
parents: 3343
diff changeset
37 #endif
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
38
778
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
39 #if HAVE_GETCWD
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
40 char *getcwd ();
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
41 #else
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
42 # include "pathmax.h"
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
43 # define INITIAL_BUFFER_SIZE (PATH_MAX + 1)
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
44 char *getwd ();
778
8043b4ae1d6a libitize
Jim Meyering <jim@meyering.net>
parents: 758
diff changeset
45 # define getcwd(Buf, Max) getwd (Buf)
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
46 #endif
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
47
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
48 /* Return the current directory, newly allocated, arbitrarily long.
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
49 Return NULL and set errno on error. */
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
50
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
51 char *
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
52 xgetcwd ()
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
53 {
3448
95da01de9977 (xgetcwd): Use HAVE_GETCWD_NULL, not (defined __GLIBC__ && __GLIBC__ >= 2),
Jim Meyering <jim@meyering.net>
parents: 3435
diff changeset
54 #if HAVE_GETCWD_NULL
3343
1ff924ca3a9a (xgetcwd) [defined __GLIBC__ && __GLIBC__ >= 2]:
Jim Meyering <jim@meyering.net>
parents: 2627
diff changeset
55 return getcwd (NULL, 0);
1ff924ca3a9a (xgetcwd) [defined __GLIBC__ && __GLIBC__ >= 2]:
Jim Meyering <jim@meyering.net>
parents: 2627
diff changeset
56 #else
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
57
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
58 /* The initial buffer size for the working directory. A power of 2
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
59 detects arithmetic overflow earlier, but is not required. */
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
60 # ifndef INITIAL_BUFFER_SIZE
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
61 # define INITIAL_BUFFER_SIZE 128
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
62 # endif
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
63
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
64 size_t buf_size = INITIAL_BUFFER_SIZE;
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
65
3433
656345934fec (xgetcwd): Reorganize to avoid some duplication.
Jim Meyering <jim@meyering.net>
parents: 3431
diff changeset
66 while (1)
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
67 {
3435
e587cbb53203 fix typo
Jim Meyering <jim@meyering.net>
parents: 3433
diff changeset
68 char *cwd;
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
69 int saved_errno;
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
70 char *buf = malloc (buf_size);
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
71 if (! buf)
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
72 return NULL;
3433
656345934fec (xgetcwd): Reorganize to avoid some duplication.
Jim Meyering <jim@meyering.net>
parents: 3431
diff changeset
73 cwd = getcwd (buf, buf_size);
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
74 if (cwd)
3433
656345934fec (xgetcwd): Reorganize to avoid some duplication.
Jim Meyering <jim@meyering.net>
parents: 3431
diff changeset
75 return cwd;
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
76 saved_errno = errno;
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
77 free (buf);
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
78 if (saved_errno != ERANGE)
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
79 return NULL;
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
80 buf_size *= 2;
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
81 if (buf_size == 0)
2627
308ad15a7eab (xgetcwd): If the required pathname length is smaller
Jim Meyering <jim@meyering.net>
parents: 778
diff changeset
82 {
3452
baf8d5fe777a Fix the !HAVE_GETCWD_NULL code to behave more
Jim Meyering <jim@meyering.net>
parents: 3448
diff changeset
83 errno = ENOMEM;
2627
308ad15a7eab (xgetcwd): If the required pathname length is smaller
Jim Meyering <jim@meyering.net>
parents: 778
diff changeset
84 return NULL;
308ad15a7eab (xgetcwd): If the required pathname length is smaller
Jim Meyering <jim@meyering.net>
parents: 778
diff changeset
85 }
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
86 }
3343
1ff924ca3a9a (xgetcwd) [defined __GLIBC__ && __GLIBC__ >= 2]:
Jim Meyering <jim@meyering.net>
parents: 2627
diff changeset
87 #endif
212
8bc57d4e2dd4 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
88 }