Changeset 1289:8bb644107e21 in roaraudio

Timestamp:

03/12/09 01:49:00 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

completed the code

File:

• libroar/sshaskpass.c (modified) (1 diff)

libroar/sshaskpass.c

@@ -37 +37 @@
 int roar_sshaskpass_getpass   (char ** pw, char * desc) {
 #ifdef ROAR_HAVE_BIN_SSH_ASKPASS
- FILE * pipe;
+ FILE * cpipe;
+ char   buf[1024];
+ int    pos;
 
- if ( (pipe = popen(ROAR_HAVE_BIN_SSH_ASKPASS, "r")) == NULL ) {
+ if ( pw == NULL )
+  return -1;
+
+ if ( (cpipe = popen(ROAR_HAVE_BIN_SSH_ASKPASS, "r")) == NULL ) {
   return -1;
  }
 
- fclose(pipe);
+ if ( fgets(buf, 1024, cpipe) == NULL ) {
+  fclose(cpipe);
+  return -1;
+ }
+
+ fclose(cpipe);
+
+ pos = strlen(buf);
+
+ for (; pos > -1 && (buf[pos] == '\r' || buf[pos] == '\n'); pos--)
+  buf[pos] = 0;
+
+ if ( pos == 0 )
+  return -1;
+
+ *pw = strdup(buf);
+
+ return 0;
 #else
  return -1;