version 1.1.1.1, 2012/02/21 16:23:02
|
version 1.1.1.3, 2013/07/22 10:46:12
|
Line 1
|
Line 1
|
/* |
/* |
* Copyright (c) 1996, 1998-2005, 2010-2011 | * Copyright (c) 1996, 1998-2005, 2010-2013 |
* Todd C. Miller <Todd.Miller@courtesan.com> |
* Todd C. Miller <Todd.Miller@courtesan.com> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 22
|
Line 22
|
#include <config.h> |
#include <config.h> |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
#include <sys/param.h> |
|
#include <sys/stat.h> |
#include <sys/stat.h> |
#include <stdio.h> |
#include <stdio.h> |
#ifdef STDC_HEADERS |
#ifdef STDC_HEADERS |
Line 60 find_path(char *infile, char **outfile, struct stat *s
|
Line 59 find_path(char *infile, char **outfile, struct stat *s
|
static char command[PATH_MAX]; /* qualified filename */ |
static char command[PATH_MAX]; /* qualified filename */ |
char *n; /* for traversing path */ |
char *n; /* for traversing path */ |
char *origpath; /* so we can free path later */ |
char *origpath; /* so we can free path later */ |
char *result = NULL; /* result of path/file lookup */ | bool found = false; /* did we find the command? */ |
int checkdot = 0; /* check current dir? */ | bool checkdot = false; /* check current dir? */ |
int len; /* length parameter */ |
int len; /* length parameter */ |
|
debug_decl(find_path, SUDO_DEBUG_UTIL) |
|
|
if (strlen(infile) >= PATH_MAX) | if (strlen(infile) >= PATH_MAX) { |
errorx(1, _("%s: %s"), infile, strerror(ENAMETOOLONG)); | errno = ENAMETOOLONG; |
| fatal("%s", infile); |
| } |
|
|
/* |
/* |
* If we were given a fully qualified or relative path |
* If we were given a fully qualified or relative path |
Line 75 find_path(char *infile, char **outfile, struct stat *s
|
Line 77 find_path(char *infile, char **outfile, struct stat *s
|
strlcpy(command, infile, sizeof(command)); /* paranoia */ |
strlcpy(command, infile, sizeof(command)); /* paranoia */ |
if (sudo_goodpath(command, sbp)) { |
if (sudo_goodpath(command, sbp)) { |
*outfile = command; |
*outfile = command; |
return FOUND; | debug_return_int(FOUND); |
} else |
} else |
return NOT_FOUND; | debug_return_int(NOT_FOUND); |
} |
} |
|
|
if (path == NULL) |
if (path == NULL) |
return NOT_FOUND; | debug_return_int(NOT_FOUND); |
path = estrdup(path); |
path = estrdup(path); |
origpath = path; |
origpath = path; |
|
|
Line 103 find_path(char *infile, char **outfile, struct stat *s
|
Line 105 find_path(char *infile, char **outfile, struct stat *s
|
* Resolve the path and exit the loop if found. |
* Resolve the path and exit the loop if found. |
*/ |
*/ |
len = snprintf(command, sizeof(command), "%s/%s", path, infile); |
len = snprintf(command, sizeof(command), "%s/%s", path, infile); |
if (len <= 0 || len >= sizeof(command)) | if (len <= 0 || len >= sizeof(command)) { |
errorx(1, _("%s: %s"), infile, strerror(ENAMETOOLONG)); | errno = ENAMETOOLONG; |
if ((result = sudo_goodpath(command, sbp))) | fatal("%s", infile); |
| } |
| if ((found = sudo_goodpath(command, sbp))) |
break; |
break; |
|
|
path = n + 1; |
path = n + 1; |
Line 116 find_path(char *infile, char **outfile, struct stat *s
|
Line 120 find_path(char *infile, char **outfile, struct stat *s
|
/* |
/* |
* Check current dir if dot was in the PATH |
* Check current dir if dot was in the PATH |
*/ |
*/ |
if (!result && checkdot) { | if (!found && checkdot) { |
len = snprintf(command, sizeof(command), "./%s", infile); |
len = snprintf(command, sizeof(command), "./%s", infile); |
if (len <= 0 || len >= sizeof(command)) | if (len <= 0 || len >= sizeof(command)) { |
errorx(1, _("%s: %s"), infile, strerror(ENAMETOOLONG)); | errno = ENAMETOOLONG; |
result = sudo_goodpath(command, sbp); | fatal("%s", infile); |
if (result && ignore_dot) | } |
return NOT_FOUND_DOT; | found = sudo_goodpath(command, sbp); |
| if (found && ignore_dot) |
| debug_return_int(NOT_FOUND_DOT); |
} |
} |
|
|
if (result) { | if (found) { |
*outfile = result; | *outfile = command; |
return FOUND; | debug_return_int(FOUND); |
} else |
} else |
return NOT_FOUND; | debug_return_int(NOT_FOUND); |
} |
} |