X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3826564e07eaffb05eca5af34a0e76f6f161b89c..e9deb44823c85daa7bb8e485610c0fad94f4be2c:/ftparchive/multicompress.cc diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 5073e98ac..16cef9769 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -14,10 +14,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "multicompress.h" -#endif - #include "multicompress.h" #include @@ -38,6 +34,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] = {{".","",0,0,0,1}, {"gzip",".gz","gzip","-9n","-d",2}, {"bzip2",".bz2","bzip2","-9","-d",3}, + {"lzma",".lzma","lzma","-9","-d",4}, {}}; // MultiCompress::MultiCompress - Constructor /*{{{*/ @@ -72,7 +69,7 @@ MultiCompress::MultiCompress(string Output,string Compress, // Hmm.. unknown. if (Comp->Name == 0) { - _error->Warning(_("Unknown Compresison Algorithm '%s'"),string(Start,I).c_str()); + _error->Warning(_("Unknown compression algorithm '%s'"),string(Start,I).c_str()); continue; } @@ -212,7 +209,7 @@ bool MultiCompress::Die() fclose(Input); Input = 0; - bool Res = ExecWait(Outputter,_("Compress Child"),false); + bool Res = ExecWait(Outputter,_("Compress child"),false); Outputter = -1; return Res; } @@ -235,7 +232,7 @@ bool MultiCompress::Finalize(unsigned long &OutSize) { struct stat St; if (stat(I->Output.c_str(),&St) != 0) - return _error->Error(_("Internal Error, Failed to create %s"), + return _error->Error(_("Internal error, failed to create %s"), I->Output.c_str()); if (I->OldMTime != St.st_mtime) @@ -368,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */