fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-01-17 12:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbmxml/3rd/minixml/mxml.hbp
  * contrib/hbmxml/3rd/minixml/mxml_fil.c
    + Patched libmxml code to create native CRLF EOL on win/dos/os2 platforms.
This commit is contained in:
Viktor Szakats
2011-01-17 11:39:44 +00:00
parent a085926636
commit d7d0cffbd7
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-17 12:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmxml/3rd/minixml/mxml.hbp
* contrib/hbmxml/3rd/minixml/mxml_fil.c
+ Patched libmxml code to create native CRLF EOL on win/dos/os2 platforms.
2011-01-17 12:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbmxml/hbmxml.c
* use hb_parstr_utf8() instead of hb_parc() in custom_save_cb()

1
harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
View File

@@ -11,6 +11,7 @@
-cpp=no
{win}-cflag=-DWIN32 -DWIN
{win|dos|os2}-cflag=-D_EOL_CRLF
mxml_att.c
mxml_ent.c

33
harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c
View File

@@ -329,8 +329,14 @@ mxmlSaveFd(mxml_node_t *node, /* I - Node to write */
return (-1);
if (col > 0)
{
#ifdef _EOL_CRLF
if (mxml_fd_putc('\r', &buf) < 0)
return (-1);
#endif
if (mxml_fd_putc('\n', &buf) < 0)
return (-1);
}
/*
* Flush and return...
@@ -368,8 +374,14 @@ mxmlSaveFile(mxml_node_t *node, /* I - Node to write */
return (-1);
if (col > 0)
{
#ifdef _EOL_CRLF
if (putc('\r', fp) < 0)
return (-1);
#endif
if (putc('\n', fp) < 0)
return (-1);
}
/*
* Return 0 (success)...
@@ -416,7 +428,12 @@ mxmlSaveString(mxml_node_t *node, /* I - Node to write */
return (-1);
if (col > 0)
{
#ifdef _EOL_CRLF
mxml_string_putc('\r', ptr);
#endif
mxml_string_putc('\n', ptr);
}
/*
* Nul-terminate the buffer...
@@ -2782,6 +2799,10 @@ mxml_write_node(mxml_node_t *node, /* I - Node to write */
if (global->wrap > 0 && (col + width) > global->wrap)
{
#ifdef _EOL_CRLF
if ((*putc_cb)('\r', p) < 0)
return (-1);
#endif
if ((*putc_cb)('\n', p) < 0)
return (-1);
@@ -2892,6 +2913,10 @@ mxml_write_node(mxml_node_t *node, /* I - Node to write */
{
if (global->wrap > 0 && col > global->wrap)
{
#ifdef _EOL_CRLF
if ((*putc_cb)('\r', p) < 0)
return (-1);
#endif
if ((*putc_cb)('\n', p) < 0)
return (-1);
@@ -2922,6 +2947,10 @@ mxml_write_node(mxml_node_t *node, /* I - Node to write */
{
if (global->wrap > 0 && col > global->wrap)
{
#ifdef _EOL_CRLF
if ((*putc_cb)('\r', p) < 0)
return (-1);
#endif
if ((*putc_cb)('\n', p) < 0)
return (-1);
@@ -2945,6 +2974,10 @@ mxml_write_node(mxml_node_t *node, /* I - Node to write */
{
if (global->wrap > 0 && col > global->wrap)
{
#ifdef _EOL_CRLF
if ((*putc_cb)('\r', p) < 0)
return (-1);
#endif
if ((*putc_cb)('\n', p) < 0)
return (-1);