mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 07:37:14 +00:00
ubi-utils-klibc: clean ubiformat patch
* fixes have been committed in klibc for stdio and the additional * fflush is not necessary anymore (runtime tested pressing CTRL+D) * bump PR Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
@@ -1,25 +1,15 @@
|
|||||||
--- a/ubi-utils/ubiformat.c 2012-05-03 01:14:39.000000000 +0200
|
--- a/ubi-utils/ubiformat.c 2012-05-03 01:14:39.000000000 +0200
|
||||||
+++ b/ubi-utils/ubiformat.c 2012-05-03 01:00:57.000000000 +0200
|
+++ b/ubi-utils/ubiformat.c 2012-05-20 23:11:57.000000000 +0200
|
||||||
@@ -246,7 +246,11 @@
|
@@ -246,7 +246,7 @@
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
normsg_cont("continue? (yes/no) ");
|
normsg_cont("continue? (yes/no) ");
|
||||||
- if (scanf("%3s", buf) == EOF) {
|
- if (scanf("%3s", buf) == EOF) {
|
||||||
+
|
|
||||||
+ fflush(stderr);
|
|
||||||
+ fflush(stdout);
|
|
||||||
+
|
|
||||||
+ if (fgets(buf,4,stdin) == NULL) {
|
+ if (fgets(buf,4,stdin) == NULL) {
|
||||||
sys_errmsg("scanf returned unexpected EOF, assume \"yes\"");
|
sys_errmsg("scanf returned unexpected EOF, assume \"yes\"");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -259,10 +263,13 @@
|
@@ -262,7 +262,7 @@
|
||||||
|
|
||||||
static int answer_is_yes(void)
|
|
||||||
{
|
|
||||||
+ fflush(stderr);
|
|
||||||
+ fflush(stdout);
|
|
||||||
+
|
|
||||||
char buf[4];
|
char buf[4];
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
|
|||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
|
||||||
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
|
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
inherit klibc
|
inherit klibc
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user