[gs-cvs] rev 7003 - trunk/gs/src

[ray at ghostscript.com]

Author: ray
Date: 2006-08-22 18:42:29 -0700 (Tue, 22 Aug 2006)
New Revision: 7003

Modified:
   trunk/gs/src/gpmisc.c
Log:
Fix missing return of combined string length and add missing return cundition
documentation.


Modified: trunk/gs/src/gpmisc.c
===================================================================
--- trunk/gs/src/gpmisc.c	2006-08-21 20:37:48 UTC (rev 7002)
+++ trunk/gs/src/gpmisc.c	2006-08-23 01:42:29 UTC (rev 7003)
@@ -120,7 +120,13 @@
  * directory references from the concatenation when possible.
  * The trailing zero byte is being added.
  *
+ * Returns "gp_combine_success" if OK and sets '*blen' to the length of
+ * the combined string. If the combined string is too small for the buffer
+ * length passed in (as defined by the initial value of *blen), then the
+ * "gp_combine_small_buffer" code is returned.
+ *
  * Also tolerates/skips leading IODevice specifiers such as %os% or %rom%
+ * When there is a leading '%' in the 'fname' no other processing is done.
  *
  * Examples : 
  *	"/gs/lib" + "../Resource/CMap/H" --> "/gs/Resource/CMap/H"
@@ -156,6 +162,7 @@
 	/* function only handles the default file system */
 	/* NOTE: %os% will subvert the normal processing of prefix and fname */
 	ip = fname;
+	*blen = flen;
 	if (!append(&bp, bpe, &ip, flen))
 	    return gp_combine_small_buffer;
 	return gp_combine_success;