|
|
@@ -1,6 +1,6 @@
|
|
|
Index: src/main/file.c
|
|
|
---- src/main/file.c.orig Wed Jan 14 20:10:51 2004
|
|
|
-+++ src/main/file.c Sat Jan 24 21:51:55 2004
|
|
|
+--- src/main/file.c.orig 2004-02-12 23:50:35.000000000 +0100
|
|
|
++++ src/main/file.c 2004-02-13 11:18:56.000000000 +0100
|
|
|
@@ -27,20 +27,20 @@
|
|
|
*/
|
|
|
void main_getsize(opts_t options)
|
|
|
@@ -25,7 +25,7 @@ Index: src/main/file.c
|
|
|
options->size = sb.st_size;
|
|
|
} else {
|
|
|
options->size = 0;
|
|
|
-@@ -48,11 +48,11 @@
|
|
|
+@@ -48,12 +48,12 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -35,12 +35,13 @@ Index: src/main/file.c
|
|
|
- fd = open64(options->argv[i], O_RDONLY);
|
|
|
+ fd = open(options->argv[i], O_RDONLY);
|
|
|
if (fd >= 0) {
|
|
|
-- options->size += lseek64(fd, 0, SEEK_END);
|
|
|
-+ options->size += lseek(fd, 0, SEEK_END);
|
|
|
+ options->size +=
|
|
|
+- lseek64(fd, 0, SEEK_END);
|
|
|
++ lseek(fd, 0, SEEK_END);
|
|
|
close(fd);
|
|
|
}
|
|
|
} else {
|
|
|
-@@ -70,8 +70,8 @@
|
|
|
+@@ -71,8 +71,8 @@
|
|
|
*/
|
|
|
int main_nextfd(opts_t options, int filenum, int oldfd)
|
|
|
{
|
|
|
@@ -51,7 +52,7 @@ Index: src/main/file.c
|
|
|
int fd;
|
|
|
|
|
|
if (oldfd > 0) {
|
|
|
-@@ -91,7 +91,7 @@
|
|
|
+@@ -92,7 +92,7 @@
|
|
|
return STDIN_FILENO;
|
|
|
}
|
|
|
|
|
|
@@ -69,7 +70,7 @@ Index: src/main/file.c
|
|
|
fprintf(stderr, "%s: %s: %s: %s\n",
|
|
|
options->program_name,
|
|
|
_("failed to stat file"),
|
|
|
-@@ -111,7 +111,7 @@
|
|
|
+@@ -110,7 +110,7 @@
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
@@ -77,10 +78,10 @@ Index: src/main/file.c
|
|
|
+ if (fstat(STDOUT_FILENO, &osb)) {
|
|
|
fprintf(stderr, "%s: %s: %s\n",
|
|
|
options->program_name,
|
|
|
- _("failed to stat output file"),
|
|
|
+ _("failed to stat output file"), strerror(errno));
|
|
|
Index: src/main/main.c
|
|
|
---- src/main/main.c.orig Wed Jan 14 20:10:42 2004
|
|
|
-+++ src/main/main.c Sat Jan 24 21:52:10 2004
|
|
|
+--- src/main/main.c.orig 2004-02-12 23:50:35.000000000 +0100
|
|
|
++++ src/main/main.c 2004-02-13 11:19:13.000000000 +0100
|
|
|
@@ -65,7 +65,7 @@
|
|
|
struct timeval start_time, next_update, next_reset, cur_time;
|
|
|
struct timeval init_time;
|
|
|
@@ -96,6 +97,6 @@ Index: src/main/main.c
|
|
|
return 1;
|
|
|
- if (fstat64(fd, &sb) == 0) {
|
|
|
+ if (fstat(fd, &sb) == 0) {
|
|
|
- main_transfer_bufsize (sb.st_blksize * 32);
|
|
|
+ main_transfer_bufsize(sb.st_blksize * 32);
|
|
|
}
|
|
|
}
|