--- ray/src/common/rtio.h	2003/06/27 06:53:21	3.1
+++ ray/src/common/rtio.h	2018/06/01 16:38:37	3.19
@@ -1,37 +1,38 @@
-/* RCSid $Id: rtio.h,v 3.1 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: rtio.h,v 3.19 2018/06/01 16:38:37 greg Exp $ */
 /*
  *	Radiance i/o and string routines
  */
 
 #ifndef _RAD_RTIO_H_
 #define _RAD_RTIO_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include  <stdio.h>
 #include  <sys/types.h>
 #include  <fcntl.h>
 #include  <string.h>
 
-/* XXX include paths.h instead */
-#ifndef	 F_OK			/* mode bits for access(2) call */
-#define	 R_OK		4		/* readable */
-#define	 W_OK		2		/* writable */
-#define	 X_OK		1		/* executable */
-#define	 F_OK		0		/* exists */
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef getchar
+#undef putc
+#undef putchar
+#undef feof
+#undef ferror
+#define getc    getc_unlocked
+#define getchar	getchar_unlocked
+#define putc    putc_unlocked
+#define putchar	putchar_unlocked
+#define feof	feof_unlocked
+#define ferror	ferror_unlocked
 #endif
-					/* string.h equivalents */
-#ifndef BSD
-#define  index			strchr
-#define  rindex			strrchr
-#endif
-			/* <unistd.h> is missing on some systems */
-extern off_t	lseek(int, off_t, int);
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 					/* defined in badarg.c */
 extern int	badarg(int ac, char **av, char *fl);
 					/* defined in expandarg.c */
+extern int	envexpchr, filexpchr;
 extern int	expandarg(int *acp, char ***avp, int n);
 					/* defined in fdate.c */
 extern time_t	fdate(char *fname);
@@ -39,26 +40,32 @@ extern int	setfdate(char *fname, long ftim);
 					/* defined in fgetline.c */
 extern char	*fgetline(char *s, int n, FILE *fp);
 					/* defined in fgetval.c */
-extern int	fgetval(FILE *fp, int ty, char *vp);
+extern int	fgetval(FILE *fp, int ty, void *vp);
 					/* defined in fgetword.c */
 extern char	*fgetword(char *s, int n, FILE *fp);
 					/* defined in fputword.c */
 extern void	fputword(char *s, FILE *fp);
-					/* defined in fixargv0.c */
-/*extern char	*fixargv0(char *av0);*/ /* XXX include paths.h instead */
 					/* defined in fropen.c */
 extern FILE	*frlibopen(char *fname);
 					/* defined in getlibpath.c */
 extern char	*getrlibpath(void);
+					/* defined in gethomedir.c */
+extern char	*gethomedir(char *uname, char *path, int plen);
 					/* defined in getpath.c */
 extern char	*getpath(char *fname, char *searchpath, int mode);
+					/* defined in byteswap.c */
+extern void	swap16(char *wp, int n);
+extern void	swap32(char *wp, int n);
+extern void	swap64(char *wp, int n);
 					/* defined in portio.c */
 extern void	putstr(char *s, FILE *fp);
 extern void	putint(long i, int siz, FILE *fp);
 extern void	putflt(double f, FILE *fp);
+extern int	putbinary(const void *s, int elsiz, int nel, FILE *fp);
 extern char	*getstr(char *s, FILE *fp);
 extern long	getint(int siz, FILE *fp);
 extern double	getflt(FILE *fp);
+extern int	getbinary(void *s, int elsiz, int nel, FILE *fp);
 					/* defined in rexpr.c */
 extern int	ecompile(char *sp, int iflg, int wflag);
 extern char	*expsave(void);
@@ -72,8 +79,8 @@ extern int	shash(char *s);
 extern char	*savqstr(char *s);
 extern void	freeqstr(char *s);
 					/* defined in wordfile.c */
-extern int	wordfile(char **words, char *fname);
-extern int	wordstring(char **avl, char *str);
+extern int	wordfile(char **words, int nargs, char *fname);
+extern int	wordstring(char **avl, int nargs, char *str);
 					/* defined in words.c */
 extern char	*atos(char *rs, int nb, char *s);
 extern char	*nextword(char *cp, int nb, char *s);
@@ -89,6 +96,11 @@ extern int	isfltd(char *s, char *ds);
 extern float *	matchlamp(char *s);
 extern int	loadlamps(char *file);
 extern void	freelamps(void);
+
+#ifndef strlcpy				/* defined in option strlcpy.c */
+extern size_t	strlcpy(char *dst, const char *src, size_t siz);
+extern size_t	strlcat(char *dst, const char *src, size_t siz);
+#endif
 
 #ifdef __cplusplus
 }