Re: [Celestia-developers] Patch proposal for celestia.cfg breakage

[Selden E B. Jr <se...@le...>]

I just now sync'd my copy of the anonymous CVS tree,
deleted all objs, and rebuilt from scratch.

The resulting Windows version of Celestia has no problems finding 
celestia.cfg

s.

> Can someone confirm breakage? I don't have any way of compiling the
> Windows code.

> Da Woon Jung wrote:
> > Hi, I noticed that the recent code checked in for reading a local cfg
> > breaks functionality on OS X. In fact a separate check for a local
> > config is not needed on OS X since the cfg file is already stored
> > locally so I #ifndef'ed out the whole thing.
> >
> > Also, doesn't the code also break on Windows, since WordExp() is
> > implemented as an identity function but since there is no
> > ~/.celestia.cfg on Windows, the ReadCelestiaConfig() inside the if
> > statement fails, resulting in config==NULL...?
> >
> > Index: celestiacore.cpp
> > ===================================================================
> > RCS file: /cvsroot/celestia/celestia/src/celestia/celestiacore.cpp,v
> > retrieving revision 1.178
> > diff -u -r1.178 celestiacore.cpp
> > --- celestiacore.cpp    3 Apr 2005 18:39:35 -0000       1.178
> > +++ celestiacore.cpp    12 May 2005 14:25:30 -0000
> > @@ -3580,10 +3580,12 @@
> >  #endif
> >
> >      config = ReadCelestiaConfig("celestia.cfg");
> > +#ifndef MACOSX
> >      std::string localConfigFile = WordExp("~/.celestia.cfg");
> >      if (localConfigFile != "") {
> >          ReadCelestiaConfig(localConfigFile.c_str(), config);
> >      }
> > +#endif
> >      if (config == NULL)
> >      {
> >          fatalError("Error reading configuration file.");;
> >
> >
> > -------------------------------------------------------
> > This SF.Net email is sponsored by Oracle Space Sweepstakes
> > Want to be the first software developer in space?
> > Enter now for the Oracle Space Sweepstakes!
> > http://ads.osdn.com/?ad_ids93&alloc_id281&op=click
> > _______________________________________________
> > Celestia-developers mailing list
> > Cel...@li...
> > https://lists.sourceforge.net/lists/listinfo/celestia-developers



> -------------------------------------------------------
> This SF.Net email is sponsored by Oracle Space Sweepstakes
> Want to be the first software developer in space?
> Enter now for the Oracle Space Sweepstakes!
> http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
> _______________________________________________
> Celestia-developers mailing list
> Cel...@li...
> https://lists.sourceforge.net/lists/listinfo/celestia-developers