pv.patch 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111
  1. Index: src/pv/file.c
  2. --- src/pv/file.c.orig 2007-08-04 22:37:30 +0200
  3. +++ src/pv/file.c 2007-08-05 08:03:14 +0200
  4. @@ -30,27 +30,27 @@
  5. */
  6. void pv_calc_total_size(opts_t opts)
  7. {
  8. - struct stat64 sb;
  9. + struct stat sb;
  10. int rc, i, j, fd;
  11. opts->size = 0;
  12. rc = 0;
  13. if (opts->argc < 1) {
  14. - if (fstat64(STDIN_FILENO, &sb) == 0)
  15. + if (fstat(STDIN_FILENO, &sb) == 0)
  16. opts->size = sb.st_size;
  17. return;
  18. }
  19. for (i = 0; i < opts->argc; i++) {
  20. if (strcmp(opts->argv[i], "-") == 0) {
  21. - rc = fstat64(STDIN_FILENO, &sb);
  22. + rc = fstat(STDIN_FILENO, &sb);
  23. if (rc != 0) {
  24. opts->size = 0;
  25. return;
  26. }
  27. } else {
  28. - rc = stat64(opts->argv[i], &sb);
  29. + rc = stat(opts->argv[i], &sb);
  30. if (rc == 0)
  31. rc = access(opts->argv[i], R_OK);
  32. }
  33. @@ -72,12 +72,12 @@
  34. * them and seeking to the end.
  35. */
  36. if (strcmp(opts->argv[i], "-") == 0) {
  37. - fd = open64("/dev/stdin", O_RDONLY);
  38. + fd = open("/dev/stdin", O_RDONLY);
  39. } else {
  40. - fd = open64(opts->argv[i], O_RDONLY);
  41. + fd = open(opts->argv[i], O_RDONLY);
  42. }
  43. if (fd >= 0) {
  44. - opts->size += lseek64(fd, 0, SEEK_END);
  45. + opts->size += lseek(fd, 0, SEEK_END);
  46. close(fd);
  47. }
  48. } else {
  49. @@ -95,8 +95,8 @@
  50. */
  51. int pv_next_file(opts_t opts, int filenum, int oldfd)
  52. {
  53. - struct stat64 isb;
  54. - struct stat64 osb;
  55. + struct stat isb;
  56. + struct stat osb;
  57. int fd;
  58. if (oldfd > 0) {
  59. @@ -118,7 +118,7 @@
  60. if (strcmp(opts->argv[filenum], "-") == 0) {
  61. fd = STDIN_FILENO;
  62. } else {
  63. - fd = open64(opts->argv[filenum], O_RDONLY);
  64. + fd = open(opts->argv[filenum], O_RDONLY);
  65. if (fd < 0) {
  66. fprintf(stderr, "%s: %s: %s: %s\n",
  67. opts->program_name,
  68. @@ -128,7 +128,7 @@
  69. }
  70. }
  71. - if (fstat64(fd, &isb)) {
  72. + if (fstat(fd, &isb)) {
  73. fprintf(stderr, "%s: %s: %s: %s\n",
  74. opts->program_name,
  75. _("failed to stat file"),
  76. @@ -137,7 +137,7 @@
  77. return -1;
  78. }
  79. - if (fstat64(STDOUT_FILENO, &osb)) {
  80. + if (fstat(STDOUT_FILENO, &osb)) {
  81. fprintf(stderr, "%s: %s: %s\n",
  82. opts->program_name,
  83. _("failed to stat output file"), strerror(errno));
  84. Index: src/pv/loop.c
  85. --- src/pv/loop.c.orig 2007-08-04 22:37:30 +0200
  86. +++ src/pv/loop.c 2007-08-05 08:04:05 +0200
  87. @@ -37,7 +37,7 @@
  88. struct timeval start_time, next_update, next_reset, cur_time;
  89. struct timeval init_time;
  90. long double elapsed, tilreset;
  91. - struct stat64 sb;
  92. + struct stat sb;
  93. int fd, n;
  94. fd = -1;
  95. @@ -73,7 +73,7 @@
  96. return 1;
  97. }
  98. - if (fstat64(fd, &sb) == 0) {
  99. + if (fstat(fd, &sb) == 0) {
  100. pv_set_buffer_size(sb.st_blksize * 32, 0);
  101. }