blob: 6b09c14d6c82a9fbaae7610e03c0530a3d20201c [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001From 8318852ef4f768bed31072aa7b57e11adc1f639c Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Sun, 29 Jun 2014 00:44:03 +0200
4Subject: [PATCH 5/6] common.h: more workarounds for klibc compatibility
5
6Patch is addressing two issues:
7* First, Klibc doesn't have rpmatch().
8* Second, Klibc lacks getline()
9
10Fixes:
11| LD ubi-utils/ubiformat
12| .../git/ubi-utils/ubiformat.o: In function `prompt':
13| .../git/./include/common.h:157: undefined reference to `getline'
14| .../git/./include/common.h:164: undefined reference to `rpmatch'
15| .../git/./include/common.h:157: undefined reference to `getline'
16| .../git/./include/common.h:164: undefined reference to `rpmatch'
17
18Upstream-Status: Pending
19
20Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
21---
22 include/common.h | 10 ++++++----
23 1 file changed, 6 insertions(+), 4 deletions(-)
24
Brad Bishopd7bf8c12018-02-25 22:55:05 -050025Index: git/include/common.h
26===================================================================
27--- git.orig/include/common.h
28+++ git/include/common.h
29@@ -161,15 +161,17 @@ static inline int __rpmatch(const char *
Patrick Williamsb48b7b42016-08-17 15:04:38 -050030 */
31 static inline bool prompt(const char *msg, bool def)
32 {
33- char *line = NULL;
34- size_t len;
35+ char *line;
36 bool ret = def;
37
38+ const int sizeof_line = 2;
39+ line = malloc(sizeof_line);
40+
41 do {
42 normsg_cont("%s (%c/%c) ", msg, def ? 'Y' : 'y', def ? 'n' : 'N');
43 fflush(stdout);
44
45- while (getline(&line, &len, stdin) == -1) {
46+ while (fgets(line, sizeof_line, stdin) == NULL) {
47 printf("failed to read prompt; assuming '%s'\n",
48 def ? "yes" : "no");
49 break;