FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to zip and tgz plug-ins to allow for use of TEMP variable on Windows.

Browse Source 
Submitted by Zach Deedler
This commit is contained in:
Don BURNS
2006-01-24 17:43:53 +00:00
parent df1d2ee93b
commit d4bacf93cd
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgPlugins/tgz/ReaderWriterTGZ.cpp
View File

@@ -50,12 +50,18 @@ class ReaderWriterTGZ : public osgDB::ReaderWriter
char command[1024];
#if defined(_WIN32) && !defined(__CYGWIN__)
strcpy(dirname, "C:/Windows/Temp/.osgdb_tgz");
if ( getenv("TEMP") != NULL ){
strcpy(dirname, getenv("TEMP"));
}else{
//TEMP environment variable not set so pick current directory.
strcpy(dirname, "./");
}
strcat(dirname, ".osgdb_tgz");
mkdir( dirname);
// note, the following C option under windows does not seem to work...
// will pursue an better tar.exe later. RO.
// Using tar.exe from http://www.cygwin.com/
// tar.exe must be in your path. (PATH environment variable).
sprintf( command,
"tar xfz %s %s",
"tar xfCz \"%s\" \"%s\"",
fileName.c_str(), dirname );
#endif
@@ -113,14 +119,12 @@ class ReaderWriterTGZ : public osgDB::ReaderWriter
osgDB::Registry::instance()->setCreateNodeFromImage(prevCreateNodeFromImage);
#if defined(_WIN32) && !defined(__CYGWIN__)
// note, is this the right command for windows?
// is there any way of overiding the Y/N option? RO.
sprintf( command, "erase %s", dirname );
system( command );
sprintf( command, "erase /F /Q /S \"%s\"", dirname );
#else
sprintf( command, "rm -rf %s", dirname );
system( command );
#endif
osg::notify(osg::NOTICE)<<"Running command '"<<command<<"'"<<std::endl;
system( command );
if( grp->getNumChildren() == 0 )
{

16
src/osgPlugins/zip/ReaderWriterZIP.cpp
View File

@@ -44,14 +44,21 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
char command[1024];
#if defined(WIN32) && !defined(__CYGWIN__)
strcpy(dirname, getenv("TEMP"));
if ( getenv("TEMP") != NULL ){
strcpy(dirname, getenv("TEMP"));
}else{
//TEMP environment variable not set so pick current directory.
strcpy(dirname, "./");
}
strcat(dirname, "\\.osgdb_zip");
mkdir(dirname);
// Using unzip.exe from http://www.info-zip.org/pub/infozip/UnZip.html
// unzip.exe must be in your path. (PATH environment variable).
sprintf( command,
"unzip -o -qq %s -d %s",
"unzip -o -qq \"%s\" -d \"%s\"",
fileName.c_str(), dirname);
osg::notify(osg::NOTICE)<<"Running command '"<<command<<"'"<<std::endl;
system( command );
#else
@@ -70,6 +77,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = options ? static_cast<osgDB::ReaderWriter::Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new osgDB::ReaderWriter::Options;
local_options->getDatabasePathList().push_front(dirname);
// deactivate the automatic generation of images to geode's.
bool prevCreateNodeFromImage = osgDB::Registry::instance()->getCreateNodeFromImage();
osgDB::Registry::instance()->setCreateNodeFromImage(false);
@@ -93,7 +101,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
#if defined(WIN32) && !defined(__CYGWIN__)
// note, is this the right command for windows?
// is there any way of overiding the Y/N option? RO.
sprintf( command, "erase /S /Q %s", dirname );
sprintf( command, "erase /S /Q \"%s\"", dirname );
system( command );
#else