--- Convert-UUlib/UUlib.xs	2020/02/28 16:57:25	1.18
+++ Convert-UUlib/UUlib.xs	2020/02/28 17:19:02	1.19
@@ -8,13 +8,13 @@
 #include "uulib/uudeview.h"
 #include "uulib/uuint.h"
 
-static int released;
+static int perlinterp_released;
 
-#define RELEASE do { released = 1; perlinterp_release (); } while (0)
-#define ACQUIRE do { perlinterp_acquire (); released = 0; } while (0)
+#define RELEASE do { perlinterp_released = 1; perlinterp_release (); } while (0)
+#define ACQUIRE do { perlinterp_acquire (); perlinterp_released = 0; } while (0)
 
-#define TEMP_ACQUIRE if (released) perlinterp_acquire ();
-#define TEMP_RELEASE if (released) perlinterp_release ();
+#define TEMP_ACQUIRE if (perlinterp_released) perlinterp_acquire ();
+#define TEMP_RELEASE if (perlinterp_released) perlinterp_release ();
 
 static int
 not_here (char *s)
@@ -30,77 +30,77 @@
   switch (*name)
     {
       case 'A':
-        if (strEQ(name, "ACT_COPYING")) return UUACT_COPYING;
-        if (strEQ(name, "ACT_DECODING")) return UUACT_DECODING;
-        if (strEQ(name, "ACT_ENCODING")) return UUACT_ENCODING;
-        if (strEQ(name, "ACT_IDLE")) return UUACT_IDLE;
-        if (strEQ(name, "ACT_SCANNING")) return UUACT_SCANNING;
+        if (strEQ (name, "ACT_COPYING")) return UUACT_COPYING;
+        if (strEQ (name, "ACT_DECODING")) return UUACT_DECODING;
+        if (strEQ (name, "ACT_ENCODING")) return UUACT_ENCODING;
+        if (strEQ (name, "ACT_IDLE")) return UUACT_IDLE;
+        if (strEQ (name, "ACT_SCANNING")) return UUACT_SCANNING;
       case 'F':
-        if (strEQ(name, "FILE_DECODED")) return UUFILE_DECODED;
-        if (strEQ(name, "FILE_ERROR")) return UUFILE_ERROR;
-        if (strEQ(name, "FILE_MISPART")) return UUFILE_MISPART;
-        if (strEQ(name, "FILE_NOBEGIN")) return UUFILE_NOBEGIN;
-        if (strEQ(name, "FILE_NODATA")) return UUFILE_NODATA;
-        if (strEQ(name, "FILE_NOEND")) return UUFILE_NOEND;
-        if (strEQ(name, "FILE_OK")) return UUFILE_OK;
-        if (strEQ(name, "FILE_READ")) return UUFILE_READ;
-        if (strEQ(name, "FILE_TMPFILE")) return UUFILE_TMPFILE;
+        if (strEQ (name, "FILE_DECODED")) return UUFILE_DECODED;
+        if (strEQ (name, "FILE_ERROR")) return UUFILE_ERROR;
+        if (strEQ (name, "FILE_MISPART")) return UUFILE_MISPART;
+        if (strEQ (name, "FILE_NOBEGIN")) return UUFILE_NOBEGIN;
+        if (strEQ (name, "FILE_NODATA")) return UUFILE_NODATA;
+        if (strEQ (name, "FILE_NOEND")) return UUFILE_NOEND;
+        if (strEQ (name, "FILE_OK")) return UUFILE_OK;
+        if (strEQ (name, "FILE_READ")) return UUFILE_READ;
+        if (strEQ (name, "FILE_TMPFILE")) return UUFILE_TMPFILE;
         break;
       case 'M':
-        if (strEQ(name, "MSG_ERROR")) return UUMSG_ERROR;
-        if (strEQ(name, "MSG_FATAL")) return UUMSG_FATAL;
-        if (strEQ(name, "MSG_MESSAGE")) return UUMSG_MESSAGE;
-        if (strEQ(name, "MSG_NOTE")) return UUMSG_NOTE;
-        if (strEQ(name, "MSG_PANIC")) return UUMSG_PANIC;
-        if (strEQ(name, "MSG_WARNING")) return UUMSG_WARNING;
+        if (strEQ (name, "MSG_ERROR")) return UUMSG_ERROR;
+        if (strEQ (name, "MSG_FATAL")) return UUMSG_FATAL;
+        if (strEQ (name, "MSG_MESSAGE")) return UUMSG_MESSAGE;
+        if (strEQ (name, "MSG_NOTE")) return UUMSG_NOTE;
+        if (strEQ (name, "MSG_PANIC")) return UUMSG_PANIC;
+        if (strEQ (name, "MSG_WARNING")) return UUMSG_WARNING;
       case 'O':
-        if (strEQ(name, "OPT_VERSION")) return UUOPT_VERSION;
-        if (strEQ(name, "OPT_FAST")) return UUOPT_FAST;
-        if (strEQ(name, "OPT_DUMBNESS")) return UUOPT_DUMBNESS;
-        if (strEQ(name, "OPT_BRACKPOL")) return UUOPT_BRACKPOL;
-        if (strEQ(name, "OPT_VERBOSE")) return UUOPT_VERBOSE;
-        if (strEQ(name, "OPT_DESPERATE")) return UUOPT_DESPERATE;
-        if (strEQ(name, "OPT_IGNREPLY")) return UUOPT_IGNREPLY;
-        if (strEQ(name, "OPT_OVERWRITE")) return UUOPT_OVERWRITE;
-        if (strEQ(name, "OPT_SAVEPATH")) return UUOPT_SAVEPATH;
-        if (strEQ(name, "OPT_IGNMODE")) return UUOPT_IGNMODE;
-        if (strEQ(name, "OPT_DEBUG")) return UUOPT_DEBUG;
-        if (strEQ(name, "OPT_ERRNO")) return UUOPT_ERRNO;
-        if (strEQ(name, "OPT_PROGRESS")) return UUOPT_PROGRESS;
-        if (strEQ(name, "OPT_USETEXT")) return UUOPT_USETEXT;
-        if (strEQ(name, "OPT_PREAMB")) return UUOPT_PREAMB;
-        if (strEQ(name, "OPT_TINYB64")) return UUOPT_TINYB64;
-        if (strEQ(name, "OPT_ENCEXT")) return UUOPT_ENCEXT;
-        if (strEQ(name, "OPT_REMOVE")) return UUOPT_REMOVE;
-        if (strEQ(name, "OPT_MOREMIME")) return UUOPT_MOREMIME;
-        if (strEQ(name, "OPT_DOTDOT")) return UUOPT_DOTDOT;
-        if (strEQ(name, "OPT_RBUF")) return UUOPT_RBUF;
-        if (strEQ(name, "OPT_WBUF")) return UUOPT_WBUF;
-        if (strEQ(name, "OPT_AUTOCHECK")) return UUOPT_AUTOCHECK;
+        if (strEQ (name, "OPT_VERSION")) return UUOPT_VERSION;
+        if (strEQ (name, "OPT_FAST")) return UUOPT_FAST;
+        if (strEQ (name, "OPT_DUMBNESS")) return UUOPT_DUMBNESS;
+        if (strEQ (name, "OPT_BRACKPOL")) return UUOPT_BRACKPOL;
+        if (strEQ (name, "OPT_VERBOSE")) return UUOPT_VERBOSE;
+        if (strEQ (name, "OPT_DESPERATE")) return UUOPT_DESPERATE;
+        if (strEQ (name, "OPT_IGNREPLY")) return UUOPT_IGNREPLY;
+        if (strEQ (name, "OPT_OVERWRITE")) return UUOPT_OVERWRITE;
+        if (strEQ (name, "OPT_SAVEPATH")) return UUOPT_SAVEPATH;
+        if (strEQ (name, "OPT_IGNMODE")) return UUOPT_IGNMODE;
+        if (strEQ (name, "OPT_DEBUG")) return UUOPT_DEBUG;
+        if (strEQ (name, "OPT_ERRNO")) return UUOPT_ERRNO;
+        if (strEQ (name, "OPT_PROGRESS")) return UUOPT_PROGRESS;
+        if (strEQ (name, "OPT_USETEXT")) return UUOPT_USETEXT;
+        if (strEQ (name, "OPT_PREAMB")) return UUOPT_PREAMB;
+        if (strEQ (name, "OPT_TINYB64")) return UUOPT_TINYB64;
+        if (strEQ (name, "OPT_ENCEXT")) return UUOPT_ENCEXT;
+        if (strEQ (name, "OPT_REMOVE")) return UUOPT_REMOVE;
+        if (strEQ (name, "OPT_MOREMIME")) return UUOPT_MOREMIME;
+        if (strEQ (name, "OPT_DOTDOT")) return UUOPT_DOTDOT;
+        if (strEQ (name, "OPT_RBUF")) return UUOPT_RBUF;
+        if (strEQ (name, "OPT_WBUF")) return UUOPT_WBUF;
+        if (strEQ (name, "OPT_AUTOCHECK")) return UUOPT_AUTOCHECK;
       case 'R':
-        if (strEQ(name, "RET_CANCEL")) return UURET_CANCEL;
-        if (strEQ(name, "RET_CONT")) return UURET_CONT;
-        if (strEQ(name, "RET_EXISTS")) return UURET_EXISTS;
-        if (strEQ(name, "RET_ILLVAL")) return UURET_ILLVAL;
-        if (strEQ(name, "RET_IOERR")) return UURET_IOERR;
-        if (strEQ(name, "RET_NODATA")) return UURET_NODATA;
-        if (strEQ(name, "RET_NOEND")) return UURET_NOEND;
-        if (strEQ(name, "RET_NOMEM")) return UURET_NOMEM;
-        if (strEQ(name, "RET_OK")) return UURET_OK;
-        if (strEQ(name, "RET_UNSUP")) return UURET_UNSUP;
+        if (strEQ (name, "RET_CANCEL")) return UURET_CANCEL;
+        if (strEQ (name, "RET_CONT")) return UURET_CONT;
+        if (strEQ (name, "RET_EXISTS")) return UURET_EXISTS;
+        if (strEQ (name, "RET_ILLVAL")) return UURET_ILLVAL;
+        if (strEQ (name, "RET_IOERR")) return UURET_IOERR;
+        if (strEQ (name, "RET_NODATA")) return UURET_NODATA;
+        if (strEQ (name, "RET_NOEND")) return UURET_NOEND;
+        if (strEQ (name, "RET_NOMEM")) return UURET_NOMEM;
+        if (strEQ (name, "RET_OK")) return UURET_OK;
+        if (strEQ (name, "RET_UNSUP")) return UURET_UNSUP;
       case 'B':
-        if (strEQ(name, "B64_ENCODED")) return B64ENCODED;
-        if (strEQ(name, "BH_ENCODED")) return BH_ENCODED;
+        if (strEQ (name, "B64_ENCODED")) return B64ENCODED;
+        if (strEQ (name, "BH_ENCODED")) return BH_ENCODED;
       case 'P':
-        if (strEQ(name, "PT_ENCODED")) return PT_ENCODED;
+        if (strEQ (name, "PT_ENCODED")) return PT_ENCODED;
       case 'Q':
-        if (strEQ(name, "QP_ENCODED")) return QP_ENCODED;
+        if (strEQ (name, "QP_ENCODED")) return QP_ENCODED;
       case 'U':
-        if (strEQ(name, "UU_ENCODED")) return UU_ENCODED;
+        if (strEQ (name, "UU_ENCODED")) return UU_ENCODED;
       case 'X':
-        if (strEQ(name, "XX_ENCODED")) return XX_ENCODED;
+        if (strEQ (name, "XX_ENCODED")) return XX_ENCODED;
       case 'Y':
-        if (strEQ(name, "YENC_ENCODED")) return YENC_ENCODED;
+        if (strEQ (name, "YENC_ENCODED")) return YENC_ENCODED;
     }
 
   errno = EINVAL;
@@ -112,15 +112,15 @@
 {
   TEMP_ACQUIRE {
 
-  dSP;
- 
-  ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 2);
+    dSP;
+   
+    ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 2);
 
-  PUSHs (sv_2mortal (newSVpv (msg, 0)));
-  PUSHs (sv_2mortal (newSViv (level)));
+    PUSHs (sv_2mortal (newSVpv (msg, 0)));
+    PUSHs (sv_2mortal (newSViv (level)));
 
-  PUTBACK; (void) perl_call_sv ((SV *)cb, G_VOID|G_DISCARD); SPAGAIN;
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; (void) perl_call_sv ((SV *)cb, G_VOID|G_DISCARD); SPAGAIN;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 }
@@ -132,26 +132,26 @@
 
   TEMP_ACQUIRE {
 
-  dSP;
-  int count;
- 
-  ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 6);
-
-  PUSHs (sv_2mortal (newSViv (uup->action)));
-  PUSHs (sv_2mortal (newSVpv (uup->curfile, 0)));
-  PUSHs (sv_2mortal (newSViv (uup->partno)));
-  PUSHs (sv_2mortal (newSViv (uup->numparts)));
-  PUSHs (sv_2mortal (newSViv (uup->fsize)));
-  PUSHs (sv_2mortal (newSViv (uup->percent)));
+    dSP;
+    int count;
+   
+    ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 6);
+
+    PUSHs (sv_2mortal (newSViv (uup->action)));
+    PUSHs (sv_2mortal (newSVpv (uup->curfile, 0)));
+    PUSHs (sv_2mortal (newSViv (uup->partno)));
+    PUSHs (sv_2mortal (newSViv (uup->numparts)));
+    PUSHs (sv_2mortal (newSViv (uup->fsize)));
+    PUSHs (sv_2mortal (newSViv (uup->percent)));
 
-  PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
+    PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
 
-  if (count != 1)
-    croak ("busycallback perl callback returned more than one argument");
+    if (count != 1)
+      croak ("busycallback perl callback returned more than one argument");
 
-  retval = POPi;
+    retval = POPi;
 
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 
@@ -165,21 +165,21 @@
 
   TEMP_ACQUIRE {
 
-  dSP;
-  int count;
- 
-  ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 1);
+    dSP;
+    int count;
+   
+    ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 1);
 
-  PUSHs (sv_2mortal (newSVpv (fname, 0)));
+    PUSHs (sv_2mortal (newSVpv (fname, 0)));
 
-  PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
+    PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
 
-  if (count != 1)
-    croak ("fnamefilter perl callback MUST return a single filename exactly");
+    if (count != 1)
+      croak ("fnamefilter perl callback MUST return a single filename exactly");
 
-  _FP_free (str); str = _FP_strdup (SvPV_nolen (TOPs));
+    _FP_free (str); str = _FP_strdup (SvPV_nolen (TOPs));
 
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 
@@ -193,25 +193,25 @@
 
   TEMP_ACQUIRE {
 
-  dSP;
-  int count;
-  SV *xfname = newSVpv ("", 0);
- 
-  ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 3);
+    dSP;
+    int count;
+    SV *xfname = newSVpv ("", 0);
+   
+    ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 3);
 
-  PUSHs (sv_2mortal (newSVpv (id, 0)));
-  PUSHs (sv_2mortal (xfname));
-  PUSHs (sv_2mortal (newSViv (retrieve)));
+    PUSHs (sv_2mortal (newSVpv (id, 0)));
+    PUSHs (sv_2mortal (xfname));
+    PUSHs (sv_2mortal (newSViv (retrieve)));
 
-  PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
+    PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
 
-  if (count != 1)
-    croak ("filecallback perl callback must return a single return status");
+    if (count != 1)
+      croak ("filecallback perl callback must return a single return status");
 
-  strcpy (fname, SvPV_nolen (xfname));
-  retval = POPi;
+    strcpy (fname, SvPV_nolen (xfname));
+    retval = POPi;
 
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 
@@ -223,29 +223,29 @@
 {
   TEMP_ACQUIRE {
 
-  dSP;
-  int count;
- 
-  ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 2);
+    dSP;
+    int count;
+   
+    ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, 2);
 
-  PUSHs (sv_2mortal(newSVpv(subject, 0)));
-  PUSHs (filename ? sv_2mortal(newSVpv(filename, 0)) : &PL_sv_undef);
+    PUSHs (sv_2mortal(newSVpv(subject, 0)));
+    PUSHs (filename ? sv_2mortal(newSVpv(filename, 0)) : &PL_sv_undef);
 
-  PUTBACK; count = perl_call_sv ((SV *)cb, G_ARRAY); SPAGAIN;
+    PUTBACK; count = perl_call_sv ((SV *)cb, G_ARRAY); SPAGAIN;
 
-  if (count > 1)
-    croak ("filenamecallback perl callback must return nothing or a single filename");
+    if (count > 1)
+      croak ("filenamecallback perl callback must return nothing or a single filename");
 
-  if (count)
-    {
-      _FP_free (filename);
+    if (count)
+      {
+        _FP_free (filename);
 
-      filename = SvOK (TOPs)
-         ? _FP_strdup (SvPV_nolen (TOPs))
-         : 0;
-    }
+        filename = SvOK (TOPs)
+           ? _FP_strdup (SvPV_nolen (TOPs))
+           : 0;
+      }
 
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 
@@ -263,21 +263,21 @@
 
   TEMP_ACQUIRE {
 
-  dSP;
-  int count;
- 
-  ENTER; SAVETMPS; PUSHMARK(SP); EXTEND(SP,1);
+    dSP;
+    int count;
+   
+    ENTER; SAVETMPS; PUSHMARK(SP); EXTEND(SP,1);
 
-  PUSHs(sv_2mortal(newSVpv(info,0)));
+    PUSHs(sv_2mortal(newSVpv(info,0)));
 
-  PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
+    PUTBACK; count = perl_call_sv ((SV *)cb, G_SCALAR); SPAGAIN;
 
-  if (count != 1)
-    croak ("info_file perl callback returned more than one argument");
+    if (count != 1)
+      croak ("info_file perl callback returned more than one argument");
 
-  retval = POPi;
+    retval = POPi;
 
-  PUTBACK; FREETMPS; LEAVE;
+    PUTBACK; FREETMPS; LEAVE;
 
   } TEMP_RELEASE;
 
@@ -298,7 +298,14 @@
     }
 }
 
-static int uu_initialized;
+static void
+initialise (void)
+{
+  int retval = UUInitialize ();
+
+  if (retval != UURET_OK)
+    croak ("unable to initialize uudeview library (%s)", UUstrerror (retval));
+}
 
 MODULE = Convert::UUlib		PACKAGE = Convert::UUlib		PREFIX = UU
 
@@ -308,27 +315,11 @@
 constant (name)
 	char *		name
 
-
-void
-UUInitialize ()
-	CODE:
-        if (!uu_initialized)
-          {
-            int retval;
-
-            if ((retval = UUInitialize ()) != UURET_OK)
-              croak ("unable to initialize uudeview library (%s)", UUstrerror (retval));
- 
-            uu_initialized = 1;
-          }
-
 void
 UUCleanUp ()
 	CODE:
-	if (uu_initialized)
-          UUCleanUp ();
-
-        uu_initialized = 0;
+        UUCleanUp ();
+        initialise ();
 
 SV *
 UUGetOption (opt)
@@ -691,4 +682,5 @@
   uu_file_sv		= newSVsv (&PL_sv_undef);
   uu_fnamefilter_sv	= newSVsv (&PL_sv_undef);
   uu_filename_sv	= newSVsv (&PL_sv_undef);
+  initialise ();