Login
Username:

Password:

Remember me



Lost Password?

Register now!

Sections

Who's Online
68 user(s) are online (43 user(s) are browsing Forums)

Members: 1
Guests: 67

VidarS, more...

Headlines






Is anyone have readdir_r() implementation for aos4 ?
Home away from home
Joined:
2007/9/11 12:31
From Russia
Posts: 7334
@All
While working on some port, find out that it needs readdir_r() which we do not have not in newlib, not in clib2. I do some search and only found this thread about:

https://forum.hyperion-entertainment.com/viewtopic.php?t=1128

But no working code of readdir_r() implementation. Did anyone have it maybe? Thanks

_________________
Join us to improve dopus5!
zerohero's mirror of os4/os3 crosscompiler suites
   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Not too shy to talk
Joined:
2020/11/17 12:08
From Slough
Posts: 256
This is why we should rearchitect to use a centralised File server and then have dos library only return proxy handles not real handles.

   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Quite a regular
Joined:
2013/10/17 16:21
From Hungary
Posts: 694
You can just do this:
int readdir_r(DIR *dirpstruct dirent *entrystruct dirent **result)
{
  *
result readdir (dirp);
  return *
result != NULL : -1;
}

This is taken from glibc:
https://chromium.googlesource.com/chro ... 961001/dirent/readdir_r.c

_________________
This is just like television, only you can see much further.
   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Just popping in
Joined:
2021/7/23 21:46
From Älvsbyn, Sweden
Posts: 43
@BSzili

that's not from glibc!

this is straight from a modern glibc

/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   The GNU C Library 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.1 of the License, or (at your option) any later version.
   The GNU C Library 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 the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

#include <errno.h>
#include <limits.h>
#include <stddef.h>
#include <string.h>
#include <dirent.h>
#include <unistd.h>
#include <sys/types.h>
#include <assert.h>
#include <dirstream.h>

#ifndef __READDIR_R
# define __READDIR_R __readdir_r
# define __GETDENTS __getdents
# define DIRENT_TYPE struct dirent
# define __READDIR_R_ALIAS
#endif

int __READDIR_R (DIR *dirpDIRENT_TYPE *entryDIRENT_TYPE **result)
{
  
DIRENT_TYPE *dp;
  
size_t reclen;
  const 
int saved_errno errno;
  
int ret;

  
__libc_lock_lock (dirp->lock);

  do
    {
      if (
dirp->offset >= dirp->size)
        {
          
/* We've emptied out our buffer.  Refill it.  */
          
size_t maxread;
          
ssize_t bytes;

#ifndef _DIRENT_HAVE_D_RECLEN
          /* Fixed-size struct; must read one at a time (see below).  */
          
maxread sizeof *dp;
#else
          
maxread dirp->allocation;
#endif

          
bytes __GETDENTS (dirp->fddirp->datamaxread);
          if (
bytes <= 0)
            {

              
/* On some systems getdents fails with ENOENT when the
                 open directory has been rmdir'd already.  POSIX.1
                 requires that we treat this condition like normal EOF.  */

              
if (bytes && errno == ENOENT)
                {
                  
bytes 0;
                  
__set_errno (saved_errno);
                }
              if (
bytes 0)
                
dirp->errcode errno;
              
dp NULL;
              break;
            }
          
dirp->size = (size_tbytes;
          
/* Reset the offset into the buffer.  */
          
dirp->offset 0;
        }
      
dp = (DIRENT_TYPE *) &dirp->data[dirp->offset];

#ifdef _DIRENT_HAVE_D_RECLEN
      
reclen dp->d_reclen;
#else
      /* The only version of `struct dirent*' that lacks `d_reclen'
         is fixed-size.  */
      
assert (sizeof dp->d_name 1);
      
reclen sizeof *dp;
      
/* The name is not terminated if it is the largest possible size.
         Clobber the following byte to ensure proper null termination.  We
         read just one entry at a time above so we know that byte will not
         be used later.  */

      
dp->d_name[sizeof dp->d_name] = '';
#endif
      
dirp->offset += reclen;

#ifdef _DIRENT_HAVE_D_OFF
      
dirp->filepos dp->d_off;
#else
      
dirp->filepos += reclen;
#endif

#ifdef NAME_MAX
      
if (reclen offsetof (DIRENT_TYPEd_name) + NAME_MAX 1)
        {
          
/* The record is very long.  It could still fit into the
             caller-supplied buffer if we can skip padding at the
             end.  */
          
size_t namelen _D_EXACT_NAMLEN (dp);
          if (
namelen <= NAME_MAX)
            
reclen offsetof (DIRENT_TYPEd_name) + namelen 1;
          else
            {
              
/* The name is too long.  Ignore this file.  */
              
dirp->errcode ENAMETOOLONG;
              
dp->d_ino 0;
              continue;
            }
        }
#endif
      /* Skip deleted and ignored files.  */
    
}
  while (
dp->d_ino == 0);
  if (
dp != NULL)
    {
      *
result memcpy (entrydpreclen);
#ifdef _DIRENT_HAVE_D_RECLEN
      
entry->d_reclen reclen;
#endif
      
ret 0;
    }
  else
    {
      *
result NULL;
      
ret dirp->errcode;
    }

  
__libc_lock_unlock (dirp->lock);

  return 
ret;
}

#ifdef __READDIR_R_ALIAS
weak_alias (__readdir_rreaddir_r)
#endif
#undef __READDIR_R
#undef __GETDENTS
#undef DIRENT_TYPE
#undef __READDIR_R_ALIAS


   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Quite a regular
Joined:
2013/10/17 16:21
From Hungary
Posts: 694
@trgswe
I stand corrected, it's from Chromium. It still works in most cases if you have readdir.

_________________
This is just like television, only you can see much further.
   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Home away from home
Joined:
2007/9/11 12:31
From Russia
Posts: 7334
@All
Thanks, pals, I use BSzili's version and it works. At least it was small enough and did what needed to do.

Version from trgswe I also found before posting a question in google, but it didn't compile because of dirstream.h which we didn't have as I see, and so...

Thanks all :)

_________________
Join us to improve dopus5!
zerohero's mirror of os4/os3 crosscompiler suites
   Report Go to top

Re: Is anyone have readdir_r() implementation for aos4 ?
Home away from home
Joined:
2006/12/4 23:15
Posts: 2310
I think BZillis workarround should be sufficient investigating I see that in the posix world readdir_r() is actually depricated and readdir() is general threadsafe (when working on seperate directory streams). I belive this is the case for newlibs readdir() too.

https://man7.org/linux/man-pages/man3/readdir_r.3.html

_________________
Blender For OS4.x : Blues : Walker Broad
   Report Go to top





[Advanced Search]



Powered by XOOPS 2.0 © 2001-2016 The XOOPS Project