From d2636e63fd823e537f61b5e9d33a85aa0626f0aa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Jul 2013 16:38:55 +0200 Subject: remove more merge artifacts --- apt-pkg/contrib/fileutl.cc | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'apt-pkg/contrib/fileutl.cc') diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 61ff0031f..0f88923cf 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -853,26 +853,6 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) } /*}}}*/ -// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool StartsWithGPGClearTextSignature(string const &FileName) -{ - static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n"; - char buffer[strlen(SIGMSG)+1]; - FILE* gpg = fopen(FileName.c_str(), "r"); - if (gpg == NULL) - return false; - - char const * const test = fgets(buffer, sizeof(buffer), gpg); - fclose(gpg); - if (test == NULL || strcmp(buffer, SIGMSG) != 0) - return false; - - return true; -} - - // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ -- cgit v1.2.3