- Fixing TAB to 2 spaces

- Fixing line endings from "\r\n" to "\n"

1 files changed, 500 insertions, 500 deletions

diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c
index 4765acd96a7..79434212038 100644
--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -1,500 +1,500 @@
-/************** PlugUtil C Program Source Code File (.C) ***************/

-/*                                                                     */

-/* PROGRAM NAME: PLUGUTIL                                              */

-/* -------------                                                       */

-/*  Version 2.7                                                        */

-/*                                                                     */

-/* COPYRIGHT:                                                          */

-/* ----------                                                          */

-/*  (C) Copyright to the author Olivier BERTRAND          1993-2012    */

-/*                                                                     */

-/* WHAT THIS PROGRAM DOES:                                             */

-/* -----------------------                                             */

-/*  This program are initialization and utility Plug routines.         */

-/*                                                                     */

-/* WHAT YOU NEED TO COMPILE THIS PROGRAM:                              */

-/* --------------------------------------                              */

-/*                                                                     */

-/*  REQUIRED FILES:                                                    */

-/*  ---------------                                                    */

-/*  See Readme.C for a list and description of required SYSTEM files.  */

-/*                                                                     */

-/*    PLUG.C          - Source code                                    */

-/*    GLOBAL.H        - Global declaration file                        */

-/*    OPTION.H        - Option declaration file                        */

-/*                                                                     */

-/*  REQUIRED LIBRARIES:                                                */

-/*  -------------------                                                */

-/*                                                                     */

-/*    OS2.LIB        - OS2 libray                                      */

-/*    LLIBCE.LIB     - Protect mode/standard combined large model C    */

-/*                     library                                         */

-/*                                                                     */

-/*  REQUIRED PROGRAMS:                                                 */

-/*  ------------------                                                 */

-/*                                                                     */

-/*    IBM C Compiler                                                   */

-/*    IBM Linker                                                       */

-/*                                                                     */

-/***********************************************************************/

-//efine DEBTRACE 3

-//efine DEBTRACE2

-

-/***********************************************************************/

-/*                                                                     */

-/*  Include relevant MariaDB header file.                              */

-/*                                                                     */

-/***********************************************************************/

-#include "my_global.h"

-#if defined(WIN32)

-//#include <windows.h>

-#else

-#if defined(UNIX) || defined(UNIV_LINUX)

-#include <errno.h>

-#include <unistd.h>

-//#define __stdcall

-#else

-#include <dir.h>

-#endif

-#include <stdarg.h>

-#endif

-

-#if defined(WIN)

-#include <alloc.h>

-#endif

-#include <errno.h>                  /* definitions of ERANGE ENOMEM    */

-#if !defined(UNIX) && !defined(UNIV_LINUX)

-#include <direct.h>                 /* Directory management library    */

-#endif

-

-/***********************************************************************/

-/*                                                                     */

-/*  Include application header files                                   */

-/*                                                                     */

-/*  global.h     is header containing all global declarations.         */

-/*                                                                     */

-/***********************************************************************/

-#define STORAGE                     /* Initialize global variables     */

-

-#include "osutil.h"

-#include "global.h"

-

-#if defined(WIN32)

-extern HINSTANCE s_hModule;									 /* Saved module handle    */

-#endif   // WIN32

-

-extern char plgini[];

-extern int  trace;

-

-#if defined(XMSG)

-extern char msglang[];

-#endif   // XMSG

-

-/***********************************************************************/

-/*                Local Definitions and static variables               */

-/***********************************************************************/

-typedef struct {

-  ushort Segsize;

-  ushort Size;

-  } AREASIZE;

-

-ACTIVITY defActivity = {            /* Describes activity and language */

-  NULL,                             /* Points to user work area(s)     */

- "Unknown"};                        /* Application name                */

-

-#if defined(XMSG) || defined(NEWMSG)

-	static char stmsg[200];

-#endif   // XMSG	||				 NEWMSG

-

-#if defined(UNIX) || defined(UNIV_LINUX)

-int GetRcString(int id, char *buf, int bufsize);

-#endif   // UNIX

-

-/**************************************************************************/

-/*  Tracing output function.                                              */

-/**************************************************************************/

-void htrc(char const *fmt, ...)

-  {

-	va_list ap;

-	va_start (ap, fmt);

-

-//if (trace == 0 || (trace == 1 && !debug) || !fmt) {

-//	printf("In %s wrong trace=%d debug=%p fmt=%p\n",

-//		__FILE__, trace, debug, fmt);

-//	trace = 0;

-//	} // endif trace

-

-//if (trace == 1)

-//	vfprintf(debug, fmt, ap);

-//else

-		vfprintf(stderr, fmt, ap);

-

-	va_end (ap);

-  } // end of htrc

-

-/***********************************************************************/

-/*  Plug initialization routine.                                       */

-/*  Language points on initial language name and eventual path.        */

-/*  Return value is the pointer to the Global structure.               */

-/***********************************************************************/

-PGLOBAL PlugInit(LPCSTR Language, uint worksize)

-  {

-  PGLOBAL g;

-

-	if (trace > 1)

-		htrc("PlugInit: Language='%s'\n", 

-				  ((!Language) ? "Null" : (char*)Language));

-

-  if (!(g = malloc(sizeof(GLOBAL)))) {

-    fprintf(stderr, MSG(GLOBAL_ERROR), (int)sizeof(GLOBAL));

-  } else {

-    g->Sarea_Size = worksize;

-    g->Trace = 0;

-    g->Activityp = g->ActivityStart = NULL;

-    strcpy(g->Message, "");

-

-    /*******************************************************************/

-    /*  Allocate the main work segment.                                */

-    /*******************************************************************/

-    if (!(g->Sarea = PlugAllocMem(g, worksize))) {

-      char errmsg[256];

-      sprintf(errmsg, MSG(WORK_AREA), g->Message);

-      strcpy(g->Message, errmsg);

-			} /* endif Sarea */

-

-    } /* endif g */

-

-  g->jump_level = -1;   /* New setting to allow recursive call of Plug */

-  return(g);

-  } /* end of PlugInit */

-

-/***********************************************************************/

-/*  PlugExit: Terminate Plug operations.                               */

-/***********************************************************************/

-int PlugExit(PGLOBAL g)

-  {

-  int       rc = 0;

-  PACTIVITY ap;

-

-  if (!g)

-    return rc;

-  else

-    ap = g->ActivityStart;

-

-  free(g->Sarea);

-  free(g);

-  return rc;

-  } /* end of PlugExit */

-

-/***********************************************************************/

-/*  Remove the file type from a file name.                             */

-/*  Note: this routine is not really implemented for Unix.             */

-/***********************************************************************/

-LPSTR PlugRemoveType(LPSTR pBuff, LPCSTR FileName)

-  {

-#if !defined(UNIX) && !defined(UNIV_LINUX)

-  char drive[_MAX_DRIVE];

-#else

-  char *drive = NULL;

-#endif

-  char direc[_MAX_DIR];

-  char fname[_MAX_FNAME];

-  char ftype[_MAX_EXT];

-

-  _splitpath(FileName, drive, direc, fname, ftype);

-

-	if (trace > 1) {

-		htrc("after _splitpath: FileName=%s\n", FileName);

-		htrc("drive=%s dir=%s fname=%s ext=%s\n",

-				  SVP(drive), direc, fname, ftype);

-		} // endif trace

-

-  _makepath(pBuff, drive, direc, fname, "");

-

-	if (trace > 1)

-		htrc("buff='%s'\n", pBuff);

-

-  return pBuff;

-  } // end of PlugRemoveType

-

-/***********************************************************************/

-/*  Set the full path of a file relatively to a given path.            */

-/*  Note: this routine is not really implemented for Unix.             */

-/***********************************************************************/

-LPCSTR PlugSetPath(LPSTR pBuff, LPCSTR FileName, LPCSTR defpath)

-  {

-  char newname[_MAX_PATH];

-  char direc[_MAX_DIR], defdir[_MAX_DIR];

-  char fname[_MAX_FNAME];

-  char ftype[_MAX_EXT];

-#if !defined(UNIX) && !defined(UNIV_LINUX)

-  char drive[_MAX_DRIVE], defdrv[_MAX_DRIVE];

-#else

-  char *drive = NULL, *defdrv = NULL;

-#endif

-

-	if (!strncmp(FileName, "//", 2) || !strncmp(FileName, "\\\\", 2)) {

-		strcpy(pBuff, FileName);			 // Remote file

-		return pBuff;

-		} // endif

-

-  _splitpath(FileName, drive, direc, fname, ftype);

-  _splitpath(defpath, defdrv, defdir, NULL, NULL);

-

-	if (trace > 1) {

-		htrc("after _splitpath: FileName=%s\n", FileName);

-#if defined(UNIX) || defined(UNIV_LINUX)

-		htrc("dir=%s fname=%s ext=%s\n", direc, fname, ftype);

-#else

-		htrc("drive=%s dir=%s fname=%s ext=%s\n", drive, direc, fname, ftype);

-		htrc("defdrv=%s defdir=%s\n", defdrv, defdir);

-#endif

-		} // endif trace

-

-  if (drive && !*drive)

-    strcpy(drive, defdrv);

-

-  switch (*direc) {

-    case '\0':

-      strcpy(direc, defdir);

-      break;

-    case '\\':

-		case '/':

-      break;

-    default:

-			// This supposes that defdir ends with a SLASH 

-			strcpy(direc, strcat(defdir, direc));

-    } // endswitch

-

-  _makepath(newname, drive, direc, fname, ftype);

-

-	if (trace > 1)

-		htrc("newname='%s'\n", newname);

-

-  if (_fullpath(pBuff, newname, _MAX_PATH)) {

-		if (trace > 1)

-			htrc("pbuff='%s'\n", pBuff);

-

-    return pBuff;

-  } else

-    return FileName;     // Error, return unchanged name

-

-  } // end of PlugSetPath

-

-#if defined(XMSG)

-/***********************************************************************/

-/*  PlugGetMessage: get a message from the message file.               */

-/***********************************************************************/

-char *PlugReadMessage(PGLOBAL g, int mid, char *m) 

-  {

-	char  msgfile[_MAX_PATH], msgid[32], buff[256];

-	char *msg;

-	FILE *mfile = NULL;

-

-	GetPrivateProfileString("Message", msglang, "Message\\english.msg", 

-																		 msgfile, _MAX_PATH, plgini);

-

-	if (!(mfile = fopen(msgfile, "rt"))) {

-		sprintf(stmsg, "Fail to open message file %s for %s", msgfile, msglang);

-		goto err;

-		} // endif mfile

-

-	for (;;)

-		if (!fgets(buff, 256, mfile)) {

-			sprintf(stmsg, "Cannot get message %d %s", mid, SVP(m));

-			goto fin;

-		} else

-			if (atoi(buff) == mid)

-				break;

-

-	if (sscanf(buff, " %*d %s \"%[^\"]", msgid, stmsg) < 2) {

-		// Old message file

-		if (!sscanf(buff, " %*d \"%[^\"]", stmsg)) {

-			sprintf(stmsg, "Bad message file for %d %s", mid, SVP(m));

-			goto fin;

-		} else

-			m = NULL;

-

-		} // endif sscanf

-

-	if (m && strcmp(m, msgid)) {

-		// Message file is out of date

-		strcpy(stmsg, m);

-		goto fin;

-		} // endif m

-

- fin:

-	fclose(mfile);

-

- err:

-	if (g) {

-		// Called by STEP

-		msg = (char *)PlugSubAlloc(g, NULL, strlen(stmsg) + 1);

-		strcpy(msg, stmsg);

-	} else // Called by MSG or PlgGetErrorMsg

-		msg =	stmsg;

-

-  return msg;

-  } // end of PlugReadMessage

-

-#elif defined(NEWMSG)

-/***********************************************************************/

-/*  PlugGetMessage: get a message from the resource string table.      */

-/***********************************************************************/

-char *PlugGetMessage(PGLOBAL g, int mid) 

-  {

-  char *msg;

-

-#if !defined(UNIX) && !defined(UNIV_LINUX)

-	int   n = LoadString(s_hModule, (uint)mid, (LPTSTR)stmsg, 200);

-

-	if (n == 0) {

-		DWORD rc = GetLastError();

-	  msg = (char*)PlugSubAlloc(g, NULL, 512);	 // Extend buf allocation

-		n = sprintf(msg, "Message %d, rc=%d: ", mid, rc);

-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |

-                  FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,

-                  (LPTSTR)(msg + n), 512 - n, NULL);

-		return msg;

-		} // endif n

-

-#else	    // UNIX

-	if (!GetRcString(mid, stmsg, 200))

-		sprintf(stmsg, "Message %d not found", mid);

-#endif		// UNIX

-

-	if (g) {

-		// Called by STEP

-		msg = (char *)PlugSubAlloc(g, NULL, strlen(stmsg) + 1);

-		strcpy(msg, stmsg);

-	} else // Called by MSG or PlgGetErrorMsg

-		msg =	stmsg;

-

-  return msg;

-  } // end of PlugGetMessage

-#endif     // NEWMSG

-

-#if defined(WIN32)

-/***********************************************************************/

-/*  Return the line length of the console screen buffer.               */

-/***********************************************************************/

-short GetLineLength(PGLOBAL g)

-	{

-	CONSOLE_SCREEN_BUFFER_INFO coninfo;

-	HANDLE  hcons = GetStdHandle(STD_OUTPUT_HANDLE);

-	BOOL    b = GetConsoleScreenBufferInfo(hcons, &coninfo);

-

-	return (b) ? coninfo.dwSize.X : 0;

-	} // end of GetLineLength

-#endif   // WIN32

-

-/***********************************************************************/

-/*  Program for memory allocation of work and language areas.          */

-/***********************************************************************/

-void *PlugAllocMem(PGLOBAL g, uint size)

-  {

-  void *areap;                     /* Pointer to allocated area        */

-

-  /*********************************************************************/

-  /*  This is the allocation routine for the WIN32/UNIX/AIX version.   */

-  /*********************************************************************/

-  if (!(areap = malloc(size)))

-    sprintf(g->Message, MSG(MALLOC_ERROR), "malloc");

-

-	if (trace > 1) {

-		if (areap)

-		  htrc("Memory of %u allocated at %p\n", size, areap);

-		else

-		  htrc("PlugAllocMem: %s\n", g->Message);

-		  

-		} // endif trace

-

-  return (areap);

-  } /* end of PlugAllocMem */

-

-/***********************************************************************/

-/*  Program for SubSet initialization of memory pools.                 */

-/*  Here there should be some verification done such as validity of    */

-/*  the address and size not larger than memory size.                  */

-/***********************************************************************/

-BOOL PlugSubSet(PGLOBAL g, void *memp, uint size)

-  {

-  PPOOLHEADER pph = memp;

-

-  pph->To_Free = (OFFSET)sizeof(POOLHEADER);

-  pph->FreeBlk = size - pph->To_Free;

-

-  return FALSE;

-  } /* end of PlugSubSet */

-

-/***********************************************************************/

-/*  Program for sub-allocating one item in a storage area.             */

-/*  Note: SubAlloc routines of OS/2 are no more used to increase the   */

-/*  code portability and avoid problems when a grammar compiled under  */

-/*  one version of OS/2 is used under another version.                 */

-/*  The simple way things are done here is also based on the fact      */

-/*  that no freeing of suballocated blocks is permitted in Plug.       */

-/***********************************************************************/

-void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)

-  {

-  PPOOLHEADER pph;                           /* Points on area header. */

-

-  if (!memp)

-    /*******************************************************************/

-    /*  Allocation is to be done in the Sarea.                         */

-    /*******************************************************************/

-    memp = g->Sarea;

-

-//size = ((size + 3) / 4) * 4;       /* Round up size to multiple of 4 */

-	size = ((size + 7) / 8) * 8;       /* Round up size to multiple of 8 */

-  pph = (PPOOLHEADER)memp;

-

-#if defined(DEBUG2) || defined(DEBUG3)

- htrc("SubAlloc in %p size=%d used=%d free=%d\n",

-  memp, size, pph->To_Free, pph->FreeBlk);

-#endif

-

-  if ((uint)size > pph->FreeBlk) {   /* Not enough memory left in pool */

-		char     *pname = "Work";

-

-		sprintf(g->Message,

-			"Not enough memory in %s area for request of %u (used=%d free=%d)",

-		                      pname, size, pph->To_Free, pph->FreeBlk);

-

-#if defined(DEBUG2) || defined(DEBUG3)

- htrc("%s\n", g->Message);

-#endif

-

-    longjmp(g->jumper[g->jump_level], 1);

-    } /* endif size OS32 code */

-

-  /*********************************************************************/

-  /*  Do the suballocation the simplest way.                           */

-  /*********************************************************************/

-  memp = MakePtr(memp, pph->To_Free); /* Points to suballocated block  */

-  pph->To_Free += size;               /* New offset of pool free block */

-  pph->FreeBlk -= size;               /* New size   of pool free block */

-#if defined(DEBUG2) || defined(DEBUG3)

- htrc("Done memp=%p used=%d free=%d\n",

-  memp, pph->To_Free, pph->FreeBlk);

-#endif

-  return (memp);

-  } /* end of PlugSubAlloc */

-

-/***********************************************************************/

-/* This routine makes a pointer from an offset to a memory pointer.    */

-/***********************************************************************/

-void *MakePtr(void *memp, OFFSET offset)

-  {

-  return ((offset == 0) ? NULL : &((char *)memp)[offset]);

-  } /* end of MakePtr */

-

-/***********************************************************************/

-/* This routine makes an offset from a pointer new format.             */

-/***********************************************************************/

-OFFSET MakeOff(void *memp, void *ptr)

-  {

-  return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp));

-  } /* end of MakeOff */

-

-/*--------------------- End of PLUGUTIL program -----------------------*/

+/************** PlugUtil C Program Source Code File (.C) ***************/
+/*                                                                     */
+/* PROGRAM NAME: PLUGUTIL                                              */
+/* -------------                                                       */
+/*  Version 2.7                                                        */
+/*                                                                     */
+/* COPYRIGHT:                                                          */
+/* ----------                                                          */
+/*  (C) Copyright to the author Olivier BERTRAND          1993-2012    */
+/*                                                                     */
+/* WHAT THIS PROGRAM DOES:                                             */
+/* -----------------------                                             */
+/*  This program are initialization and utility Plug routines.         */
+/*                                                                     */
+/* WHAT YOU NEED TO COMPILE THIS PROGRAM:                              */
+/* --------------------------------------                              */
+/*                                                                     */
+/*  REQUIRED FILES:                                                    */
+/*  ---------------                                                    */
+/*  See Readme.C for a list and description of required SYSTEM files.  */
+/*                                                                     */
+/*    PLUG.C          - Source code                                    */
+/*    GLOBAL.H        - Global declaration file                        */
+/*    OPTION.H        - Option declaration file                        */
+/*                                                                     */
+/*  REQUIRED LIBRARIES:                                                */
+/*  -------------------                                                */
+/*                                                                     */
+/*    OS2.LIB        - OS2 libray                                      */
+/*    LLIBCE.LIB     - Protect mode/standard combined large model C    */
+/*                     library                                         */
+/*                                                                     */
+/*  REQUIRED PROGRAMS:                                                 */
+/*  ------------------                                                 */
+/*                                                                     */
+/*    IBM C Compiler                                                   */
+/*    IBM Linker                                                       */
+/*                                                                     */
+/***********************************************************************/
+//efine DEBTRACE 3
+//efine DEBTRACE2
+
+/***********************************************************************/
+/*                                                                     */
+/*  Include relevant MariaDB header file.                              */
+/*                                                                     */
+/***********************************************************************/
+#include "my_global.h"
+#if defined(WIN32)
+//#include <windows.h>
+#else
+#if defined(UNIX) || defined(UNIV_LINUX)
+#include <errno.h>
+#include <unistd.h>
+//#define __stdcall
+#else
+#include <dir.h>
+#endif
+#include <stdarg.h>
+#endif
+
+#if defined(WIN)
+#include <alloc.h>
+#endif
+#include <errno.h>                  /* definitions of ERANGE ENOMEM    */
+#if !defined(UNIX) && !defined(UNIV_LINUX)
+#include <direct.h>                 /* Directory management library    */
+#endif
+
+/***********************************************************************/
+/*                                                                     */
+/*  Include application header files                                   */
+/*                                                                     */
+/*  global.h     is header containing all global declarations.         */
+/*                                                                     */
+/***********************************************************************/
+#define STORAGE                     /* Initialize global variables     */
+
+#include "osutil.h"
+#include "global.h"
+
+#if defined(WIN32)
+extern HINSTANCE s_hModule;                   /* Saved module handle    */
+#endif   // WIN32
+
+extern char plgini[];
+extern int  trace;
+
+#if defined(XMSG)
+extern char msglang[];
+#endif   // XMSG
+
+/***********************************************************************/
+/*                Local Definitions and static variables               */
+/***********************************************************************/
+typedef struct {
+  ushort Segsize;
+  ushort Size;
+  } AREASIZE;
+
+ACTIVITY defActivity = {            /* Describes activity and language */
+  NULL,                             /* Points to user work area(s)     */
+ "Unknown"};                        /* Application name                */
+
+#if defined(XMSG) || defined(NEWMSG)
+  static char stmsg[200];
+#endif   // XMSG  ||         NEWMSG
+
+#if defined(UNIX) || defined(UNIV_LINUX)
+int GetRcString(int id, char *buf, int bufsize);
+#endif   // UNIX
+
+/**************************************************************************/
+/*  Tracing output function.                                              */
+/**************************************************************************/
+void htrc(char const *fmt, ...)
+  {
+  va_list ap;
+  va_start (ap, fmt);
+
+//if (trace == 0 || (trace == 1 && !debug) || !fmt) {
+//  printf("In %s wrong trace=%d debug=%p fmt=%p\n",
+//    __FILE__, trace, debug, fmt);
+//  trace = 0;
+//  } // endif trace
+
+//if (trace == 1)
+//  vfprintf(debug, fmt, ap);
+//else
+    vfprintf(stderr, fmt, ap);
+
+  va_end (ap);
+  } // end of htrc
+
+/***********************************************************************/
+/*  Plug initialization routine.                                       */
+/*  Language points on initial language name and eventual path.        */
+/*  Return value is the pointer to the Global structure.               */
+/***********************************************************************/
+PGLOBAL PlugInit(LPCSTR Language, uint worksize)
+  {
+  PGLOBAL g;
+
+  if (trace > 1)
+    htrc("PlugInit: Language='%s'\n", 
+          ((!Language) ? "Null" : (char*)Language));
+
+  if (!(g = malloc(sizeof(GLOBAL)))) {
+    fprintf(stderr, MSG(GLOBAL_ERROR), (int)sizeof(GLOBAL));
+  } else {
+    g->Sarea_Size = worksize;
+    g->Trace = 0;
+    g->Activityp = g->ActivityStart = NULL;
+    strcpy(g->Message, "");
+
+    /*******************************************************************/
+    /*  Allocate the main work segment.                                */
+    /*******************************************************************/
+    if (!(g->Sarea = PlugAllocMem(g, worksize))) {
+      char errmsg[256];
+      sprintf(errmsg, MSG(WORK_AREA), g->Message);
+      strcpy(g->Message, errmsg);
+      } /* endif Sarea */
+
+    } /* endif g */
+
+  g->jump_level = -1;   /* New setting to allow recursive call of Plug */
+  return(g);
+  } /* end of PlugInit */
+
+/***********************************************************************/
+/*  PlugExit: Terminate Plug operations.                               */
+/***********************************************************************/
+int PlugExit(PGLOBAL g)
+  {
+  int       rc = 0;
+  PACTIVITY ap;
+
+  if (!g)
+    return rc;
+  else
+    ap = g->ActivityStart;
+
+  free(g->Sarea);
+  free(g);
+  return rc;
+  } /* end of PlugExit */
+
+/***********************************************************************/
+/*  Remove the file type from a file name.                             */
+/*  Note: this routine is not really implemented for Unix.             */
+/***********************************************************************/
+LPSTR PlugRemoveType(LPSTR pBuff, LPCSTR FileName)
+  {
+#if !defined(UNIX) && !defined(UNIV_LINUX)
+  char drive[_MAX_DRIVE];
+#else
+  char *drive = NULL;
+#endif
+  char direc[_MAX_DIR];
+  char fname[_MAX_FNAME];
+  char ftype[_MAX_EXT];
+
+  _splitpath(FileName, drive, direc, fname, ftype);
+
+  if (trace > 1) {
+    htrc("after _splitpath: FileName=%s\n", FileName);
+    htrc("drive=%s dir=%s fname=%s ext=%s\n",
+          SVP(drive), direc, fname, ftype);
+    } // endif trace
+
+  _makepath(pBuff, drive, direc, fname, "");
+
+  if (trace > 1)
+    htrc("buff='%s'\n", pBuff);
+
+  return pBuff;
+  } // end of PlugRemoveType
+
+/***********************************************************************/
+/*  Set the full path of a file relatively to a given path.            */
+/*  Note: this routine is not really implemented for Unix.             */
+/***********************************************************************/
+LPCSTR PlugSetPath(LPSTR pBuff, LPCSTR FileName, LPCSTR defpath)
+  {
+  char newname[_MAX_PATH];
+  char direc[_MAX_DIR], defdir[_MAX_DIR];
+  char fname[_MAX_FNAME];
+  char ftype[_MAX_EXT];
+#if !defined(UNIX) && !defined(UNIV_LINUX)
+  char drive[_MAX_DRIVE], defdrv[_MAX_DRIVE];
+#else
+  char *drive = NULL, *defdrv = NULL;
+#endif
+
+  if (!strncmp(FileName, "//", 2) || !strncmp(FileName, "\\\\", 2)) {
+    strcpy(pBuff, FileName);       // Remote file
+    return pBuff;
+    } // endif
+
+  _splitpath(FileName, drive, direc, fname, ftype);
+  _splitpath(defpath, defdrv, defdir, NULL, NULL);
+
+  if (trace > 1) {
+    htrc("after _splitpath: FileName=%s\n", FileName);
+#if defined(UNIX) || defined(UNIV_LINUX)
+    htrc("dir=%s fname=%s ext=%s\n", direc, fname, ftype);
+#else
+    htrc("drive=%s dir=%s fname=%s ext=%s\n", drive, direc, fname, ftype);
+    htrc("defdrv=%s defdir=%s\n", defdrv, defdir);
+#endif
+    } // endif trace
+
+  if (drive && !*drive)
+    strcpy(drive, defdrv);
+
+  switch (*direc) {
+    case '\0':
+      strcpy(direc, defdir);
+      break;
+    case '\\':
+    case '/':
+      break;
+    default:
+      // This supposes that defdir ends with a SLASH 
+      strcpy(direc, strcat(defdir, direc));
+    } // endswitch
+
+  _makepath(newname, drive, direc, fname, ftype);
+
+  if (trace > 1)
+    htrc("newname='%s'\n", newname);
+
+  if (_fullpath(pBuff, newname, _MAX_PATH)) {
+    if (trace > 1)
+      htrc("pbuff='%s'\n", pBuff);
+
+    return pBuff;
+  } else
+    return FileName;     // Error, return unchanged name
+
+  } // end of PlugSetPath
+
+#if defined(XMSG)
+/***********************************************************************/
+/*  PlugGetMessage: get a message from the message file.               */
+/***********************************************************************/
+char *PlugReadMessage(PGLOBAL g, int mid, char *m) 
+  {
+  char  msgfile[_MAX_PATH], msgid[32], buff[256];
+  char *msg;
+  FILE *mfile = NULL;
+
+  GetPrivateProfileString("Message", msglang, "Message\\english.msg", 
+                                     msgfile, _MAX_PATH, plgini);
+
+  if (!(mfile = fopen(msgfile, "rt"))) {
+    sprintf(stmsg, "Fail to open message file %s for %s", msgfile, msglang);
+    goto err;
+    } // endif mfile
+
+  for (;;)
+    if (!fgets(buff, 256, mfile)) {
+      sprintf(stmsg, "Cannot get message %d %s", mid, SVP(m));
+      goto fin;
+    } else
+      if (atoi(buff) == mid)
+        break;
+
+  if (sscanf(buff, " %*d %s \"%[^\"]", msgid, stmsg) < 2) {
+    // Old message file
+    if (!sscanf(buff, " %*d \"%[^\"]", stmsg)) {
+      sprintf(stmsg, "Bad message file for %d %s", mid, SVP(m));
+      goto fin;
+    } else
+      m = NULL;
+
+    } // endif sscanf
+
+  if (m && strcmp(m, msgid)) {
+    // Message file is out of date
+    strcpy(stmsg, m);
+    goto fin;
+    } // endif m
+
+ fin:
+  fclose(mfile);
+
+ err:
+  if (g) {
+    // Called by STEP
+    msg = (char *)PlugSubAlloc(g, NULL, strlen(stmsg) + 1);
+    strcpy(msg, stmsg);
+  } else // Called by MSG or PlgGetErrorMsg
+    msg =  stmsg;
+
+  return msg;
+  } // end of PlugReadMessage
+
+#elif defined(NEWMSG)
+/***********************************************************************/
+/*  PlugGetMessage: get a message from the resource string table.      */
+/***********************************************************************/
+char *PlugGetMessage(PGLOBAL g, int mid) 
+  {
+  char *msg;
+
+#if !defined(UNIX) && !defined(UNIV_LINUX)
+  int   n = LoadString(s_hModule, (uint)mid, (LPTSTR)stmsg, 200);
+
+  if (n == 0) {
+    DWORD rc = GetLastError();
+    msg = (char*)PlugSubAlloc(g, NULL, 512);   // Extend buf allocation
+    n = sprintf(msg, "Message %d, rc=%d: ", mid, rc);
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+                  FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
+                  (LPTSTR)(msg + n), 512 - n, NULL);
+    return msg;
+    } // endif n
+
+#else      // UNIX
+  if (!GetRcString(mid, stmsg, 200))
+    sprintf(stmsg, "Message %d not found", mid);
+#endif    // UNIX
+
+  if (g) {
+    // Called by STEP
+    msg = (char *)PlugSubAlloc(g, NULL, strlen(stmsg) + 1);
+    strcpy(msg, stmsg);
+  } else // Called by MSG or PlgGetErrorMsg
+    msg =  stmsg;
+
+  return msg;
+  } // end of PlugGetMessage
+#endif     // NEWMSG
+
+#if defined(WIN32)
+/***********************************************************************/
+/*  Return the line length of the console screen buffer.               */
+/***********************************************************************/
+short GetLineLength(PGLOBAL g)
+  {
+  CONSOLE_SCREEN_BUFFER_INFO coninfo;
+  HANDLE  hcons = GetStdHandle(STD_OUTPUT_HANDLE);
+  BOOL    b = GetConsoleScreenBufferInfo(hcons, &coninfo);
+
+  return (b) ? coninfo.dwSize.X : 0;
+  } // end of GetLineLength
+#endif   // WIN32
+
+/***********************************************************************/
+/*  Program for memory allocation of work and language areas.          */
+/***********************************************************************/
+void *PlugAllocMem(PGLOBAL g, uint size)
+  {
+  void *areap;                     /* Pointer to allocated area        */
+
+  /*********************************************************************/
+  /*  This is the allocation routine for the WIN32/UNIX/AIX version.   */
+  /*********************************************************************/
+  if (!(areap = malloc(size)))
+    sprintf(g->Message, MSG(MALLOC_ERROR), "malloc");
+
+  if (trace > 1) {
+    if (areap)
+      htrc("Memory of %u allocated at %p\n", size, areap);
+    else
+      htrc("PlugAllocMem: %s\n", g->Message);
+      
+    } // endif trace
+
+  return (areap);
+  } /* end of PlugAllocMem */
+
+/***********************************************************************/
+/*  Program for SubSet initialization of memory pools.                 */
+/*  Here there should be some verification done such as validity of    */
+/*  the address and size not larger than memory size.                  */
+/***********************************************************************/
+BOOL PlugSubSet(PGLOBAL g, void *memp, uint size)
+  {
+  PPOOLHEADER pph = memp;
+
+  pph->To_Free = (OFFSET)sizeof(POOLHEADER);
+  pph->FreeBlk = size - pph->To_Free;
+
+  return FALSE;
+  } /* end of PlugSubSet */
+
+/***********************************************************************/
+/*  Program for sub-allocating one item in a storage area.             */
+/*  Note: SubAlloc routines of OS/2 are no more used to increase the   */
+/*  code portability and avoid problems when a grammar compiled under  */
+/*  one version of OS/2 is used under another version.                 */
+/*  The simple way things are done here is also based on the fact      */
+/*  that no freeing of suballocated blocks is permitted in Plug.       */
+/***********************************************************************/
+void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
+  {
+  PPOOLHEADER pph;                           /* Points on area header. */
+
+  if (!memp)
+    /*******************************************************************/
+    /*  Allocation is to be done in the Sarea.                         */
+    /*******************************************************************/
+    memp = g->Sarea;
+
+//size = ((size + 3) / 4) * 4;       /* Round up size to multiple of 4 */
+  size = ((size + 7) / 8) * 8;       /* Round up size to multiple of 8 */
+  pph = (PPOOLHEADER)memp;
+
+#if defined(DEBUG2) || defined(DEBUG3)
+ htrc("SubAlloc in %p size=%d used=%d free=%d\n",
+  memp, size, pph->To_Free, pph->FreeBlk);
+#endif
+
+  if ((uint)size > pph->FreeBlk) {   /* Not enough memory left in pool */
+    char     *pname = "Work";
+
+    sprintf(g->Message,
+      "Not enough memory in %s area for request of %u (used=%d free=%d)",
+                          pname, size, pph->To_Free, pph->FreeBlk);
+
+#if defined(DEBUG2) || defined(DEBUG3)
+ htrc("%s\n", g->Message);
+#endif
+
+    longjmp(g->jumper[g->jump_level], 1);
+    } /* endif size OS32 code */
+
+  /*********************************************************************/
+  /*  Do the suballocation the simplest way.                           */
+  /*********************************************************************/
+  memp = MakePtr(memp, pph->To_Free); /* Points to suballocated block  */
+  pph->To_Free += size;               /* New offset of pool free block */
+  pph->FreeBlk -= size;               /* New size   of pool free block */
+#if defined(DEBUG2) || defined(DEBUG3)
+ htrc("Done memp=%p used=%d free=%d\n",
+  memp, pph->To_Free, pph->FreeBlk);
+#endif
+  return (memp);
+  } /* end of PlugSubAlloc */
+
+/***********************************************************************/
+/* This routine makes a pointer from an offset to a memory pointer.    */
+/***********************************************************************/
+void *MakePtr(void *memp, OFFSET offset)
+  {
+  return ((offset == 0) ? NULL : &((char *)memp)[offset]);
+  } /* end of MakePtr */
+
+/***********************************************************************/
+/* This routine makes an offset from a pointer new format.             */
+/***********************************************************************/
+OFFSET MakeOff(void *memp, void *ptr)
+  {
+  return ((!ptr) ? 0 : (OFFSET)((char *)ptr - (char *)memp));
+  } /* end of MakeOff */
+
+/*--------------------- End of PLUGUTIL program -----------------------*/