int cflag = 0;
int dflag = 0;
int tflag = 0;
+ int pflag = 0;
long int volumesize = 0;
+ size_t pagesize = 32768; /* 32KB */
int ch;
t_BlockSort *bs;
- while ((ch = getopt(argc, argv, "cdt:")) != -1) {
+ while ((ch = getopt(argc, argv, "cdt:p:")) != -1) {
switch (ch) {
case 'c': cflag = 1;
break;
-
+
case 'd': dflag = 1;
break;
-
+
case 't': tflag = 1;
- volumesize = atoi(optarg);
+ volumesize = atol(optarg);
break;
-
- default: fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]);
+
+ case 'p': pflag = 1;
+ pagesize = atoi(optarg);
+ break;
+
+ default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]);
return(2);
}
}
if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]);
- if ((tflag == 1) && (volumesize <= 0)) fprintf(stderr,"Error: The volume size must be a non-zero value\n");
- return (2);
+ return (3);
+ }
+ if ((tflag) && (volumesize <= 0l)) {
+ fprintf(stderr,"Error: The volume size must be a non-zero value\n");
+ return (4);
+ }
+ if ((pflag) && (pagesize <= 1u)) {
+ fprintf(stderr,"Error: El tamaño de página debe ser mayor a 1 byte.\n");
+ return (5);
}
if (cflag == 1) {
/* Comprimo */
/* No me gusta el tmpfile ... es para probar como anda todo junto */
FILE *fp, *fp_out;
- unsigned long int len, i, j, total, k;
+ unsigned long int i, j, total, k;
int *mtf;
char *salida, *data, c;
- len = 4096;
- data = malloc(sizeof(char)*len);
- salida = malloc(sizeof(char)*(len));
- bs = bs_create(len);
+ data = malloc(sizeof(char)*pagesize);
+ salida = malloc(sizeof(char)*(pagesize));
+ bs = bs_create(pagesize);
fp = fopen(argv[optind], "rb");
fp_out = fopen("tmp.comp", "wb");
c = fgetc(fp);
total = 0;
while (!feof(fp)) {
i = 0;
- while ((!feof(fp)) && (i < len)) {
+ while ((!feof(fp)) && (i < pagesize)) {
data[i++] = c;
c = fgetc(fp);
total++;
fclose(fp);
fclose(fp_out);
bs_destroy(bs);
- i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
+ i = shuff_encode_file("tmp.comp",argv[optind+1],volumesize);
/* borro el temporal */
unlink("tmp.comp");
return i;