| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111 |
- Index: src/pv/file.c
- --- src/pv/file.c.orig 2007-08-04 22:37:30 +0200
- +++ src/pv/file.c 2007-08-05 08:03:14 +0200
- @@ -30,27 +30,27 @@
- */
- void pv_calc_total_size(opts_t opts)
- {
- - struct stat64 sb;
- + struct stat sb;
- int rc, i, j, fd;
-
- opts->size = 0;
- rc = 0;
-
- if (opts->argc < 1) {
- - if (fstat64(STDIN_FILENO, &sb) == 0)
- + if (fstat(STDIN_FILENO, &sb) == 0)
- opts->size = sb.st_size;
- return;
- }
-
- for (i = 0; i < opts->argc; i++) {
- if (strcmp(opts->argv[i], "-") == 0) {
- - rc = fstat64(STDIN_FILENO, &sb);
- + rc = fstat(STDIN_FILENO, &sb);
- if (rc != 0) {
- opts->size = 0;
- return;
- }
- } else {
- - rc = stat64(opts->argv[i], &sb);
- + rc = stat(opts->argv[i], &sb);
- if (rc == 0)
- rc = access(opts->argv[i], R_OK);
- }
- @@ -72,12 +72,12 @@
- * them and seeking to the end.
- */
- if (strcmp(opts->argv[i], "-") == 0) {
- - fd = open64("/dev/stdin", O_RDONLY);
- + fd = open("/dev/stdin", O_RDONLY);
- } else {
- - fd = open64(opts->argv[i], O_RDONLY);
- + fd = open(opts->argv[i], O_RDONLY);
- }
- if (fd >= 0) {
- - opts->size += lseek64(fd, 0, SEEK_END);
- + opts->size += lseek(fd, 0, SEEK_END);
- close(fd);
- }
- } else {
- @@ -95,8 +95,8 @@
- */
- int pv_next_file(opts_t opts, int filenum, int oldfd)
- {
- - struct stat64 isb;
- - struct stat64 osb;
- + struct stat isb;
- + struct stat osb;
- int fd;
-
- if (oldfd > 0) {
- @@ -118,7 +118,7 @@
- if (strcmp(opts->argv[filenum], "-") == 0) {
- fd = STDIN_FILENO;
- } else {
- - fd = open64(opts->argv[filenum], O_RDONLY);
- + fd = open(opts->argv[filenum], O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "%s: %s: %s: %s\n",
- opts->program_name,
- @@ -128,7 +128,7 @@
- }
- }
-
- - if (fstat64(fd, &isb)) {
- + if (fstat(fd, &isb)) {
- fprintf(stderr, "%s: %s: %s: %s\n",
- opts->program_name,
- _("failed to stat file"),
- @@ -137,7 +137,7 @@
- return -1;
- }
-
- - if (fstat64(STDOUT_FILENO, &osb)) {
- + if (fstat(STDOUT_FILENO, &osb)) {
- fprintf(stderr, "%s: %s: %s\n",
- opts->program_name,
- _("failed to stat output file"), strerror(errno));
- Index: src/pv/loop.c
- --- src/pv/loop.c.orig 2007-08-04 22:37:30 +0200
- +++ src/pv/loop.c 2007-08-05 08:04:05 +0200
- @@ -37,7 +37,7 @@
- struct timeval start_time, next_update, next_reset, cur_time;
- struct timeval init_time;
- long double elapsed, tilreset;
- - struct stat64 sb;
- + struct stat sb;
- int fd, n;
-
- fd = -1;
- @@ -73,7 +73,7 @@
- return 1;
- }
-
- - if (fstat64(fd, &sb) == 0) {
- + if (fstat(fd, &sb) == 0) {
- pv_set_buffer_size(sb.st_blksize * 32, 0);
- }
-
|