1*4882a593SmuzhiyunFrom c6934455ec2337e6da7ea9fbc3486ce9beeb5d82 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: OpenEmbedded <oe.patch@oe> 3*4882a593SmuzhiyunDate: Wed, 11 Apr 2018 22:51:05 +0200 4*4882a593SmuzhiyunSubject: [PATCH] x86-linux-setup.c: replace vfscanf() with vsscanf() 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunklibc lacks vfscanf() 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Inappropriate [klibc specific] 9*4882a593SmuzhiyunSigned-off-by: Andrea Adami <andrea.adami@gmail.com> 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun kexec/arch/i386/x86-linux-setup.c | 11 ++++++++++- 13*4882a593Smuzhiyun 1 file changed, 10 insertions(+), 1 deletion(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c 16*4882a593Smuzhiyunindex 5514c1c..bdb28c6 100644 17*4882a593Smuzhiyun--- a/kexec/arch/i386/x86-linux-setup.c 18*4882a593Smuzhiyun+++ b/kexec/arch/i386/x86-linux-setup.c 19*4882a593Smuzhiyun@@ -200,6 +200,8 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, 20*4882a593Smuzhiyun FILE *fp; 21*4882a593Smuzhiyun int retno; 22*4882a593Smuzhiyun char filename[PATH_MAX]; 23*4882a593Smuzhiyun+ long line_size = MAX_LINE; 24*4882a593Smuzhiyun+ char *line; 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun snprintf(filename, PATH_MAX, "%s/%s", dir, file); 27*4882a593Smuzhiyun filename[PATH_MAX-1] = 0; 28*4882a593Smuzhiyun@@ -210,7 +212,14 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line, 29*4882a593Smuzhiyun } 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun va_start(argptr, scanf_line); 32*4882a593Smuzhiyun- retno = vfscanf(fp, scanf_line, argptr); 33*4882a593Smuzhiyun+ 34*4882a593Smuzhiyun+ line = xmalloc(sizeof(line) * line_size); 35*4882a593Smuzhiyun+ while(fgets(line, sizeof(line), fp) != NULL ) { 36*4882a593Smuzhiyun+ line_size += MAX_LINE; 37*4882a593Smuzhiyun+ line = xrealloc(line,line_size); 38*4882a593Smuzhiyun+ } 39*4882a593Smuzhiyun+ retno = vsscanf(line, scanf_line, argptr); 40*4882a593Smuzhiyun+ 41*4882a593Smuzhiyun va_end(argptr); 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun fclose(fp); 44