Alfredos bzip2 stuff

Author: jgg
Date: 2001-03-11 22:37:35 GMT
Alfredos bzip2 stuff

diff --git a/methods/gzip.cc b/methods/gzip.cc
index c0092c7550ace7523f1f9c10a5d14cd2a429e9bb..3f0efab4f47f78ed136714522d92d21d51c830d4 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: gzip.cc,v 1.13 2001/03/11 05:30:20 jgg Exp $
+// $Id: gzip.cc,v 1.14 2001/03/11 22:37:35 jgg Exp $

 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 


@@ -22,6 +22,8 @@
 #include <errno.h>
                                                                        /*}}}*/
 
 #include <errno.h>
                                                                        /*}}}*/
 

+const char *Prog;
+

 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);


@@ -34,13 +36,14 @@ class GzipMethod : public pkgAcqMethod
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------

-/* This forks gzip and hashes the resulting decompressed output as it
-   flows to the destination file */
+/* */

 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
    string Path = Get.Host + Get.Path; // To account for relative paths
    
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
    string Path = Get.Host + Get.Path; // To account for relative paths
    

+   string GzPathOption = "Dir::bin::"+string(Prog);
+

    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);


@@ -50,7 +53,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)

-      return _error->Errno("pipe","Couldn't open pipe for gzip");
+      return _error->Errno("pipe","Couldn't open pipe for %s",Prog);

 
    // Fork gzip
    int Process = ExecFork();
 
    // Fork gzip
    int Process = ExecFork();


@@ -65,7 +68,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];
       SetCloseExec(STDOUT_FILENO,false);
       
       const char *Args[3];

-      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
+      Args[0] = _config->Find(GzPathOption,Prog).c_str();

       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);
       Args[1] = "-d";
       Args[2] = 0;
       execvp(Args[0],(char **)Args);


@@ -94,7 +97,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       
       if (Count < 0)
       {
       
       if (Count < 0)
       {

-        _error->Errno("read", "Read error from gzip process");
+        _error->Errno("read", "Read error from %s process",Prog);

         Failed = true;
         break;
       }
         Failed = true;
         break;
       }


@@ -104,14 +107,14 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)
       
       Hash.Add(Buffer,Count);
       if (To.Write(Buffer,Count) == false)

-      {         
+      {

         Failed = true;
         break;
         Failed = true;
         break;

-      }         
+      }      

    }
    
    // Wait for gzip to finish
    }
    
    // Wait for gzip to finish

-   if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
+   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)

    {
       To.OpFail();
       return false;
    {
       To.OpFail();
       return false;


@@ -147,8 +150,12 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-int main()
+int main(int argc, char *argv[])

 {
    GzipMethod Mth;
 {
    GzipMethod Mth;

+
+   Prog = strrchr(argv[0],'/');
+   Prog++;
+   

    return Mth.Run();
 }
    return Mth.Run();
 }

diff --git a/methods/makefile b/methods/makefile
index dfab23ab2a88f3dc064323e5ec2eba8a4ac64088..80f7492558ac5f02f5b9405c6b4813e95cd955dc 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -55,11 +55,17 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 

-# SSH method symlink
-all: $(BIN)/ssh
-veryclean: clean-$(BIN)/ssh    
+# SSH and vzip2 method symlink
+all: $(BIN)/ssh $(BIN)/bzip2
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2

 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh
 clean-$(BIN)/ssh:
 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh
 clean-$(BIN)/ssh:

-       rm $(BIN)/ssh
+       -rm $(BIN)/ssh
+
+$(BIN)/bzip2:
+       echo "Installing bzip2 method link"
+       ln -fs gzip $(BIN)/bzip2
+clean-$(BIN)/bzip2:
+       -rm $(BIN)/bzip2