Changeset 4037 for neercs/trunkTweet

Timestamp:

Nov 25, 2009, 1:36:22 PM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added error checking on PyObject?->char*
• Different handling for errors/results

Location:

neercs/trunk/src

Files:

• interpreter.c (modified) (10 diffs)
• neercs.h (modified) (1 diff)

neercs/trunk/src/interpreter.c

@@ -161 +161 @@
     }
 
-    if (screen_list->interpreter_props.output)
+    if (screen_list->interpreter_props.output_err)
     {
         caca_set_color_ansi(screen_list->cv, CACA_RED, CACA_BLUE);
         caca_printf(screen_list->cv, x + 2, y + 4,
-                    screen_list->interpreter_props.output);
-    }
-
+                    screen_list->interpreter_props.output_err);
+    }
+    if (screen_list->interpreter_props.output_res)
+    {
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTGREEN, CACA_BLUE);
+        caca_printf(screen_list->cv, x + 2, y + 4,
+                    screen_list->interpreter_props.output_res);
+    }
 }
 
@@ -173 +178 @@
 int python_init(struct screen_list *sl)
 {
-    sl->interpreter_props.output = NULL;
+    sl->interpreter_props.output_err = NULL;
+    sl->interpreter_props.output_res = NULL;
     Py_Initialize();
     
@@ -183 +189 @@
 int python_close(struct screen_list *sl)
 {
-    if (sl->interpreter_props.output)
-        free(sl->interpreter_props.output);
-    sl->interpreter_props.output = NULL;
+    if (sl->interpreter_props.output_err)
+        free(sl->interpreter_props.output_err);
+    if (sl->interpreter_props.output_res)
+        free(sl->interpreter_props.output_res);
+    sl->interpreter_props.output_err = NULL;
+    sl->interpreter_props.output_res = NULL;
     Py_Finalize();
     return 0;
@@ -199 +208 @@
     debug("py Executing '%s'\n", sl->interpreter_props.command);
 
-    if (sl->interpreter_props.output)
-    {
-        // FIXME free(sl->interpreter_props.output);
-        sl->interpreter_props.output = NULL;
-    }
-
+    if (sl->interpreter_props.output_err)
+    {
+        free(sl->interpreter_props.output_err);
+        sl->interpreter_props.output_err = NULL;
+    }
+    if (sl->interpreter_props.output_res)
+    {
+        free(sl->interpreter_props.output_res);
+        sl->interpreter_props.output_res = NULL;
+    }
+    
     PyObject *pModule, *pName, *pFunc, *pValue;
 
@@ -211 +225 @@
     if (!pName)
     {
-        sl->interpreter_props.output = getPythonError();
+        sl->interpreter_props.output_err = getPythonError();
         err = 1;
         debug("py Error 1\n");
@@ -228 +242 @@
             if (pValue != NULL) {
                 char *res = getStringFromPyObject(pValue);
-                sl->interpreter_props.output = res;
+                sl->interpreter_props.output_res = res;
                 debug("py Result of call: %s\n", res);
                 Py_DECREF(pValue);
+                err = 2;
             }
             else {
                 Py_DECREF(pFunc);
                 Py_DECREF(pModule);
-                sl->interpreter_props.output = getPythonError();
+                sl->interpreter_props.output_err = getPythonError();
                 err = 1;
                 debug("py Call failed\n");
@@ -244 +259 @@
         else
         {
-            sl->interpreter_props.output = getPythonError();
+            sl->interpreter_props.output_err = getPythonError();
             err = 1;
             debug("py Error 2\n");
@@ -252 +267 @@
     else
     {
-        sl->interpreter_props.output = getPythonError();
+        sl->interpreter_props.output_err = getPythonError();
         err = 1;
-        debug("py: %s\n", sl->interpreter_props.output);
+        debug("py: %s\n", sl->interpreter_props.output_err);
         goto end;
     }
@@ -287 +302 @@
     char *evalue = getStringFromPyObject(value);
 
-    int r = asprintf(&err, "Error in %s : %s", etype, evalue);
+    int r = asprintf(&err, "%s", evalue);
         (void)r;
     return err;
@@ -297 +312 @@
     char *err = PyBytes_AS_STRING(PyUnicode_AsEncodedString(str, "utf-8",
                                                             "Error ~"));
-    return err;
+    
+    char *ret = strdup(err);
+    return ret;
 }
 

neercs/trunk/src/neercs.h

@@ -150 +150 @@
     int size;
     char *command;
-    char *output;
+    char *output_err;
+    char *output_res;
 };