d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvme_manage: trim newline from fgets() buffer

Browse Source 
Fixes firmware update trying to open the firmware file with a newline
appended to the path.

Change-Id: I82c37e304a8a85901a5c9d419143cf20af079c34
Signed-off-by: Isaac Otsiabah <iotsiabah@us.fujitsu.com>
Reviewed-on: https://review.gerrithub.io/364705
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Isaac Otsiabah 2017-06-08 17:23:35 -07:00 committed by Daniel Verkamp
parent 3bfecec994
commit 73c9bd296a
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -280,6 +280,24 @@ display_controller_list(void)
}
}
static char *
get_line(char *buf, int buf_size, FILE *f)
{
char *ret;
size_t len;
ret = fgets(buf, buf_size, f);
if (ret == NULL) {
return NULL;
}
len = strlen(buf);
if (len > 0 && buf[len - 1] == '\n') {
buf[len - 1] = '\0';
}
return buf;
}
static struct dev *
get_controller(void)
{
@ -298,7 +316,7 @@ get_controller(void)
printf("Please Input PCI Address(domain:bus:dev.func): \n");
while ((ch = getchar()) != '\n' && ch != EOF);
p = fgets(address, 64, stdin);
p = get_line(address, 64, stdin);
if (p == NULL) {
return NULL;
}
@ -769,7 +787,7 @@ update_firmware_image(void)
printf("Please Input The Path Of Firmware Image\n");
if (fgets(path, 256, stdin) == NULL) {
if (get_line(path, sizeof(path), stdin) == NULL) {
printf("Invalid path setting\n");
while (getchar() != '\n');
return;