--- ray/src/common/getpath.c	2004/02/12 18:55:50	2.17
+++ ray/src/common/getpath.c	2019/12/28 18:05:14	2.21
@@ -1,22 +1,21 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: getpath.c,v 2.17 2004/02/12 18:55:50 greg Exp $";
+static const char	RCSid[] = "$Id: getpath.c,v 2.21 2019/12/28 18:05:14 greg Exp $";
 #endif
 /*
  *  getpath.c - function to search for file in a list of directories
  *
- *  External symbols declared in standard.h
+ *  External symbols declared in rtio.h
  */
 
 #include "copyright.h"
 
-#include  <string.h>
 #include  <ctype.h>
 
 #include  "rtio.h"
 #include  "paths.h"
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 static char *
 core_getpath	/* wrapped below: expand fname, return full path */
 #else
@@ -24,14 +23,14 @@ char *
 getpath	/* expand fname, return full path */
 #endif
 (
-register char  *fname,
-register char  *searchpath,
-int  mode
+	char  *fname,
+	char  *searchpath,
+	int  mode
 )
 {
 	static char  pname[PATH_MAX];
 	char uname[512];
-	register char  *cp;
+	char  *cp;
 	int i;
 
 	if (fname == NULL) { return(NULL); }
@@ -39,41 +38,41 @@ int  mode
 	pname[0] = '\0';		/* check for full specification */
 
 	if (ISABS(fname)) { /* absolute path */
-		strncpy(pname, fname, sizeof(pname)-1);
+		strlcpy(pname, fname, sizeof(pname));
 	} else {
 		switch (*fname) {
-			case '.':				/* relative to cwd */
-				strncpy(pname, fname, sizeof(pname)-1);
+			case '.':		/* relative to cwd */
+				strlcpy(pname, fname, sizeof(pname));
 				break;
-			case '~':				/* relative to home directory */
+			case '~':		/* relative to home directory */
 				fname++;
 				cp = uname;
-				for (i=0;i<sizeof(uname)&&*fname!='\0'&&!ISDIRSEP(*fname);i++)
+				for (i = 0; i < sizeof(uname) && *fname
+						&& !ISDIRSEP(*fname); i++)
 					*cp++ = *fname++;
 				*cp = '\0';
 				cp = gethomedir(uname, pname, sizeof(pname));
 				if(cp == NULL) return NULL;
-				strncat(pname, fname, sizeof(pname)-strlen(pname)-1);
+				strlcat(pname, fname, sizeof(pname));
 				break;
 		}
 	}
 	if (pname[0])		/* got it, check access if search requested */
-		return(searchpath==NULL||access(pname,mode)==0 ? pname : NULL);
+		return(!searchpath || access(pname,mode)==0 ? pname : NULL);
 
-	if (searchpath == NULL) {			/* don't search */
-		strncpy(pname, fname, sizeof(pname)-1);
+	if (!searchpath) {			/* no search */
+		strlcpy(pname, fname, sizeof(pname));
 		return(pname);
 	}
 	/* check search path */
 	do {
 		cp = pname;
-		while (*searchpath && (*cp = *searchpath++) != PATHSEP) {
-			cp++;
-		}
-		if (cp > pname && !ISDIRSEP(cp[-1])) {
+		while (*searchpath && (*cp = *searchpath++) != PATHSEP)
+			cp += (cp-pname < sizeof(pname)-2);
+		if (cp > pname && !ISDIRSEP(cp[-1]))
 			*cp++ = DIRSEP;
-		}
-		strncpy(cp, fname, sizeof(pname)-strlen(pname)-1);
+		*cp = '\0';
+		strlcat(pname, fname, sizeof(pname));
 		if (access(pname, mode) == 0)		/* file accessable? */
 			return(pname);
 	} while (*searchpath);
@@ -82,7 +81,7 @@ int  mode
 }
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 /* This is a wrapper around the above, "emulating" access mode X_OK,
    which is not supported on Windows.
    If we see X_OK and the filename has no extension, then we'll remove
@@ -93,12 +92,12 @@ int  mode
 */
 char *
 getpath(	/* expand fname, return full path */
-register char  *ffname,
-register char  *searchpath,
-int  mode
+	char  *ffname,
+	char  *searchpath,
+	int  mode
 )
 {
-	register char  *cp;
+	char  *cp;
 	char fname[PATH_MAX];
 
 	if (ffname == NULL)