#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
while ((line = mutt_read_line (line, &linelen, fpin, &lineno)) != NULL) {
if (regexec (PgpGoodSign.rx, line, 0, NULL, 0) == 0) {
- dprint (2, (debugfile, "pgp_copy_checksig: \"%s\" matches regexp.\n",
- line));
+ debug_print (2, ("\"%s\" matches regexp.\n", line));
rv = 0;
}
else
- dprint (2,
- (debugfile,
- "pgp_copy_checksig: \"%s\" doesn't match regexp.\n", line));
+ debug_print (2, ("\"%s\" doesn't match regexp.\n", line));
if (strncmp (line, "[GNUPG:] ", 9) == 0)
continue;
FREE (&line);
}
else {
- dprint (2, (debugfile, "pgp_copy_checksig: No pattern.\n"));
+ debug_print (2, ("No pattern.\n"));
mutt_copy_stream (fpin, fpout);
rv = 1;
}
break;
if (armor_header) {
- char *p = mutt_skip_whitespace (buf);
+ char *p = str_skip_initws (buf);
if (*p == '\0')
armor_header = 0;
bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
last_pos = offset;
- if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) {
+ if (safe_strncmp ("-----BEGIN PGP ", buf, 15) == 0) {
clearsign = 0;
start_pos = last_pos;
}
while (fgets (buf, sizeof (buf), tfp)) {
- if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) {
+ if (safe_strncmp ("-----BEGIN PGP ", buf, 15) == 0) {
if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0)
enc = 1;
else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0)
if ((rv = mutt_wait_filter (thepid)))
badsig = -1;
- dprint (1,
- (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n",
- rv));
+ debug_print (1, ("mutt_wait_filter returned %d.\n", rv));
}
safe_fclose (&pgperr);
mutt_unlink (sigfile);
mutt_unlink (pgperrfile);
- dprint (1, (debugfile, "pgp_verify_one: returning %d.\n", badsig));
+ debug_print (1, ("returning %d.\n", badsig));
return badsig;
}
if ((thepid = pgp_invoke_sign (&pgpin, &pgpout, &pgperr,
-1, -1, -1, signedfile)) == -1) {
- mutt_perror _("Can't open PGP subprocess!");
+ mutt_perror (_("Can't open PGP subprocess!"));
fclose (fp);
unlink (sigfile);
if ((thepid = pgp_invoke_traditional (&pgpin, NULL, NULL,
-1, fileno (pgpout), fileno (pgperr),
pgpinfile, keylist, flags)) == -1) {
- mutt_perror _("Can't invoke PGP");
+ mutt_perror (_("Can't invoke PGP"));
fclose (pgpout);
fclose (pgperr);
pgp_ask_for_key (_("Sign as: "), NULL, KEYFLAG_CANSIGN,
PGP_PUBRING))) {
snprintf (input_signas, sizeof (input_signas), "0x%s", pgp_keyid (p));
- mutt_str_replace (&PgpSignAs, input_signas);
+ str_replace (&PgpSignAs, input_signas);
pgp_free_key (&p);
msg->security |= SIGN;