#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include <limits.h>
#include <sys/types.h>
#include <dirent.h>
-#include "ignore-value.h"
-
#include "daemon.h"
+#include "optgroups.h"
#include "actions.h"
+/* On Windows, NAME_MAX is not defined. */
+#ifndef NAME_MAX
+#define NAME_MAX FILENAME_MAX
+#endif
+
+int
+optgroup_realpath_available (void)
+{
+#ifdef HAVE_REALPATH
+ return 1;
+#else
+ return 0;
+#endif
+}
+
char *
do_realpath (const char *path)
{
+#ifdef HAVE_REALPATH
char *ret;
CHROOT_IN;
}
return ret; /* caller frees */
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
char *
{
char ret[PATH_MAX+1] = "/";
size_t next = 1;
+ int fd_cwd;
- /* MUST chdir ("/") before leaving this function. */
- if (chdir (sysroot) == -1) {
+ /* 'fd_cwd' here is a surrogate for the current working directory, so
+ * that we don't have to actually call chdir(2).
+ */
+ fd_cwd = open (sysroot, O_RDONLY | O_DIRECTORY);
+ if (fd_cwd == -1) {
reply_with_perror ("%s", sysroot);
return NULL;
}
/* Read the current directory looking (case insensitively) for
* this element of the path.
*/
- DIR *dir = opendir (".");
+ int fd2 = dup (fd_cwd); /* because closedir will close it */
+ if (fd2 == -1) {
+ reply_with_perror ("dup");
+ goto error;
+ }
+ DIR *dir = fdopendir (fd2);
if (dir == NULL) {
reply_with_perror ("opendir");
goto error;
errno = 0;
while ((d = readdir (dir)) != NULL) {
- if (strcasecmp (d->d_name, name) == 0)
+ if (STRCASEEQ (d->d_name, name))
break;
}
next += i;
/* Is it a directory? Try going into it. */
- if (chdir (d->d_name) == -1) {
+ fd2 = openat (fd_cwd, d->d_name, O_RDONLY | O_DIRECTORY);
+ int err = errno;
+ close (fd_cwd);
+ fd_cwd = fd2;
+ errno = err;
+ if (fd_cwd == -1) {
/* ENOTDIR is OK provided we've reached the end of the path. */
if (errno != ENOTDIR) {
- reply_with_perror ("chdir: %s", d->d_name);
+ reply_with_perror ("openat: %s", d->d_name);
goto error;
}
}
}
- ignore_value (chdir ("/"));
+ close (fd_cwd);
ret[next] = '\0';
char *retp = strdup (ret);
return retp; /* caller frees */
error:
- ignore_value (chdir ("/"));
+ close (fd_cwd);
return NULL;
}