Add timeout on wait-for-ACK to SiRF driver.

Correct initialization observed oon SiRF-III.  All regression tests pass.

1 files changed, 7 insertions, 1 deletions

diff --git a/gpsmon.c b/gpsmon.c
index 6eae3e5b..54bd0f59 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -1158,7 +1158,13 @@ int main(int argc, char **argv)
     else 
 	devicename = argv[optind];
 
-    (void)strlcpy(session.gpsdata.dev.path, devicename,
+    /* backward compatibilty: accept a bare server name */
+    if (strchr(devicename, ':') == NULL && devicename[0] != '/')
+	(void) strlcpy(session.gpsdata.dev.path, 
+		       "tcp://", sizeof(session.gpsdata.dev.path));
+    else
+	session.gpsdata.dev.path[0] = '\0';
+    (void)strlcat(session.gpsdata.dev.path, devicename,
 		  sizeof(session.gpsdata.dev.path));
 
     if (gpsd_activate(&session, O_PROBEONLY) == -1) {