From: Keith Packard <keithp@keithp.com>
Date: Sun, 7 Oct 2018 17:32:48 +0000 (-0700)
Subject: altos-map: Switch from json FD ops to json FILE ops
X-Git-Tag: 1.8.7~3^2~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=581f700e08ec8a1c3bfc5a09e7186676c54a5460

altos-map: Switch from json FD ops to json FILE ops

Older versions (in Debian stable) do not have the fd-based operations.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/map-server/altos-map/altos-map-fake b/map-server/altos-map/altos-map-fake
new file mode 100755
index 00000000..1bf5f8e2
--- /dev/null
+++ b/map-server/altos-map/altos-map-fake
@@ -0,0 +1,5 @@
+#!/bin/sh
+# map-N43.799102,W120.586281-hybrid-20.jpg
+export QUERY_STRING="lat=43.799102&lon=-120.586281&zoom=20"
+export REMOTE_ADDR="127.0.0.1"
+./altos-map
diff --git a/map-server/altos-map/altos-map.c b/map-server/altos-map/altos-map.c
index 690ec728..38701076 100644
--- a/map-server/altos-map/altos-map.c
+++ b/map-server/altos-map/altos-map.c
@@ -226,16 +226,23 @@ int main(int argc, char **argv)
 	if (s < 0)
 		fail(408, "Cannot connect AltOS map daemon");
 
+	FILE	*sf = fdopen(s, "r+");
+
+	if (sf == NULL)
+		fail(400, "allocation failure");
+
 	json_t *request = json_pack("{s:f s:f s:i s:s}", "lat", lat, "lon", lon, "zoom", zoom, "remote_addr", remote_addr);
 
 	if (request == NULL)
 		fail(400, "Cannot create JSON request");
 
-	if (json_dumpfd(request, s, 0) < 0)
+	if (json_dumpf(request, sf, 0) < 0)
 		fail(400, "Cannot write JSON request");
 
+	fflush(sf);
+
 	json_error_t	error;
-	json_t 		*reply = json_loadfd(s, 0, &error);
+	json_t 		*reply = json_loadf(sf, 0, &error);
 
 	if (!reply)
 		fail(400, "Cannot read JSON reply");
diff --git a/map-server/altos-map/altos-mapc-fake b/map-server/altos-map/altos-mapc-fake
deleted file mode 100755
index 9e22f76f..00000000
--- a/map-server/altos-map/altos-mapc-fake
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# map-N43.799102,W120.586281-hybrid-20.jpg
-export QUERY_STRING="lat=43.799102&lon=-120.586281&zoom=20"
-export REMOTE_ADDR="127.0.0.1"
-./altos-mapc
-