patch-htdocs_mkdata_c 1016 B

1234567891011121314151617181920212223242526272829303132333435
  1. --- ympd-1.2.2.orig/htdocs/mkdata.c 2014-09-28 13:39:27.000000000 +0200
  2. +++ ympd-1.2.2/htdocs/mkdata.c 2014-10-05 08:52:52.000000000 +0200
  3. @@ -7,7 +7,6 @@
  4. #include <stdlib.h>
  5. #include <stdio.h>
  6. -#include <error.h>
  7. #include <errno.h>
  8. #include <string.h>
  9. @@ -58,16 +57,20 @@ int main(int argc, char *argv[])
  10. int i, j, buf;
  11. FILE *fd;
  12. - if(argc <= 1)
  13. - error(EXIT_FAILURE, 0, "Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]);
  14. + if(argc <= 1) {
  15. + printf("Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]);
  16. + exit(EXIT_FAILURE);
  17. + }
  18. for(i = 1; i < argc; i++)
  19. {
  20. printf("static const unsigned char v%d[] = {", i);
  21. fd = fopen(argv[i], "r");
  22. - if(!fd)
  23. - error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]);
  24. + if(!fd) {
  25. + printf("Failed open file %s", argv[i]);
  26. + exit(EXIT_FAILURE);
  27. + }
  28. j = 0;
  29. while((buf = fgetc(fd)) != EOF)