cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pretty symlink logic for help files

This commit is contained in:
Valery V Yatsko 2008-06-28 11:48:30 +04:00
parent 7dd98666cc
commit c735f93023
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cache.c
View File

@ -136,7 +136,7 @@ cache_file(const char *filename, const char *shortname, int flags)
if(!EmptyString(line)) if(!EmptyString(line))
{ {
lineptr = rb_malloc(sizeof(struct cacheline)); lineptr = rb_malloc(sizeof(struct cacheline));
rb_strlcpy(lineptr->data, line, sizeof(lineptr->data)); untabify(lineptr->data, line, sizeof(lineptr->data));
rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents); rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents);
} }
else else
@ -224,6 +224,10 @@ load_help(void)
struct cachefile *cacheptr; struct cachefile *cacheptr;
struct DictionaryIter iter; struct DictionaryIter iter;
#if defined(S_ISLNK) && defined(HAVE_LSTAT)
struct stat sb;
#endif
DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper) DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper)
{ {
irc_dictionary_delete(help_dict_oper, cacheptr->name); irc_dictionary_delete(help_dict_oper, cacheptr->name);
@ -257,6 +261,25 @@ load_help(void)
{ {
rb_snprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name); rb_snprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name);
#if defined(S_ISLNK) && defined(HAVE_LSTAT)
if(lstat(filename, &sb) < 0)
continue;
/* ok, if its a symlink, we work on the presumption if an
* oper help exists of that name, its a symlink to that --fl
*/
if(S_ISLNK(sb.st_mode))
{
cacheptr = irc_dictionary_retrieve(help_dict_oper, ldirent->d_name);
if(cacheptr != NULL)
{
cacheptr->flags |= HELP_USER;
continue;
}
}
#endif
cacheptr = cache_file(filename, ldirent->d_name, HELP_USER); cacheptr = cache_file(filename, ldirent->d_name, HELP_USER);
irc_dictionary_add(help_dict_user, cacheptr->name, cacheptr); irc_dictionary_add(help_dict_user, cacheptr->name, cacheptr);
} }