rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 07:43:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2018-06-01

Browse Source 
Git mirror commit fb63610a69b0eb7f69a201ba05c4c1a7a2739cf9.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-21 13:47:02 +02:00
parent 2df56dbd60
commit bcdce02d9b
340 changed files with 27754 additions and 11720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
freebsd/sys/kern/init_main.c
View File

@@ -722,7 +722,9 @@ start_init(void *dummy)
vm_offset_t addr;
struct execve_args args;
int options, error;
char *var, *path, *next, *s;
size_t pathlen;
char *var, *path;
char *free_init_path, *tmp_init_path;
char *ucp, **uap, *arg0, *arg1;
struct thread *td;
struct proc *p;
@@ -751,17 +753,12 @@ start_init(void *dummy)
strlcpy(init_path, var, sizeof(init_path));
freeenv(var);
}
free_init_path = tmp_init_path = strdup(init_path, M_TEMP);
for (path = init_path; *path != '\0'; path = next) {
while (*path == ':')
path++;
if (*path == '\0')
break;
for (next = path; *next != '\0' && *next != ':'; next++)
/* nothing */ ;
while ((path = strsep(&tmp_init_path, ":")) != NULL) {
pathlen = strlen(path) + 1;
if (bootverbose)
printf("start_init: trying %.*s\n", (int)(next - path),
path);
printf("start_init: trying %s\n", path);
/*
* Move out the boot flag argument.
@@ -793,9 +790,8 @@ start_init(void *dummy)
/*
* Move out the file name (also arg 0).
*/
(void)subyte(--ucp, 0);
for (s = next - 1; s >= path; s--)
(void)subyte(--ucp, *s);
ucp -= pathlen;
copyout(path, ucp, pathlen);
arg0 = ucp;
/*
@@ -821,13 +817,14 @@ start_init(void *dummy)
* to user mode as init!
*/
if ((error = sys_execve(td, &args)) == EJUSTRETURN) {
free(free_init_path, M_TEMP);
TSEXIT();
return;
}
if (error != ENOENT)
printf("exec %.*s: error %d\n", (int)(next - path),
path, error);
printf("exec %s: error %d\n", path, error);
}
free(free_init_path, M_TEMP);
printf("init: not found in path %s\n", init_path);
panic("no init");
}