Changeset 6603 for pymolproxy

Timestamp:

Nov 10, 2016 7:16:03 PM (7 years ago)

Author:

ldelgass

Message:

fix error status

File:

• pymolproxy/trunk/pymolproxy.c (modified) (5 diffs)

pymolproxy/trunk/pymolproxy.c

@@ -200 +200 @@
     int rockOffset;
     int cacheId;
-    int error;
     int status;
     int width, height;                  /* Size of viewport. */
@@ -299 +298 @@
     size_t length;
 
-    if (proxyPtr->error) {
-        return TCL_ERROR;
-    }
-
     va_start(ap, format);
-    result = vsnprintf(buffer, BUFSIZ-1, format, ap);
+    result = vsnprintf(buffer, BUFSIZ, format, ap);
     va_end(ap);
+    if (result >= BUFSIZ) {
+        ERROR("Buffer too small for command (len=%d)", result);
+        proxyPtr->status = TCL_ERROR;
+        return proxyPtr->status;
+    }
 
 #ifdef EXEC_DEBUG
-    DEBUG("to-pymol>(%s) code=%d", buffer, result);
+    DEBUG("to-pymol>(%s) len=%d", buffer, result);
 #endif
     if (recording) {
@@ -320 +320 @@
         ERROR("short write to pymol (wrote=%d, should have been %d): %s",
               numWritten, length, strerror(errno));
-    }
-    proxyPtr->status = result;
-    return  proxyPtr->status;
+        proxyPtr->status = TCL_ERROR;
+    }
+    return proxyPtr->status;
 }
 
@@ -552 +552 @@
 clear_error(PymolProxy *proxyPtr)
 {
-    proxyPtr->error = 0;
     proxyPtr->status = TCL_OK;
 }
@@ -2156 +2155 @@
             close(f);
         }
-        INFO("attempting to start \"%s\"", argv[0]);
+        INFO("Executing \"%s\"", argv[0]);
         execvp(argv[0], argv);
         ERROR("can't exec `%s': %s", argv[0], strerror(errno));