From 1f33f42d7bcb019b268d938df643a7a785dc19ab Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Mon, 7 Jun 2021 09:05:40 +0100 Subject: sync: enable in default configuration Enable the sync applet by default. It doesn't actually do anything useful but at least it prevents some scripts from failing. --- configs/mingw32_defconfig | 2 +- configs/mingw64_defconfig | 2 +- include/mingw.h | 2 +- libbb/Kbuild.src | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 9e410b881..0ea5eaee4 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -321,7 +321,7 @@ CONFIG_FEATURE_STAT_FORMAT=y CONFIG_FEATURE_STAT_FILESYSTEM=y # CONFIG_STTY is not set CONFIG_SUM=y -# CONFIG_SYNC is not set +CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set CONFIG_FSYNC=y CONFIG_TAC=y diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index a9918e3d3..e85fbf71f 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig @@ -321,7 +321,7 @@ CONFIG_FEATURE_STAT_FORMAT=y CONFIG_FEATURE_STAT_FILESYSTEM=y # CONFIG_STTY is not set CONFIG_SUM=y -# CONFIG_SYNC is not set +CONFIG_SYNC=y # CONFIG_FEATURE_SYNC_FANCY is not set CONFIG_FSYNC=y CONFIG_TAC=y diff --git a/include/mingw.h b/include/mingw.h index 367aa7cdc..49e792b69 100644 --- a/include/mingw.h +++ b/include/mingw.h @@ -471,7 +471,7 @@ NOIMPL(setuid,uid_t gid UNUSED_PARAM); NOIMPL(seteuid,uid_t gid UNUSED_PARAM); unsigned int sleep(unsigned int seconds); int symlink(const char *target, const char *linkpath); -static inline void sync(void) {} +static inline void sync(void) { sleep(2); } long sysconf(int name); IMPL(getpagesize,int,4096,void); NOIMPL(ttyname_r,int fd UNUSED_PARAM, char *buf UNUSED_PARAM, int sz UNUSED_PARAM); diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index d7cbb7ff1..102e360af 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -78,6 +78,7 @@ lib-y += u_signal_names.o lib-y += uuencode.o lib-y += verror_msg.o lib-y += vfork_daemon_rexec.o +lib-y += warn_ignoring_args.o lib-y += wfopen.o lib-y += wfopen_input.o lib-y += xatonum.o @@ -112,7 +113,6 @@ lib-$(CONFIG_PLATFORM_POSIX) += setup_environment.o lib-$(CONFIG_PLATFORM_POSIX) += signals.o lib-$(CONFIG_PLATFORM_POSIX) += speed_table.o lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o -lib-$(CONFIG_PLATFORM_POSIX) += warn_ignoring_args.o lib-$(CONFIG_PLATFORM_POSIX) += write.o lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o -- cgit v1.2.3-55-g6feb