From c27596aac7d36f2f09be47fc4e0bfab2b5d410c5 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@astropi.att.net>
Date: Thu, 20 Jun 2013 10:13:53 -0700
Subject: [PATCH] Change file properties to not execute, move socket creatio
 after sync in a2pid.c

---
 src/A2PI.PO         | Bin
 src/Makefile        |   2 +-
 src/a2lib.c         |   0
 src/a2mon.c         |   0
 src/a2pid.c         |  32 ++++++++++++++++----------------
 src/a2slideshow.mon |   0
 src/bintomon.c      |   0
 src/dskread.c       |   0
 src/dskwrite.c      |   0
 9 files changed, 17 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 src/A2PI.PO
 mode change 100755 => 100644 src/Makefile
 mode change 100755 => 100644 src/a2lib.c
 mode change 100755 => 100644 src/a2mon.c
 mode change 100755 => 100644 src/a2pid.c
 mode change 100755 => 100644 src/a2slideshow.mon
 mode change 100755 => 100644 src/bintomon.c
 mode change 100755 => 100644 src/dskread.c
 mode change 100755 => 100644 src/dskwrite.c

diff --git a/src/A2PI.PO b/src/A2PI.PO
old mode 100755
new mode 100644
diff --git a/src/Makefile b/src/Makefile
old mode 100755
new mode 100644
index 9306e4a..81e149f
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-BIN=a2pid a2mon dskread dskwrite bintomon
+BIN=a2serclk a2pid a2mon dskread dskwrite bintomon
 
 all: $(BIN)
 
diff --git a/src/a2lib.c b/src/a2lib.c
old mode 100755
new mode 100644
diff --git a/src/a2mon.c b/src/a2mon.c
old mode 100755
new mode 100644
diff --git a/src/a2pid.c b/src/a2pid.c
old mode 100755
new mode 100644
index 378df38..54889d0
--- a/src/a2pid.c
+++ b/src/a2pid.c
@@ -662,22 +662,6 @@ void main(int argc, char **argv)
         evrely.type = EV_REL;
         evrely.code = REL_Y;
         evsync.type = EV_SYN;
-        /*
-         * Open socket.
-         */
-        prlog("a2pid: Open server socket\n");
-        bzero(&servaddr, sizeof(servaddr));
-        servaddr.sin_family      = AF_INET;
-        servaddr.sin_port        = htons(6502);
-        servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
-        srvfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-        if (srvfd < 0)
-                die("error: socket create");
-        if (bind(srvfd,(struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
-                die("error: bind socket");
-        if (listen(srvfd, 1) < 0)
-                die("error: listen socket");
-        reqfd = 0;
         /*
          * Open serial port.
          */
@@ -720,6 +704,22 @@ void main(int argc, char **argv)
         }
         newtio.c_cc[VMIN] = 3; /* blocking read until 3 chars received */
         tcsetattr(a2fd, TCSANOW, &newtio);
+        /*
+         * Open socket.
+         */
+        prlog("a2pid: Open server socket\n");
+        bzero(&servaddr, sizeof(servaddr));
+        servaddr.sin_family      = AF_INET;
+        servaddr.sin_port        = htons(6502);
+        servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
+        srvfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+        if (srvfd < 0)
+                die("error: socket create");
+        if (bind(srvfd,(struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
+                die("error: bind socket");
+        if (listen(srvfd, 1) < 0)
+                die("error: listen socket");
+        reqfd = 0;
         FD_ZERO(&openset);
         FD_SET(a2fd,  &openset);
         FD_SET(srvfd, &openset);
diff --git a/src/a2slideshow.mon b/src/a2slideshow.mon
old mode 100755
new mode 100644
diff --git a/src/bintomon.c b/src/bintomon.c
old mode 100755
new mode 100644
diff --git a/src/dskread.c b/src/dskread.c
old mode 100755
new mode 100644
diff --git a/src/dskwrite.c b/src/dskwrite.c
old mode 100755
new mode 100644