Added patch from Samuel Thibault to make project compile
on Hurd branch of Debian.
This commit is contained in:
parent
5b03e0faf0
commit
c679a49aac
@ -58,6 +58,9 @@ sysvinit (2.92) unreleased; urgency=low
|
|||||||
where we are talking about an initscript called halt or the halt
|
where we are talking about an initscript called halt or the halt
|
||||||
program. Likewise whether we are talking about the shutdown process
|
program. Likewise whether we are talking about the shutdown process
|
||||||
or the specific shutdown program.
|
or the specific shutdown program.
|
||||||
|
Should address Debian bug #374039.
|
||||||
|
* Added patch from Samuel Thibault to make project compile
|
||||||
|
on Hurd branch of Debian.
|
||||||
|
|
||||||
|
|
||||||
sysvinit (2.91) world; urgency=low
|
sysvinit (2.91) world; urgency=low
|
||||||
|
@ -159,7 +159,7 @@ char* scandev(DIR *dir)
|
|||||||
fd = dirfd(dir);
|
fd = dirfd(dir);
|
||||||
rewinddir(dir);
|
rewinddir(dir);
|
||||||
while ((dent = readdir(dir))) {
|
while ((dent = readdir(dir))) {
|
||||||
char path[PATH_MAX];
|
char *path;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (fstatat(fd, dent->d_name, &st, 0) < 0)
|
if (fstatat(fd, dent->d_name, &st, 0) < 0)
|
||||||
continue;
|
continue;
|
||||||
@ -167,9 +167,10 @@ char* scandev(DIR *dir)
|
|||||||
continue;
|
continue;
|
||||||
if (comparedev != st.st_rdev)
|
if (comparedev != st.st_rdev)
|
||||||
continue;
|
continue;
|
||||||
if ((size_t)snprintf(path, sizeof(path), "/dev/%s", dent->d_name) >= sizeof(path))
|
if (asprintf(&path, "/dev/%s", dent->d_name) < 0)
|
||||||
continue;
|
continue;
|
||||||
name = realpath(path, NULL);
|
name = realpath(path, NULL);
|
||||||
|
free(path);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
|
@ -144,7 +144,9 @@ void tcinit(struct console *con)
|
|||||||
cfsetispeed(tio, ispeed);
|
cfsetispeed(tio, ispeed);
|
||||||
cfsetospeed(tio, ospeed);
|
cfsetospeed(tio, ospeed);
|
||||||
|
|
||||||
|
#ifndef __GNU__
|
||||||
tio->c_line = 0;
|
tio->c_line = 0;
|
||||||
|
#endif
|
||||||
tio->c_cc[VTIME] = 0;
|
tio->c_cc[VTIME] = 0;
|
||||||
tio->c_cc[VMIN] = 1;
|
tio->c_cc[VMIN] = 1;
|
||||||
|
|
||||||
@ -203,7 +205,7 @@ void tcinit(struct console *con)
|
|||||||
tio->c_cc[VEOF] = CEOF;
|
tio->c_cc[VEOF] = CEOF;
|
||||||
# ifdef VSWTC
|
# ifdef VSWTC
|
||||||
tio->c_cc[VSWTC] = _POSIX_VDISABLE;
|
tio->c_cc[VSWTC] = _POSIX_VDISABLE;
|
||||||
# else
|
# elif defined(VSWTCH)
|
||||||
tio->c_cc[VSWTCH] = _POSIX_VDISABLE;
|
tio->c_cc[VSWTCH] = _POSIX_VDISABLE;
|
||||||
# endif
|
# endif
|
||||||
tio->c_cc[VSTART] = CSTART;
|
tio->c_cc[VSTART] = CSTART;
|
||||||
@ -261,7 +263,7 @@ void tcfinal(struct console *con)
|
|||||||
tio->c_cc[VEOF] = CEOF;
|
tio->c_cc[VEOF] = CEOF;
|
||||||
#ifdef VSWTC
|
#ifdef VSWTC
|
||||||
tio->c_cc[VSWTC] = _POSIX_VDISABLE;
|
tio->c_cc[VSWTC] = _POSIX_VDISABLE;
|
||||||
#else
|
#elif defined(VSWTCH)
|
||||||
tio->c_cc[VSWTCH] = _POSIX_VDISABLE;
|
tio->c_cc[VSWTCH] = _POSIX_VDISABLE;
|
||||||
#endif
|
#endif
|
||||||
tio->c_cc[VSTART] = CSTART;
|
tio->c_cc[VSTART] = CSTART;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user