luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kconfig: Fix warning: ignoring return value of 'fgets'

Browse Source 
This fix facilitates fgets() either it returns on success or on error or
when end of file occurs.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Jean Sacren 2010-08-04 16:03:16 -06:00 committed by Michal Marek
parent bf5e327a30
commit 4418a2b904
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/kconfig/conf.c
View File

@ -108,7 +108,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
check_stdin(); check_stdin();
case oldaskconfig: case oldaskconfig:
fflush(stdout); fflush(stdout);
fgets(line, 128, stdin); xfgets(line, 128, stdin);
return 1; return 1;
default: default:
break; break;
@ -306,7 +306,7 @@ static int conf_choice(struct menu *menu)
check_stdin(); check_stdin();
case oldaskconfig: case oldaskconfig:
fflush(stdout); fflush(stdout);
fgets(line, 128, stdin); xfgets(line, 128, stdin);
strip(line); strip(line);
if (line[0] == '?') { if (line[0] == '?') {
print_help(menu); print_help(menu);
@ -644,3 +644,14 @@ int main(int ac, char **av)
} }
return 0; return 0;
} }
/*
* Helper function to facilitate fgets() by Jean Sacren.
*/
void xfgets(str, size, in)
char *str;
int size;
FILE *in;
{
if (fgets(str, size, in) == NULL)
fprintf(stderr, "\nError in reading or end of file.\n");
}

3
scripts/kconfig/lkc.h
View File

@ -72,6 +72,9 @@ void zconf_nextfile(const char *name);
int zconf_lineno(void); int zconf_lineno(void);
char *zconf_curname(void); char *zconf_curname(void);
/* conf.c */
void xfgets(char *str, int size, FILE *in);
/* confdata.c */ /* confdata.c */
const char *conf_get_configname(void); const char *conf_get_configname(void);
const char *conf_get_autoconfig_name(void); const char *conf_get_autoconfig_name(void);