On 6/24/05, abe-t <[EMAIL PROTECTED]> wrote:
> Update of /cvsroot/naviserver/naviserver/nsd
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/nsd
> 
> Modified Files:
>         nsmain.c
> Log Message:
>   Corrected normalizing the home path on Windows.
> 
> 
> Index: nsmain.c
> ===================================================================
> RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -C2 -d -r1.13 -r1.14
> *** nsmain.c    11 Jun 2005 10:03:56 -0000      1.13
> --- nsmain.c    24 Jun 2005 08:38:27 -0000      1.14
> ***************
> *** 111,115 ****
>       int  i, fd, sig, optind, cmdargc;
>       char **cmdargv;
> !     char *config;
>       Ns_Time timeout;
> 
> --- 111,115 ----
>       int  i, fd, sig, optind, cmdargc;
>       char **cmdargv;
> !     char *config, *tcp;
>       Ns_Time timeout;
> 
> ***************
> *** 592,596 ****
>        */
> 
> !     nsconf.home = getcwd(buf, sizeof(buf));
>       if (nsconf.home == NULL) {
>           Ns_Fatal("nsmain: getcwd failed: '%s'", strerror(errno));
> --- 592,597 ----
>        */
> 
> !     tcp =
> !     nsconf.home = getcwd(NULL, _MAX_PATH);
>       if (nsconf.home == NULL) {
>           Ns_Fatal("nsmain: getcwd failed: '%s'", strerror(errno));
> ***************
> *** 604,608 ****
>           ++nsconf.home;
>       }
> !     nsconf.home = buf;
> 
>       /*
> --- 605,609 ----
>           ++nsconf.home;
>       }
> !     nsconf.home = tcp;
> 
>       /*


What does 'tcp' stand for?  How about 'cwd':

    nsconf.home = getcwd(NULL, _MAX_PATH);
    if (nsconf.home == NULL) {
        Ns_Fatal("nsmain: getcwd failed: '%s'", strerror(errno));
    }
    for (cwd = nsconf.home; *cwd != '\0'; cwd++) {
        if (*cwd == '\\') {
            *cwd = '/';
        } else if (isupper(*cwd)) {
            *cwd = tolower(*cwd);
        }
    }

Reply via email to