summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/contrib/hashes.cc25
-rw-r--r--apt-pkg/contrib/hashes.h9
-rw-r--r--apt-pkg/contrib/strutl.cc8
-rw-r--r--apt-pkg/contrib/strutl.h1
-rw-r--r--apt-private/makefile2
-rw-r--r--apt-private/private-sources.cc59
-rw-r--r--apt-private/private-sources.h3
-rw-r--r--apt-private/private-utils.cc50
-rw-r--r--apt-private/private-utils.h11
-rw-r--r--cmdline/apt-get.cc19
-rw-r--r--cmdline/apt.cc9
-rw-r--r--test/libapt/strutil_test.cc18
12 files changed, 190 insertions, 24 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index e1a431823..b4c768db9 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -55,6 +55,26 @@ HashString::HashString(std::string StringedHash) /*{{{*/
/*}}}*/
bool HashString::VerifyFile(std::string filename) const /*{{{*/
{
+ std::string fileHash = GetHashForFile(filename);
+
+ if(_config->FindB("Debug::Hashes",false) == true)
+ std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl;
+
+ return (fileHash == Hash);
+}
+ /*}}}*/
+bool HashString::FromFile(std::string filename) /*{{{*/
+{
+ // pick the strongest hash
+ if (Type == "")
+ Type = _SupportedHashes[0];
+
+ Hash = GetHashForFile(filename);
+ return true;
+}
+ /*}}}*/
+std::string HashString::GetHashForFile(std::string filename) const /*{{{*/
+{
std::string fileHash;
FileFd Fd(filename, FileFd::ReadOnly);
@@ -84,10 +104,7 @@ bool HashString::VerifyFile(std::string filename) const /*{{{*/
}
Fd.Close();
- if(_config->FindB("Debug::Hashes",false) == true)
- std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl;
-
- return (fileHash == Hash);
+ return fileHash;
}
/*}}}*/
const char** HashString::SupportedHashes()
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 0c0b6c6a7..0a8bcd259 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -36,7 +36,10 @@ class HashString
protected:
std::string Type;
std::string Hash;
- static const char * _SupportedHashes[10];
+ static const char* _SupportedHashes[10];
+
+ // internal helper
+ std::string GetHashForFile(std::string filename) const;
public:
HashString(std::string Type, std::string Hash);
@@ -49,6 +52,10 @@ class HashString
// verify the given filename against the currently loaded hash
bool VerifyFile(std::string filename) const;
+ // generate a hash string from the given filename
+ bool FromFile(std::string filename);
+
+
// helper
std::string toStr() const; // convert to str as "type:hash"
bool empty() const;
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 9f794927d..962112854 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -49,6 +49,14 @@ std::string Strip(const std::string &s)
size_t end = s.find_last_not_of(" \t\n");
return s.substr(start, end-start+1);
}
+
+bool Endswith(const std::string &s, const std::string &end)
+{
+ if (end.size() > s.size())
+ return false;
+ return (s.substr(s.size() - end.size(), s.size()) == end);
+}
+
}
}
/*}}}*/
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index c8fc317c0..8d746f10e 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -36,6 +36,7 @@ using std::ostream;
namespace APT {
namespace String {
std::string Strip(const std::string &s);
+ bool Endswith(const std::string &s, const std::string &ending);
};
};
diff --git a/apt-private/makefile b/apt-private/makefile
index 1d179f0b2..728890b9b 100644
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -17,7 +17,7 @@ MAJOR=0.0
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
-PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main
+PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main utils sources
SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
new file mode 100644
index 000000000..65706e785
--- /dev/null
+++ b/apt-private/private-sources.cc
@@ -0,0 +1,59 @@
+
+#include <apt-pkg/hashes.h>
+#include <apti18n.h>
+
+#include "private-output.h"
+#include "private-sources.h"
+#include "private-utils.h"
+
+/* Interface discussion with donkult (for the future):
+ apt [add-{archive,release,component}|edit|change-release|disable]-sources
+ and be clever and work out stuff from the Release file
+*/
+
+// EditSource - EditSourcesList /*{{{*/
+// ---------------------------------------------------------------------
+bool EditSources(CommandLine &CmdL)
+{
+ bool res;
+ pkgSourceList sl;
+ std::string outs;
+
+ std::string sourceslist;
+ if (CmdL.FileList[1] != NULL)
+ {
+ sourceslist = _config->FindDir("Dir::Etc::sourceparts") + CmdL.FileList[1];
+ if (!APT::String::Endswith(sourceslist, ".list"))
+ sourceslist += ".list";
+ } else {
+ sourceslist = _config->FindFile("Dir::Etc::sourcelist");
+ }
+ HashString before;
+ if (FileExists(sourceslist))
+ before.FromFile(sourceslist);
+
+ do {
+ EditFileInSensibleEditor(sourceslist);
+ _error->PushToStack();
+ res = sl.Read(sourceslist);
+ if (!res) {
+ _error->DumpErrors();
+ strprintf(outs, _("Failed to parse %s. Edit again? "),
+ sourceslist.c_str());
+ std::cout << outs;
+ // FIXME: should we add a "restore previous" option here?
+ res = !YnPrompt(true);
+ }
+ _error->RevertToStack();
+ } while (res == false);
+
+ if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) {
+ strprintf(
+ outs, _("Your '%s' file changed, please run 'apt-get update'."),
+ sourceslist.c_str());
+ std::cout << outs << std::endl;
+ }
+
+ return true;
+}
+ /*}}}*/
diff --git a/apt-private/private-sources.h b/apt-private/private-sources.h
new file mode 100644
index 000000000..b394622be
--- /dev/null
+++ b/apt-private/private-sources.h
@@ -0,0 +1,3 @@
+#include <apt-pkg/cmndline.h>
+
+bool EditSources(CommandLine &CmdL);
diff --git a/apt-private/private-utils.cc b/apt-private/private-utils.cc
new file mode 100644
index 000000000..813f19329
--- /dev/null
+++ b/apt-private/private-utils.cc
@@ -0,0 +1,50 @@
+#include <cstdlib>
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include "private-utils.h"
+
+
+// DisplayFileInPager - Display File with pager /*{{{*/
+void DisplayFileInPager(std::string filename)
+{
+ std::string pager = _config->Find("Dir::Bin::Pager",
+ "/usr/bin/sensible-pager");
+
+ pid_t Process = ExecFork();
+ if (Process == 0)
+ {
+ const char *Args[3];
+ Args[0] = pager.c_str();
+ Args[1] = filename.c_str();
+ Args[2] = 0;
+ execvp(Args[0],(char **)Args);
+ exit(100);
+ }
+
+ // Wait for the subprocess
+ ExecWait(Process, "sensible-pager", false);
+}
+ /*}}}*/
+
+// EditFileInSensibleEditor - Edit File with editor /*{{{*/
+void EditFileInSensibleEditor(std::string filename)
+{
+ std::string editor = _config->Find("Dir::Bin::Editor",
+ "/usr/bin/sensible-editor");
+
+ pid_t Process = ExecFork();
+ if (Process == 0)
+ {
+ const char *Args[3];
+ Args[0] = editor.c_str();
+ Args[1] = filename.c_str();
+ Args[2] = 0;
+ execvp(Args[0],(char **)Args);
+ exit(100);
+ }
+
+ // Wait for the subprocess
+ ExecWait(Process, "sensible-editor", false);
+}
+ /*}}}*/
diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h
new file mode 100644
index 000000000..258dd06a8
--- /dev/null
+++ b/apt-private/private-utils.h
@@ -0,0 +1,11 @@
+#ifndef APT_PRIVATE_UTILS_H
+#define APT_PRIVATE_UTILS_H
+
+#include<string>
+
+void DisplayFileInPager(std::string filename);
+void EditFileInSensibleEditor(std::string filename);
+
+
+
+#endif
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 15373b050..912b2d609 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -59,6 +59,7 @@
#include <apt-private/private-update.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-moo.h>
+#include <apt-private/private-utils.h>
#include <apt-private/acqprogress.h>
@@ -1378,24 +1379,6 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
return _error->Error("changelog download failed");
}
/*}}}*/
-// DisplayFileInPager - Display File with pager /*{{{*/
-void DisplayFileInPager(string filename)
-{
- pid_t Process = ExecFork();
- if (Process == 0)
- {
- const char *Args[3];
- Args[0] = "/usr/bin/sensible-pager";
- Args[1] = filename.c_str();
- Args[2] = 0;
- execvp(Args[0],(char **)Args);
- exit(100);
- }
-
- // Wait for the subprocess
- ExecWait(Process, "sensible-pager", false);
-}
- /*}}}*/
// DoChangelog - Get changelog from the command line /*{{{*/
// ---------------------------------------------------------------------
bool DoChangelog(CommandLine &CmdL)
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index e30967ec2..4bcae0aba 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -41,6 +41,7 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/metaindex.h>
+#include <apt-pkg/hashes.h>
#include <apti18n.h>
@@ -54,8 +55,12 @@
#include <apt-private/private-upgrade.h>
#include <apt-private/private-show.h>
#include <apt-private/private-main.h>
+#include <apt-private/private-utils.h>
+#include <apt-private/private-sources.h>
/*}}}*/
+
+
bool ShowHelp(CommandLine &CmdL)
{
ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
@@ -74,6 +79,8 @@ bool ShowHelp(CommandLine &CmdL)
" update - update list of available packages\n"
" install - install packages\n"
" upgrade - upgrade the systems packages\n"
+ "\n"
+ " edit-sources - edit the source information file\n"
);
return true;
@@ -89,6 +96,8 @@ int main(int argc, const char *argv[]) /*{{{*/
{"remove", &DoInstall},
{"update",&DoUpdate},
{"upgrade",&DoUpgradeWithAllowNewPackages},
+ // misc
+ {"edit-sources",&EditSources},
// helper
{"moo",&DoMoo},
{"help",&ShowHelp},
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index 110a20d27..8215654d0 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -69,5 +69,23 @@ int main(int argc,char *argv[])
result = StringSplit(input, "");
equals(result.size(), 0);
+ // endswith
+ bool b;
+ input = "abcd";
+ b = APT::String::Endswith(input, "d");
+ equals(b, true);
+
+ b = APT::String::Endswith(input, "cd");
+ equals(b, true);
+
+ b = APT::String::Endswith(input, "abcd");
+ equals(b, true);
+
+ b = APT::String::Endswith(input, "x");
+ equals(b, false);
+
+ b = APT::String::Endswith(input, "abcndefg");
+ equals(b, false);
+
return 0;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 06:56:41 +0000