head	1.6;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2
	OPENPKG_CW_FP:1.3;
locks; strict;
comment	@# @;


1.6
date	2007.08.30.17.25.19;	author rse;	state Exp;
branches;
next	1.5;
commitid	RBE3iwvP4OsgENvs;

1.5
date	2007.08.05.06.08.09;	author cs;	state Exp;
branches;
next	1.4;
commitid	mKm2ZzXJsrkMHwss;

1.4
date	2007.02.05.08.02.57;	author rse;	state Exp;
branches;
next	1.3;
commitid	G2J8B1yzNLrS9h5s;

1.3
date	2004.11.07.10.55.57;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2004.02.13.10.26.31;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.24.20.55.31;	author rse;	state Exp;
branches;
next	;

1.3.2.1
date	2004.11.07.10.55.57;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.55.20;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.6
log
@upgrading package: pv 1.0.1 -> 1.1.0
@
text
@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);
 	}
 
@


1.5
log
@upgrading package: pv 0.9.9 -> 1.0.1
@
text
@d2 3
a4 3
--- 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 @@@@
d36 1
a36 1
@@@@ -72,12 +72,12 @@@@
d51 2
a52 2
 		} else {
@@@@ -95,8 +95,8 @@@@
d63 1
a63 1
@@@@ -118,7 +118,7 @@@@
d72 1
a72 1
@@@@ -128,7 +128,7 @@@@
d81 1
a81 1
@@@@ -137,7 +137,7 @@@@
d91 3
a93 3
--- 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 @@@@
d96 1
a96 1
 	long double elapsed, tilreset;
d101 2
a102 2
 	fd = -1;
@@@@ -73,7 +73,7 @@@@
@


1.4
log
@upgrading package: pv 0.9.6 -> 0.9.9
@
text
@d1 4
a4 4
Index: src/main/file.c
--- src/main/file.c.orig	2007-02-05 01:06:47 +0100
+++ src/main/file.c	2007-02-05 08:53:41 +0100
@@@@ -27,20 +27,20 @@@@
d6 1
a6 1
 void main_getsize(opts_t opts)
d10 1
a10 1
 	int i, fd;
d13 1
d24 3
a26 4
-			if (fstat64(STDIN_FILENO, &sb) == 0) {
+			if (fstat(STDIN_FILENO, &sb) == 0) {
 				opts->size = sb.st_size;
 			} else {
d28 1
a28 1
@@@@ -48,16 +48,16 @@@@
d30 5
d36 7
a42 8
 
-		if (stat64(opts->argv[i], &sb) == 0) {
+		if (stat(opts->argv[i], &sb) == 0) {
 			if (S_ISBLK(sb.st_mode)) {
 				/*
 				 * Get the size of block devices by opening
 				 * them and seeking to the end.
 				 */
d45 8
a52 8
 				if (fd >= 0) {
 					opts->size +=
-					    lseek64(fd, 0, SEEK_END);
+					    lseek(fd, 0, SEEK_END);
 					close(fd);
 				}
 			} else {
@@@@ -76,8 +76,8 @@@@
d54 1
a54 1
 int main_nextfd(opts_t opts, int filenum, int oldfd)
d63 1
a63 1
@@@@ -99,7 +99,7 @@@@
d72 1
a72 1
@@@@ -109,7 +109,7 @@@@
d81 1
a81 1
@@@@ -118,7 +118,7 @@@@
d90 4
a93 4
Index: src/main/main.c
--- src/main/main.c.orig	2007-02-05 01:06:47 +0100
+++ src/main/main.c	2007-02-05 08:54:34 +0100
@@@@ -68,7 +68,7 @@@@
d102 7
a108 8
@@@@ -105,7 +105,7 @@@@
 		fd = main_nextfd(opts, n, -1);
 		if (fd < 0)
 			return 1;
-		if (fstat64(fd, &sb) == 0) {
+		if (fstat(fd, &sb) == 0) {
 			main_transfer_bufsize(sb.st_blksize * 32, 0);
 		}
d110 1
@


1.3
log
@upgrading package: pv 0.8.6 -> 0.8.9
@
text
@d2 2
a3 2
--- src/main/file.c.orig	2004-11-06 22:07:05 +0100
+++ src/main/file.c	2004-11-07 11:54:34 +0100
d87 3
a89 3
--- src/main/main.c.orig	2004-11-06 22:07:05 +0100
+++ src/main/main.c	2004-11-07 11:53:34 +0100
@@@@ -66,7 +66,7 @@@@
d98 1
a98 1
@@@@ -103,7 +103,7 @@@@
d104 1
a104 1
 			main_transfer_bufsize(sb.st_blksize * 32);
@


1.3.2.1
log
@file pv.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:20 +0000
@
text
@d1 106
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 106
Index: src/main/file.c
--- src/main/file.c.orig	2004-11-06 22:07:05 +0100
+++ src/main/file.c	2004-11-07 11:54:34 +0100
@@@@ -27,20 +27,20 @@@@
  */
 void main_getsize(opts_t opts)
 {
-	struct stat64 sb;
+	struct stat sb;
 	int i, fd;
 
 	opts->size = 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) {
-			if (fstat64(STDIN_FILENO, &sb) == 0) {
+			if (fstat(STDIN_FILENO, &sb) == 0) {
 				opts->size = sb.st_size;
 			} else {
 				opts->size = 0;
@@@@ -48,16 +48,16 @@@@
 			}
 		}
 
-		if (stat64(opts->argv[i], &sb) == 0) {
+		if (stat(opts->argv[i], &sb) == 0) {
 			if (S_ISBLK(sb.st_mode)) {
 				/*
 				 * Get the size of block devices by opening
 				 * them and seeking to the end.
 				 */
-				fd = open64(opts->argv[i], O_RDONLY);
+				fd = open(opts->argv[i], O_RDONLY);
 				if (fd >= 0) {
 					opts->size +=
-					    lseek64(fd, 0, SEEK_END);
+					    lseek(fd, 0, SEEK_END);
 					close(fd);
 				}
 			} else {
@@@@ -76,8 +76,8 @@@@
  */
 int main_nextfd(opts_t opts, int filenum, int oldfd)
 {
-	struct stat64 isb;
-	struct stat64 osb;
+	struct stat isb;
+	struct stat osb;
 	int fd;
 
 	if (oldfd > 0) {
@@@@ -99,7 +99,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,
@@@@ -109,7 +109,7 @@@@
 		}
 	}
 
-	if (fstat64(fd, &isb)) {
+	if (fstat(fd, &isb)) {
 		fprintf(stderr, "%s: %s: %s: %s\n",
 			opts->program_name,
 			_("failed to stat file"),
@@@@ -118,7 +118,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/main/main.c
--- src/main/main.c.orig	2004-11-06 22:07:05 +0100
+++ src/main/main.c	2004-11-07 11:53:34 +0100
@@@@ -66,7 +66,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;
@@@@ -103,7 +103,7 @@@@
 		fd = main_nextfd(opts, n, -1);
 		if (fd < 0)
 			return 1;
-		if (fstat64(fd, &sb) == 0) {
+		if (fstat(fd, &sb) == 0) {
 			main_transfer_bufsize(sb.st_blksize * 32);
 		}
 	}
@


1.2
log
@upgrading package: pv 0.7.0 -> 0.8.0
@
text
@d2 2
a3 2
--- 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
d6 1
a6 1
 void main_getsize(opts_t options)
d12 1
a12 1
 	options->size = 0;
d14 1
a14 1
 	if (options->argc < 1) {
d17 1
a17 1
 			options->size = sb.st_size;
d21 2
a22 2
 	for (i = 0; i < options->argc; i++) {
 		if (strcmp(options->argv[i], "-") == 0) {
d25 1
a25 1
 				options->size = sb.st_size;
d27 2
a28 2
 				options->size = 0;
@@@@ -48,12 +48,12 @@@@
d32 2
a33 2
-		if (stat64(options->argv[i], &sb) == 0) {
+		if (stat(options->argv[i], &sb) == 0) {
d35 6
a40 2
-				fd = open64(options->argv[i], O_RDONLY);
+				fd = open(options->argv[i], O_RDONLY);
d42 1
a42 1
 					options->size +=
d48 1
a48 1
@@@@ -71,8 +71,8 @@@@
d50 1
a50 1
 int main_nextfd(opts_t options, int filenum, int oldfd)
d59 11
a69 11
@@@@ -92,7 +92,7 @@@@
 		return STDIN_FILENO;
 	}
 
-	fd = open64(options->argv[filenum], O_RDONLY);
+	fd = open(options->argv[filenum], O_RDONLY);
 	if (fd < 0) {
 		fprintf(stderr, "%s: %s: %s: %s\n",
 			options->program_name,
@@@@ -101,7 +101,7 @@@@
 		return -1;
d75 1
a75 1
 			options->program_name,
d77 1
a77 1
@@@@ -110,7 +110,7 @@@@
d84 1
a84 1
 			options->program_name,
d87 3
a89 3
--- 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 @@@@
d98 2
a99 2
@@@@ -102,7 +102,7 @@@@
 		fd = main_nextfd(options, n, -1);
@


1.1
log
@try to fix building
@
text
@d2 2
a3 2
--- src/main/file.c.orig	Wed Jan 14 20:10:51 2004
+++ src/main/file.c	Sat Jan 24 21:51:55 2004
d28 1
a28 1
@@@@ -48,11 +48,11 @@@@
d38 3
a40 2
-					options->size += lseek64(fd, 0, SEEK_END);
+					options->size += lseek(fd, 0, SEEK_END);
d44 1
a44 1
@@@@ -70,8 +70,8 @@@@
d55 1
a55 1
@@@@ -91,7 +91,7 @@@@
d73 1
a73 1
@@@@ -111,7 +111,7 @@@@
d81 1
a81 1
 			_("failed to stat output file"),
d83 2
a84 2
--- src/main/main.c.orig	Wed Jan 14 20:10:42 2004
+++ src/main/main.c	Sat Jan 24 21:52:10 2004
d100 1
a100 1
 			main_transfer_bufsize (sb.st_blksize * 32);
@