mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* util.c: Eliminate get_small_endian_long() and CHECK macro.

Browse Source
This commit is contained in:
Pavel Roskin 2002-07-02 21:25:49 +00:00
parent 7f6c3c3bb6
commit 2752379086
2 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@ -1,5 +1,7 @@
2002-07-02 Pavel Roskin <proski@gnu.org>
* util.c: Eliminate get_small_endian_long() and CHECK macro.
* util.h: Rename compression types, add a type for uncompressed
files.
* util.c (is_gunzipable): Rename to ...

23
src/util.c
View File

@ -844,17 +844,6 @@ char *get_current_wd (char *buffer, int size)
}
#endif /* !USE_VFS */
#define CHECK(x) if (x == -1) return 0;
static long
get_small_endian_long (int fd)
{
unsigned char buffer [4];
CHECK (mc_read (fd, buffer, 4));
return (buffer [3] << 24) | (buffer [2] << 16) | (buffer [1] << 8) | buffer [0];
}
/* This function returns 0 if the file is not in not compressed by
* one of the supported compressors (gzip, bzip, bzip2). Otherwise,
* the compression type is returned, as defined in util.h
@ -864,7 +853,8 @@ int get_compression_type (int fd)
unsigned char magic[4];
/* Read the magic signature */
CHECK (mc_read (fd, &magic [0], 4));
if (mc_read (fd, &magic[0], 4) != 4)
return COMPRESSION_NONE;
/* GZIP_MAGIC and OLD_GZIP_MAGIC */
if (magic[0] == 037 && (magic[1] == 0213 || magic[1] == 0236)) {
@ -872,10 +862,12 @@ int get_compression_type (int fd)
}
/* PKZIP_MAGIC */
if (magic [0] == 0120 && magic [1] == 0113 && magic [2] == 003 && magic [3] == 004){
if (magic[0] == 0120 && magic[1] == 0113 && magic[2] == 003
&& magic[3] == 004) {
/* Read compression type */
mc_lseek (fd, 8, SEEK_SET);
CHECK (mc_read (fd, &magic [0], 2));
if (mc_read (fd, &magic[0], 2) != 2)
return COMPRESSION_NONE;
/* Gzip can handle only deflated (8) or stored (0) files */
if ((magic[0] != 8 && magic[0] != 0) || magic[1] != 0)
@ -886,7 +878,8 @@ int get_compression_type (int fd)
}
/* PACK_MAGIC and LZH_MAGIC and compress magic */
if (magic [0] == 037 && (magic [1] == 036 || magic [1] == 0240 || magic [1] == 0235)){
if (magic[0] == 037
&& (magic[1] == 036 || magic[1] == 0240 || magic[1] == 0235)) {
/* Compatible with gzip */
return COMPRESSION_GZIP;
}