Different fixes

goldlib/gall/gall.all

@@ -135,6 +135,7 @@ gutlmisc cpp     all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg
 gutlmtsk cpp     all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg
 gutltag  cpp     all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg
 gutlvers cpp     all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg
+gcharset cpp     all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg
 
 ## OS specific utilities
 gutldos  cpp     all                                     djg

goldlib/gall/gcharset.cpp

@@ -0,0 +1,113 @@
+//  This may look like C code, but it is really -*- C++ -*-
+
+//  ------------------------------------------------------------------
+//  The Goldware Library
+//  Copyright (C) 1990-1999 Odinn Sorensen
+//  Copyright (C) 1999-2000 Alexander S. Aganichev
+//  ------------------------------------------------------------------
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Library General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Library General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public
+//  License along with this program; if not, write to the Free
+//  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+//  MA 02111-1307, USA
+//  ------------------------------------------------------------------
+//  $Id$
+//  ------------------------------------------------------------------
+//  Utility functions.
+//  ------------------------------------------------------------------
+
+#include <cstdlib>
+#include <cstdio>
+#include <clocale>
+#include <gcmpall.h>
+#include <gstrall.h>
+#ifdef __WIN32__
+#include <windows.h>
+#endif
+#ifdef __OS2__
+#define INCL_DOS
+#include <os2.h>
+#endif
+#ifdef __DJGPP__
+#include <dpmi.h>
+#include <sys/farptr.h>
+#endif
+
+static char charsetbuf[256];
+
+const char *get_charset(void)
+{
+#if defined(__DJGPP__)
+  int segment, selector;
+  __dpmi_regs regs;
+
+  strcpy(charsetbuf, "IBMPC");
+  if ((segment = __dpmi_allocate_dos_memory(3, &selector)) != -1) {
+    regs.h.ah = 0x65;
+    regs.h.al = 0x01;
+    regs.x.bx = 0xffff;
+    regs.x.dx = 0xffff;
+    regs.x.cx = 41;
+    regs.x.es = segment;
+    regs.x.di = 0;
+    __dpmi_int(0x21, &regs);
+    if (!(regs.x.flags & 1) and (regs.x.cx == 41)) {
+      int CCP = _farpeekw(selector, 5);
+      sprintf(charsetbuf, "CP%i", CCP);
+    }
+    __dpmi_free_dos_memory(selector);
+  }
+#elif defined(__WIN32__)
+  sprintf(charsetbuf, "CP%i", GetOEMCP());
+#elif defined(__OS2__)
+  ULONG CCP[8];
+  ULONG cb;
+
+  strcpy(charsetbuf, "IBMPC");
+  if(DosQueryCp(sizeof (CCP), CCP, &cb) == 0)
+    sprintf(charsetbuf, "CP%i", CCP[0]);
+#else
+  const char *cp;
+
+  strcpy(charsetbuf, "LATIN-1");
+  cp = setlocale(LC_CTYPE, "");
+  if((cp != NULL) and ((cp = strchr(cp, '.')) != NULL)) {
+    if(strieql(cp, "KOI8R"))
+      cp = "KOI8-R";
+    strxcpy(charsetbuf, cp, sizeof(charsetbuf));
+  }
+#endif
+  return charsetbuf;
+}
+
+const char *get_dos_charset(const char *cpfrom)
+{
+#if defined(__WIN32__) || defined(__MSDOS__) || defined(__OS2__)
+  (void)cpfrom; // These platforms use DOS CP on console, so ignore request
+  return "";
+#else
+  static const struct _cpmap {
+    char *from, *to;
+  } cpmap[] = {
+    { "LATIN-1", "CP437" },
+    { "KOI8-R", "CP866" },
+    { NULL, NULL }
+  };
+
+  int i;
+  for(i = 0; cpmap[i].from != NULL; i++) {
+    if(strieql(cpfrom, cpmap[i].from))
+      return cpmap[i].to;
+  }
+  return "";
+#endif
+}

goldlib/gall/gcharset.h

@@ -0,0 +1,38 @@
+//  This may look like C code, but it is really -*- C++ -*-
+
+//  ------------------------------------------------------------------
+//  The Goldware Library
+//  Copyright (C) 1990-1999 Odinn Sorensen
+//  ------------------------------------------------------------------
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Library General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Library General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public
+//  License along with this program; if not, write to the Free
+//  Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+//  MA 02111-1307, USA
+//  ------------------------------------------------------------------
+//  $Id$
+//  ------------------------------------------------------------------
+//  Charset handling utility.
+//  ------------------------------------------------------------------
+
+#ifndef __gcharset_h
+#define __gcharset_h
+
+
+//  ------------------------------------------------------------------
+
+const char *get_charset(void);
+const char *get_dos_charset(const char *);
+
+//  ------------------------------------------------------------------
+
+#endif // __gcharset_h