dirent.c   dirent.c 
#ifndef _MSC_BUILD
/* ==================================================================== /* ====================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
skipping to change at line 150 skipping to change at line 151
{ {
if (!dp) return 0; if (!dp) return 0;
if ((HANDLE)dp->handle != INVALID_HANDLE_VALUE) _findclose(dp->handle); if ((HANDLE)dp->handle != INVALID_HANDLE_VALUE) _findclose(dp->handle);
if (dp->dir) free(dp->dir); if (dp->dir) free(dp->dir);
if (dp) free(dp); if (dp) free(dp);
return 0; return 0;
} }
#endif // #ifndef __MINGW32__ #endif // #ifndef __MINGW32__
#else
/* lt__dirent.c -- internal directory entry scanning interface
Copyright (C) 2001, 2004 Free Software Foundation, Inc.
Written by Bob Friesenhahn, 2001
NOTE: The canonical source of this file is maintained with the
GNU Libtool package. Report bugs to bug-libtool@gnu.org.
GNU Libltdl is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
As a special exception to the GNU Lesser General Public License,
if you distribute this file as part of a program or library that
is built using GNU Libtool, you may include this file under the
same distribution terms that you use for the rest of that program.
GNU Libltdl is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with GNU Libltdl; see the file COPYING.LIB. If not, a
copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//#include "lt__private.h"
#include <assert.h>
#include <stddef.h>
#include "kdewin32/dirent.h"
#if defined(WIN32)
void closedir (DIR *entry)
{
assert (entry != (DIR *) NULL);
FindClose (entry->hSearch);
free ((void *) entry);
}
DIR* opendir (const char *path)
{
char file_spec[260];
DIR *entry;
assert (path != (char *) 0);
if (strncpy (file_spec, path, sizeof file_spec) >= sizeof file_spec
|| strncat (file_spec, "\\", sizeof file_spec) >= sizeof file_spec)
return (DIR *) 0;
entry = (DIR *) malloc (sizeof(DIR));
if (entry != (DIR *) 0)
{
entry->firsttime = TRUE;
entry->hSearch = FindFirstFileA (file_spec, &entry->Win32FindDataA);
if (entry->hSearch == INVALID_HANDLE_VALUE)
{
if (strncat (file_spec, "\\*.*", sizeof file_spec) < sizeof file_s
pec)
{
entry->hSearch = FindFirstFileA (file_spec, &entry->Win32FindD
ataA);
}
if (entry->hSearch == INVALID_HANDLE_VALUE)
{
entry = (free (entry), (DIR *) 0);
}
}
}
return entry;
}
struct dirent* readdir (DIR *entry)
{
int status;
if (entry == (DIR *) 0)
return (struct dirent *) 0;
if (!entry->firsttime)
{
status = FindNextFileA (entry->hSearch, &entry->Win32FindDataA);
if (status == 0)
return (struct dirent *) 0;
}
entry->firsttime = FALSE;
if (strncpy (entry->file_info.d_name, entry->Win32FindDataA.cFileName,
sizeof entry->file_info.d_name) >= sizeof entry->file_info.d_name)
return (struct dirent *) 0;
entry->file_info.d_namlen = strlen (entry->file_info.d_name);
return &entry->file_info;
}
#endif /*defined(__WINDOWS__)*/
#endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/