Changeset 60590

Timestamp:

May 29, 2014, 3:23:24 PM (10 years ago)

Author:

glynn

Message:

Add G_fatal_longjmp()

Location:

grass/trunk

Files:

• include/defs/gis.h (modified) (2 diffs)
• lib/gis/error.c (modified) (3 diffs)

grass/trunk/include/defs/gis.h

@@ -61 +61 @@
 #include <stdarg.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -218 +219 @@
 
 /* error.c */
+jmp_buf *G_fatal_longjmp(int);
 int G_info_format(void);
 void G_message(const char *, ...) __attribute__ ((format(printf, 1, 2)));

grass/trunk/lib/gis/error.c

@@ -15 +15 @@
 #include <stdlib.h>
 #include <string.h>
+#include <setjmp.h>
 #include <unistd.h>
 #include <time.h>
@@ -58 +59 @@
 static void log_error(const char *, int);
 
+static int fatal_longjmp;
+static jmp_buf fatal_jmp_buf;
+
+jmp_buf *G_fatal_longjmp(int enable)
+{
+    fatal_longjmp = enable;
+    return &fatal_jmp_buf;
+}
+
 static void vfprint_error(int type, const char *template, va_list ap)
 {
@@ -157 +167 @@
         vfprint_error(ERR, msg, ap);
         va_end(ap);
+    }
+
+    if (fatal_longjmp) {
+        busy = 0;
+        longjmp(fatal_jmp_buf, 1);
     }