Changeset 26798

Timestamp:

2013-01-29T16:22:48+13:00 (11 years ago)

Author:

davidb

Message:

Support for cross-compiling with Android-NDK added

Location:

main/trunk/greenstone2/common-src/src/getpw

Files:

• Makefile.in (modified) (2 diffs)
• getpw.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/src/getpw/Makefile.in

@@ -63 +63 @@
 endif
 
+ifeq ($(GSDLOS),android)
+  SOURCES += crypt.c crypt_util.c
+endif
+
 OBJECTS = \
     getpw.o
@@ -69 +73 @@
   # e.g. we are cross-compiling with mingw under Linux
   OBJECTS += crypt.o crypt_util.o getpass.o
+endif
+
+ifeq ($(GSDLOS),android)
+  OBJECTS += crypt.o crypt_util.o
 endif
 

main/trunk/greenstone2/common-src/src/getpw/getpw.cpp

@@ -120 +120 @@
 #endif
 
+
+#if defined(__ANDROID__)
+
+// See:
+//  http://stackoverflow.com/questions/1196418/getting-a-password-in-c-without-using-getpass-3
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <termios.h>
+
+char* getpass(const char* prompt)
+{
+    struct termios oflags, nflags;
+    char* password = (char*)malloc(64);
+
+    /* disabling echo */
+    tcgetattr(fileno(stdin), &oflags);
+    nflags = oflags;
+    nflags.c_lflag &= ~ECHO;
+    nflags.c_lflag |= ECHONL;
+
+    if (tcsetattr(fileno(stdin), TCSANOW, &nflags) != 0) {
+        perror("tcsetattr");
+        return NULL;
+    }
+
+    printf(prompt);
+    fgets(password, sizeof(password), stdin);
+    password[strlen(password) - 1] = 0;
+
+    /* restore terminal */
+    if (tcsetattr(fileno(stdin), TCSANOW, &oflags) != 0) {
+        perror("tcsetattr");
+        return NULL;
+    }
+
+    return password;
+}
+#endif
+
+
+
+
 int main (int argc, char *argv[]) {