Changeset 3634 for trunk/lang/matlab/rpLibGetString.cc

Timestamp:

Apr 18, 2013 6:20:13 PM (11 years ago)

Author:

gah

Message:

add fix from release branch: matlab rpLibGetString doesn't handle binary strings (with NULs)

File:

• trunk/lang/matlab/rpLibGetString.cc (modified) (2 diffs)

trunk/lang/matlab/rpLibGetString.cc

@@ -28 +28 @@
  */
 
-void mexFunction(int nlhs, mxArray *plhs[],
-                 int nrhs, const mxArray *prhs[])
+
+void 
+mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
 {
-    int         libIndex    = 0;
-    int         retLibIndex = 0;
-    int         err         = 1;
-    RpLibrary*  lib         = NULL;
-    std::string path        = "";
-    std::string retStr      = "";
+    int libIndex;
+    int err = 1;
+    std::string path;
 
     /* Check for proper number of arguments. */
     if (nrhs != 2) {
-        mexErrMsgTxt("Two input required.");
+        mexErrMsgTxt("wrong # of arguments: "
+                     "should be rpLibGetString(lib, path)");
     }
 
@@ -48 +47 @@
     /* Call the C subroutine. */
     if ( (libIndex > 0) && (!path.empty()) ) {
-        lib = (RpLibrary*) getObject_Void(libIndex);
+        RpLibrary*  lib;
 
-        if (lib) {
-            retStr = lib->getString(path);
-            err = 0;
-        }
+        lib = (RpLibrary*)getObject_Void(libIndex);
+        if (lib != NULL) {
+            std::string contents;
+            contents = lib->getString(path);
+
+            mwSize dims[2];
+            dims[0] = 1;                        /* Treat as a row vector. */
+            dims[1] = contents.length();
+            plhs[0] = mxCreateCharArray(2, dims);
+            
+            /* Copy character array (may include NULs) into the matlab
+             * array. */
+            const char *src = contents.c_str();
+            mxChar *dest = (mxChar *)mxGetPr(plhs[0]);
+            for (int i = 0; i < contents.length(); i++) {
+                dest[i] = src[i];
+            }
+            plhs[1] = mxCreateDoubleScalar(0);
+            return;
+        }
     }
-
     /* Set C-style string output_buf to MATLAB mexFunction output*/
-    plhs[0] = mxCreateString(retStr.c_str());
+    plhs[0] = mxCreateString("");
     plhs[1] = mxCreateDoubleScalar(err);
-
     return;
 }