From d607c875a0999bd29c4db7c92182c8c193379d2a Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 16 Feb 2015 06:13:24 -0500
Subject: Repair the logic for setting a non-default SHM export segment.

Also, ensure this always happens within the regression-test driver.

All regression tests pass.
---
 gpsctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gpsctl.c')

diff --git a/gpsctl.c b/gpsctl.c
index b0d78c34..5dbf2069 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -296,7 +296,7 @@ int main(int argc, char **argv)
 	case 'R':		/* remove the SHM export segment */
 #ifdef SHM_EXPORT_ENABLE
 	    /*@-nullpass@*/
-	    status = shmget(getenv("GPSD_SHM_KEY") ? (key_t)atoi(getenv("GPSD_SHM_KEY")) : (key_t)GPSD_KEY, 0, 0);
+	    status = shmget(getenv("GPSD_SHM_KEY") ? (key_t)strtol(getenv("GPSD_SHM_KEY"), NULL, 0) : (key_t)GPSD_SHM_KEY, 0, 0);
 	    if (status == -1) {
 		gpsd_report(&context.errout, LOG_WARN,
 			    "GPSD SHM segment does not exist.\n");
-- 
cgit v1.2.1