cvs commit: apr/file_io/win32 dir.c

[wrowe]

wrowe       01/04/12 06:40:01

  Modified:    file_io/win32 dir.c
  Log:
    Uninitialized data error.
  
  Revision  Changes    Path
  1.56      +4 -1      apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/dir.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- dir.c     2001/02/25 20:39:30     1.55
  +++ dir.c     2001/04/12 13:40:00     1.56
  @@ -149,7 +149,8 @@
        */
   #if APR_HAS_UNICODE_FS
       apr_oslevel_e os_level;
  -    apr_wchar_t *eos, wdirname[APR_PATH_MAX];
  +    apr_wchar_t wdirname[APR_PATH_MAX];
  +    apr_wchar_t *eos = NULL;
       if (!apr_get_oslevel(thedir->cntxt, &os_level) && os_level >= APR_WIN_NT)
       {
           if (thedir->dirhand == INVALID_HANDLE_VALUE) 
  @@ -224,6 +225,8 @@
               /* Almost all our work is done.  Tack on the wide file name
                * to the end of the wdirname (already / delimited)
                */
  +            if (!eos)
  +                eos = wcschr(wdirname, '\0');
               wcscpy(eos, thedir->w.entry->cFileName);
               return more_finfo(finfo, wdirname, wanted, MORE_OF_WFSPEC, 
os_level);
           }