FCL/sftools/dev/build: comparison bintools/rcomp/src/main.cpp

equal deleted inserted replaced

-:7c4a911dc066
+:541af5ee3ed9
 /*
-* Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include "unistd.h"
 #if defined( __MSVCDOTNET__) || defined(__TOOLS2__)
 #include <iostream>
+#include <fstream>
 using std::cout;
 using std::endl;
 using std::cerr;
 #else //!__MSVCDOTNET__
 #ifndef __LINUX__
 	}
 void OutputHelp()
 	{
-	cerr << "Resource compiler version " << version << " (Build " << build << ") (C) 1997-2009 Nokia Corporation." << endl;
+	cerr << "Resource compiler version " << version << " (Build " << build << ") (C) 1997-2010 Nokia Corporation." << endl;
 	cerr << "Usage: rcomp [-vpul] [-force] [-oRSCFile] [-{uid2,uid3}] [-hHeaderFile] [-sSourceFile] [-iBaseInputFileName]" << endl;
 	cerr << "\tv" << "\tverbose" << endl;
 	cerr << "\tp" << "\tParser debugging" << endl;
 	cerr << "\tl" << "\tCheck localisation comments" << endl;
 	cerr << "\tforce" << "\tEmit localisation warnings even if no localisation tags are present" << endl;
 				}
 			}
 		}
 	if(SourceFileName.Length() == 0)
 		{
-		pSourceFile = stdin;
+		pSourceFile = NULL ; //stdin;
 		}
 	else
-		{
+	{
 		if((pSourceFile = fopen(SourceFileName.GetAssertedNonEmptyBuffer(), "r") ) == NULL)
-			{
+		{
 			cerr << "Failed to open " << SourceFileName << endl;
 			exit(-2);
-			}
+		}
-		}
+		//Searchig for BOM signature which if found will be ignored
-	//Searchig for BOM signature which if found will be ignored
+		unsigned char buffer[3];
+		fread( buffer, sizeof( char ), 3, pSourceFile);
-	unsigned char buffer[3];
+		if((buffer[0]!=239) && (buffer[1]!=187) && (buffer[2]!=191))
-	fread( buffer, sizeof( char ), 3, pSourceFile);
+		{
+			// BOM not found. Set the file-position indicator to 0
-	if((buffer[0]!=239) && (buffer[1]!=187) && (buffer[2]!=191))
+			filePositionIndicator = fpos_t();
-		{
+			if(fsetpos(pSourceFile, &filePositionIndicator) !=0)
-		// BOM not found. Set the file-position indicator to 0
+			{
-		filePositionIndicator = fpos_t();
+				perror("fsetpos error");
-		if(fsetpos(pSourceFile, &filePositionIndicator) !=0)
+				exit(-2);
-			{
-			perror("fsetpos error");
 			}
 		}
+	}
 	verbose = vParam;
 	pG = new GlobalData;
 	if (pG==NULL)
 		exit(-4);
+	if(NULL == pSourceFile){ // Cache the standard input
+		pG->StdInBufLength = 0;
+		unsigned long allocSize = 0x100000 ; // 1M bytes
+		pG->StdInfBufPos = 0 ;
+		pG->StdInBuffer = (char*)malloc(allocSize);
+		if(NULL == pG->StdInBuffer){
+			delete pG ;
+			exit(-4);
+		}
+		int result = 1;
+		char* buffer = pG->StdInBuffer;
+		FILE *file = stdin ;
+		const int KIOBytes = 0x20000 ;
+		while(1) {
+			result = fread(buffer, 1, KIOBytes, file);
+			if(result == 0){
+				*buffer = 0;
+				break ;
+			}
+			buffer += result ;
+			pG->StdInBufLength += result ;
+			if((pG->StdInBufLength + KIOBytes) > allocSize) {
+				allocSize += KIOBytes ;
+				pG->StdInBuffer = (char*)realloc(pG->StdInBuffer,allocSize);
+				if(NULL == pG->StdInBuffer){
+					delete pG ;
+					exit(-4);
+				}
+				buffer = pG->StdInBuffer + pG->StdInBufLength;
+			}
+		}
+		const unsigned char BOM[] = {0xef , 0xbb, 0xbf, 0x0 };
+		if(0 == memcmp(pG->StdInBuffer,BOM,3))
+			pG->StdInfBufPos = 3 ;
+	}
+	else {
+		pG->StdInBuffer = 0 ;
+		pG->StdInBufLength = 0;
+	}
 	Tokenize(MessageSuppressionList);
 	pGL = new GlobalLocalisationData;
 	if(pG==NULL)
 	#ifdef __TOOLS2__
 	pG->FileLineHandler.SetBase(SourceFileName,0);
 	#endif
 	int ret=ParseSourceFile(pSourceFile, pParam);
-	fclose(pSourceFile);
+	if(pSourceFile != NULL)
+		fclose(pSourceFile);
+	if(pG->StdInBuffer != NULL)
+		free(pG->StdInBuffer);
 	pGL->StoreFinalComment(); // final comment not stored during running of lex and yacc
 	if(lParam && (pGL->LocalisationCommentsExist() || lForce))
 		{
 		pGL->AnalyseLocalisationData();
 		std::string totalpath(s.substr( 0, s.rfind("/")+1 ));
 		const char* uidTool = "uidcrc";
 #else
 		std::string totalpath(s.substr( 0, s.rfind("\\")+1 ));
 		const char* uidTool = "uidcrc.exe";
+		// in case unix style of seperator is used in windows.
+		if(!totalpath.length()){
+			totalpath = s.substr( 0, s.rfind("/")+1 );
+		}
 #endif
-		// Calls the uidcrc tool with the full path to where RCOMP resides in
 		std::string uidpath(uidTool);
-		totalpath += uidpath;
+		// try to call the uidcrc tool with the full path to where RCOMP resides in
+		// if does not exists, search uidcrc in PATH
+		if(totalpath.length()){
+			std::string trypath(totalpath);
+			trypath += uidpath;
+			std::fstream _file;
+			_file.open(trypath.c_str(), std::ios::in);
+			if(!_file){
+				// try to search from PATH
+				totalpath = uidpath;
+			}
+			else{
+				_file.close();
+				// invoke from the path RCOMP resides in
+				totalpath += uidpath;
+			}
+		}
+		else{
+			// search from PATH
+			totalpath = uidpath;
+		}
 		// Find and replace all occurences of \ with /
 		std::string searchString( "\\" );
 		std::string replaceString( "/" );
 		std::string::size_type pos = 0;
 		if (verbose)
 			{
 			MOFF; cout << uidcrcTool << " " << uidcrcUIDs[0] << " " << uidcrcUIDs[1] << " " << uidcrcUIDs[2] << " " << DataOutputFileName.GetAssertedNonEmptyBuffer(); cout << endl; MON;
 			}
-#ifndef __LINUX__
+		int namelen = strlen(uidcrcTool) + strlen(uidcrcUIDs[0]) * 3 + DataOutputFileName.Length() + 10;
-		const int error = _spawnlp (_P_WAIT,
+		char *uidcrc_params = new char[namelen];
-									uidcrcTool,
-									uidcrcTool,
-									uidcrcUIDs[0],
-									uidcrcUIDs[1],
-									uidcrcUIDs[2],
-									DataOutputFileName.GetAssertedNonEmptyBuffer(),
-									NULL);
-#else
-		char uidcrc_params[256];
 		const int ret = snprintf(uidcrc_params,
-					 sizeof(uidcrc_params),
+					 namelen,
 					 "%s %s %s %s %s",
 					 uidcrcTool,
 					 uidcrcUIDs[0],
 					 uidcrcUIDs[1],
 					 uidcrcUIDs[2],
 		if(ret <= 0) {
 			cerr << "Failed to write UIDs to " << DataOutputFileName << endl;
 			exit(ret);
 		}
 		const int error = system(uidcrc_params);
-#endif //__LINUX__
 		if(error != 0)
 			{
 			cerr << "Failed to write UIDs to " << DataOutputFileName << endl;
 			exit(error);
 			}
+		delete[] uidcrc_params;
 		RCBinaryStream RSCStream;
 		RSCStream.OpenForAppend(DataOutputFileName);
 		if(! RSCStream.IsOpen())
 			{
 			cerr << "Failed to open " << DataOutputFileName << endl;

changeset 629	541af5ee3ed9
parent 626	ac03b93ca9c4