Sync

Author: jgg
Date: 1998-10-30 07:53:30 GMT
Sync

3 files changed, 189 insertions, 381 deletions

diff --git a/methods/copy.cc b/methods/copy.cc
index b1c0fe36..e63801f3 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: copy.cc,v 1.3 1998/10/26 07:11:52 jgg Exp $
+// $Id: copy.cc,v 1.4 1998/10/30 07:53:51 jgg Exp $
 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it
@@ -10,130 +10,75 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #include <apt-pkg/fileutl.h>
-#include <strutl.h>
+#include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>
-#include <stdio.h>
 									/*}}}*/
 
-// Fail - Generate a failure message					/*{{{*/
+class CopyMethod : public pkgAcqMethod
+{
+   virtual bool Fetch(string Message,URI Get);
+   
+   public:
+   
+   CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+};
+
+// CopyMethod::Fetch - Fetch a file					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void Fail(string URI)
+bool CopyMethod::Fetch(string Message,URI Get)
 {
-   string Err = "Undetermined Error";
-   if (_error->empty() == false)
-      _error->PopMessage(Err);
+   string File = Get.Path;
+
+   // See if the file exists
+   FileFd From(File,FileFd::ReadOnly);
+   FileFd To(DestFile,FileFd::WriteEmpty);
+   To.EraseOnFailure();
+   if (_error->PendingError() == true)
+      return false;
    
-   printf("400 URI Failure\n"
-	  "URI: %s\n"
-	  "Message: %s\n\n",URI.c_str(),Err.c_str());
-   _error->Discard();
-}
-									/*}}}*/
+   // Copy the file
+   if (CopyFile(From,To) == false)
+      return false;
 
-int main()
-{
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
+   From.Close();
+   To.Close();
    
-   printf("100 Capabilities\n"
-	  "Version: 1.0\n"
-	  "Pipeline: true\n\n");
-      
-   vector<string> Messages;   
-   while (1)
+   // Transfer the modification times
+   struct stat Buf;
+   if (stat(File.c_str(),&Buf) != 0)
    {
-      if (WaitFd(STDIN_FILENO) == false ||
-	  ReadMessages(STDIN_FILENO,Messages) == false)
-	 return 0;
-
-      while (Messages.empty() == false)
-      {
-	 string Message = Messages.front();
-	 Messages.erase(Messages.begin());
-	 
-	 // Fetch the message number
-	 char *End;
-	 int Number = strtol(Message.c_str(),&End,10);
-	 if (End == Message.c_str())
-	 {
-	    cerr << "Malformed message!" << endl;
-	    return 100;
-	 }
-	 
-	 // We only understand 600 URI Fetch messages
-	 if (Number != 600)
-	    continue;
-	 
-	 // Grab the URI bit 
-	 string URI = LookupTag(Message,"URI");
-	 string Target = LookupTag(Message,"Filename");
-	 
-	 // Grab the filename
-	 string::size_type Pos = URI.find(':');
-	 if (Pos == string::npos)
-	 {
-	    _error->Error("Invalid message");
-	    Fail(URI);
-	    continue;
-	 }
-	 string File = string(URI,Pos+1);
-	 
-	 // Start the reply message
-	 string Result = "201 URI Done";
-	 Result += "\nURI: " + URI;
-	 Result += "\nFileName: " + Target;
-	 
-	 // See if the file exists
-	 FileFd From(File,FileFd::ReadOnly);
-	 FileFd To(Target,FileFd::WriteEmpty);
-	 To.EraseOnFailure();
-	 if (_error->PendingError() == true)
-	 {
-	    Fail(URI);
-	    continue;
-	 }	 
-	 
-	 // Copy the file
-	 if (CopyFile(From,To) == false)
-	 {
-	    Fail(URI);
-	    continue;
-	 }	 
-	
-	 From.Close();
-	 To.Close();
-	 
-	 // Transfer the modification times
-	 struct stat Buf;
-	 if (stat(File.c_str(),&Buf) != 0)
-	 {
-	    _error->Errno("stat","Failed to stat");
-	    Fail(URI);
-	    continue;
-	 }
-	 struct utimbuf TimeBuf;
-	 TimeBuf.actime = Buf.st_atime;
-	 TimeBuf.modtime = Buf.st_mtime;
-	 if (utime(Target.c_str(),&TimeBuf) != 0)
-	 {
-	    To.OpFail();
-	    _error->Errno("utime","Failed to set modification time");
-	    Fail(URI);
-	    continue;
-	 }
-	       
-	 // Send the message
-	 Result += "\n\n";
-	 if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-	     (signed)Result.length())
-	    return 100;
-      }      
+      To.OpFail();
+      return _error->Errno("stat","Failed to stat");
    }
    
-   return 0;
+   struct utimbuf TimeBuf;
+   TimeBuf.actime = Buf.st_atime;
+   TimeBuf.modtime = Buf.st_mtime;
+   if (utime(DestFile.c_str(),&TimeBuf) != 0)
+   {
+      To.OpFail();
+      return _error->Errno("utime","Failed to set modification time");
+   }
+   
+   // Forumulate a result
+   FetchResult Res;
+   Res.Size = Buf.st_size;
+   Res.Filename = DestFile;
+   Res.LastModified = Buf.st_mtime;
+   Res.IMSHit = false;
+   
+   URIDone(Res);
+   return true;
+}
+									/*}}}*/
+
+int main()
+{
+   CopyMethod Mth;
+   return Mth.Run();
 }
diff --git a/methods/file.cc b/methods/file.cc
index fc42c296..64490749 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: file.cc,v 1.3 1998/10/23 00:50:02 jgg Exp $
+// $Id: file.cc,v 1.4 1998/10/30 07:53:52 jgg Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -13,132 +13,72 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apt-pkg/fileutl.h>
-#include <strutl.h>
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/error.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdio.h>
 									/*}}}*/
 
-// Fail - Generate a failure message					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void Fail(string URI)
+class FileMethod : public pkgAcqMethod
 {
-   printf("400 URI Failure\n"
-	  "URI: %s\n"
-	  "Message: File does not exist\n\n",URI.c_str());
-}
-									/*}}}*/
+   virtual bool Fetch(string Message,URI Get);
+   
+   public:
+   
+   FileMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+};
 
-int main()
+// FileMethod::Fetch - Fetch a file					/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool FileMethod::Fetch(string Message,URI Get)
 {
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
+   string File = Get.Path;
+   FetchResult Res;
    
-   printf("100 Capabilities\n"
-	  "Version: 1.0\n"
-	  "Pipeline: true\n\n");
-      
-   vector<string> Messages;   
-   while (1)
+   // See if the file exists
+   struct stat Buf;
+   if (stat(File.c_str(),&Buf) == 0)
    {
-      if (WaitFd(STDIN_FILENO) == false ||
-	  ReadMessages(STDIN_FILENO,Messages) == false)
-	 return 0;
-
-      while (Messages.empty() == false)
+      Res.Size = Buf.st_size;
+      Res.Filename = File;
+      Res.LastModified = Buf.st_mtime;
+      Res.IMSHit = false;
+      if (LastModified == Buf.st_mtime)
+	 Res.IMSHit = true;
+   }
+   
+   // See if we can compute a file without a .gz exentsion
+   string::size_type Pos = File.rfind(".gz");
+   if (Pos + 3 == File.length())
+   {
+      File = string(File,0,Pos);
+      if (stat(File.c_str(),&Buf) == 0)
       {
-	 string Message = Messages.front();
-	 Messages.erase(Messages.begin());
-	 
-	 // Fetch the message number
-	 char *End;
-	 int Number = strtol(Message.c_str(),&End,10);
-	 if (End == Message.c_str())
-	 {
-	    cerr << "Malformed message!" << endl;
-	    return 100;
-	 }
+	 FetchResult AltRes;
+	 AltRes.Size = Buf.st_size;
+	 AltRes.Filename = File;
+	 AltRes.LastModified = Buf.st_mtime;
+	 AltRes.IMSHit = false;
+	 if (LastModified == Buf.st_mtime)
+	    AltRes.IMSHit = true;
 	 
-	 // We only understand 600 URI Fetch messages
-	 if (Number != 600)
-	    continue;
-	 
-	 // Grab the URI bit 
-	 string URI = LookupTag(Message,"URI");
-	 
-	 // Grab the filename
-	 string::size_type Pos = URI.find(':');
-	 if (Pos == string::npos)
-	 {
-	    Fail(URI);
-	    continue;
-	 }
-	 string File = string(URI,Pos+1);
-	 
-	 // Grab the modification time
-	 time_t LastMod;
-	 string LTime = LookupTag(Message,"Last-Modified");
-	 if (LTime.empty() == false && StrToTime(LTime,LastMod) == false)
-	    LTime = string();
-	 
-	 // Start the reply message
-	 string Result = "201 URI Done";
-	 Result += "\nURI: " + URI;
-
-	 // See if the file exists
-	 struct stat Buf;
-	 bool Ok = false;
-	 if (stat(File.c_str(),&Buf) == 0)
-	 {
-	    char S[300];
-	    sprintf(S,"\nSize: %ld",Buf.st_size);
-	    
-	    Result += "\nFilename: " + File;
-	    Result += S;
-	    Result += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
-	    if (LTime.empty() == false && LastMod == Buf.st_mtime)
-	       Result += "\nIMS-Hit: true";
-		
-	    Ok = true;
-	 }
-	 
-	 // See if we can compute a file without a .gz exentsion
-	 Pos = File.rfind(".gz");
-	 if (Pos + 3 == File.length())
-	 {
-	    File = string(File,0,Pos);
-	    if (stat(File.c_str(),&Buf) == 0)
-	    {
-	       char S[300];
-	       sprintf(S,"\nAlt-Size: %ld",Buf.st_size);
-	       
-	       Result += "\nAlt-Filename: " + File;
-	       Result += S;
-	       Result += "\nAlt-Last-Modified: " + TimeRFC1123(Buf.st_mtime);
-	       if (LTime.empty() == false && LastMod == Buf.st_mtime)
-		  Result += "\nAlt-IMS-Hit: true";
-	       
-	       Ok = true;
-	    }
-	 }
-	 
-	 // Did we find something?
-	 if (Ok == false)
-	 {
-	    Fail(URI);
-	    continue;
-	 }
-	 Result += "\n\n";
-	 
-	 // Send the message
-	 if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-	     (signed)Result.length())
-	    return 100;
+	 URIDone(Res,&AltRes);
+	 return true;
       }      
    }
    
-   return 0;
+   if (Res.Filename.empty() == true)
+      return _error->Error("File not found");
+   
+   URIDone(Res);
+   return true;
+}
+									/*}}}*/
+
+int main()
+{
+   FileMethod Mth;
+   return Mth.Run();
 }
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 84ad472e..acba7fc5 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: gzip.cc,v 1.2 1998/10/26 07:11:53 jgg Exp $
+// $Id: gzip.cc,v 1.3 1998/10/30 07:53:53 jgg Exp $
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
@@ -11,8 +11,7 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/acquire-worker.h>
+#include <apt-pkg/acquire-method.h>
 #include <strutl.h>
 
 #include <sys/stat.h>
@@ -22,166 +21,90 @@
 #include <stdio.h>
 									/*}}}*/
 
-// Fail - Generate a failure message					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void Fail(string URI)
+class GzipMethod : public pkgAcqMethod
 {
-   string Err = "Undetermined Error";
-   if (_error->empty() == false)
-      _error->PopMessage(Err);
+   virtual bool Fetch(string Message,URI Get);
    
-   printf("400 URI Failure\n"
-	  "URI: %s\n"
-	  "Message: %s\n\n",URI.c_str(),Err.c_str());
-   _error->Discard();
-}
-									/*}}}*/
+   public:
+   
+   GzipMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
+};
 
-int main()
+// GzipMethod::Fetch - Decompress the passed URI			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool GzipMethod::Fetch(string Message,URI Get)
 {
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
+   // Open the source and destintation files
+   FileFd From(Get.Path,FileFd::ReadOnly);
+   FileFd To(DestFile,FileFd::WriteEmpty);   
+   To.EraseOnFailure();
+   if (_error->PendingError() == true)
+      return false;
    
-   printf("100 Capabilities\n"
-	  "Version: 1.0\n"
-	  "Pipeline: true\n"
-	  "Send-Config: true\n\n");
-
-   vector<string> Messages;   
-   while (1)
+   // Fork gzip
+   int Process = fork();
+   if (Process < 0)
+      return _error->Errno("fork","Couldn't fork gzip");
+   
+   // The child
+   if (Process == 0)
    {
-      if (WaitFd(STDIN_FILENO) == false ||
-	  ReadMessages(STDIN_FILENO,Messages) == false)
-	 return 0;
-
-      while (Messages.empty() == false)
-      {
-	 string Message = Messages.front();
-	 Messages.erase(Messages.begin());
-	 
-	 // Fetch the message number
-	 char *End;
-	 int Number = strtol(Message.c_str(),&End,10);
-	 if (End == Message.c_str())
-	 {
-	    cerr << "Malformed message!" << endl;
-	    return 100;
-	 }
-	 
-	 // 601 configuration message
-	 if (Number == 601)
-	 {
-	    pkgInjectConfiguration(Message,*_config);
-	    continue;
-	 }	 
+      dup2(From.Fd(),STDIN_FILENO);
+      dup2(To.Fd(),STDOUT_FILENO);
+      From.Close();
+      To.Close();
+      SetCloseExec(STDIN_FILENO,false);
+      SetCloseExec(STDOUT_FILENO,false);
+      
+      const char *Args[3];
+      Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
+      Args[1] = "-d";
+      Args[2] = 0;
+      execvp(Args[0],(char **)Args);
+      exit(100);
+   }
+   From.Close();
+   
+   // Wait for gzip to finish
+   int Status;
+   if (waitpid(Process,&Status,0) != Process)
+   {
+      To.OpFail();
+      return _error->Errno("wait","Waiting for gzip failed");
+   }	 
+   
+   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+   {
+      To.OpFail();
+      return _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
+   }	 
+   
+   To.Close();
+   
+   // Transfer the modification times
+   struct stat Buf;
+   if (stat(Get.Path.c_str(),&Buf) != 0)
+      return _error->Errno("stat","Failed to stat");
 
-	 // 600 URI Fetch message
-	 if (Number != 600)
-	    continue;
-	 
-	 // Grab the URI bit 
-	 string URI = LookupTag(Message,"URI");
-	 string Target = LookupTag(Message,"Filename");
-	 
-	 // Grab the filename
-	 string::size_type Pos = URI.find(':');
-	 if (Pos == string::npos)
-	 {
-	    _error->Error("Invalid message");
-	    Fail(URI);
-	    continue;
-	 }
-	 string File = string(URI,Pos+1);
-	 
-	 // Start the reply message
-	 string Result = "201 URI Done";
-	 Result += "\nURI: " + URI;
-	 Result += "\nFileName: " + Target;
-	 
-	 // See if the file exists
-	 FileFd From(File,FileFd::ReadOnly);
-	 FileFd To(Target,FileFd::WriteEmpty);
-	 To.EraseOnFailure();
-	 if (_error->PendingError() == true)
-	 {
-	    Fail(URI);
-	    continue;
-	 }	 
-	 
-	 // Fork gzip
-	 int Process = fork();
-	 if (Process < 0)
-	 {
-	    _error->Errno("fork","Couldn't fork gzip");
-	    Fail(URI);
-	    continue;
-	 }
-	 
-	 // The child
-	 if (Process == 0)
-	 {
-	    dup2(From.Fd(),STDIN_FILENO);
-	    dup2(To.Fd(),STDOUT_FILENO);
-	    From.Close();
-	    To.Close();
-	    SetCloseExec(STDIN_FILENO,false);
-	    SetCloseExec(STDOUT_FILENO,false);
-	    
-	    const char *Args[3];
-	    Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
-	    Args[1] = "-d";
-	    Args[2] = 0;
-	    execvp(Args[0],(char **)Args);
-	    exit(100);
-	 }
-	 From.Close();
-	 
-	 // Wait for gzip to finish
-	 int Status;
-	 if (waitpid(Process,&Status,0) != Process)
-	 {
-	    To.OpFail();
-	    _error->Errno("wait","Waiting for gzip failed");
-	    Fail(URI);
-	    continue;
-	 }	 
+   struct utimbuf TimeBuf;
+   TimeBuf.actime = Buf.st_atime;
+   TimeBuf.modtime = Buf.st_mtime;
+   if (utime(DestFile.c_str(),&TimeBuf) != 0)
+      return _error->Errno("utime","Failed to set modification time");
 
-	 if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
-	 {
-	    To.OpFail();
-	    _error->Error("gzip failed, perhaps the disk is full or the directory permissions are wrong.");
-	    Fail(URI);
-	    continue;
-	 }	 
-	 
-	 To.Close();
-	 
-	 // Transfer the modification times
-	 struct stat Buf;
-	 if (stat(File.c_str(),&Buf) != 0)
-	 {
-	    _error->Errno("stat","Failed to stat");
-	    Fail(URI);
-	    continue;
-	 }
-	 struct utimbuf TimeBuf;
-	 TimeBuf.actime = Buf.st_atime;
-	 TimeBuf.modtime = Buf.st_mtime;
-	 if (utime(Target.c_str(),&TimeBuf) != 0)
-	 {
-	    _error->Errno("utime","Failed to set modification time");
-	    Fail(URI);
-	    continue;
-	 }
-	 
-	 // Send the message
-	 Result += "\n\n";
-	 if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-	     (signed)Result.length())
-	    return 100;
-      }      
-   }
+   // Return a Done response
+   FetchResult Res;
+   Res.LastModified = Buf.st_mtime;
+   Res.Filename = DestFile;
+   URIDone(Res);
    
-   return 0;
+   return true;
+}
+									/*}}}*/
+
+int main()
+{
+   GzipMethod Mth;
+   return Mth.Run();
 }