Cambios minimos, no se si entraran en la impresion :(

[z.facultad/75.06/jacu.git] / src / mtf / mtf.c

diff --git a/src/mtf/mtf.c b/src/mtf/mtf.c
index 9f394e31ae0d6749c7f4b2147a9713729f72c223..4f69bc92d0f0c5216bc9a2ef14eff62f209c0935 100644 (file)
--- a/src/mtf/mtf.c
+++ b/src/mtf/mtf.c
@@ -1,3 +1,24 @@
+/*----------------------------------------------------------------------------
+ *                   jacu - Just Another Compression Utility
+ *----------------------------------------------------------------------------
+ * This file is part of jacu.
+ *
+ * jacu is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * jacu is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with jacu; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ *----------------------------------------------------------------------------
+ */
+

 #include "mtf.h"
 
 /****privadas*****/
 #include "mtf.h"
 
 /****privadas*****/


@@ -24,14 +45,15 @@ unsigned char *jacu_mtf(unsigned char *datos, int len, unsigned char **_z, int *
        
        pos = (unsigned char *)malloc(len*sizeof(unsigned char));
        z = jacu_buscar_z(datos, len, &size);
        
        pos = (unsigned char *)malloc(len*sizeof(unsigned char));
        z = jacu_buscar_z(datos, len, &size);

-       *_z = (unsigned char*)malloc(len*sizeof(unsigned char));
-       memcpy(*_z, z, len*sizeof(unsigned char));
+       *_z = (unsigned char*)malloc(size*sizeof(unsigned char));
+       memcpy(*_z, z, size*sizeof(unsigned char));

        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);
                if (pos[i] != 0) 
                        pop_front(z, pos[i]);
        }
        (*z_len) = size;
        for(i=0; i<len; i++){
                pos[i] = get_pos(z, size, datos[i]);
                if (pos[i] != 0) 
                        pop_front(z, pos[i]);
        }
        (*z_len) = size;

+       free(z);

        return pos;
 }
 
        return pos;
 }
 


@@ -71,7 +93,6 @@ int no_pertenece(char *z, char c, int len)
 {
        int i;
        
 {
        int i;
        

-       /* XXX Z NO TIENE 255 POSICIONES XXX */

        for(i=0; i<len; i++)
                if (z[i] == c)
                        return 0;
        for(i=0; i<len; i++)
                if (z[i] == c)
                        return 0;