From: Ricardo Markiewicz <gazer.arg@gmail.com>
Date: Sun, 27 Jun 2004 01:14:40 +0000 (+0000)
Subject:  Se mueve la lectura del bloque a BS, que ahora le voy a meter una optimizacion para
X-Git-Tag: svn_import~45
X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/commitdiff_plain/61867dc77de42e411942e3a8cb5b652e8007f538

 Se mueve la lectura del bloque a BS, que ahora le voy a meter una optimizacion para
 textos a ver que pasa.
---

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index fb13e55..93b7bb5 100644
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -139,3 +139,18 @@ void bs_destroy(t_BlockSort *bs)
 	free(bs->array);
 	free(bs);
 }
+
+int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
+{
+	Uint32 i=0;
+
+	while ((!feof(fp)) && (i < pagesize)) {
+		data[i++] = fgetc(fp);
+	}
+
+	/* Saco un EOF que lee de mas */
+	if (i<pagesize) i--;
+
+	return i;
+}
+
diff --git a/src/blocksorting/bs.h b/src/blocksorting/bs.h
index 9efc1e5..7e686ee 100644
--- a/src/blocksorting/bs.h
+++ b/src/blocksorting/bs.h
@@ -56,5 +56,7 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido);
  */
 void bs_restore(char *dst, char *c, Uint32 k, Uint32 len);
 
+int bs_readblock(FILE *fp, char *data, Uint32 pagesize);
+
 #endif
 
diff --git a/src/jacu.c b/src/jacu.c
index 4b35832..556f621 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -161,13 +161,9 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
 	total = 0;
 	while (!feof(fp)) {
 		i = 0;
-		while ((!feof(fp)) && (i < pagesize)) {
-			data[i++] = fgetc(fp);
-			total++;
-		}
+		i = bs_readblock(fp, data, pagesize);
+		total += i;
 
-		/* Saco un EOF que lee de mas */
-		if (i<pagesize) i--;
 
 		/* Aplico BS guardando su resultado + el K en salida */
 		bs_solve(data, salida, bs, &k, i);