aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-05-27 01:39:18 +0000
committerMarcus Brinkmann <[email protected]>2003-05-27 01:39:18 +0000
commitf52a066e357281c21fdcabb0883f81398156ccd6 (patch)
tree1388363af0b1969a705b72d0f81c5a833e9d210f
parentdoc/ (diff)
downloadgpgme-f52a066e357281c21fdcabb0883f81398156ccd6.tar.gz
gpgme-f52a066e357281c21fdcabb0883f81398156ccd6.zip
Reintroduce a check in edit_fnc.
-rw-r--r--trunk/tests/gpg/t-edit.c41
1 files changed, 22 insertions, 19 deletions
diff --git a/trunk/tests/gpg/t-edit.c b/trunk/tests/gpg/t-edit.c
index d66933f0..74f0cde4 100644
--- a/trunk/tests/gpg/t-edit.c
+++ b/trunk/tests/gpg/t-edit.c
@@ -77,29 +77,32 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd)
flush_data (out);
fprintf (stdout, "[-- Code: %i, %s --]\n", status, args);
-
- if (!strcmp (args, "keyedit.prompt"))
- {
- static int step = 0;
- switch (step)
+ if (fd >= 0)
+ {
+ if (!strcmp (args, "keyedit.prompt"))
{
- case 0:
- result = "fpr";
- break;
- case 1:
- result = "expire";
- break;
- default:
- result = "quit";
- break;
+ static int step = 0;
+
+ switch (step)
+ {
+ case 0:
+ result = "fpr";
+ break;
+ case 1:
+ result = "expire";
+ break;
+ default:
+ result = "quit";
+ break;
+ }
+ step++;
}
- step++;
+ else if (!strcmp (args, "keyedit.save.okay"))
+ result = "Y";
+ else if (!strcmp (args, "keygen.valid"))
+ result = "0";
}
- else if (!strcmp (args, "keyedit.save.okay"))
- result = "Y";
- else if (!strcmp (args, "keygen.valid"))
- result = "0";
if (result)
{