zx/bforce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

some fixes

Browse Source
This commit is contained in:
Evgeniy Kozhuhovskiy 2005-01-14 11:44:59 +00:00
parent b390eec6a0
commit 87a2ea7de5
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/bforce/nodelist.c
View File

@ -246,7 +246,7 @@ int nodelist_parsestring(s_node *node, char *str)
* pointer to the allocated nodelist structure (will be used with all * pointer to the allocated nodelist structure (will be used with all
* nodelist operations), and NULL to indicate errors. * nodelist operations), and NULL to indicate errors.
*/ */
s_nodelist *nodelist_open(const char *dir, const char *name, int mode) s_nodelist *nodelist_open(const char *dir, char *name, int mode)
{ {
s_nodelist tmp; s_nodelist tmp;
const char *openmode; const char *openmode;
@ -287,10 +287,14 @@ s_nodelist *nodelist_open(const char *dir, const char *name, int mode)
* example config for details) */ * example config for details) */
if( strcmp(name+strlen(name)-4, ".999") == 0 ) if( strcmp(name+strlen(name)-4, ".999") == 0 )
{ {
char *tmpseek; /* char *tmpseek;
tmpseek = (char*) malloc(MAX_NAME); tmpseek = (char*) malloc(MAX_NAME);
char *tmpname; char *tmpname;
tmpname = (char*) malloc(MAX_NAME); tmpname = (char*) malloc(MAX_NAME);*/
char tmpseek[MAX_NAME];
char tmpname[MAX_NAME];
tmpname[0]='\0';
tmpseek[0]='\0';
/* int count; /* int count;
struct stat *tmpbuf; struct stat *tmpbuf;
*/ */
@ -306,7 +310,7 @@ s_nodelist *nodelist_open(const char *dir, const char *name, int mode)
{ {
strnxcpy(tmpseek, DIRSEPSTR, 255-strlen(tmpseek)); strnxcpy(tmpseek, DIRSEPSTR, 255-strlen(tmpseek));
} }
strnxcpy(tmpseek, name, 255-strlen(tmpseek)); strncpy(tmpseek, name, 255-strlen(tmpseek));
sprintf(tmpseek, "%i", count); sprintf(tmpseek, "%i", count);
if( stat(tmpseek, tmpbuf) == 0) if( stat(tmpseek, tmpbuf) == 0)
{ {
@ -324,29 +328,30 @@ s_nodelist *nodelist_open(const char *dir, const char *name, int mode)
} }
else else
{ {
strnxcpy(tmpname, name, MAX_NAME-strlen(name)); strncpy(tmpname, name, sizeof(tmpname));
struct stat *ndfile; struct stat *ndfile;
time_t lasttime = 0; time_t lasttime;
while( (ndir = readdir(ndirstream)) ) while( (ndir = readdir(ndirstream)) )
{ {
strnxcpy(tmpseek, ndir->d_name, MAX_NAME-strlen(tmpseek)); strncpy(tmpseek, ndir->d_name, sizeof(tmpseek));
tmpseek[strlen(tmpseek)-3] = '\0'; if ( strlen(tmpseek) < 3 )
tmpname[strlen(name)-3] = '\0'; continue;
if( strncmp(tmpseek, tmpname, MAX_NAME-strlen(tmpseek)) )
if( strncmp(tmpseek, tmpname, (strlen(tmpseek)-3) ) == 0 )
{ {
if( stat(tmpseek, ndfile) ) if( stat(tmpseek, ndfile) )
{ {
if( ndfile->st_mtime > lasttime ) if( ndfile->st_mtime > lasttime )
{ {
lasttime = ndfile->st_mtime; lasttime = ndfile->st_mtime;
strnxcpy(name, tmpname, MAX_NAME-strlen(tmpseek)); strncpy(name, tmpseek, MAX_NAME-strlen(tmpseek));
} }
} }
} }
} }
} }
free(tmpname); // free(tmpname);
free(tmpseek); // free(tmpseek);
} }