On Mon, 1 Dec 2003, Corinna Vinschen wrote:

> On Mon, Dec 01, 2003 at 10:07:25AM +0100, Dr. Volker Zell wrote:
> > Hi
> >
> > As discussed in cygwin-apps here's a small patch to point cygwin to an existing
> > time zone datasbase when the tzcode/data package is installed.
>
> Should we do some extra stuff to maintain backward compatibility with
> the old /usr/local/etc path?  I don't think so but...
>
> Corinna

That's pretty much what I suggested in
<http://cygwin.com/ml/cygwin-apps/2003-11/msg00443.html>.  Right now, the
code is not $TZDIR-aware, AFAICS.  IMO, having it first check the TZDIR
environment variable, and if that's not set, default to the #defined value
of TZDIR would be the right solution.  Something like (very raw)

Index: localtime.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/localtime.cc,v
retrieving revision 1.8
diff -u -p -r1.8 localtime.cc
--- localtime.cc        20 Dec 2002 03:40:00 -0000      1.8
+++ localtime.cc        1 Dec 2003 16:44:49 -0000
@@ -717,7 +717,8 @@ tzload(const char *name, struct state *s
        register int            fid;
        save_errno              save;

-       if (name == NULL && (name = TZDEFAULT) == NULL)
+       if (name == NULL && (name = getenv("TZDEFAULT")) == NULL
+                        && (name = TZDEFAULT) == NULL)
                return -1;
        {
                register int    doaccess;
@@ -734,7 +735,7 @@ tzload(const char *name, struct state *s
                        ++name;
                doaccess = name[0] == '/';
                if (!doaccess) {
-                       if ((p = TZDIR) == NULL)
+                       if ((p = getenv("TZDIR") == NULL && (p = TZDIR) == NULL)
                                return -1;
                        if ((strlen(p) + strlen(name) + 1) >= sizeof fullname)
                                return -1;
------------------------------------------------------------------------------
        Igor
-- 
                                http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_                [EMAIL PROTECTED]
ZZZzz /,`.-'`'    -.  ;-;;,_            [EMAIL PROTECTED]
     |,4-  ) )-,_. ,\ (  `'-'           Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL     a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster."  -- Patrick Naughton

Reply via email to