mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-11 22:05:23 +01:00
6ed2e09f3a
- This idea originates from very early in the project and was, at the
time, a very easy way to categorise things.
- Now, it doesn't really make much sense - it is fairly arbitary, often
occuring when there is a change in kernel, but not from builder-hex0
to fiwix, and sysb is in reality completely unnecessary.
- In short, the sys* stuff is a bit of a mess that makes the project
more difficult to understand.
- This puts everything down into one folder and has a manifest file that
is used to generate the build scripts on the fly rather than using
coded scripts.
- This is created in the "seed" stage.
stage0-posix -- (calls) --> seed -- (generates) --> main steps
Alongside this change there are a variety of other smaller fixups to the
general structure of the live-bootstrap rootfs.
- Creating a rootfs has become much simpler and is defined as code in
go.sh. The new structure, for an about-to-be booted system, is
/
-- /steps (direct copy of steps/)
-- /distfiles (direct copy of distfiles/)
-- all files from seed/*
-- all files from seed/stage0-posix/*
- There is no longer such a thing as /usr/include/musl, this didn't
really make any sense, as musl is the final libc used. Rather, to
separate musl and mes, we have /usr/include/mes, which is much easier
to work with.
- This also makes mes easier to blow away later.
- A few things that weren't properly in packages have been changed;
checksum-transcriber, simple-patch, kexec-fiwix have all been given
fully qualified package names.
- Highly breaking change, scripts now exist in their package directory
but NOT WITH THE packagename.sh. Rather, they use pass1.sh, pass2.sh,
etc. This avoids manual definition of passes.
- Ditto with patches; default directory is patches, but then any patch
series specific to a pass are named patches-passX.
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
|
|
|
SPDX-License-Identifier: MIT
|
|
|
|
Make sure real __stdio_exit() is called on exit and not the dummy
|
|
noop versions. This fixes the issue of truncated output when redirecting
|
|
output to a file or pipe. It also fixes truncated output on programs
|
|
that forget to call fclose()
|
|
diff --git a/src/exit/exit.c b/src/exit/exit.c
|
|
index a6869b37..a4164682 100644
|
|
--- src/exit/exit.c
|
|
+++ src/exit/exit.c
|
|
@@ -2,16 +2,6 @@
|
|
#include <stdint.h>
|
|
#include "libc.h"
|
|
|
|
-static void dummy()
|
|
-{
|
|
-}
|
|
-
|
|
-/* atexit.c and __stdio_exit.c override these. the latter is linked
|
|
- * as a consequence of linking either __toread.c or __towrite.c. */
|
|
-weak_alias(dummy, __funcs_on_exit);
|
|
-weak_alias(dummy, __stdio_exit);
|
|
-weak_alias(dummy, _fini);
|
|
-
|
|
extern weak hidden void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
|
|
|
|
static void libc_exit_fini(void)
|
|
diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
|
|
index d7398f59..69141813 100644
|
|
--- src/internal/stdio_impl.h
|
|
+++ src/internal/stdio_impl.h
|
|
@@ -47,9 +47,9 @@ struct _IO_FILE {
|
|
struct __locale_struct *locale;
|
|
};
|
|
|
|
-extern hidden FILE *volatile __stdin_used;
|
|
-extern hidden FILE *volatile __stdout_used;
|
|
-extern hidden FILE *volatile __stderr_used;
|
|
+extern FILE *volatile __stdin_used;
|
|
+extern FILE *volatile __stdout_used;
|
|
+extern FILE *volatile __stderr_used;
|
|
|
|
hidden int __lockfile(FILE *);
|
|
hidden void __unlockfile(FILE *);
|
|
diff --git a/src/stdio/__stdio_exit.c b/src/stdio/__stdio_exit.c
|
|
index a5e42c67..5947a141 100644
|
|
--- src/stdio/__stdio_exit.c
|
|
+++ src/stdio/__stdio_exit.c
|
|
@@ -1,10 +1,5 @@
|
|
#include "stdio_impl.h"
|
|
|
|
-static FILE *volatile dummy_file = 0;
|
|
-weak_alias(dummy_file, __stdin_used);
|
|
-weak_alias(dummy_file, __stdout_used);
|
|
-weak_alias(dummy_file, __stderr_used);
|
|
-
|
|
static void close_file(FILE *f)
|
|
{
|
|
if (!f) return;
|
|
--
|
|
2.30.0
|
|
|