X-Git-Url: https://git.evergreen-ils.org/?p=OpenSRF.git;a=blobdiff_plain;f=src%2Flibopensrf%2Futils.c;h=491f168a65d6f7cf1288ee8ff2d1f20a3b7b916b;hp=778afabcb046445c5c01e71ee2812c43dab348a3;hb=4a02ad9f39356a92105fdd1491a95e98634e5ea3;hpb=c5904a8e5afdcc24dd9d400c970ddb6db626bbfe

diff --git a/src/libopensrf/utils.c b/src/libopensrf/utils.c
index 778afab..491f168 100644
--- a/src/libopensrf/utils.c
+++ b/src/libopensrf/utils.c
@@ -16,6 +16,9 @@ GNU General Public License for more details.
 #include <opensrf/log.h>
 #include <errno.h>
 
+static const char hex_chars[]   = "0123456789abcdef";
+static unsigned char hex_code[7] = "\\u00";
+
 inline void* safe_malloc( int size ) {
 	void* ptr = (void*) malloc( size );
 	if( ptr == NULL ) {
@@ -424,6 +427,112 @@ char* uescape( const char* string, int size, int full_escape ) {
 	return buffer_release(buf);
 }
 
+int buffer_append_uescape( growing_buffer* buf, const char* string ) {
+
+	if(NULL == string)
+		return 0;       // Nothing to add?  Nothing to do
+
+	if( NULL == buf )
+		return -1;      // Nothing to add to
+
+	int idx = 0;
+	unsigned long int c;
+
+	while (string[idx]) {
+
+		c = 0x0;
+
+		if ((unsigned char)string[idx] >= 0x80) { // not ASCII
+
+			if ((unsigned char)string[idx] >= 0xC0 && (unsigned char)string[idx] <= 0xF4) { // starts a UTF8 string
+
+				int clen = 1;
+				if (((unsigned char)string[idx] & 0xF0) == 0xF0) {
+					clen = 3;
+					c = (unsigned char)string[idx] ^ 0xF0;
+
+				} else if (((unsigned char)string[idx] & 0xE0) == 0xE0) {
+					clen = 2;
+					c = (unsigned char)string[idx] ^ 0xE0;
+
+				} else if (((unsigned char)string[idx] & 0xC0) == 0xC0) {
+					clen = 1;
+					c = (unsigned char)string[idx] ^ 0xC0;
+				}
+
+				for (;clen;clen--) {
+
+					idx++; // look at the next byte
+					c = (c << 6) | ((unsigned char)string[idx] & 0x3F); // add this byte worth
+				}
+
+				buffer_fadd(buf, "\\u%04x", c);
+
+			} else {
+				return idx + 1;
+			}
+
+		} else if(string[idx] >= ' ' ) { // printable ASCII character
+
+			c = string[idx];
+			switch(c) {
+				case '"':
+				case '\\':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, c);
+					break;
+
+                default:
+			        OSRF_BUFFER_ADD_CHAR(buf, c);
+            }
+
+		} else {
+			c = string[idx];
+
+			/* escape the usual suspects */
+			switch(c) {
+				case '\b':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, 'b');
+					break;
+	
+				case '\f':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, 'f');
+					break;
+	
+				case '\t':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, 't');
+					break;
+	
+				case '\n':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, 'n');
+					break;
+	
+				case '\r':
+					OSRF_BUFFER_ADD_CHAR(buf, '\\');
+					OSRF_BUFFER_ADD_CHAR(buf, 'r');
+					break;
+
+				default:
+				{
+					// Represent as \u followed by four hex characters
+					hex_code[ 4 ] = hex_chars[ c >> 4 ];    // high nybble
+					hex_code[ 5 ] = hex_chars[ c & 0x0F ];  // low nybble
+					hex_code[ 6 ] = '\0';
+					OSRF_BUFFER_ADD(buf, (char *) hex_code);
+					break;
+				}
+			}
+		}
+
+		idx++;
+	}
+
+	return 0;
+}
 
 // A function to turn a process into a daemon 
 int daemonize( void ) {