tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

execvpe: Fixup indention for readability 

The file was added with a mixed indention, now all are spaces.

Corresponding to the indented tabwidth of 2 and a sub-indention on curly
brackets.
This commit is contained in:
Markus Frosch 2017-12-19 16:36:03 +01:00
parent 49931ea732
commit da1265a0fc
1 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
third-party/execvpe/execvpe.c vendored
View File

@ -67,24 +67,24 @@ icinga2_execvpe (file, argv, envp)
execve (file, argv, envp); execve (file, argv, envp);
if (errno == ENOEXEC) if (errno == ENOEXEC)
{ {
/* Count the arguments. */ /* Count the arguments. */
int argc = 0; int argc = 0;
while (argv[argc++]) while (argv[argc++])
; ;
size_t len = (argc + 1) * sizeof (char *); size_t len = (argc + 1) * sizeof (char *);
char **script_argv; char **script_argv;
void *ptr = NULL; void *ptr = NULL;
script_argv = alloca (len); script_argv = alloca (len);
if (script_argv != NULL) if (script_argv != NULL)
{ {
scripts_argv (file, argv, argc, script_argv); scripts_argv (file, argv, argc, script_argv);
execve (script_argv[0], script_argv, envp); execve (script_argv[0], script_argv, envp);
free (ptr); free (ptr);
} }
} }
} }
else else
{ {
@ -92,12 +92,12 @@ icinga2_execvpe (file, argv, envp)
size_t alloclen = 0; size_t alloclen = 0;
char *path = getenv ("PATH"); char *path = getenv ("PATH");
if (path == NULL) if (path == NULL)
{ {
pathlen = confstr (_CS_PATH, (char *) NULL, 0); pathlen = confstr (_CS_PATH, (char *) NULL, 0);
alloclen = pathlen + 1; alloclen = pathlen + 1;
} }
else else
pathlen = strlen (path); pathlen = strlen (path);
size_t len = strlen (file) + 1; size_t len = strlen (file) + 1;
alloclen += pathlen + len + 1; alloclen += pathlen + len + 1;
@ -106,14 +106,14 @@ icinga2_execvpe (file, argv, envp)
name = alloca (alloclen); name = alloca (alloclen);
if (path == NULL) if (path == NULL)
{ {
/* There is no `PATH' in the environment. /* There is no `PATH' in the environment.
The default search path is the current directory The default search path is the current directory
followed by the path `confstr' returns for `_CS_PATH'. */ followed by the path `confstr' returns for `_CS_PATH'. */
path = name + pathlen + len + 1; path = name + pathlen + len + 1;
path[0] = ':'; path[0] = ':';
(void) confstr (_CS_PATH, path + 1, pathlen); (void) confstr (_CS_PATH, path + 1, pathlen);
} }
/* Copy the file name at the top. */ /* Copy the file name at the top. */
name = (char *) memcpy (name + pathlen + 1, file, len); name = (char *) memcpy (name + pathlen + 1, file, len);
@ -124,81 +124,81 @@ icinga2_execvpe (file, argv, envp)
bool got_eacces = false; bool got_eacces = false;
char *p = path; char *p = path;
do do
{ {
char *startp; char *startp;
path = p; path = p;
p = strchr (path, ':'); p = strchr (path, ':');
if (!p) if (!p)
p = path + strlen(path); p = path + strlen(path);
if (p == path) if (p == path)
/* Two adjacent colons, or a colon at the beginning or the end /* Two adjacent colons, or a colon at the beginning or the end
of `PATH' means to search the current directory. */ of `PATH' means to search the current directory. */
startp = name + 1; startp = name + 1;
else else
startp = (char *) memcpy (name - (p - path), path, p - path); startp = (char *) memcpy (name - (p - path), path, p - path);
/* Try to execute this name. If it works, execve will not return. */ /* Try to execute this name. If it works, execve will not return. */
execve (startp, argv, envp); execve (startp, argv, envp);
if (errno == ENOEXEC) if (errno == ENOEXEC)
{ {
if (script_argv == NULL) if (script_argv == NULL)
{ {
/* Count the arguments. */ /* Count the arguments. */
int argc = 0; int argc = 0;
while (argv[argc++]) while (argv[argc++])
; ;
size_t arglen = (argc + 1) * sizeof (char *); size_t arglen = (argc + 1) * sizeof (char *);
script_argv = alloca (arglen); script_argv = alloca (arglen);
if (script_argv == NULL) if (script_argv == NULL)
{ {
/* A possible EACCES error is not as important as /* A possible EACCES error is not as important as
the ENOMEM. */ the ENOMEM. */
got_eacces = false; got_eacces = false;
break; break;
} }
scripts_argv (startp, argv, argc, script_argv); scripts_argv (startp, argv, argc, script_argv);
} }
execve (script_argv[0], script_argv, envp); execve (script_argv[0], script_argv, envp);
} }
switch (errno) switch (errno)
{ {
case EACCES: case EACCES:
/* Record the we got a `Permission denied' error. If we end /* Record the we got a `Permission denied' error. If we end
up finding no executable we can use, we want to diagnose up finding no executable we can use, we want to diagnose
that we did find one but were denied access. */ that we did find one but were denied access. */
got_eacces = true; got_eacces = true;
case ENOENT: case ENOENT:
case ESTALE: case ESTALE:
case ENOTDIR: case ENOTDIR:
/* Those errors indicate the file is missing or not executable /* Those errors indicate the file is missing or not executable
by us, in which case we want to just try the next path by us, in which case we want to just try the next path
directory. */ directory. */
case ENODEV: case ENODEV:
case ETIMEDOUT: case ETIMEDOUT:
/* Some strange filesystems like AFS return even /* Some strange filesystems like AFS return even
stranger error numbers. They cannot reasonably mean stranger error numbers. They cannot reasonably mean
anything else so ignore those, too. */ anything else so ignore those, too. */
break; break;
default: default:
/* Some other error means we found an executable file, but /* Some other error means we found an executable file, but
something went wrong executing it; return the error to our something went wrong executing it; return the error to our
caller. */ caller. */
return -1; return -1;
} }
} }
while (*p++ != '\0'); while (*p++ != '\0');
/* We tried every element and none of them worked. */ /* We tried every element and none of them worked. */
if (got_eacces) if (got_eacces)
/* At least one failure was due to permissions, so report that /* At least one failure was due to permissions, so report that
error. */ error. */
errno = EACCES; errno = EACCES;
} }
/* Return the error from the last attempt (probably ENOENT). */ /* Return the error from the last attempt (probably ENOENT). */