--- ray/src/common/savqstr.c	1993/01/27 20:23:49	2.2
+++ ray/src/common/savqstr.c	2012/06/01 19:17:17	2.10
@@ -1,44 +1,82 @@
-/* Copyright (c) 1993 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: savqstr.c,v 2.10 2012/06/01 19:17:17 greg Exp $";
 #endif
+/*
+ *  Save unshared strings.
+ *
+ *  External symbols declared in standard.h
+ */
 
+#include "copyright.h"
+
+#include <stdlib.h>
+
+#include "rtio.h"
+#include "rterror.h"
+
+
+#if 1
+
+char *
+savqstr(char *s)			/* save a private string */
+{
+	char  *cp;
+	char  *newp;
+
+	for (cp = s; *cp++; )			/* compute strlen()+1 */
+		;
+	newp = (char *)malloc(cp-s);
+	if (newp == NULL) {
+		eputs("out of memory in savqstr");
+		quit(1);
+	}
+	for (cp = newp; (*cp++ = *s++); )		/* inline strcpy() */
+		;
+	return(newp);				/* return new location */
+}
+
+
+void
+freeqstr(char *s)			/* free a private string */
+{
+	if (s != NULL)
+		free((void *)s);
+}
+
+#else
+
 /*
  *  Save unshared strings, packing them together into
  *  large blocks to optimize paging in VM environments.
  */
 
-#define  NULL		0
+#include "rtmisc.h"
 
-#ifdef  BIGMEM
+#ifdef  SMLMEM
 #ifndef  MINBLOCK
-#define  MINBLOCK	(1<<12)		/* minimum allocation block size */
+#define  MINBLOCK	(1<<10)		/* minimum allocation block size */
 #endif
 #ifndef  MAXBLOCK
-#define  MAXBLOCK	(1<<16)		/* maximum allocation block size */
+#define  MAXBLOCK	(1<<14)		/* maximum allocation block size */
 #endif
 #else
 #ifndef  MINBLOCK
-#define  MINBLOCK	(1<<10)		/* minimum allocation block size */
+#define  MINBLOCK	(1<<12)		/* minimum allocation block size */
 #endif
 #ifndef  MAXBLOCK
-#define  MAXBLOCK	(1<<14)		/* maximum allocation block size */
+#define  MAXBLOCK	(1<<16)		/* maximum allocation block size */
 #endif
 #endif
 
-extern char  *bmalloc();
 
-
 char *
-savqstr(s)			/* save a private string */
-register char  *s;
+savqstr(char *s)			/* save a private string */
 {
 	static char  *curp = NULL;		/* allocated memory pointer */
 	static unsigned  nrem = 0;		/* bytes remaining in block */
 	static unsigned  nextalloc = MINBLOCK;	/* next block size */
-	register char  *cp;
-	register unsigned  n;
+	char  *cp;
+	unsigned  n;
 
 	for (cp = s; *cp++; )			/* compute strlen()+1 */
 		;
@@ -62,8 +100,10 @@ register char  *s;
 }
 
 
-freeqstr(s)			/* free a private string (not recommended) */
-char  *s;
+void
+freeqstr(char *s)		/* free a private string (not recommended) */
 {
 	bfree(s, strlen(s)+1);
 }
+
+#endif