/*
*******************************************************************************
*
-* Copyright (C) 2002-2003, International Business Machines
+* Copyright (C) 2002-2004, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
#include "uresimp.h"
#include "unicode/ustring.h"
#include "unicode/uchar.h"
+#include "ustr.h"
+#include "prscmnts.h"
#include <time.h>
static int tabCount = 0;
/*get ID for each element. ID is globally unique.*/
static char* getID(const char* id, char* curKey, char* result) {
- if(curKey == NULL) {
+ if(curKey == NULL) {
result = uprv_malloc(sizeof(char)*uprv_strlen(id) + 1);
uprv_memset(result, 0, sizeof(char)*uprv_strlen(id) + 1);
uprv_strcpy(result, id);
* of information. It's also used as a hashing function. Unlike a regular
* checksum, it's sensitive to the order of the characters.
* It produces a 32 bit
- *
+ *
* @author Michael Lecuyer (mjl@theorem.com)
* @version 1.1 August 11, 1998
*/
-
+
/* ICU is not endian portable, because ICU data generated on big endian machines can be
- * ported to big endian machines but not to little endian machines and vice versa. The
- * conversion is not portable across platforms with different endianess.
+ * ported to big endian machines but not to little endian machines and vice versa. The
+ * conversion is not portable across platforms with different endianess.
*/
-
+
static uint32_t computeCRC(char *ptr, uint32_t len, uint32_t lastcrc){
int32_t crc;
uint32_t temp1;
crc = lastcrc;
while(len--!=0) {
- temp1 = (uint32_t)crc>>8;
- temp2 = crc_ta[(crc^*ptr) & 0xFF];
+ temp1 = (uint32_t)crc>>8;
+ temp2 = crc_ta[(crc^*ptr) & 0xFF];
crc = temp1^temp2;
ptr++;
}
return FALSE;
}
-/* Parse the filename, and get its language information.
- * If it fails to get the language information from the filename,
+/* Parse the filename, and get its language information.
+ * If it fails to get the language information from the filename,
* use "en" as the default value for language
*/
static char* parseFilename(const char* fileName, char* lang) {
char* pos;
char* pos2;
- int first;
- int second;
+ int32_t first;
+ int32_t second;
char* str0 = NULL;
char* str1 = NULL;
char* str2 = NULL;
char* str3 = NULL;
- int index = 0;
- UBool ISO_tag = TRUE;
+ int32_t index = 0;
+ UBool ISO_tag = TRUE;
ISOLanguages = uloc_getISOLanguages();
ISOCountries = uloc_getISOCountries();
pos = uprv_strrchr(fileName, U_FILE_SEP_CHAR);
pos2 = uprv_strrchr(fileName, '.');
-
+
if(pos == NULL) {
first = -1;
}else {
- first = pos - fileName;
+ first = (int32_t)(pos - fileName);
}
if(pos2 == NULL) {
- second = uprv_strlen(fileName);
+ second = (int32_t)uprv_strlen(fileName);
} else {
- second = pos2 - fileName;
+ second = (int32_t)(pos2 - fileName);
}
- index = second - first - 1;
+ index = (int32_t)(second - first - 1);
str0 = uprv_malloc(sizeof(char) * index + 1);
uprv_memset(str0, 0, sizeof(char) * index + 1);
uprv_strncpy(str0, fileName + first + 1, index);
-
+
pos = uprv_strchr( str0, '_' );
- first = pos - str0;
+ first = (int32_t)(pos - str0);
if (pos == NULL) {
str1 = uprv_malloc(sizeof(char)*uprv_strlen(str0)+1);
uprv_memset(str1, 0, sizeof(char)*uprv_strlen(str0)+1);
uprv_memset(str1, 0, sizeof(char)*first+1);
uprv_strncpy(str1, str0, first);
pos = uprv_strrchr( str0, '_' );
- second = pos - str0;
+ second = (int32_t)(pos - str0);
if(first != second && second-first != 1) {
index = second - first-1;
str2 = uprv_malloc(sizeof(char)*index+1);
uprv_memset(str2, 0, sizeof(char)*index+1);
uprv_strncpy(str2, str0 + first + 1, index );
- index = uprv_strlen(str0) - second -1;
+ index = (int32_t)(uprv_strlen(str0) - second -1);
str3 = uprv_malloc(sizeof(char)*index+1);
uprv_memset(str3, 0, sizeof(char)*index+1);
uprv_strncpy(str3, str0 + second + 1, index);
str1 = uprv_malloc(sizeof(char)*first+1);
uprv_memset(str1, 0, sizeof(char)*first+1);
uprv_strncpy(str1, str0, index );
- index = uprv_strlen(str0) - second -1;
+ index = (int32_t)(uprv_strlen(str0) - second -1);
str2 = uprv_malloc(sizeof(char)*index+1);
uprv_memset(str2, 0, sizeof(char)*index+1);
uprv_strncpy(str2, str0 + second + 1, index );
}
static const char* xmlHeader = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
- "<!DOCTYPE xliff "
+ "<!DOCTYPE xliff "
"SYSTEM \"http://www.oasis-open.org/committees/xliff/documents/xliff.dtd\">\n";
static const char* bundleStart = "<xliff version = \"1.0\">\n";
static const char* bundleEnd = "</xliff>\n";
void res_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status);
-static char* convertAndEscape(char** pDest, int32_t destCap, int32_t* destLength,
+static char* convertAndEscape(char** pDest, int32_t destCap, int32_t* destLength,
const UChar* src, int32_t srcLen, UErrorCode* status){
int32_t srcIndex=0;
char* dest=NULL;
fprintf(stderr, "Illegal Surrogate! \n");
uprv_free(dest);
return NULL;
- }
+ }
if((destLen+UTF8_CHAR_LENGTH(c)) < destCap){
switch(c) {
case '&':
uprv_strcpy(dest+( destLen),"&");
- destLen+=uprv_strlen("&");
+ destLen+=(int32_t)uprv_strlen("&");
break;
case '<':
uprv_strcpy(dest+(destLen),"<");
- destLen+=uprv_strlen("<");
+ destLen+=(int32_t)uprv_strlen("<");
break;
case '>':
uprv_strcpy(dest+(destLen),">");
- destLen+=uprv_strlen(">");
+ destLen+=(int32_t)uprv_strlen(">");
break;
case '"':
uprv_strcpy(dest+(destLen),""");
- destLen+=uprv_strlen(""");
+ destLen+=(int32_t)uprv_strlen(""");
break;
case '\'':
uprv_strcpy(dest+(destLen),"'");
- destLen+=uprv_strlen("'");
+ destLen+=(int32_t)uprv_strlen("'");
break;
/* Disallow C0 controls except TAB, CR, LF*/
case 0x1E:
case 0x1F:
*status = U_ILLEGAL_CHAR_FOUND;
- fprintf(stderr, "Illegal Character \\u%04X! \n",c);
+ fprintf(stderr, "Illegal Character \\u%04X!\n",(int)c);
uprv_free(dest);
return NULL;
default:
U8_APPEND((unsigned char*)dest,destLen,destCap,c,isError);
if(isError){
*status = U_ILLEGAL_CHAR_FOUND;
- fprintf(stderr, "Illegal Character \\U%08X! \n",c);
+ fprintf(stderr, "Illegal Character \\U%08X!\n",(int)c);
uprv_free(dest);
return NULL;
- }
+ }
}
}else{
destCap += destLen;
-
+
temp = (char*) uprv_malloc(sizeof(char)*destCap);
if(temp==NULL){
*status=U_MEMORY_ALLOCATION_ERROR;
return dest;
}
+#define ASTERISK 0x002A
+#define SPACE 0x0020
+#define CR 0x000A
+#define LF 0x000D
+#define AT_SIGN 0x0040
+
+static const UChar tokens[][11] = {
+ {0x0040, 0x0074, 0x0072, 0x0061, 0x006e, 0x0073, 0x006c, 0x0061, 0x0074, 0x0065, 0x0000}, /* @translate */
+ {0x0040, 0x006e, 0x006f, 0x0074, 0x0065, 0x0000} /* @note */
+};
+
+static const UChar yes[] = { 0x0079, 0x0065, 0x0073, 0x0000}; /* yes */
+static const UChar no[] ={ 0x006e, 0x006f, 0x0000 }; /* no */
+
+
+
+static void
+trim(char **src, int32_t *len){
+
+ char *s = NULL;
+ int32_t i = 0;
+ if(src == NULL || *src == NULL){
+ return;
+ }
+ s = *src;
+ /* trim from the end */
+ for( i=(*len-1); i>= 0; i--){
+ switch(s[i]){
+ case ASTERISK:
+ case SPACE:
+ case CR:
+ case LF:
+ s[i] = 0;
+ continue;
+ default:
+ break;
+ }
+ break;
+
+ }
+ *len = i+1;
+}
+
+static void
+print(UChar* src, int32_t srcLen,const char *tagStart,const char *tagEnd, UErrorCode *status){
+ int32_t bufCapacity = srcLen*4;
+ char *buf = NULL;
+ int32_t bufLen = 0;
+
+ if(U_FAILURE(*status)){
+ return;
+ }
+
+ buf = (char*) (uprv_malloc(bufCapacity));
+ if(buf==0){
+ fprintf(stderr, "Could not allocate memory!!");
+ exit(U_MEMORY_ALLOCATION_ERROR);
+ }
+ buf = convertAndEscape(&buf, bufCapacity, &bufLen, src, srcLen,status);
+ if(U_SUCCESS(*status)){
+ trim(&buf,&bufLen);
+ T_FileStream_write(out,tagStart, (int32_t)uprv_strlen(tagStart));
+ T_FileStream_write(out, buf, bufLen);
+ T_FileStream_write(out,tagEnd, (int32_t)uprv_strlen(tagEnd));
+ T_FileStream_write(out,"\n",1);
+
+ }
+}
+static void
+printNoteElements(struct UString *src, UErrorCode *status){
+
+#if UCONFIG_NO_REGULAR_EXPRESSIONS==0 /* donot compile when no RegularExpressions are available */
+
+ int32_t capacity = 0;
+ UChar* note = NULL;
+ int32_t noteLen = 0;
+ int32_t count = 0,i;
+
+ if(src == NULL){
+ return;
+ }
+
+ capacity = src->fLength;
+ note = (UChar*) uprv_malloc(U_SIZEOF_UCHAR * capacity);
+
+ count = getCount(src->fChars,src->fLength, UPC_NOTE, status);
+ if(U_FAILURE(*status)){
+ return;
+ }
+ for(i=0; i < count; i++){
+ noteLen = getAt(src->fChars,src->fLength, ¬e, capacity, i, UPC_NOTE, status);
+ if(U_FAILURE(*status)){
+ return;
+ }
+ if(noteLen > 0){
+ write_tabs(out);
+ print(note, noteLen,"<note>", "</note>", status);
+ }
+ }
+ uprv_free(note);
+#else
+ fprintf(stderr, "Warning: Could not output comments to XLIFF file. ICU has been built without RegularExpression support.\n");
+
+#endif /* UCONFIG_NO_REGULAR_EXPRESSIONS */
+
+}
+
+static void
+printComments(struct UString *src, const char *resName, UBool printTranslate, UErrorCode *status){
+
+#if UCONFIG_NO_REGULAR_EXPRESSIONS==0 /* donot compile when no RegularExpressions are available */
+
+ int32_t capacity = src->fLength;
+ char* buf = NULL;
+ int32_t bufLen = 0;
+ const char* translateAttr = " translate=\"";
+ UChar* desc = (UChar*) uprv_malloc(U_SIZEOF_UCHAR * capacity);
+ UChar* trans = (UChar*) uprv_malloc(U_SIZEOF_UCHAR * capacity);
+
+ int32_t descLen = 0, transLen=0;
+ if(status==NULL || U_FAILURE(*status)){
+ uprv_free(desc);
+ uprv_free(trans);
+ return;
+ }
+ if(desc==NULL || trans==NULL){
+ *status = U_MEMORY_ALLOCATION_ERROR;
+ uprv_free(desc);
+ uprv_free(trans);
+ return;
+ }
+ src->fLength = removeCmtText(src->fChars, src->fLength, status);
+ descLen = getDescription(src->fChars,src->fLength, &desc, capacity, status);
+ transLen = getTranslate(src->fChars,src->fLength, &trans, capacity, status);
+
+ /* first print translate attribute */
+ if(transLen > 0){
+ if(printTranslate==TRUE){
+ /* print translate attribute */
+ buf = convertAndEscape(&buf, 0, &bufLen, trans, transLen, status);
+ if(U_SUCCESS(*status)){
+ T_FileStream_write(out,translateAttr, (int32_t)uprv_strlen(translateAttr));
+ T_FileStream_write(out,buf, bufLen);
+ T_FileStream_write(out,"\">\n", 3);
+ }
+ }else if(getShowWarning() == TRUE){
+ fprintf(stderr, "Warning: Tranlate attribute for resource %s cannot be set. XLIFF prohibits it.\n", resName);
+ /* no translate attribute .. just close the tag */
+ T_FileStream_write(out,">\n", 2);
+ }
+ }else{
+ /* no translate attribute .. just close the tag */
+ T_FileStream_write(out,">\n", 2);
+ }
+ if(descLen > 0){
+ write_tabs(out);
+ print(desc, descLen, "<!--", "-->", status);
+ }
+#else
+
+ fprintf(stderr, "Warning: Could not output comments to XLIFF file. ICU has been built without RegularExpression support.\n");
+
+#endif /* UCONFIG_NO_REGULAR_EXPRESSIONS */
+
+}
/* Writing Functions */
-static void
+static void
string_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status) {
char* buf = NULL;
int32_t bufLen = 0;
-
+
char* sid = NULL;
const char* strStart = "<trans-unit xml:space = \"preserve\" id = \"";
const char* valStrStart = "<source xml:lang = \"";
const char* valStrEnd = "</source>\n";
const char* strEnd = "</trans-unit>\n";
-
+
if(status==NULL || U_FAILURE(*status)){
return;
}
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
write_tabs(out);
- T_FileStream_write(out,strStart, uprv_strlen(strStart));
+ T_FileStream_write(out,strStart, (int32_t)uprv_strlen(strStart));
sid = getID(id, NULL, sid);
- T_FileStream_write(out,sid, uprv_strlen(sid));
- T_FileStream_write(out,"\">\n", 3);
+ T_FileStream_write(out,sid, (int32_t)uprv_strlen(sid));
+ T_FileStream_write(out,"\"", 1);
tabCount++;
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+
write_tabs(out);
- T_FileStream_write(out,valStrStart, uprv_strlen(valStrStart));
- T_FileStream_write(out,language, uprv_strlen(language));
+
+ T_FileStream_write(out,valStrStart, (int32_t)uprv_strlen(valStrStart));
+ T_FileStream_write(out,language, (int32_t)uprv_strlen(language));
T_FileStream_write(out,"\">", 2);
-
+
buf = convertAndEscape(&buf,0,&bufLen,res->u.fString.fChars,res->u.fString.fLength,status);
if(U_FAILURE(*status)){
return;
}
+
T_FileStream_write(out,buf,bufLen);
- T_FileStream_write(out,valStrEnd,uprv_strlen(valStrEnd));
-
+ T_FileStream_write(out,valStrEnd,(int32_t)uprv_strlen(valStrEnd));
+
+ printNoteElements(res->fComment, status);
+
tabCount--;
write_tabs(out);
- T_FileStream_write(out,strEnd,uprv_strlen(strEnd));
+ T_FileStream_write(out,strEnd,(int32_t)uprv_strlen(strEnd));
}else{
const char* keyStrStart = "resname = \"";
-
+
write_tabs(out);
-
- T_FileStream_write(out, strStart, uprv_strlen(strStart));
+
+ T_FileStream_write(out, strStart, (int32_t)uprv_strlen(strStart));
sid = getID(id, srBundle->fKeys+res->fKey,sid);
- T_FileStream_write(out,sid, uprv_strlen(sid));
+ T_FileStream_write(out,sid, (int32_t)uprv_strlen(sid));
T_FileStream_write(out,"\" ", 2);
- T_FileStream_write(out,keyStrStart, uprv_strlen(keyStrStart));
-
- T_FileStream_write(out,srBundle->fKeys+res->fKey, uprv_strlen(srBundle->fKeys+res->fKey));
-
- T_FileStream_write(out,"\">\n", 3);
+ T_FileStream_write(out,keyStrStart, (int32_t)uprv_strlen(keyStrStart));
+
+ T_FileStream_write(out,srBundle->fKeys+res->fKey, (int32_t)uprv_strlen(srBundle->fKeys+res->fKey));
+ T_FileStream_write(out,"\"", 1);
tabCount++;
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, TRUE, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+
write_tabs(out);
- T_FileStream_write(out,valStrStart,uprv_strlen(valStrStart));
+ T_FileStream_write(out,valStrStart, (int32_t)uprv_strlen(valStrStart));
- T_FileStream_write(out,language, uprv_strlen(language));
+ T_FileStream_write(out,language, (int32_t)uprv_strlen(language));
T_FileStream_write(out,"\">", 2);
buf = convertAndEscape(&buf,0,&bufLen,res->u.fString.fChars,res->u.fString.fLength,status);
}
T_FileStream_write(out,buf,bufLen);
- T_FileStream_write(out,valStrEnd,uprv_strlen(valStrEnd));
+ T_FileStream_write(out,valStrEnd,(int32_t)uprv_strlen(valStrEnd));
+
+ printNoteElements(res->fComment, status);
+
tabCount--;
write_tabs(out);
- T_FileStream_write(out,strEnd,uprv_strlen(strEnd));
+ T_FileStream_write(out,strEnd,(int32_t)uprv_strlen(strEnd));
}
uprv_free(sid);
- sid = NULL;
-
+ sid = NULL;
+
uprv_free(buf);
buf = NULL;
}
-static void
+static void
alias_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status) {
static const char* startKey = "resname=\"";
static const char* val = "<source>";
static const char* start = "<trans-unit restype = \"alias\" xml:space = \"preserve\" id = \"";
static const char* end = "</trans-unit>\n";
char* sid = NULL;
-
+
char* buf = NULL;
int32_t bufLen=0;
write_tabs(out);
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
-
+
sid = getID(id, NULL, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
- T_FileStream_write(out, "\">\n", 3);
+ T_FileStream_write(out, "\"", 1);
tabCount++;
- write_tabs(out);
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment,srBundle->fKeys+res->fKey, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+ write_tabs(out);
T_FileStream_write(out, val, (int32_t)uprv_strlen(val));
}else{
sid = getID(id, srBundle->fKeys+res->fKey, sid);
T_FileStream_write(out, "\" ", 2);
T_FileStream_write(out, startKey, (int32_t)uprv_strlen(startKey));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
-
- T_FileStream_write(out, "\">\n", 3);
+
+ T_FileStream_write(out, "\"", 1);
tabCount++;
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+
write_tabs(out);
-
+
T_FileStream_write(out, val, (int32_t)uprv_strlen(val));
}
-
+
buf = convertAndEscape(&buf,0,&bufLen,res->u.fString.fChars,res->u.fString.fLength,/*FALSE,*/status);
if(U_FAILURE(*status)){
return;
}
T_FileStream_write(out,buf,bufLen);
- T_FileStream_write(out, endKey, uprv_strlen(endKey));
-
+ T_FileStream_write(out, endKey, (int32_t)uprv_strlen(endKey));
+
+ printNoteElements(res->fComment, status);
+
tabCount--;
write_tabs(out);
-
- T_FileStream_write(out, end, uprv_strlen(end));
+
+ T_FileStream_write(out, end, (int32_t)uprv_strlen(end));
uprv_free(buf);
uprv_free(sid);
}
-static void
+static void
array_write_xml( struct SResource *res, const char* id, const char* language, UErrorCode *status) {
const char* start = "<group restype = \"array\" xml:space = \"preserve\" id = \"";
const char* end = "</group>\n";
const char* startKey= "resname=\"";
- const char* endKey = "\">\n";
+
char* sid = NULL;
int index = 0;
-
+
struct SResource *current = NULL;
struct SResource *first =NULL;
-
+
write_tabs(out);
- if(res->fKey==0xFFFF ||uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ tabCount++;
+ if(res->fKey<0 ||uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, NULL, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
- T_FileStream_write(out, "\">\n", 3);
+ T_FileStream_write(out, "\"", 1);
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}else{
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, srBundle->fKeys+res->fKey, sid);
T_FileStream_write(out, "\" ", 2);
T_FileStream_write(out, startKey, (int32_t)uprv_strlen(startKey));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
- T_FileStream_write(out, endKey, uprv_strlen(endKey));
+ T_FileStream_write(out, "\"", 1);
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}
current = res->u.fArray.fFirst;
first=current;
- tabCount++;
+
while (current != NULL) {
char c[256] = {0};
char* subId = NULL;
itostr(c, index,10,0);
index++;
subId = getID(sid, c, subId);
-
+
res_write_xml(current, subId, language, status);
uprv_free(subId);
subId = NULL;
}
tabCount--;
write_tabs(out);
- T_FileStream_write(out,end,uprv_strlen(end));
+ T_FileStream_write(out,end,(int32_t)uprv_strlen(end));
uprv_free(sid);
sid = NULL;
}
-static void
+static void
intvector_write_xml( struct SResource *res, const char* id, const char* language, UErrorCode *status) {
const char* start = "<group restype = \"intvector\" xml:space = \"preserve\" id = \"";
const char* end = "</group>\n";
const char* startKey= "resname=\"";
- const char* endKey = "\">\n";
- const char* intStart = "<trans-unit restype = \"int\" translate = \"no\" xml:space = \"preserve\" id = \"";
+ const char* intStart = "<trans-unit restype = \"int\" xml:space = \"preserve\" translate=\"no\" id = \"";
const char* valIntStart = "<source>";
const char* valIntEnd = "</source>\n";
const char* intEnd = "</trans-unit>\n";
char* sid = NULL;
char* ivd = NULL;
-
+
uint32_t i=0;
uint32_t len=0;
char buf[256] = {'0'};
write_tabs(out);
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ tabCount++;
+
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, NULL, sid);
- T_FileStream_write(out,sid, uprv_strlen(sid));
- T_FileStream_write(out,"\">\n", 3);
+ T_FileStream_write(out,sid, (int32_t)uprv_strlen(sid));
+ T_FileStream_write(out, "\"", 1);
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, FALSE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}else{
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, srBundle->fKeys+res->fKey, sid);
- T_FileStream_write(out,sid, uprv_strlen(sid));
+ T_FileStream_write(out,sid, (int32_t)uprv_strlen(sid));
T_FileStream_write(out,"\" ", 2);
-
+
T_FileStream_write(out, startKey, (int32_t)uprv_strlen(startKey));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
- T_FileStream_write(out, endKey, uprv_strlen(endKey));
+ T_FileStream_write(out, "\"", 1);
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}
- tabCount++;
-
+
+
for(i = 0; i<res->u.fIntVector.fCount; i++) {
char c[256] = {0};
itostr(c, i,10,0);
ivd = getID(sid, c, ivd);
len=itostr(buf,res->u.fIntVector.fArray[i],10,0);
-
+
write_tabs(out);
T_FileStream_write(out, intStart, (int32_t)uprv_strlen(intStart));
- T_FileStream_write(out, ivd, uprv_strlen(ivd));
+ T_FileStream_write(out, ivd, (int32_t)uprv_strlen(ivd));
T_FileStream_write(out,"\">\n", 3);
tabCount++;
write_tabs(out);
- T_FileStream_write(out,valIntStart, uprv_strlen(valIntStart));
-
+ T_FileStream_write(out,valIntStart, (int32_t)uprv_strlen(valIntStart));
+
T_FileStream_write(out,buf,len);
-
- T_FileStream_write(out,valIntEnd, uprv_strlen(valIntEnd));
+
+ T_FileStream_write(out,valIntEnd, (int32_t)uprv_strlen(valIntEnd));
tabCount--;
write_tabs(out);
T_FileStream_write(out, intEnd, (int32_t)uprv_strlen(intEnd));
-
+
uprv_free(ivd);
ivd = NULL;
}
-
+
tabCount--;
write_tabs(out);
-
- T_FileStream_write(out, end, uprv_strlen(end));
+
+ T_FileStream_write(out, end, (int32_t)uprv_strlen(end));
uprv_free(sid);
sid = NULL;
}
-static void
+static void
int_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status) {
- const char* intStart = "<trans-unit restype = \"int\" translate = \"no\" xml:space = \"preserve\" id = \"";
+ const char* intStart = "<trans-unit restype = \"int\" xml:space = \"preserve\" id = \"";
const char* valIntStart = "<source>";
const char* valIntEnd = "</source>\n";
const char* intEnd = "</trans-unit>\n";
const char* keyIntStart = "resname = \"";
char* sid = NULL;
char buf[256] = {0};
-
+
uint32_t len=0;
write_tabs(out);
-
+
tabCount++;
-
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, intStart, (int32_t)uprv_strlen(intStart));
sid = getID(id, NULL, sid);
- T_FileStream_write(out, sid, uprv_strlen(sid));
- T_FileStream_write(out,"\">\n", 3);
+ T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
+ T_FileStream_write(out,"\"", 1);
+
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
write_tabs(out);
- T_FileStream_write(out,valIntStart, uprv_strlen(valIntStart));
+ T_FileStream_write(out,valIntStart, (int32_t)uprv_strlen(valIntStart));
}else{
- T_FileStream_write(out, intStart, uprv_strlen(intStart));
+ T_FileStream_write(out, intStart, (int32_t)uprv_strlen(intStart));
sid = getID(id, srBundle->fKeys+res->fKey, sid);
- T_FileStream_write(out, sid, uprv_strlen(sid));
+ T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
T_FileStream_write(out,"\" ", 2);
- T_FileStream_write(out,keyIntStart, uprv_strlen(keyIntStart));
-
+ T_FileStream_write(out,keyIntStart, (int32_t)uprv_strlen(keyIntStart));
+
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
- T_FileStream_write(out, "\">\n", 3);
+ T_FileStream_write(out,"\"", 1);
+
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
write_tabs(out);
T_FileStream_write(out, valIntStart, (int32_t)uprv_strlen(valIntStart));
-
+
}
len=itostr(buf,res->u.fIntValue.fValue,10,0);
T_FileStream_write(out,buf,len);
-
- T_FileStream_write(out, valIntEnd, uprv_strlen(valIntEnd));
+
+ T_FileStream_write(out, valIntEnd, (int32_t)uprv_strlen(valIntEnd));
+ printNoteElements(res->fComment, status);
tabCount--;
write_tabs(out);
- T_FileStream_write(out, intEnd, uprv_strlen(intEnd));
+ T_FileStream_write(out, intEnd, (int32_t)uprv_strlen(intEnd));
uprv_free(sid);
sid = NULL;
}
-static void
+static void
bin_write_xml( struct SResource *res, const char* id, const char* language, UErrorCode *status) {
- const char* start = "<bin-unit restype = \"bin\" translate = \"no\" id = \"";
- const char* importStart = "<bin-unit restype = \"import\" translate = \"no\" id = \"";
+ const char* start = "<bin-unit restype = \"bin\" id = \"";
+ const char* importStart = "<bin-unit restype = \"import\" id = \"";
const char* mime = " mime-type = ";
const char* key = "\" resname = \"";
const char* valStart = "<bin-source>\n";
const char* m_type = "\"application";
char* sid = NULL;
uint32_t crc = 0xFFFFFFFF;
-
+
char fileName[1024] ={0};
- int32_t tLen = ( outDir == NULL) ? 0 :uprv_strlen(outDir);
- char* fn = (char*) uprv_malloc(sizeof(char) * (tLen+1024 +
- (res->u.fBinaryValue.fFileName !=NULL ?
+ int32_t tLen = ( outDir == NULL) ? 0 :(int32_t)uprv_strlen(outDir);
+ char* fn = (char*) uprv_malloc(sizeof(char) * (tLen+1024 +
+ (res->u.fBinaryValue.fFileName !=NULL ?
uprv_strlen(res->u.fBinaryValue.fFileName) :0)));
const char* ext = NULL;
-
- char* f = NULL;
-
+
+ char* f = NULL;
+
fn[0]=0;
if(res->u.fBinaryValue.fFileName!=NULL){
write_tabs(out);
T_FileStream_write(out, importStart, (int32_t)uprv_strlen(importStart));
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
sid = getID(id, NULL, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
} else {
T_FileStream_write(out, "\" ", 2);
T_FileStream_write(out, mime, (int32_t)uprv_strlen(mime));
T_FileStream_write(out, m_type, (int32_t)uprv_strlen(m_type));
- if(!(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0)){
+ if(!(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0)){
T_FileStream_write(out, key, (int32_t)uprv_strlen(key));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
- }
- T_FileStream_write(out, "\">\n", 3);
+ }
+ T_FileStream_write(out,"\"", 1);
tabCount++;
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+
write_tabs(out);
- T_FileStream_write(out, valStart, uprv_strlen(valStart));
+
+ T_FileStream_write(out, valStart, (int32_t)uprv_strlen(valStart));
tabCount++;
write_tabs(out);
- T_FileStream_write(out, externalFileStart, uprv_strlen(externalFileStart));
+ T_FileStream_write(out, externalFileStart, (int32_t)uprv_strlen(externalFileStart));
T_FileStream_write(out, f, (int32_t)uprv_strlen(f));
- T_FileStream_write(out, externalFileEnd, uprv_strlen(externalFileEnd));
+ T_FileStream_write(out, externalFileEnd, (int32_t)uprv_strlen(externalFileEnd));
tabCount--;
write_tabs(out);
- T_FileStream_write(out, valEnd, uprv_strlen(valEnd));
+ T_FileStream_write(out, valEnd, (int32_t)uprv_strlen(valEnd));
+
+ printNoteElements(res->fComment, status);
tabCount--;
write_tabs(out);
- T_FileStream_write(out,end,uprv_strlen(end));
+ T_FileStream_write(out,end,(int32_t)uprv_strlen(end));
} else {
char temp[256] = {0};
uint32_t i = 0;
write_tabs(out);
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
sid = getID(id, NULL, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
} else {
sid = getID(id, srBundle->fKeys+res->fKey, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
}
-
+
T_FileStream_write(out, "\" ", 2);
T_FileStream_write(out, mime, (int32_t)uprv_strlen(mime));
T_FileStream_write(out, m_type, (int32_t)uprv_strlen(m_type));
- if(!(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0)){
+ if(!(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0)){
T_FileStream_write(out, key, (int32_t)uprv_strlen(key));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
}
- T_FileStream_write(out, "\">\n", 3);
+ T_FileStream_write(out,"\"", 1);
tabCount++;
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, TRUE, status);
+
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
+
write_tabs(out);
- T_FileStream_write(out, valStart, uprv_strlen(valStart));
+ T_FileStream_write(out, valStart, (int32_t)uprv_strlen(valStart));
tabCount++;
write_tabs(out);
- T_FileStream_write(out, fileStart, uprv_strlen(fileStart));
-
+ T_FileStream_write(out, fileStart, (int32_t)uprv_strlen(fileStart));
+
while(i <res->u.fBinaryValue.fLength){
len = itostr(temp,res->u.fBinaryValue.fData[i],16,2);
crc = computeCRC(temp, len, crc);
i++;
}
-
+
len = itostr(temp, crc, 10, 0);
T_FileStream_write(out,temp,len);
T_FileStream_write(out,"\">",2);
-
+
i = 0;
while(i <res->u.fBinaryValue.fLength){
len = itostr(temp,res->u.fBinaryValue.fData[i],16,2);
T_FileStream_write(out,temp,len);
i++;
}
- T_FileStream_write(out, fileEnd, uprv_strlen(fileEnd));
+ T_FileStream_write(out, fileEnd, (int32_t)uprv_strlen(fileEnd));
tabCount--;
write_tabs(out);
- T_FileStream_write(out, valEnd, uprv_strlen(valEnd));
+ T_FileStream_write(out, valEnd, (int32_t)uprv_strlen(valEnd));
+ printNoteElements(res->fComment, status);
+
tabCount--;
write_tabs(out);
- T_FileStream_write(out,end,uprv_strlen(end));
-
+ T_FileStream_write(out,end,(int32_t)uprv_strlen(end));
+
uprv_free(fn);
uprv_free(sid);
sid = NULL;
-static void
+static void
table_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status) {
uint32_t i = 0;
const char* idstr = " id = \"";
const char* end = "</group>\n";
const char* startKey= "resname=\"";
- const char* endKey = ">\n";
if (U_FAILURE(*status)) {
return ;
}
-
+
if (res->u.fTable.fCount > 0) {
write_tabs(out);
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ tabCount++;
+
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
-
+
sid = getID(id, NULL, sid);
/* only write the id if the sid!="" */
if(sid[0]!='\0'){
T_FileStream_write(out, "\" ", 2);
}
- T_FileStream_write(out, endKey, (int32_t)uprv_strlen(endKey));
-
+
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}else{
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, srBundle->fKeys+res->fKey, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
T_FileStream_write(out, "\" ", 2);
}
-
+
T_FileStream_write(out, startKey, (int32_t)uprv_strlen(startKey));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
T_FileStream_write(out, "\" ", 2);
- T_FileStream_write(out, endKey, uprv_strlen(endKey));
+
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}
- tabCount++;
-
+
save = current = res->u.fTable.fFirst;
i = 0;
while (current != NULL) {
res_write_xml(current, sid, language, status);
-
+
if(U_FAILURE(*status)){
return;
}
}
tabCount--;
write_tabs(out);
- T_FileStream_write(out,end,uprv_strlen(end));
+ T_FileStream_write(out,end,(int32_t)uprv_strlen(end));
} else {
write_tabs(out);
- if(res->fKey==0xFFFF || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
+ if(res->fKey<0 || uprv_strcmp(srBundle->fKeys+res->fKey ,"")==0){
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, NULL, sid);
T_FileStream_write(out, sid, (int32_t)uprv_strlen(sid));
- T_FileStream_write(out, endKey, (int32_t)uprv_strlen(endKey));
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, sid, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}else{
T_FileStream_write(out, start, (int32_t)uprv_strlen(start));
sid = getID(id, srBundle->fKeys+res->fKey, sid);
T_FileStream_write(out, "\" ", 2);
T_FileStream_write(out, startKey, (int32_t)uprv_strlen(startKey));
T_FileStream_write(out, srBundle->fKeys+res->fKey, (int32_t) uprv_strlen(srBundle->fKeys+res->fKey));
- T_FileStream_write(out, endKey, uprv_strlen(endKey));
+
+ if(res->fComment!=NULL && res->fComment->fChars != NULL){
+ printComments(res->fComment, srBundle->fKeys+res->fKey, FALSE, status);
+ printNoteElements(res->fComment, status);
+ }else{
+ T_FileStream_write(out,">\n", 2);
+ }
}
-
+
write_tabs(out);
- T_FileStream_write(out,end,uprv_strlen(end));
+ T_FileStream_write(out,end,(int32_t)uprv_strlen(end));
}
uprv_free(sid);
sid = NULL;
}
-void
+void
res_write_xml(struct SResource *res, const char* id, const char* language, UErrorCode *status) {
-
+
if (U_FAILURE(*status)) {
return ;
}
array_write_xml (res, id, language, status);
return;
case URES_TABLE:
+ case URES_TABLE32:
table_write_xml (res, id, language, status);
return;
*status = U_INTERNAL_PROGRAM_ERROR;
}
-void
+void
bundle_write_xml(struct SRBRoot *bundle, const char *outputDir,const char* outputEnc, const char* filename,
- char *writtenFilename, int writtenFilenameLen,
- const char* language, const char* package, UErrorCode *status) {
+ char *writtenFilename, int writtenFilenameLen,
+ const char* language, const char* outFileName, UErrorCode *status) {
char* xmlfileName = NULL;
char* outputFileName = NULL;
const char* file2 = "original = \"";
const char* file3 = "\" tool = \"genrb\" ";
const char* file4 = "date = \"";
- const char* file5 = "\" ts = \"";
const char* fileEnd = "</file>\n";
const char* headerStart = "<header>";
const char* headerEnd = "</header>\n";
const char* bodyStart = "<body>\n";
const char* bodyEnd = "</body>\n";
- const char* defaultLang = "en";
+
char* pid = NULL;
char* temp = NULL;
char* lang = NULL;
char* pos;
- int first, index;
+ int32_t first, index;
time_t currTime;
char timeBuf[128];
-
+
outDir = outputDir;
srBundle = bundle;
-
+
pos = uprv_strrchr(filename, '\\');
if(pos != NULL) {
- first = pos - filename + 1;
+ first = (int32_t)(pos - filename + 1);
} else {
first = 0;
}
- index = uprv_strlen(filename) - uprv_strlen(textExt) - first;
+ index = (int32_t)(uprv_strlen(filename) - uprv_strlen(textExt) - first);
originalFileName = uprv_malloc(sizeof(char)*index+1);
uprv_memset(originalFileName, 0, sizeof(char)*index+1);
uprv_strncpy(originalFileName, filename + first, index);
-
+
if(uprv_strcmp(originalFileName, srBundle->fLocale) != 0) {
- fprintf(stdout, "warning! The file name is not same as the resource name!\n");
+ fprintf(stdout, "Warning: The file name is not same as the resource name!\n");
}
temp = originalFileName;
if (language == NULL) {
lang = parseFilename(filename, lang);
if (lang == NULL) {
- lang = uprv_malloc(sizeof(char)*uprv_strlen(defaultLang) +1);
- uprv_memset(lang, 0, sizeof(char)*uprv_strlen(defaultLang) +1);
- uprv_strcpy(lang, defaultLang);
+ /* now check if locale name is valid or not
+ * this is to cater for situation where
+ * pegasusServer.txt contains
+ *
+ * en{
+ * ..
+ * }
+ */
+ lang = parseFilename(srBundle->fLocale, lang);
+ /*
+ * Neither the file name nor the table name inside the
+ * txt file contain a valid country and language codes
+ * throw an error.
+ * pegasusServer.txt contains
+ *
+ * testelements{
+ * ....
+ * }
+ */
+ if(lang==NULL){
+ fprintf(stderr, "Error: The file name and table name do not contain a valid language code. Please use -l option to specify it.\n");
+ exit(U_ILLEGAL_ARGUMENT_ERROR);
+ }
}
} else {
lang = uprv_malloc(sizeof(char)*uprv_strlen(language) +1);
uprv_strcpy(lang, language);
}
- if(package) {
- outputFileName = uprv_malloc(sizeof(char)*uprv_strlen(package) + 1);
- uprv_memset(outputFileName, 0, sizeof(char)*uprv_strlen(package) + 1);
- uprv_strcpy(outputFileName,package);
+ if(outFileName) {
+ outputFileName = uprv_malloc(sizeof(char)*uprv_strlen(outFileName) + 1);
+ uprv_memset(outputFileName, 0, sizeof(char)*uprv_strlen(outFileName) + 1);
+ uprv_strcpy(outputFileName,outFileName);
} else {
outputFileName = uprv_malloc(sizeof(char)*uprv_strlen(srBundle->fLocale) + 1);
uprv_memset(outputFileName, 0, sizeof(char)*uprv_strlen(srBundle->fLocale) + 1);
uprv_strcpy(outputFileName,srBundle->fLocale);
}
-
+
if(outputDir) {
xmlfileName = uprv_malloc(sizeof(char)*(uprv_strlen(outputDir) + uprv_strlen(outputFileName) + uprv_strlen(xliffExt) + 1) +1);
uprv_memset(xmlfileName, 0, sizeof(char)*(uprv_strlen(outputDir)+ uprv_strlen(outputFileName) + uprv_strlen(xliffExt) + 1) +1);
xmlfileName = uprv_malloc(sizeof(char)*(uprv_strlen(outputFileName) + uprv_strlen(xliffExt)) +1);
uprv_memset(xmlfileName, 0, sizeof(char)*(uprv_strlen(outputFileName) + uprv_strlen(xliffExt)) +1);
}
-
+
if(outputDir){
uprv_strcpy(xmlfileName, outputDir);
if(outputDir[uprv_strlen(outputDir)-1] !=U_FILE_SEP_CHAR){
if (U_FAILURE(*status)) {
return;
}
-
+
out= T_FileStream_open(xmlfileName,"w");
if(out==NULL){
*status = U_FILE_ACCESS_ERROR;
return;
}
- T_FileStream_write(out,xmlHeader, uprv_strlen(xmlHeader));
-
+ T_FileStream_write(out,xmlHeader, (int32_t)uprv_strlen(xmlHeader));
+
if(outputEnc && *outputEnc!='\0'){
/* store the output encoding */
enc = outputEnc;
return;
}
}
- T_FileStream_write(out,bundleStart,uprv_strlen(bundleStart));
+ T_FileStream_write(out,bundleStart, (int32_t)uprv_strlen(bundleStart));
write_tabs(out);
- T_FileStream_write(out, fileStart, uprv_strlen(fileStart));
- T_FileStream_write(out,lang,uprv_strlen(lang));
- T_FileStream_write(out,file1, uprv_strlen(file1));
- T_FileStream_write(out,file2, uprv_strlen(file2));
- T_FileStream_write(out,originalFileName, uprv_strlen(originalFileName));
- T_FileStream_write(out,file3, uprv_strlen(file3));
- T_FileStream_write(out,file4, uprv_strlen(file4));
+ T_FileStream_write(out, fileStart, (int32_t)uprv_strlen(fileStart));
+ /* check if lang and language are the same */
+ if(language != NULL && uprv_strcmp(lang, srBundle->fLocale)!=0){
+ fprintf(stderr,"Warning: The top level tag in the resource and language specified are not the same. Please check the input.\n");
+ }
+ T_FileStream_write(out,lang, (int32_t)uprv_strlen(lang));
+ T_FileStream_write(out,file1, (int32_t)uprv_strlen(file1));
+ T_FileStream_write(out,file2, (int32_t)uprv_strlen(file2));
+ T_FileStream_write(out,originalFileName, (int32_t)uprv_strlen(originalFileName));
+ T_FileStream_write(out,file3, (int32_t)uprv_strlen(file3));
+ T_FileStream_write(out,file4, (int32_t)uprv_strlen(file4));
time(&currTime);
strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&currTime));
- T_FileStream_write(out,timeBuf, uprv_strlen(timeBuf));
+ T_FileStream_write(out,timeBuf, (int32_t)uprv_strlen(timeBuf));
- if(package) {
- T_FileStream_write(out,file5, uprv_strlen(file5));
- T_FileStream_write(out,package, uprv_strlen(package));
- }
T_FileStream_write(out,"\">\n", 3);
tabCount++;
write_tabs(out);
- T_FileStream_write(out,headerStart, uprv_strlen(headerStart));
- T_FileStream_write(out,headerEnd, uprv_strlen(headerEnd));
+ T_FileStream_write(out,headerStart, (int32_t)uprv_strlen(headerStart));
+ T_FileStream_write(out,headerEnd, (int32_t)uprv_strlen(headerEnd));
write_tabs(out);
tabCount++;
- T_FileStream_write(out,bodyStart, uprv_strlen(bodyStart));
-
- if(package) {
- pid = uprv_malloc(sizeof(char) * uprv_strlen(package)+1);
- uprv_memset(pid, 0, sizeof(char) * uprv_strlen(package)+1);
- uprv_strcpy(pid, package);
- res_write_xml(bundle->fRoot, pid, lang, status);
- } else {
- res_write_xml(bundle->fRoot, "", lang, status);
- }
+ T_FileStream_write(out,bodyStart, (int32_t)uprv_strlen(bodyStart));
+
+
+ res_write_xml(bundle->fRoot, srBundle->fLocale, lang, status);
tabCount--;
write_tabs(out);
- T_FileStream_write(out,bodyEnd, uprv_strlen(bodyEnd));
+ T_FileStream_write(out,bodyEnd, (int32_t)uprv_strlen(bodyEnd));
tabCount--;
write_tabs(out);
- T_FileStream_write(out,fileEnd, uprv_strlen(fileEnd));
+ T_FileStream_write(out,fileEnd, (int32_t)uprv_strlen(fileEnd));
tabCount--;
write_tabs(out);
- T_FileStream_write(out,bundleEnd,uprv_strlen(bundleEnd));
+ T_FileStream_write(out,bundleEnd,(int32_t)uprv_strlen(bundleEnd));
T_FileStream_close(out);
ucnv_close(conv);
}
if(outputFileName != NULL){
uprv_free(outputFileName);
- pid = NULL;
- }
+ pid = NULL;
+ }
}
projects / apple / icu.git / blobdiff