Changeset 1235:e53f5bf8f19b in roaraudio for libroar/pinentry.c
- Timestamp:
- 02/25/09 22:17:28 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/pinentry.c
r1234 r1235 96 96 _exit(1); 97 97 98 execlp(ROAR_HAVE_BIN_PINENTRY, " --display", display, "--ttytype", term, "--ttyname", tty, NULL);98 execlp(ROAR_HAVE_BIN_PINENTRY, "RoarAudio", "--display", display, "--ttytype", term, "--ttyname", tty, NULL); 99 99 100 100 _exit(1); … … 109 109 110 110 pe->fin = fdopen(in[0], "r"); 111 112 roar_pinentry_recv(pe, NULL, NULL); 111 113 112 114 return 0; … … 185 187 tp = realbuf + strlen(realbuf) - 1; 186 188 187 for (; *tp != '\r' && *tp != '\n'; tp--)189 for (; *tp == '\r' || *tp == '\n'; tp--) 188 190 *tp = 0; 189 191 … … 249 251 250 252 int roar_pinentry_set_yes (struct roar_pinentry * pe, char * yes) { 251 return roar_pinentry_set(pe, " YES", yes);253 return roar_pinentry_set(pe, "OK", yes); 252 254 } 253 255 254 256 int roar_pinentry_set_no (struct roar_pinentry * pe, char * no) { 255 return roar_pinentry_set(pe, " NO", no);257 return roar_pinentry_set(pe, "CANCEL", no); 256 258 } 257 259 … … 289 291 return -1; 290 292 291 return roar_pinentry_req(pe, "GETPIN", NULL, NULL, pw); 293 if ( roar_pinentry_req(pe, "GETPIN", NULL, NULL, pw) == -1 ) 294 return -1; 295 296 return 0; 292 297 } 293 298
Note: See TracChangeset
for help on using the changeset viewer.