/*
- * Copyright (c) 1996, 1998-2004 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1996, 1998-2005, 2010
+ * Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#include <sys/param.h>
#endif /* STDC_HEADERS */
#ifdef HAVE_STRING_H
# include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-# include <strings.h>
-# endif
#endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_ERR_H
-# include <err.h>
-#else
-# include "emul/err.h"
-#endif /* HAVE_ERR_H */
#include "sudo.h"
-#ifndef lint
-static const char rcsid[] = "$Sudo: find_path.c,v 1.109 2004/08/24 18:01:12 millert Exp $";
-#endif /* lint */
-
/*
* This function finds the full pathname for a command and
* stores it in a statically allocated array, filling in a pointer
* but it is in '.' and IGNORE_DOT is set.
*/
int
-find_path(infile, outfile, sbp, path)
+find_path(infile, outfile, sbp, path, ignore_dot)
char *infile; /* file to find */
char **outfile; /* result parameter */
struct stat *sbp; /* stat result parameter */
char *path; /* path to search */
+ int ignore_dot; /* don't check cwd */
{
static char command[PATH_MAX]; /* qualified filename */
char *n; /* for traversing path */
int len; /* length parameter */
if (strlen(infile) >= PATH_MAX)
- errx(1, "%s: File name too long", infile);
+ errorx(1, "%s: File name too long", infile);
/*
* If we were given a fully qualified or relative path
return(NOT_FOUND);
}
- /* Use PATH passed in unless SECURE_PATH is in effect. */
-#ifdef SECURE_PATH
- if (!user_is_exempt())
- path = SECURE_PATH;
-#endif /* SECURE_PATH */
if (path == NULL)
return(NOT_FOUND);
path = estrdup(path);
*/
len = snprintf(command, sizeof(command), "%s/%s", path, infile);
if (len <= 0 || len >= sizeof(command))
- errx(1, "%s: File name too long", infile);
+ errorx(1, "%s: File name too long", infile);
if ((result = sudo_goodpath(command, sbp)))
break;
path = n + 1;
} while (n);
- free(origpath);
+ efree(origpath);
/*
* Check current dir if dot was in the PATH
*/
if (!result && checkdot) {
- result = sudo_goodpath(infile, sbp);
- if (result && def_ignore_dot)
+ len = snprintf(command, sizeof(command), "./%s", infile);
+ if (len <= 0 || len >= sizeof(command))
+ errorx(1, "%s: File name too long", infile);
+ result = sudo_goodpath(command, sbp);
+ if (result && ignore_dot)
return(NOT_FOUND_DOT);
}