OpenSystemsDevelopment / usbboot

Commit c862d4816886a05a11b9db65dd64c7662ce97d78

Authored by Tim Gover
Committed by GitHub
2 parents 288307a6 97e4c9c8

Merge pull request #170 from timg236/usbboot-warn-empty-files 

usbboot: Warning on missing / empty files.
Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
@@ -39,7 +39,7 @@ int main(int argc, char * argv[]) @@ -39,7 +39,7 @@ int main(int argc, char * argv[])
39 fprintf(fp_out, "/* Automatically generated file from %s */\n", argv[1]); 39 fprintf(fp_out, "/* Automatically generated file from %s */\n", argv[1]);
40 strcpy(fname, argv[1]); 40 strcpy(fname, argv[1]);
41 for(p = fname; *p; p++) 41 for(p = fname; *p; p++)
42 - if(!isalnum(*p)) 42 + if(!isalnum((int) *p))
43 *p = '_'; 43 *p = '_';
44 fprintf(fp_out, "unsigned int %s_len = %d;\n", fname, length); 44 fprintf(fp_out, "unsigned int %s_len = %d;\n", fname, length);
45 fprintf(fp_out, "unsigned char %s[] = {\n\t", fname); 45 fprintf(fp_out, "unsigned char %s[] = {\n\t", fname);
@@ -587,7 +587,8 @@ int file_server(libusb_device_handle * usb_device) @@ -587,7 +587,8 @@ int file_server(libusb_device_handle * usb_device)
587 file_size = ftell(fp); 587 file_size = ftell(fp);
588 fseek(fp, 0, SEEK_SET); 588 fseek(fp, 0, SEEK_SET);
589 589
590 - if(verbose) printf("File size = %d bytes\n", file_size); 590 + if(verbose || !file_size)
  591 + printf("File size = %d bytes\n", file_size);
591 592
592 int sz = libusb_control_transfer(usb_device, LIBUSB_REQUEST_TYPE_VENDOR, 0, 593 int sz = libusb_control_transfer(usb_device, LIBUSB_REQUEST_TYPE_VENDOR, 0,
593 file_size & 0xffff, file_size >> 16, NULL, 0, 1000); 594 file_size & 0xffff, file_size >> 16, NULL, 0, 1000);
@@ -598,7 +599,7 @@ int file_server(libusb_device_handle * usb_device) @@ -598,7 +599,7 @@ int file_server(libusb_device_handle * usb_device)
598 else 599 else
599 { 600 {
600 ep_write(NULL, 0, usb_device); 601 ep_write(NULL, 0, usb_device);
601 - if(verbose) printf("Cannot open file %s\n", message.fname); 602 + printf("Cannot open file %s\n", message.fname);
602 break; 603 break;
603 } 604 }
604 break; 605 break;
@@ -615,6 +616,9 @@ int file_server(libusb_device_handle * usb_device) @@ -615,6 +616,9 @@ int file_server(libusb_device_handle * usb_device)
615 file_size = ftell(fp); 616 file_size = ftell(fp);
616 fseek(fp, 0, SEEK_SET); 617 fseek(fp, 0, SEEK_SET);
617 618
  619 + if (!file_size)
  620 + printf("WARNING: %s is empty\n", message.fname);
  621 +
618 buf = malloc(file_size); 622 buf = malloc(file_size);
619 if(buf == NULL) 623 if(buf == NULL)
620 { 624 {