2009-02-11 20:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* COPYING * doc/license.txt * source/rtl/binnum.c * Added rewritten versions of these functions, now with a proper license: BIN2W(), BIN2I(), BIN2L(), I2BIN(), L2BIN() ; Thanks to Przemek.
2009-02-11 19:06:00 +00:00
parent 31ed19525f
commit 5c754d9eca
4 changed files with 70 additions and 68 deletions
--- a/harbour/COPYING
+++ b/harbour/COPYING
@@ -71,7 +71,6 @@ THE OLD HARBOUR PROJECT LIBRARY LICENSE

 Note: This license only applies to the following files:

-   source\rtl\binnum.c
   source\lang\msgeu.c
   source\lang\msgsl437.c
   source\lang\msgsl852.c
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
   2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2009-02-11 20:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * COPYING
+  * doc/license.txt
+  * source/rtl/binnum.c
+    * Added rewritten versions of these functions, now with
+      a proper license: BIN2W(), BIN2I(), BIN2L(), I2BIN(), L2BIN()
+    ; Thanks to Przemek.
+
 2009-02-11 19:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
  * include/std.ch
  * include/hbclass.ch
--- a/harbour/doc/license.txt
+++ b/harbour/doc/license.txt
@@ -75,8 +75,6 @@ THE OLD HARBOUR PROJECT LIBRARY LICENSE

 Note: This license only applies to the following files:

-   source\rtl\philes.c
-   source\rtl\binnum.c
   source\lang\msgeu.c
   source\lang\msgsl437.c
   source\lang\msgsl852.c
--- a/harbour/source/rtl/binnum.c
+++ b/harbour/source/rtl/binnum.c
@@ -6,20 +6,13 @@
 * Harbour Project source code:
 * BIN2W(), BIN2I(), BIN2L(), I2BIN(), L2BIN() functions
 *
- * Copyright 1999 Manuel Ruiz <mrt@joca.es>
+ * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://www.harbour-project.org
 *
 * 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, with one exception:
- *
- * The exception is that if you link the Harbour Runtime Library (HRL)
- * and/or the Harbour Virtual Machine (HVM) with other files to produce
- * an executable, this does not by itself cause the resulting executable
- * to be covered by the GNU General Public License. Your use of that
- * executable is in no way restricted on account of linking the HRL
- * and/or HVM code into it.
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,9 +20,33 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
- * their web site at http://www.gnu.org/).
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
 *
 */

@@ -39,89 +56,69 @@
 HB_FUNC( BIN2W )
 {
   PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
+   UINT16 uiResult = 0;

   if( pItem )
   {
-      char * pszString = hb_itemGetCPtr( pItem );
      ULONG ulLen = hb_itemGetCLen( pItem );
-
-      hb_retnl( HB_MKUSHORT( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
-                             ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0 ) );
+      if( ulLen )
+      {
+         const char * pszString = hb_itemGetCPtr( pItem );
+         uiResult = HB_GET_LE_INT16( pszString );
+      }
   }
-   else
-      hb_retni( 0 );
+   hb_retnint( uiResult );
 }

 HB_FUNC( BIN2I )
 {
   PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
+   INT16 iResult = 0;

   if( pItem )
   {
-      char * pszString = hb_itemGetCPtr( pItem );
      ULONG ulLen = hb_itemGetCLen( pItem );
-
-      hb_retni( HB_MKSHORT( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
-                            ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0 ) );
+      if( ulLen )
+      {
+         const char * pszString = hb_itemGetCPtr( pItem );
+         iResult = HB_GET_LE_UINT16( pszString );
+      }
   }
-   else
-      hb_retni( 0 );
+   hb_retnint( iResult );
 }

 HB_FUNC( BIN2L )
 {
   PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
+   INT32 iResult = 0;

   if( pItem )
   {
-      char * pszString = hb_itemGetCPtr( pItem );
      ULONG ulLen = hb_itemGetCLen( pItem );
-
-      hb_retnl( HB_MKLONG( ( ulLen >= 1 ) ? ( BYTE ) pszString[ 0 ] : 0,
-                           ( ulLen >= 2 ) ? ( BYTE ) pszString[ 1 ] : 0,
-                           ( ulLen >= 3 ) ? ( BYTE ) pszString[ 2 ] : 0,
-                           ( ulLen >= 4 ) ? ( BYTE ) pszString[ 3 ] : 0 ) );
+      if( ulLen )
+      {
+         const char * pszString = hb_itemGetCPtr( pItem );
+         if( ulLen >= 3 )
+            iResult = HB_GET_LE_INT32( pszString );
+         else
+            iResult = HB_GET_LE_UINT16( pszString );
+      }
   }
-   else
-      hb_retnl( 0 );
+   hb_retnint( iResult );
 }

 HB_FUNC( I2BIN )
 {
-   char szString[ 2 ];
-
-   if( ISNUM( 1 ) )
-   {
-      SHORT iValue = ( SHORT ) hb_parni( 1 );
-
-      HB_PUT_LE_UINT16( szString, iValue );
-   }
-   else
-   {
-      szString[ 0 ] =
-      szString[ 1 ] = '\0';
-   }
-
-   hb_retclen( szString, 2 );
+   char szResult[ 2 ];
+   INT16 iValue = ( INT16 ) hb_parni( 1 );
+   HB_PUT_LE_UINT16( szResult, iValue );
+   hb_retclen( szResult, 2 );
 }

 HB_FUNC( L2BIN )
 {
-   char szString[ 4 ];
-
-   if( ISNUM( 1 ) )
-   {
-      long lValue = hb_parnl( 1 );
-
-      HB_PUT_LE_UINT32( szString, lValue );
-   }
-   else
-   {
-      szString[ 0 ] =
-      szString[ 1 ] =
-      szString[ 2 ] =
-      szString[ 3 ] = '\0';
-   }
-
-   hb_retclen( szString, 4 );
+   char szResult[ 4 ];
+   INT32 iValue = ( INT32 ) hb_parnl( 1 );
+   HB_PUT_LE_UINT32( szResult, iValue );
+   hb_retclen( szResult, 4 );
 }