commit 58e7000290719bf835fd91339f785faa2ff36178
Author: John J. McDonough <jjmcd(a)fedoraproject.org>
Date: Mon Sep 22 10:49:01 2014 -0400
Automatic update
tools/doc-publican-rpm/cleanString.c | 36 +++++++++++++++-------------
tools/doc-publican-rpm/doc-publican-rpm.h | 6 ++--
tools/doc-publican-rpm/makeDesktopFile.c | 12 +++++-----
3 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/tools/doc-publican-rpm/cleanString.c b/tools/doc-publican-rpm/cleanString.c
index 8252b8c..864aef7 100644
--- a/tools/doc-publican-rpm/cleanString.c
+++ b/tools/doc-publican-rpm/cleanString.c
@@ -8,6 +8,8 @@
*/
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
/*! cleanString() - remove & tags from a string
@@ -22,43 +24,43 @@
\arg szInT - pointer to the input string
\arg szOut - pointer to a buffer for the result
*/
-void cleanString( char *szInT, char *szOut )
+void cleanString( wchar_t *szInT, wchar_t *szOut )
{
- char *q;
- char szIn[1024];
- int recurse;
+ wchar_t *q;
+ wchar_t szIn[1024];
+ //int recurse;
- recurse = 0;
- strcpy(szIn,szInT);
- q=strchr(szIn,'&');
+ //recurse = 0;
+ wcscpy(szIn,szInT);
+ q=wcschr(szIn,'&');
if ( !q )
{
//printf("Returning original string:\n%s\n",szIn);
- strcpy(szOut,szIn);
+ wcscpy(szOut,szIn);
return;
}
//else
// printf("Found an &:\n%s\n",szIn);
*q='\0';
- strcpy(szOut,szIn);
+ wcscpy(szOut,szIn);
q++;
- if ( !strncmp("amp;",q,4) )
+ if ( !wcsncmp((wchar_t *)"amp;",q,4) )
{
- strcat(szOut,"&");
+ wcscat(szOut,(wchar_t *)"&");
q+=4;
- strcat(szOut,q);
+ wcscat(szOut,q);
}
- else if ( !strncmp("nbsp;",q,5) )
+ else if ( !wcsncmp((wchar_t *)"nbsp;",q,5) )
{
- strcat(szOut," ");
+ wcscat(szOut,(wchar_t *)" ");
q+=5;
- strcat(szOut,q);
+ wcscat(szOut,q);
}
else
{
- strcat(szOut,"&");
- strcat(szOut,q);
+ wcscat(szOut,(wchar_t *)"&");
+ wcscat(szOut,q);
}
}
diff --git a/tools/doc-publican-rpm/doc-publican-rpm.h
b/tools/doc-publican-rpm/doc-publican-rpm.h
index 69192ae..b3e3155 100644
--- a/tools/doc-publican-rpm/doc-publican-rpm.h
+++ b/tools/doc-publican-rpm/doc-publican-rpm.h
@@ -4,9 +4,9 @@ EXTERN struct
//! ISO code for the language
char szLang[16];
//! Document title in local language
- char szTitle[128];
+ wchar_t szTitle[128];
//! Document subtitle in local language
- char szSubtitle[512];
+ wchar_t szSubtitle[512];
} rcConvInfo[50];
//! Version number of the produced rpm
@@ -41,4 +41,4 @@ void makeDesktopFile( char * );
void makeIndexFile( char * );
void makeTarFile( void );
void makeSpecFile( void );
-void cleanString( char *, char * );
+void cleanString( wchar_t *, wchar_t * );
diff --git a/tools/doc-publican-rpm/makeDesktopFile.c
b/tools/doc-publican-rpm/makeDesktopFile.c
index f805479..60be473 100644
--- a/tools/doc-publican-rpm/makeDesktopFile.c
+++ b/tools/doc-publican-rpm/makeDesktopFile.c
@@ -49,7 +49,7 @@ void makeDesktopFile( char *szDir )
FILE *f;
int i;
char szCLang[16];
- char szTextString[1024];
+ wchar_t szTextString[1024];
// Make the Gnome file
strcpy(szFilename,szDir);
@@ -69,23 +69,23 @@ void makeDesktopFile( char *szDir )
// desktop-file-validate doesn't like this
// fprintf(f,"Encoding=UTF-8\n");
cleanString(rcConvInfo[0].szTitle,szTextString);
- fprintf(f,"Name=%s\n",szTextString);
+ fprintf(f,"Name=%S\n",szTextString);
for ( i=1; i<nEntry; i++ )
{
cvtLang(rcConvInfo[i].szLang ,szCLang);
cleanString(rcConvInfo[i].szTitle,szTextString);
- fprintf(f,"Name[%s]=%s\n",
+ fprintf(f,"Name[%S]=%s\n",
szCLang,szTextString);
}
cleanString(rcConvInfo[0].szTitle,szTextString);
- fprintf(f,"GenericName=%s\n",szTextString);
+ fprintf(f,"GenericName=%S\n",szTextString);
cleanString(rcConvInfo[0].szSubtitle,szTextString);
- fprintf(f,"Comment=%s\n",szTextString);
+ fprintf(f,"Comment=%S\n",szTextString);
for ( i=1; i<nEntry; i++ )
{
cvtLang(rcConvInfo[i].szLang ,szCLang);
cleanString(rcConvInfo[i].szSubtitle,szTextString);
- fprintf(f,"Comment[%s]=%s\n",
+ fprintf(f,"Comment[%S]=%s\n",
szCLang,szTextString);
}
// BZ684546 Changed from htmlview to xdg-open