3 files changed, 53 insertions, 25 deletions

diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 9b8b2146cc..fa12f94730 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -2,6 +2,7 @@ gcc-support.c
 pluginlib_actions.c
 helper.c
 md5.c
+pluginlib_exit.c
 jhash.c
 configfile.c
 fixedpoint.c
diff --git a/apps/plugins/lib/pluginlib_exit.c b/apps/plugins/lib/pluginlib_exit.c
new file mode 100644
index 0000000000..82ae11aca0
--- /dev/null
+++ b/apps/plugins/lib/pluginlib_exit.c
@@ -0,0 +1,25 @@
+/***************************************************************************
+*             __________               __   ___.
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*                     \/            \/     \/    \/            \/
+* $Id$
+*
+* Copyright (C) 2009 by Maurus Cuelenaere
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* KIND, either express or implied.
+*
+****************************************************************************/
+
+#include "pluginlib_exit.h"
+
+jmp_buf __exit_env DATA_ATTR;
+
diff --git a/apps/plugins/lib/pluginlib_exit.h b/apps/plugins/lib/pluginlib_exit.h
index 411d0751d1..00cbc8dc7f 100644
--- a/apps/plugins/lib/pluginlib_exit.h
+++ b/apps/plugins/lib/pluginlib_exit.h
@@ -22,33 +22,35 @@
 #ifndef __PLUGINLIB_EXIT_H__
 #define __PLUGINLIB_EXIT_H__
 
-/* make sure we are in sync with the real definitions, especially on
- * hosted systems */
-#include <stdlib.h>
-#include "gcc_extensions.h"
-
-/* these are actually implemented in plugin_crt0.c which all plugins link */
-extern int atexit(void (*func)(void));
-extern void exit(int status) NORETURN_ATTR;
-/* these don't call the exit handlers */
-extern void _exit(int status) NORETURN_ATTR;
-/* C99 version */
-#define _Exit _exit
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#define EXIT_FAILURE 1
+#include "config.h"
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#include "../../codecs/lib/setjmp.h"
+#else
+#include <setjmp.h>
 #endif
 
-/**
- * helper function to handle USB connected events coming from
- * button_get()
- *
- * it will exit the plugin if usb is detected, but it will call the atexit func
- * before actually showing the usb screen
- *
- * it additionally handles power off as well, with the same behavior
+#define _PLUGINLIB_EXIT_INIT(atexit) switch(setjmp(__exit_env))   \
+                                     {                            \
+                                         case 1:                  \
+                                             atexit               \
+                                             return PLUGIN_OK;    \
+                                         case 2:                  \
+                                             atexit               \
+                                             return PLUGIN_ERROR; \
+                                         case 0:                  \
+                                         default:                 \
+                                             break;               \
+                                     }
+
+/* Either PLUGINLIB_EXIT_INIT or PLUGINLIB_EXIT_INIT_ATEXIT needs to be placed
+ * as the first line in plugin_start. The _ATEXIT version will call the named
+ * no-argument function when exit() is called before exiting the plugin, to
+ * allow for cleanup.
  */
-extern void exit_on_usb(int button);
+#define PLUGINLIB_EXIT_INIT _PLUGINLIB_EXIT_INIT()
+#define PLUGINLIB_EXIT_INIT_ATEXIT(atexit) _PLUGINLIB_EXIT_INIT(atexit();)
+
+extern jmp_buf __exit_env;
+#define exit(status) longjmp(__exit_env, status != 0 ? 2 : 1)
 
 #endif /*  __PLUGINLIB_EXIT_H__ */