summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/acqprogress.cc306
-rw-r--r--cmdline/acqprogress.h39
-rw-r--r--cmdline/apt-get.cc33
-rw-r--r--cmdline/apt.cc4
4 files changed, 11 insertions, 371 deletions
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
deleted file mode 100644
index c362c1edf..000000000
--- a/cmdline/acqprogress.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description /*{{{*/
-// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $
-/* ######################################################################
-
- Acquire Progress - Command line progress meter
-
- ##################################################################### */
- /*}}}*/
-// Include files /*{{{*/
-#include<config.h>
-
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/acquire-item.h>
-#include <apt-pkg/acquire-worker.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/error.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <iostream>
-#include <unistd.h>
-
-#include "acqprogress.h"
-#include <apti18n.h>
- /*}}}*/
-
-using namespace std;
-
-// AcqTextStatus::AcqTextStatus - Constructor /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) :
- ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
-{
- BlankLine[0] = 0;
-}
- /*}}}*/
-// AcqTextStatus::Start - Downloading has started /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void AcqTextStatus::Start()
-{
- pkgAcquireStatus::Start();
- BlankLine[0] = 0;
- ID = 1;
-};
- /*}}}*/
-// AcqTextStatus::IMSHit - Called when an item got a HIT response /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
-{
- if (Quiet > 1)
- return;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
-
- cout << _("Hit ") << Itm.Description;
- if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
- cout << endl;
- Update = true;
-};
- /*}}}*/
-// AcqTextStatus::Fetch - An item has started to download /*{{{*/
-// ---------------------------------------------------------------------
-/* This prints out the short description and the expected size */
-void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
-{
- Update = true;
- if (Itm.Owner->Complete == true)
- return;
-
- Itm.Owner->ID = ID++;
-
- if (Quiet > 1)
- return;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
-
- cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
- if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
- cout << endl;
-};
- /*}}}*/
-// AcqTextStatus::Done - Completed a download /*{{{*/
-// ---------------------------------------------------------------------
-/* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
-{
- Update = true;
-};
- /*}}}*/
-// AcqTextStatus::Fail - Called when an item fails to download /*{{{*/
-// ---------------------------------------------------------------------
-/* We print out the error text */
-void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
-{
- if (Quiet > 1)
- return;
-
- // Ignore certain kinds of transient failures (bad code)
- if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
- return;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
-
- 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;
-};
- /*}}}*/
-// AcqTextStatus::Stop - Finished downloading /*{{{*/
-// ---------------------------------------------------------------------
-/* This prints out the bytes downloaded and the overall average line
- speed */
-void AcqTextStatus::Stop()
-{
- pkgAcquireStatus::Stop();
- if (Quiet > 1)
- return;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r' << flush;
-
- if (FetchedBytes != 0 && _error->PendingError() == false)
- ioprintf(cout,_("Fetched %sB in %s (%sB/s)\n"),
- SizeToStr(FetchedBytes).c_str(),
- TimeToStr(ElapsedTime).c_str(),
- SizeToStr(CurrentCPS).c_str());
-}
- /*}}}*/
-// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
-// ---------------------------------------------------------------------
-/* 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. */
-bool AcqTextStatus::Pulse(pkgAcquire *Owner)
-{
- pkgAcquireStatus::Pulse(Owner);
-
- if (Quiet > 0)
- return true;
-
- enum {Long = 0,Medium,Short} Mode = Medium;
-
- char Buffer[sizeof(BlankLine)];
- char *End = Buffer + sizeof(Buffer);
- char *S = Buffer;
- if (ScreenWidth >= sizeof(Buffer))
- ScreenWidth = sizeof(Buffer)-1;
-
- // Put in the percent done
- sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
-
- bool Shown = false;
- for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
- I = Owner->WorkerStep(I))
- {
- S += strlen(S);
-
- // There is no item running
- if (I->CurrentItem == 0)
- {
- if (I->Status.empty() == false)
- {
- snprintf(S,End-S," [%s]",I->Status.c_str());
- Shown = true;
- }
-
- continue;
- }
-
- Shown = true;
-
- // Add in the short description
- if (I->CurrentItem->Owner->ID != 0)
- 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());
- S += strlen(S);
-
- // Show the short mode string
- if (I->CurrentItem->Owner->Mode != 0)
- {
- snprintf(S,End-S," %s",I->CurrentItem->Owner->Mode);
- S += strlen(S);
- }
-
- // Add the current progress
- if (Mode == Long)
- snprintf(S,End-S," %llu",I->CurrentSize);
- else
- {
- if (Mode == Medium || I->TotalSize == 0)
- snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
- }
- S += strlen(S);
-
- // Add the total size and percent
- if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
- {
- if (Mode == Short)
- snprintf(S,End-S," %.0f%%",
- (I->CurrentSize*100.0)/I->TotalSize);
- else
- snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
- (I->CurrentSize*100.0)/I->TotalSize);
- }
- S += strlen(S);
- snprintf(S,End-S,"]");
- }
-
- // Show something..
- if (Shown == false)
- snprintf(S,End-S,_(" [Working]"));
-
- /* 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 long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
- 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)
- {
- memset(Buffer + Len,' ',ScreenWidth - Len);
- strcpy(Buffer + ScreenWidth - LenT,Tmp);
- }
- }
- Buffer[ScreenWidth] = 0;
- BlankLine[ScreenWidth] = 0;
- sigprocmask(SIG_SETMASK,&OldSigs,0);
-
- // Draw the current status
- if (strlen(Buffer) == strlen(BlankLine))
- cout << '\r' << Buffer << flush;
- else
- cout << '\r' << BlankLine << '\r' << Buffer << flush;
- memset(BlankLine,' ',strlen(Buffer));
- 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 we do not output on a terminal and one of the options to avoid user
- // interaction is given, we assume that no user is present who could react
- // on your media change request
- if (isatty(STDOUT_FILENO) != 1 && Quiet >= 2 &&
- (_config->FindB("APT::Get::Assume-Yes",false) == true ||
- _config->FindB("APT::Get::Force-Yes",false) == true ||
- _config->FindB("APT::Get::Trivial-Only",false) == true))
-
- return false;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
- ioprintf(cout,_("Media change: please insert the disc labeled\n"
- " '%s'\n"
- "in the drive '%s' and press enter\n"),
- Media.c_str(),Drive.c_str());
-
- char C = 0;
- bool bStatus = true;
- while (C != '\n' && C != '\r')
- {
- int len = read(STDIN_FILENO,&C,1);
- if(C == 'c' || len <= 0)
- bStatus = false;
- }
-
- if(bStatus)
- Update = true;
- return bStatus;
-}
- /*}}}*/
diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h
deleted file mode 100644
index 8f0903923..000000000
--- a/cmdline/acqprogress.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description /*{{{*/
-// $Id: acqprogress.h,v 1.5 2003/02/02 22:24:11 jgg Exp $
-/* ######################################################################
-
- Acquire Progress - Command line progress meter
-
- ##################################################################### */
- /*}}}*/
-#ifndef ACQPROGRESS_H
-#define ACQPROGRESS_H
-
-#include <apt-pkg/acquire.h>
-
-#include <string>
-
-class AcqTextStatus : public pkgAcquireStatus
-{
- unsigned int &ScreenWidth;
- char BlankLine[1024];
- unsigned long ID;
- unsigned long Quiet;
-
- public:
-
- virtual bool MediaChange(std::string Media,std::string Drive);
- virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
- virtual void Fetch(pkgAcquire::ItemDesc &Itm);
- virtual void Done(pkgAcquire::ItemDesc &Itm);
- virtual void Fail(pkgAcquire::ItemDesc &Itm);
- virtual void Start();
- virtual void Stop();
-
- bool Pulse(pkgAcquire *Owner);
-
- AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
-};
-
-#endif
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6d6ba5ff9..1148dbbf3 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -828,13 +828,10 @@ static bool DoSource(CommandLine &CmdL)
queued.insert(Last->Index().ArchiveURI(I->Path));
// check if we have a file with that md5 sum already localy
- if(!I->MD5Hash.empty() && FileExists(flNotDir(I->Path)))
+ if(!I->Hash.empty() && FileExists(flNotDir(I->Path)))
{
- FileFd Fd(flNotDir(I->Path), FileFd::ReadOnly);
- MD5Summation sum;
- sum.AddFD(Fd.Fd(), Fd.Size());
- Fd.Close();
- if((string)sum.Result() == I->MD5Hash)
+ HashString hash_string = HashString(I->Hash);
+ if(hash_string.VerifyFile(flNotDir(I->Path)))
{
ioprintf(c1out,_("Skipping already downloaded file '%s'\n"),
flNotDir(I->Path).c_str());
@@ -843,7 +840,7 @@ static bool DoSource(CommandLine &CmdL)
}
new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),
- I->MD5Hash,I->Size,
+ I->Hash,I->Size,
Last->Index().SourceInfo(*Last,*I),Src);
}
}
@@ -1689,20 +1686,6 @@ static bool ShowHelp(CommandLine &)
return true;
}
/*}}}*/
-// SigWinch - Window size change signal handler /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static void SigWinch(int)
-{
- // Riped from GNU ls
-#ifdef TIOCGWINSZ
- struct winsize ws;
-
- if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
- ScreenWidth = ws.ws_col - 1;
-#endif
-}
- /*}}}*/
int main(int argc,const char *argv[]) /*{{{*/
{
CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
@@ -1757,14 +1740,12 @@ int main(int argc,const char *argv[]) /*{{{*/
// see if we are in simulate mode
CheckSimulateMode(CmdL);
+ // Init the signals
+ InitSignals();
+
// Setup the output streams
InitOutput();
- // Setup the signals
- signal(SIGPIPE,SIG_IGN);
- signal(SIGWINCH,SigWinch);
- SigWinch(0);
-
// Match the operation
CmdL.DispatchArg(Cmds);
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 4813861a4..72086af14 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -96,6 +96,10 @@ int main(int argc, const char *argv[]) /*{{{*/
std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
+ // Init the signals
+ InitSignals();
+
+ // Init the output
InitOutput();
// Set up gettext support
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:36:01 +0000