mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
Daniel Golle
75d4b7a129
Stable bug-fix release in the 2.03.x series. The bundled device-mapper library bumps from 1.02.209 to 1.02.215; track that in PKG_VERSION_DM as well so the libdevmapper package shows the correct upstream version. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
--- a/lib/commands/toolcontext.c
|
|
+++ b/lib/commands/toolcontext.c
|
|
@@ -1665,6 +1665,7 @@ struct cmd_context *create_toolcontext(c
|
|
/* FIXME Make this configurable? */
|
|
reset_lvm_errno(1);
|
|
|
|
+#ifdef __GLIBC__
|
|
/* Set in/out stream buffering before glibc */
|
|
if (set_buffering
|
|
&& !cmd->running_on_valgrind /* Skipping within valgrind execution. */
|
|
@@ -1709,6 +1710,7 @@ struct cmd_context *create_toolcontext(c
|
|
} else if (!set_buffering)
|
|
/* Without buffering, must not use stdin/stdout */
|
|
init_silent(1);
|
|
+#endif
|
|
|
|
/*
|
|
* Environment variable LVM_SYSTEM_DIR overrides this below.
|
|
@@ -2047,6 +2049,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
if (cmd->cft_def_hash)
|
|
dm_hash_destroy(cmd->cft_def_hash);
|
|
|
|
+#ifdef __GLIBC__
|
|
if (!cmd->running_on_valgrind && cmd->linebuffer) {
|
|
int flags;
|
|
/* Reset stream buffering to defaults */
|
|
@@ -2070,6 +2073,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
|
|
free(cmd->linebuffer);
|
|
}
|
|
+#endif
|
|
|
|
destroy_config_context(cmd);
|
|
|
|
--- a/tools/lvmcmdline.c
|
|
+++ b/tools/lvmcmdline.c
|
|
@@ -3395,6 +3395,7 @@ int lvm_split(char *str, int *argc, char
|
|
/* Make sure we have always valid filedescriptors 0,1,2 */
|
|
static int _check_standard_fds(void)
|
|
{
|
|
+#ifdef __GLIBC__
|
|
int err = is_valid_fd(STDERR_FILENO);
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) &&
|
|
@@ -3421,6 +3422,12 @@ static int _check_standard_fds(void)
|
|
strerror(errno));
|
|
return 0;
|
|
}
|
|
+#else
|
|
+ if (!is_valid_fd(STDERR_FILENO) ||
|
|
+ !is_valid_fd(STDOUT_FILENO) ||
|
|
+ !is_valid_fd(STDIN_FILENO))
|
|
+ return 0;
|
|
+#endif
|
|
|
|
return 1;
|
|
}
|