You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
110 lines
2.5 KiB
110 lines
2.5 KiB
Index: src/pv/file.c |
|
--- src/pv/file.c.orig 2007-08-30 12:58:38 +0200 |
|
+++ src/pv/file.c 2007-08-30 19:23:08 +0200 |
|
@@ -34,27 +34,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); |
|
} |
|
@@ -76,12 +76,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 if (S_ISREG(sb.st_mode)) { |
|
@@ -150,8 +150,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) { |
|
@@ -173,7 +173,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, |
|
@@ -183,7 +183,7 @@ |
|
} |
|
} |
|
|
|
- if (fstat64(fd, &isb)) { |
|
+ if (fstat(fd, &isb)) { |
|
fprintf(stderr, "%s: %s: %s: %s\n", |
|
opts->program_name, |
|
_("failed to stat file"), |
|
@@ -192,7 +192,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-30 12:58:38 +0200 |
|
+++ src/pv/loop.c 2007-08-30 19:24:30 +0200 |
|
@@ -57,7 +57,7 @@ |
|
struct timeval start_time, next_update, next_reset, cur_time; |
|
struct timeval init_time; |
|
long double elapsed; |
|
- struct stat64 sb; |
|
+ struct stat sb; |
|
int fd, n; |
|
|
|
/* |
|
@@ -106,7 +106,7 @@ |
|
return 1; |
|
} |
|
|
|
- if (fstat64(fd, &sb) == 0) { |
|
+ if (fstat(fd, &sb) == 0) { |
|
pv_set_buffer_size(sb.st_blksize * 32, 0); |
|
} |
|
|
|
|