Small segv bug fix

[apt.git] / cmdline / acqprogress.cc

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 194d3bb565a6a32bcbe1dba6d02cd5ab14d9629d..f16843c612970feb750e2b5f0b573c07457e4ea2 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acqprogress.cc,v 1.3 1998/11/23 07:32:24 jgg Exp $
+// $Id: acqprogress.cc,v 1.16 1999/07/03 03:10:35 jgg Exp $
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
@@ -11,8 +11,10 @@
 #include "acqprogress.h"
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
+#include <apt-pkg/strutl.h>
+
 #include <stdio.h>
-#include <strutl.h>
+#include <signal.h>
                                                                        /*}}}*/
 
 // AcqTextStatus::AcqTextStatus - Constructor                          /*{{{*/
@@ -46,7 +48,7 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    
    cout << "Hit " << Itm.Description;
    if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
    Update = true;
 };
@@ -68,9 +70,9 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    
-   cout << "Get:" << hex << Itm.Owner->ID << dec << ' ' << Itm.Description;
+   cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
    if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
 };
                                                                        /*}}}*/
@@ -90,11 +92,22 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
+   if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
+      return;
+      
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    
-   cout << "Err " << Itm.Description << endl;
-   cout << "  " << Itm.Owner->ErrorText << endl;
+   if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
+   {
+      cout << "Ign " << Itm.Description << endl;
+   }
+   else
+   {
+      cout << "Err " << Itm.Description << endl;
+      cout << "  " << Itm.Owner->ErrorText << endl;
+   }
+   
    Update = true;
 };
                                                                        /*}}}*/
@@ -112,9 +125,9 @@ void AcqTextStatus::Stop()
       cout << '\r' << BlankLine << '\r';
    
    if (FetchedBytes != 0)
-      cout << "Fetched " << SizeToStr(FetchedBytes) << " in " << 
+      cout << "Fetched " << SizeToStr(FetchedBytes) << "B in " <<
          TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) << 
-         "/s)" << endl;
+         "B/s)" << endl;
 }
                                                                        /*}}}*/
 // AcqTextStatus::Pulse - Regular event pulse                          /*{{{*/
@@ -122,10 +135,10 @@ void AcqTextStatus::Stop()
 /* This draws the current progress. Each line has an overall percent
    meter and a per active item status meter along with an overall 
    bandwidth and ETA indicator. */
-void AcqTextStatus::Pulse(pkgAcquire *Owner)
+bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 {
    if (Quiet > 0)
-      return;
+      return true;
    
    pkgAcquireStatus::Pulse(Owner);
    
@@ -148,7 +161,11 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       if (I->CurrentItem == 0)
       {
         if (I->Status.empty() == false)
+        {
            snprintf(S,End-S," [%s]",I->Status.c_str());
+           Shown = true;
+        }
+        
         continue;
       }
 
@@ -156,7 +173,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       
       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)
-        snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,
+        snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
                  I->CurrentItem->ShortDesc.c_str());
       else
         snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
@@ -171,11 +188,11 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
             
       // Add the current progress
       if (Mode == Long)
-        snprintf(S,End-S," %u",I->CurrentSize);
+        snprintf(S,End-S," %lu",I->CurrentSize);
       else
       {
         if (Mode == Medium || I->TotalSize == 0)
-           snprintf(S,End-S," %s",SizeToStr(I->CurrentSize).c_str());
+           snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
       }
       S += strlen(S);
       
@@ -183,10 +200,10 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
       {
         if (Mode == Short)
-           snprintf(S,End-S," %u%%",
+           snprintf(S,End-S," %lu%%",
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
         else
-           snprintf(S,End-S,"/%s %u%%",SizeToStr(I->TotalSize).c_str(),
+           snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);
@@ -197,12 +214,18 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    if (Shown == false)
       snprintf(S,End-S," [Working]");
       
-   // Put in the ETA and cps meter
+   /* Put in the ETA and cps meter, block off signals to prevent strangeness
+      during resizing */
+   sigset_t Sigs,OldSigs;
+   sigemptyset(&Sigs);
+   sigaddset(&Sigs,SIGWINCH);
+   sigprocmask(SIG_BLOCK,&Sigs,&OldSigs);
+   
    if (CurrentCPS != 0)
    {      
       char Tmp[300];
       unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
-      sprintf(Tmp," %s/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
+      sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
       unsigned int Len = strlen(Buffer);
       unsigned int LenT = strlen(Tmp);
       if (Len + LenT < ScreenWidth)
@@ -212,7 +235,9 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       }      
    }
    Buffer[ScreenWidth] = 0;
-   
+   BlankLine[ScreenWidth] = 0;
+   sigprocmask(SIG_UNBLOCK,&OldSigs,0);
+
    // Draw the current status
    if (strlen(Buffer) == strlen(BlankLine))
       cout << '\r' << Buffer << flush;
@@ -222,5 +247,25 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    BlankLine[strlen(Buffer)] = 0;
    
    Update = false;
+
+   return true;
+}
+                                                                       /*}}}*/
+// AcqTextStatus::MediaChange - Media need to be swapped               /*{{{*/
+// ---------------------------------------------------------------------
+/* Prompt for a media swap */
+bool AcqTextStatus::MediaChange(string Media,string Drive)
+{
+   if (Quiet <= 0)
+      cout << '\r' << BlankLine << '\r';   
+   cout << "Media Change: Please insert the disc labeled '" << Media << "' in "\
+           "the drive '" << Drive << "' and press enter" << endl;
+
+   char C = 0;
+   while (C != '\n' && C != '\r')
+      read(STDIN_FILENO,&C,1);
+   
+   Update = true;
+   return true;
 }
                                                                        /*}}}*/