Agrego el Mitico y Enigmatico Word Scaping al block sorting. Para usarlo usar parame...

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

diff --git a/src/jacu.c b/src/jacu.c
index 75ca87ccadfeccf070a53fdaf7b7194be5ed85f3..1648e82eb0b6599a62c98fcf1e861af59f6ef9ed 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -20,6 +20,7 @@ typedef struct _flags_ {
        int qflag;
        int sflag;
        int mflag;
        int qflag;
        int sflag;
        int mflag;

+       int rflag; /* Richard Dictionary :-) */

 } t_Flags;
 
 int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel);
 } t_Flags;
 
 int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel);


@@ -35,7 +36,7 @@ int main(int argc, char* argv[])
                        
        memset(&flags, 0, sizeof(t_Flags));
 
                        
        memset(&flags, 0, sizeof(t_Flags));
 

-       while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) { 
+       while ((ch = getopt(argc, argv, "rscdzm:t:q:")) != -1) { 

                 
                switch (ch) { 
                        case 'c': flags.cflag = 1; 
                 
                switch (ch) { 
                        case 'c': flags.cflag = 1; 


@@ -58,6 +59,8 @@ int main(int argc, char* argv[])
                                volumesize = atol(optarg);
                                break; 
 
                                volumesize = atol(optarg);
                                break; 
 

+                       case 'r': flags.rflag = 1;
+                               break;

                        case 'q': flags.qflag = 1; 
                                switch (atoi(optarg))
                                {
                        case 'q': flags.qflag = 1; 
                                switch (atoi(optarg))
                                {


@@ -85,13 +88,13 @@ int main(int argc, char* argv[])
                                }
                                break; 
 
                                }
                                break; 
 

-                       default: fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
+                       default: fprintf(stderr, "Usage: %s [-cdzsr][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 

                                         return(2);
                }
        }
                
        if ( (argc == 1) || (flags.cflag & flags.dflag) || !(flags.cflag | flags.dflag) || ((argc - optind) < 2) || (flags.mflag & flags.sflag)) {
                                         return(2);
                }
        }
                
        if ( (argc == 1) || (flags.cflag & flags.dflag) || !(flags.cflag | flags.dflag) || ((argc - optind) < 2) || (flags.mflag & flags.sflag)) {

-               fprintf(stderr, "Usage: %s [-cdzs][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
+               fprintf(stderr, "Usage: %s [-cdzsr][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); 

                return (3);
        }
        if ((flags.tflag) && (volumesize <= 0l)) {
                return (3);
        }
        if ((flags.tflag) && (volumesize <= 0l)) {


@@ -161,7 +164,7 @@ int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags
        total = 0;
        while (!feof(fp)) {
                i = 0;
        total = 0;
        while (!feof(fp)) {
                i = 0;

-               i = bs_readblock(fp, data, pagesize);
+               i = bs_readblock(fp, data, pagesize, flags->rflag);

                total += i;
 
 
                total += i;