/* depend: */
/* cflags: */
-/* linker: atoi.o code.o debug.o fprintf.o */
+/* linker: atoi.o code.o debug.o fdprintf.o */
-#include <malloc.h>
-#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stddef.h>
#include "atoi.h"
#include "code.h"
#include "debug.h"
-#include "fprintf.h"
+#include "fdprintf.h"
/* constants */
#define BUFFER_SIZE 4096
+#define COMPRESS 1
+#define DECOMPRESS 2
+
+#ifndef O_RAW
+#define O_RAW 0
+#endif /* O_RAW */
+
/* macros */
/* gobal variables */
/* help function */
-void usage (int ret)
-{
- FILE *fd = ret ? stderr : stdout;
- myfprintf (fd, "usage: %s\n", progname);
- myfprintf (fd, " -h : help message\n");
- myfprintf (fd, " -i <file>: input file\n");
- myfprintf (fd, " -o <file>: output file\n");
- myfprintf (fd, " -v : verbose level (%d)\n", verbose);
-
- exit (ret);
-}
-
-void blkcpy (void *dst, const void *src, int len)
+int usage (int ret)
{
- while (len--) {
- *((char *)dst++) = *((char *)src++);
- }
+ int fd = ret ? stdfderr : stdfdout;
+ fdprintf (fd, "usage: %s\n", progname);
+ fdprintf (fd, " -h : help message\n");
+ fdprintf (fd, " -i <file>: input file\n");
+ fdprintf (fd, " -o <file>: output file\n");
+ fdprintf (fd, " -v : verbose level (%d)\n", verbose);
+
+ return ret;
}
/* create occurence table */
{
byte_t buffer[BUFFER_SIZE] = {0};
int nbread;
- int *table = NULL;
- FILE *fid = NULL;
+ static int table[NB_BYTES] = {0};
+ int fid = 0;
- VERBOSE (DEBUG, PRINTF ("start creating occurence table\n"));
-
- /* memory allocation */
- table = (int *) calloc (NB_BYTES, sizeof (int));
- if (table == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
- return NULL;
- }
- VERBOSE (INFO, myfprintf (stdout, "memory allocated\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start creating occurence table\n"));
/* open file */
- fid = fopen (filename, "rb");
- if (fid == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s'\n", filename));
- free (table);
+ fid = open (filename, O_RDONLY|O_RAW);
+ if (fid == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s'\n", filename));
return NULL;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", filename));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", filename));
/* read file */
- while (!feof (fid)) {
- nbread = fread (buffer, 1, BUFFER_SIZE, fid);
- VERBOSE (DEBUG, PRINTF ("nbread: %d\n", nbread));
+ while ((nbread = read (fid, buffer, BUFFER_SIZE)) > 0) {
+ VERBOSE (DEBUG, PRINTOUT ("nbread: %d\n", nbread));
while (nbread--) {
table[(int)buffer[nbread]]++;
}
}
/* close file */
- fclose (fid);
+ close (fid);
- VERBOSE (DEBUG, PRINTF ("end creating occurence table\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end creating occurence table\n"));
return table;
}
{
int i;
- myfprintf (stdout, "Occurence table\n");
+ PRINTOUT ("Occurence table\n");
for (i = 0; i < NB_BYTES; i++) {
if (table[i]) {
- myfprintf (stdout, "0x%02x '%c': %d\n", i, ((i < 32) || (i > 127)) ? '.' : i, table[i]);
+ PRINTOUT ("0x%02x '%c': %d\n", i, ((i < 32) || (i > 127)) ? '.' : i, table[i]);
}
}
}
-/* leaf structure */
-
-typedef struct _leaf_t
-{
- struct _leaf_t *left;
- struct _leaf_t *right;
- int occ;
- byte_t c;
-} leaf_t;
-
/* initialize forest */
leaf_t **init_forest (int *table)
{
- leaf_t **leafs = NULL;
+ static leaf_t *leafs[NB_BYTES] = {0};
int nb_leafs = 0;
int i, l;
- VERBOSE (DEBUG, PRINTF ("start initiliazing forest\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start initiliazing forest\n"));
/* count number of leafs */
for (i = 0; i < NB_BYTES; i++) {
}
}
- /* allocate memory */
- leafs = (leaf_t **) calloc (nb_leafs + 1, sizeof (leaf_t *));
- if (leafs == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
- return NULL;
- }
-
/* initialize leafs */
for (i = 0, l = 0; i < NB_BYTES; i++) {
if (table[i] > 0) {
- leafs[l] = (leaf_t *) calloc (1, sizeof (leaf_t));
+ leafs[l] = getleaf (1);
if (leafs[l] == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
+ VERBOSE (ERROR, PRINTERR ("can't allocate memory\n"));
return NULL;
}
leafs[l]->occ = table[i];
}
}
- VERBOSE (DEBUG, PRINTF ("end initiliazing forest\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end initiliazing forest\n"));
return leafs;
}
int ante;
int i, j;
- VERBOSE (DEBUG, PRINTF ("start creating tree\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start creating tree\n"));
/* count number of leafs */
while (leafs[nb_leafs] != NULL) {
/* create branch */
if ((last == -1) || (ante == -1)) {
- VERBOSE (ERROR, myfprintf (stdout, "error during tree building\n"));
+ VERBOSE (ERROR, PRINTERR ("error during tree building\n"));
return NULL;
}
- branch = (leaf_t *) calloc (1, sizeof (leaf_t));
+ branch = getleaf (1);
if (branch == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
+ VERBOSE (ERROR, PRINTERR ("can't allocate memory\n"));
return NULL;
}
branch->left = leafs[last];
leafs[ante] = NULL;
}
- VERBOSE (DEBUG, PRINTF ("end creating tree\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end creating tree\n"));
return (last != -1) ? leafs[last] : NULL;
}
-/* free tree */
-
-void free_tree (leaf_t *root) {
- if (root) {
- if (root->left) {
- free_tree (root->left);
- }
- if (root->right) {
- free_tree (root->right);
- }
- free (root);
- }
-}
-
/* explore tree */
void explore_tree (code_t *table, leaf_t *root, char *code, int index)
{
+
+ VERBOSE (DEBUG, PRINTOUT ("start exploring code tree\n"));
+
if ((root->left == NULL) && (root->right == NULL)) {
codcpy ((char *)(table + (int)(root->c)), sizeof (code_t), code);
}
codcpy (code + index, sizeof (code_t), "0");
explore_tree (table, root->right, code, index + 1);
}
+
+ VERBOSE (DEBUG, PRINTOUT ("end exploring code tree\n"));
}
/* create code table */
-
code_t *create_code (leaf_t *root)
{
- code_t *table = NULL;
+ static code_t table[NB_BYTES] = {0};
code_t code = {0};
- VERBOSE (DEBUG, PRINTF ("start creating code table\n"));
-
- /* allocate table */
- table = (code_t *) calloc (NB_BYTES, sizeof (code_t));
- if (table == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
- return NULL;
- }
+ VERBOSE (DEBUG, PRINTOUT ("start creating code table\n"));
explore_tree (table, root, (char *)&code, 0);
- VERBOSE (DEBUG, PRINTF ("end creating code table\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end creating code table\n"));
return table;
}
char *code;
int i;
- myfprintf (stdout, "Code table\n");
+ PRINTOUT ("Code table\n");
for (i = 0; i < NB_BYTES; i++) {
code = (char *)(codes + i);
if (codlen (code) == 0) {
continue;
}
- myfprintf (stdout, "0x%02x '%c': %s\n", i, ((i < 32) || (i > 127)) ? '.' : i, code);
+ PRINTOUT ("0x%02x '%c': %s\n", i, ((i < 32) || (i > 127)) ? '.' : i, code);
}
}
byte_t *encode_header_table (code_t *codes, int *occ)
{
- byte_t buffer[NB_BYTES * (NB_BYTES - 1) / 2 / 8 + NB_BYTES + 6] = {0};
+ static byte_t buffer[NB_BYTES * (NB_BYTES - 1) / 2 / 8 + NB_BYTES + 6] = {0};
char bits[(NB_BYTES - 1) + 8 + 1] = {0};
char *code;
byte_t *header = buffer;
int nb = 0;
int size = 0;
- VERBOSE (DEBUG, PRINTF ("start encoding header and code table\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start encoding header and code table\n"));
/* mode 1 or 2 */
for (i = 0; i < NB_BYTES; i++) {
}
}
mode = (NB_BYTES < 2 * nb + 1) ? 1 : 2;
- VERBOSE (DEBUG, PRINTF ("nb chars: %d\n", nb));
- VERBOSE (DEBUG, PRINTF ("mode: %d\n", mode));
- VERBOSE (DEBUG, PRINTF ("size: %d\n", size));
- VERBOSE (DEBUG, PRINTF ("rem: %d\n", size % 256));
+ VERBOSE (DEBUG, PRINTOUT ("nb chars: %d\n", nb));
+ VERBOSE (DEBUG, PRINTOUT ("mode: %d\n", mode));
+ VERBOSE (DEBUG, PRINTOUT ("size: %d\n", size));
+ VERBOSE (DEBUG, PRINTOUT ("rem: %d\n", size % 256));
/* header */
codcpy ((char *)header, sizeof (buffer), (mode == 1) ? "MZ1 " : "MZ2 ");
/* length */
length = (int)(header - buffer - 6);
- VERBOSE (DEBUG, PRINTF ("lengh: %d %02x %02x\n", length, length >> 8, length & 0xff));
+ VERBOSE (DEBUG, PRINTOUT ("lengh: %d %02x %02x\n", length, length >> 8, length & 0xff));
buffer[3] = (byte_t)(length >> 8);
buffer[4] = (byte_t)(length & 0xff);
buffer[5] = (byte_t)(size % 256);
+ header = buffer;
- /* allocation */
- header = (byte_t *) calloc (length + 6, 1);
- blkcpy (header, buffer, length + 6);
-
- VERBOSE (DEBUG, PRINTF ("end encoding header and code table\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end encoding header and code table\n"));
return header;
}
int length, i;
length = (header[3] << 8) + header[4];
- VERBOSE (DEBUG, PRINTF ("lengh: %d\n", length));
+ VERBOSE (DEBUG, PRINTOUT ("lengh: %d\n", length));
for (i = 0; i < length + 6; i++) {
- myfprintf (stdout, "%02x", header[i]);
+ PRINTOUT ("%02x", header[i]);
}
- myfprintf (stdout, "\n");
+ PRINTOUT ("\n");
}
/* write crompressed file */
byte_t bufin[BUFFER_SIZE] = {0};
byte_t bufout[BUFFER_SIZE] = {0};
char bits[(NB_BYTES - 1) + 8 + 1] = {0};
- FILE *fin, *fout;
+ int fin, fout;
int length = 0;
- int i, j, nbread;
+ int i, j, nbread, nbwrite;
byte_t *pt;
- VERBOSE (DEBUG, PRINTF ("start writting compressed file\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start writting compressed file\n"));
/* open input file */
- fin = fopen (input, "rb");
- if (fin == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s' for reading\n", input));
+ fin = open (input, O_RDONLY|O_RAW);
+ if (fin == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s' for reading\n", input));
return 1;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", input));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", input));
/* open output file */
- fout = fopen (output, "wb");
- if (fin == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s' for writing\n", output));
+ fout = open (output, O_WRONLY|O_CREAT|O_RAW, 0700);
+ if (fout == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s' for writing\n", output));
+ close (fin);
return 1;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", output));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", output));
/* write header */
length = (header[3] << 8) + header[4];
- VERBOSE (DEBUG, PRINTF ("lengh: %d\n", length));
- fwrite (header, 1, length + 6, fout);
+ VERBOSE (DEBUG, PRINTOUT ("lengh: %d\n", length));
+ nbwrite = write (fout, header, length + 6);
+ if (nbwrite != length + 6) {
+ VERBOSE (ERROR, PRINTERR ("can't write %d bytes in file '%s'\n", length + 6 - nbwrite, output));
+ close (fout);
+ close (fin);
+ return 1;
+ }
+
/* write file */
pt = bufout;
- while (!feof (fin)) {
- nbread = fread (bufin, 1, BUFFER_SIZE, fin);
- VERBOSE (DEBUG, PRINTF ("nbread: %d\n", nbread));
+ while ((nbread = read (fin, bufin, BUFFER_SIZE)) > 0) {
+ VERBOSE (DEBUG, PRINTOUT ("nbread: %d\n", nbread));
for (i = 0; i < nbread; i++) {
codcat (bits, sizeof (code_t), (char *)(codes + bufin[i]));
while (codlen (bits) > (8 - 1)) {
}
codcpy (bits, sizeof (code_t), bits + 8);
if (pt - bufout == BUFFER_SIZE - 1) {
- fwrite (bufout, 1, BUFFER_SIZE, fout);
+ nbwrite = write (fout, bufout, BUFFER_SIZE);
+ if (nbwrite != BUFFER_SIZE) {
+ VERBOSE (ERROR, PRINTERR ("can't write %d bytes in file '%s'\n", BUFFER_SIZE - nbwrite, output));
+ close (fout);
+ close (fin);
+ return 1;
+ }
pt = bufout;
} else {
pt++;
}
}
}
- VERBOSE (DEBUG, PRINTF ("lastest bits : %d\n", codlen (bits)));
+ VERBOSE (DEBUG, PRINTOUT ("lastest bits : %d\n", codlen (bits)));
if (codlen (bits) > 0) {
for (j = 0; j < (int)codlen (bits); j++) {
*pt <<= 1;
pt++;
}
if (pt != bufout) {
- VERBOSE (DEBUG, PRINTF ("last partial buffer written: %u\n", pt - bufout));
- fwrite (bufout, 1, pt - bufout, fout);
+ VERBOSE (DEBUG, PRINTOUT ("last partial buffer written: %u\n", pt - bufout));
+ nbwrite = write (fout, bufout, pt - bufout);
+ if (nbwrite != pt - bufout) {
+ VERBOSE (ERROR, PRINTERR ("can't write %d bytes in file '%s'\n", pt - bufout - nbwrite, output));
+ close (fout);
+ close (fin);
+ return 1;
+ }
}
/* closing */
- fclose (fin);
- fclose (fout);
+ close (fin);
+ close (fout);
- VERBOSE (DEBUG, PRINTF ("end writting compressed file\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end writting compressed file\n"));
return 0;
}
/* read header */
code_t *read_header (char *filename) {
+ static code_t table[NB_BYTES] = {0};
byte_t buffer[NB_BYTES * (NB_BYTES - 1) / 2 / 8 + NB_BYTES + 6] = {0};
- code_t *table = NULL;
byte_t *codes = NULL;
byte_t cur;
int lengths[NB_BYTES] = {0};
- FILE *fid = NULL;
+ int fid;
int mode = 0;
- size_t i, j, l, nb, size;
+ int i, j, l, nb, size;
- VERBOSE (DEBUG, PRINTF ("start reading header\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start reading header\n"));
/* open file */
- fid = fopen (filename, "rb");
- if (fid == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s'\n", filename));
+ fid = open (filename, O_RDONLY|O_RAW);
+ if (fid == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s'\n", filename));
return NULL;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", filename));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", filename));
/* read magic number */
- nb = fread (buffer, 1, 6, fid);
- VERBOSE (DEBUG, PRINTF ("nb, buffer: %d 0x%02x 0x%02x\n", nb, buffer[0], buffer[1]));
+ nb = read (fid, buffer, 6);
+ VERBOSE (DEBUG, PRINTOUT ("nb, buffer: %d 0x%02x 0x%02x\n", nb, buffer[0], buffer[1]));
if ((nb == 6) && (buffer[0] == 'M') && (buffer[1] == 'Z')) {
mode = (buffer[2] == '1') ? 1 : (buffer[2] == '2') ? 2 : 0;
size = (buffer[3] << 8) + buffer[4];
- VERBOSE (DEBUG, PRINTF ("mode, size: %d %d\n", mode, size));
+ VERBOSE (DEBUG, PRINTOUT ("mode, size: %d %d\n", mode, size));
if (size > NB_BYTES * (NB_BYTES - 1) / 2 / 8 + NB_BYTES) {
mode = 0;
} else {
- nb = fread (buffer, 1, size, fid);
- VERBOSE (DEBUG, PRINTF ("nb read: %d\n", nb));
+ nb = read (fid, buffer, size);
+ VERBOSE (DEBUG, PRINTOUT ("nb read: %d/%d\n", nb, size));
if (nb != size) {
mode = 0;
}
}
}
- fclose (fid);
+ close (fid);
if (mode == 0) {
- VERBOSE (ERROR, myfprintf (stdout, "incorrect file\n"));
+ VERBOSE (ERROR, PRINTERR ("incorrect file\n"));
return NULL;
}
break;
case 2:
nb = *(codes++) + 1;
- VERBOSE (DEBUG, PRINTF ("nb codes: %d\n", nb));
+ VERBOSE (DEBUG, PRINTOUT ("nb codes: %d\n", nb));
for (i = 0; i < nb; i++) {
j = *(codes++);
lengths[j] = *(codes++);
}
break;
}
- VERBOSE (DEBUG, for (i = 0; i < NB_BYTES; i++) if (lengths[i]) PRINTF ("%d: %d\n", i, lengths[i]));
+ VERBOSE (DEBUG, for (i = 0; i < NB_BYTES; i++) if (lengths[i]) PRINTOUT ("%d: %d\n", i, lengths[i]));
/* check lengths */
for (i = 0, l = 0; i < NB_BYTES; i++) {
}
if (((mode == 1) && (size - 256 != (l + 7) / 8)) ||
((mode == 2) && (size - 2 * nb - 1 != (l + 7) / 8))) {
- VERBOSE (ERROR, myfprintf (stdout, "incorrect code table length\n"));
- return NULL;
- }
-
- /* allocate table */
- table = (code_t *) calloc (NB_BYTES, sizeof (code_t));
- if (table == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't allocate memory\n"));
+ VERBOSE (ERROR, PRINTERR ("incorrect code table length: %d %d %d\n", size, nb, l));
return NULL;
}
}
}
- VERBOSE (DEBUG, PRINTF ("end reading header\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end reading header\n"));
return table;
}
byte_t bufout[BUFFER_SIZE] = {0};
byte_t bufhea[MAX(NB_BYTES * (NB_BYTES - 1) / 2 / 8 + NB_BYTES + 6, BUFFER_SIZE)] = {0};
char bits[(NB_BYTES - 1) + 1] = {0};
- FILE *fin, *fout;
- int i, j, k, nb, size, rem;
+ int fin, fout;
+ int i, j, k, nb, size, nbwrite, rem;
int is_found;
int l = 0;
byte_t *pt;
- VERBOSE (DEBUG, PRINTF ("start writing decompressed file\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start writing decompressed file\n"));
/* open file for reading */
- fin = fopen (input, "rb");
- if (fin == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s' for reading\n", input));
+ fin = open (input, O_RDONLY|O_RAW);
+ if (fin == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s' for reading\n", input));
return 1;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", input));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", input));
/* read magic number */
- nb = fread (bufhea, 1, 6, fin);
+ nb = read (fin, bufhea, 6);
if (nb != 6) {
- VERBOSE (ERROR, myfprintf (stdout, "can't read file\n"));
- fclose (fin);
+ VERBOSE (ERROR, PRINTERR ("can't read file\n"));
+ close (fin);
return 1;
}
size = (bufhea[3] << 8) + bufhea[4];
- VERBOSE (DEBUG, myfprintf (stdout, "table size: %d\n", size));
+ VERBOSE (DEBUG, PRINTOUT ("table size: %d\n", size));
rem = bufhea[5];
- VERBOSE (DEBUG, myfprintf (stdout, "remainder: %d\n", rem));
- nb = fread (bufhea, 1, size, fin);
+ VERBOSE (DEBUG, PRINTOUT ("remainder: %d\n", rem));
+ nb = read (fin, bufhea, size);
if (nb != size) {
- VERBOSE (ERROR, myfprintf (stdout, "can't read file\n"));
- fclose (fin);
+ VERBOSE (ERROR, PRINTERR ("can't read file\n"));
+ close (fin);
return 1;
}
/* open file for writing */
- fout = fopen (output, "wb");
- if (fout == NULL) {
- VERBOSE (ERROR, myfprintf (stdout, "can't open file '%s' for writing\n", output));
- return 2;
+ fout = open (output, O_WRONLY|O_CREAT|O_RAW, 0700);
+ if (fout == -1) {
+ VERBOSE (ERROR, PRINTERR ("can't open file '%s' for writing\n", output));
+ close (fin);
+ return 1;
}
- VERBOSE (INFO, myfprintf (stdout, "file '%s' opened\n", output));
+ VERBOSE (INFO, PRINTOUT ("file '%s' opened\n", output));
/* write file */
pt = bufout;
- while (!feof (fin)) {
- nb = fread (bufin, 1, BUFFER_SIZE, fin);
- VERBOSE (DEBUG, PRINTF ("nbread: %d\n", nb));
+ while ((nb = read (fin, bufin, BUFFER_SIZE)) > 0) {
+ VERBOSE (DEBUG, PRINTOUT ("nbread: %d\n", nb));
for (i = 0; i < nb; i++) {
for (j = 0; j < 8; j++) {
codcat (bits, sizeof (bits), ((bufin[i] & 0x80) == 0) ? "0" : "1");
bufin[i] <<= 1;
l++;
- VERBOSE (DEBUG, PRINTF ("bits: %d - %s\n", codlen (bits), bits));
+ VERBOSE (DEBUG, PRINTOUT ("bits: %d - %s\n", codlen (bits), bits));
/* look for correct code */
is_found = 0;
for (k = 0; (k < NB_BYTES) && (!is_found); k++) {
if (codcmp ((char *)(codes + k), bits) == 0) {
is_found = 1;
- VERBOSE (DEBUG, PRINTF ("found: %d\n", k));
+ VERBOSE (DEBUG, PRINTOUT ("found: %d\n", k));
*pt= k;
bits[0] = 0;
if (pt - bufout == BUFFER_SIZE - 1) {
- VERBOSE (DEBUG, PRINTF ("nb buffer out: %u\n", (pt - bufout)));
- fwrite (bufout, 1, BUFFER_SIZE, fout);
+ VERBOSE (DEBUG, PRINTOUT ("nb buffer out: %u\n", (pt - bufout)));
+ nbwrite = write (fout, bufout, BUFFER_SIZE);
+ if (nbwrite != BUFFER_SIZE) {
+ VERBOSE (ERROR, PRINTERR ("can't write %d bytes in file '%s'\n'", BUFFER_SIZE - nbwrite, output));
+ close (fout);
+ close (fin);
+ return 1;
+ }
pt = bufout;
} else {
pt++;
}
}
}
- if ((i == nb - 1) && (l % 256 == rem) && (feof (fin))) {
- VERBOSE (DEBUG, PRINTF ("break\n"));
+ if ((i == nb - 1) && (l % 256 == rem) && (nb != BUFFER_SIZE)) {
+ VERBOSE (DEBUG, PRINTOUT ("break\n"));
break;
}
}
}
}
if (pt != bufout) {
- VERBOSE (DEBUG, PRINTF ("nb buffer out: %u\n", (pt - bufout)));
- fwrite (bufout, 1, pt - bufout, fout);
+ VERBOSE (DEBUG, PRINTOUT ("nb buffer out: %u\n", (pt - bufout)));
+ nbwrite = write (fout, bufout, pt - bufout);
+ if (nbwrite != pt - bufout) {
+ VERBOSE (ERROR, PRINTERR ("can't write %d bytes in file '%s'\n'", pt - bufout - nbwrite, output));
+ close (fout);
+ close (fin);
+ return 1;
+ }
}
/* close files */
- fclose (fin);
- fclose (fout);
+ close (fin);
+ close (fout);
- VERBOSE (DEBUG, PRINTF ("end writing decompressed file\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end writing decompressed file\n"));
return 0;
}
int c;
char * arg;
- VERBOSE (DEBUG, PRINTF ("start processing arguments\n"));
+ VERBOSE (DEBUG, PRINTOUT ("start processing arguments\n"));
while (argc-- > 1) {
arg = *(++argv);
if (arg[0] != '-') {
- myfprintf (stderr, "%s: invalid option -- %s\n", progname, arg);
- usage (1);
+ PRINTERR ("%s: invalid option -- %s\n", progname, arg);
+ return usage (1);
}
c = arg[1];
- VERBOSE (DEBUG, PRINTF ("option: %c\n", c));
+ VERBOSE (DEBUG, PRINTOUT ("option: %c\n", c));
switch (c) {
case 'c':
mode = COMPRESS;
break;
case 'i':
input = (arg[2]) ? arg + 2 : (--argc > 0 ) ? *(++argv) : NULL;
- VERBOSE (DEBUG, PRINTF ("input: %s\n", input));
+ VERBOSE (DEBUG, PRINTOUT ("input: %s\n", input));
break;
case 'o':
output = (arg[2]) ? arg + 2 : (--argc > 0 ) ? *(++argv) : NULL;
- VERBOSE (DEBUG, PRINTF ("output: %s\n", output));
+ VERBOSE (DEBUG, PRINTOUT ("output: %s\n", output));
break;
case 'v':
arg = (arg[2]) ? arg + 2 : (--argc > 0 ) ? *(++argv) : NULL;
if (arg == NULL) {
- myfprintf (stderr, "%s: missing verbose level\n", progname);
- usage (1);
+ PRINTERR ("%s: missing verbose level\n", progname);
+ return usage (1);
}
- verbose = myatoi (arg);
- VERBOSE (INFO, myfprintf (stdout, "verbose: %d\n", verbose));
+ verbose = atoi (arg);
+ VERBOSE (INFO, PRINTOUT ("verbose: %d\n", verbose));
break;
case 'h':
default:
- usage (c != 'h');
+ return usage (c != 'h');
}
}
if ((input == NULL) || (output == NULL)) {
- myfprintf (stderr, "%s: missing file\n", progname);
- usage (1);
+ PRINTERR ("%s: missing file\n", progname);
+ return usage (1);
}
- VERBOSE (DEBUG, PRINTF ("end processing arguments\n"));
+ VERBOSE (DEBUG, PRINTOUT ("end processing arguments\n"));
switch (mode) {
case COMPRESS:
break;
}
- /* clean everything */
- fflush (stdout);
- if (header) free (header);
- if (codes) free (codes);
- if (root) free_tree (root);
- if (leafs) free (leafs);
- if (table) free (table);
-
return rc;
}
// test: cmp compress.c tmp.c
// test: rm compress.mz tmp.c
-/* vim: set ts=4 sw=4 et */
+/* vim: set ts=4 sw=4 et: */
Soft'N'Design Software / projects / compress.git / blobdiff