Changeset 1235:e53f5bf8f19b in roaraudio

Timestamp:

02/25/09 22:17:28 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some bugs...

File:

• libroar/pinentry.c (modified) (5 diffs)

libroar/pinentry.c

@@ -96 +96 @@
      _exit(1);
 
-    execlp(ROAR_HAVE_BIN_PINENTRY, "--display", display, "--ttytype", term, "--ttyname", tty, NULL);
+    execlp(ROAR_HAVE_BIN_PINENTRY, "RoarAudio", "--display", display, "--ttytype", term, "--ttyname", tty, NULL);
 
     _exit(1);
@@ -109 +109 @@
 
  pe->fin = fdopen(in[0], "r");
+
+ roar_pinentry_recv(pe, NULL, NULL);
 
  return 0;
@@ -185 +187 @@
  tp = realbuf + strlen(realbuf) - 1;
 
- for (; *tp != '\r' && *tp != '\n'; tp--)
+ for (; *tp == '\r' || *tp == '\n'; tp--)
   *tp = 0;
 
@@ -249 +251 @@
 
 int roar_pinentry_set_yes  (struct roar_pinentry * pe, char * yes) {
- return roar_pinentry_set(pe, "YES", yes);
+ return roar_pinentry_set(pe, "OK", yes);
 }
 
 int roar_pinentry_set_no   (struct roar_pinentry * pe, char * no) {
- return roar_pinentry_set(pe, "NO", no);
+ return roar_pinentry_set(pe, "CANCEL", no);
 }
 
@@ -289 +291 @@
    return -1;
 
- return roar_pinentry_req(pe, "GETPIN", NULL, NULL, pw);
+ if ( roar_pinentry_req(pe, "GETPIN", NULL, NULL, pw) == -1 )
+  return -1;
+
+ return 0;
 }