/* fchdir replacement.
- Copyright (C) 2006-2009 Free Software Foundation, Inc.
+ Copyright (C) 2006-2011 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
# define HAVE_CANONICALIZE_FILE_NAME 1
# else
# define HAVE_CANONICALIZE_FILE_NAME 0
+# define canonicalize_file_name(name) NULL
# endif
#endif
descriptor, since mingw refuses to rename any in-use file system
object. */
-/* Array of file descriptors opened. If it points to a directory, it stores
- info about this directory. */
+/* Array of file descriptors opened. If REPLACE_OPEN_DIRECTORY or if it points
+ to a directory, it stores info about this directory. */
typedef struct
{
char *name; /* Absolute name of the directory, or NULL. */
static dir_info_t *dirs;
static size_t dirs_allocated;
-/* Try to ensure dirs has enough room for a slot at index fd. Return
- false and set errno to ENOMEM on allocation failure. */
+/* Try to ensure dirs has enough room for a slot at index fd; free any
+ contents already in that slot. Return false and set errno to
+ ENOMEM on allocation failure. */
static bool
ensure_dirs_slot (size_t fd)
{
- if (fd >= dirs_allocated)
+ if (fd < dirs_allocated)
+ free (dirs[fd].name);
+ else
{
size_t new_allocated;
dir_info_t *new_dirs;
and fcntl. Both arguments must be valid and distinct file
descriptors. Close NEWFD and return -1 if OLDFD is tracking a
directory, but there is insufficient memory to track the same
- directory in NEWFD; otherwise return NEWFD.
-
- FIXME: Need to implement rpl_fcntl in gnulib, and have it call
- this. */
+ directory in NEWFD; otherwise return NEWFD. */
int
_gl_register_dup (int oldfd, int newfd)
{
return NULL;
}
+#if REPLACE_OPEN_DIRECTORY
/* Return stat information about FD in STATBUF. Needed when
rpl_open() used a dummy file to work around an open() that can't
normally visit directories. */
-#if REPLACE_OPEN_DIRECTORY
+# undef fstat
int
rpl_fstat (int fd, struct stat *statbuf)
{