summaryrefslogtreecommitdiffstats
path: root/main.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 16:12:47 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 16:12:47 +0000
commit4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f (patch)
tree1dea8ff881747fb84455151329255c6f1020493b /main.cc
parentAdding debian version 0.6-1. (diff)
downloadzutils-4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f.tar.xz
zutils-4edfc3fca1fdca1e046ad16c42ee0a22ab72bb6f.zip
Merging upstream version 0.7.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.cc b/main.cc
index 828ac06..eba364b 100644
--- a/main.cc
+++ b/main.cc
@@ -551,8 +551,8 @@ int print_magic_type( const std::string & magic_type )
{
std::string data;
- if( magic_type == "gzip" ) std::printf( "\x1F\x8B" );
- else if( magic_type == "bzip2" ) std::printf( "BZh" );
+ if( magic_type == "bzip2" ) std::printf( "BZh" );
+ else if( magic_type == "gzip" ) std::printf( "\x1F\x8B" );
else if( magic_type == "lzip" ) std::printf( "LZIP" );
else if( magic_type == "xz" ) std::printf( "%c7zXZ", '\xFD' );
else if( hex_to_data( magic_type, data ) ) std::printf( data.c_str() );