--- parser3/src/main/pa_dir.C 2001/04/06 12:34:54 1.1 +++ parser3/src/main/pa_dir.C 2001/11/05 11:46:27 1.8 @@ -1,14 +1,12 @@ /** @file Parser: directory scanning for different OS-es. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2000,2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_dir.C,v 1.1 2001/04/06 12:34:54 paf Exp $ + $Id: pa_dir.C,v 1.8 2001/11/05 11:46:27 paf Exp $ */ -#include "pa_config_includes.h" #include "pa_dir.h" #include "pa_common.h" @@ -32,7 +30,7 @@ void findclose(struct ffblk *_ffblk) { #else bool findfirst(const char *_pathname, struct ffblk *_ffblk, int _attrib) { - strncpy(_ffblk->filePath, _pathname, MAXPATH); + strncpy(_ffblk->filePath, _pathname, MAXPATH-1); _ffblk->filePath[MAXPATH-1]=0; if(!(_ffblk->dir=opendir(_ffblk->filePath))) return true; @@ -46,8 +44,7 @@ bool findnext(struct ffblk *_ffblk) { return true; int maxsize=sizeof(_ffblk->ff_name)-1; - strncpy(_ffblk->ff_name, entry->d_name, maxsize); - _ffblk->ff_name[maxsize]=0; + strncpy(_ffblk->ff_name, entry->d_name, maxsize-1); _ffblk->ff_name[maxsize]=0; char fileSpec[MAXPATH]; snprintf(fileSpec, MAXPATH, "%s/%s",