OSX: Multiple libedit/readline fixes (#585)

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index d0e68b6121a32086d8109badf8f768a28c154eee..1b64f68b2e7f12624dee586eb4246f3e1bd723d2 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -67,18 +67,24 @@ struct receiver_arg {
 byte_t rx[sizeof(UsbCommand)];
 byte_t* prx = rx;
 
-static void *uart_receiver(void *targ) {
+
+static void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+*uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
 
        while (arg->run) {
                rxlen = 0;
-               if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-rx), &rxlen)) {
+               if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-rx), &rxlen) && rxlen) {
                        prx += rxlen;
                        if (prx-rx < sizeof(UsbCommand)) {
                                continue;
                        }
-                       
                        UsbCommandReceived((UsbCommand*)rx);
                }
                prx = rx;
@@ -96,7 +102,13 @@ static void *uart_receiver(void *targ) {
 }
 
 
-void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;
@@ -120,7 +132,7 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
                        printf("executing commands from file: %s\n", script_cmds_file);
                }
        }
-       
+
        read_history(".history");
 
        while(1)  {
@@ -356,11 +368,13 @@ int main(int argc, char* argv[]) {
                sp = uart_open(argv[1]);
        } else {
                printf("Waiting for Proxmark to appear on %s ", argv[1]);
+               fflush(stdout);
                int openCount = 0;
                do {
                        sp = uart_open(argv[1]);
                        msleep(1000);
                        printf(".");
+                       fflush(stdout);
                } while(++openCount < 20 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
                printf("\n");
        }