Mercurial > gftp.yaz
changeset 692:81172373727f
2005-2-13 Brian Masney <masneyb@gftp.org>
* lib/fsplib/fsplib.c - updated to use fsplib 0.4. Fixes compilation
errors under Solaris/IRIX
| author | masneyb |
|---|---|
| date | Sun, 13 Feb 2005 14:45:28 +0000 |
| parents | 8fb0cbd3aecc |
| children | fd44f94c14ef |
| files | ChangeLog lib/fsplib/fsplib.c |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 12 16:39:43 2005 +0000 +++ b/ChangeLog Sun Feb 13 14:45:28 2005 +0000 @@ -1,3 +1,7 @@ +2005-2-13 Brian Masney <masneyb@gftp.org> + * lib/fsplib/fsplib.c - updated to use fsplib 0.4. Fixes compilation + errors under Solaris/IRIX + 2005-2-4 Brian Masney <masneyb@gftp.org> * docs/website/announce.txt - updated announcement with release of 2.0.18 @@ -3282,7 +3286,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.405 2005/02/04 16:14:54 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.406 2005/02/13 14:45:28 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/fsplib/fsplib.c Sat Feb 12 16:39:43 2005 +0000 +++ b/lib/fsplib/fsplib.c Sun Feb 13 14:45:28 2005 +0000 @@ -591,13 +591,15 @@ if (rc != 0) return rc; +#ifdef HAVE_DIRENT_TYPE /* convert FSP dirent to OS dirent */ if (fentry.type == FSP_RDTYPE_DIR ) entry->d_type=DT_DIR; else entry->d_type=DT_REG; - +#endif + /* remove symlink destination */ c=strchr(fentry.name,'\n'); if (c) @@ -608,14 +610,16 @@ fentry.namlen-=rc; } +#ifdef HAVE_DIRENT_FILENO entry->d_fileno = 10; +#endif entry->d_reclen = fentry.reclen; strncpy(entry->d_name,fentry.name,MAXNAMLEN); if (fentry.namlen > MAXNAMLEN) { entry->d_name[MAXNAMLEN + 1 ] = '\0'; -#ifdef HAVE_NAMLEN +#ifdef HAVE_DIRENT_NAMLEN entry->d_namlen = MAXNAMLEN; } else {