From 8c2711406484b774635b76ae248ffc6e37b42e14 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 31 Jan 2013 23:07:23 +0000
Subject: [PATCH] 2013-02-01 00:05 UTC+0100 Viktor Szakats (harbour syenar.net)
   * ChangeLog.txt     + added encoding information to the header, which is
 UTF-8       from now on. It means that high chars are now allowed,       but
 ONLY in UTF-8 encoding. Configure your editor accordingly.     + added SVN
 props for UTF-8.

  * contrib/hbblink/blinker.prg
  * contrib/hbxpp/runshell.prg
    ! RUNSHELL()/SWPRUNCMD() fixes for *nix systems.

  * src/codepage/l_hu.c
    * comment made bit more precise

  * src/codepage/cpua866.c
    + comment added about the different from standard
      Ukrainian collation
---
 harbour/ChangeLog.txt               | 20 +++++++++++++++++++-
 harbour/contrib/hbblink/blinker.prg |  2 +-
 harbour/contrib/hbxpp/runshell.prg  |  2 +-
 harbour/src/codepage/cpua866.c      | 10 ++++++++++
 harbour/src/codepage/l_hu.c         |  6 +++---
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index fdce16e923..d38b8c1b6f 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -6,10 +6,28 @@
    YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name (your_email address)
    2010-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
    See copyright/license at the end of the file.
-   Notation (in 5th column):
+   Encoding: UTF-8  Notation (in 5th column):
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-01 00:05 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * ChangeLog.txt
+    + added encoding information to the header, which is UTF-8
+      from now on. It means that high chars are now allowed,
+      but ONLY in UTF-8 encoding. Configure your editor accordingly.
+    + added SVN props for UTF-8.
+
+  * contrib/hbblink/blinker.prg
+  * contrib/hbxpp/runshell.prg
+    ! RUNSHELL()/SWPRUNCMD() fixes for *nix systems.
+
+  * src/codepage/l_hu.c
+    * comment made bit more precise
+
+  * src/codepage/cpua866.c
+    + comment added about the different from standard
+      Ukrainian collation
+
 2013-01-31 22:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/src/vm/classes.c
     ! added missing HB_STACK_TLS_PRELOAD
diff --git a/harbour/contrib/hbblink/blinker.prg b/harbour/contrib/hbblink/blinker.prg
index 11c3b6bf92..d1f7f4f3a7 100644
--- a/harbour/contrib/hbblink/blinker.prg
+++ b/harbour/contrib/hbblink/blinker.prg
@@ -395,7 +395,7 @@ FUNCTION SwpRunCmd( cCommand, nMem, cRunPath, cTempPath )
 
    IF ! Empty( cShell )
 #if defined( __PLATFORM__UNIX )
-      cCommand := cShell + " " + cCommand
+      cCommand := cShell + " -c " + "'" + StrTran( cCommand, "'", "'\''" ) + "'"
 #else
       cCommand := cShell + " /c " + cCommand
 #endif
diff --git a/harbour/contrib/hbxpp/runshell.prg b/harbour/contrib/hbxpp/runshell.prg
index 34c8f41d74..99d36ba10b 100644
--- a/harbour/contrib/hbxpp/runshell.prg
+++ b/harbour/contrib/hbxpp/runshell.prg
@@ -82,7 +82,7 @@ FUNCTION RunShell( cCommand, cProgram, lAsync, lBackground )
 
    IF HB_ISSTRING( cCommand )
 #if defined( __PLATFORM__UNIX )
-      cProgram += " " + cCommand
+      cProgram += " -c " + "'" + StrTran( cCommand, "'", "'\''" ) + "'"
 #else
       cProgram += " /c " + cCommand
 #endif
diff --git a/harbour/src/codepage/cpua866.c b/harbour/src/codepage/cpua866.c
index e8ed0bd1f8..3bb94cea9d 100644
--- a/harbour/src/codepage/cpua866.c
+++ b/harbour/src/codepage/cpua866.c
@@ -50,6 +50,16 @@
  *
  */
 
+/* NOTE: This collation misses two characters (Ґґ) from
+         the Ukrainian alphabet and uses non-cyrillic
+         versions for another two (Іі), because the
+         originals cannot be encoded in CP-866:
+           Ґ - U+0490 - http://codepoints.net/U+0490
+           ґ - U+0491 - http://codepoints.net/U+0491
+           І - U+0406 - http://codepoints.net/U+0406
+           і - U+0456 - http://codepoints.net/U+0456
+         [druzus/vszakats] */
+
 #define HB_CP_ID        UA866
 #define HB_CP_INFO      "Ukrainian CP-866"
 #define HB_CP_UNITB     HB_UNITB_866
diff --git a/harbour/src/codepage/l_hu.c b/harbour/src/codepage/l_hu.c
index 0846f577d1..d37532475a 100644
--- a/harbour/src/codepage/l_hu.c
+++ b/harbour/src/codepage/l_hu.c
@@ -4,9 +4,9 @@
 
 /* Viktor Szakats (harbour syenar.net) */
 
-/* NOTE: Ä/ä has been added to work like sixhu852.obj for
-         S*ccessWare SIx Driver, but it's not a Hungarian
-         character. [vszakats] */
+/* NOTE: Ä/ä have been added to work like sixhu852.obj
+         for S*ccessWare SIx Driver, but they're not part
+         of the Hungarian alphabet. [vszakats] */
 
 #define HB_CP_UPPER     "AÁÄBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"
 #define HB_CP_LOWER     "aáäbcdeéfghiíjklmnoóöőpqrstuúüűvwxyz"