comparison lib/fsplib/fsplib.c @ 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 6b6fbcf76d00
children fd44f94c14ef
comparison
equal deleted inserted replaced
691:8fb0cbd3aecc 692:81172373727f
589 rc=fsp_readdir_native(dir,&fentry,&fresult); 589 rc=fsp_readdir_native(dir,&fentry,&fresult);
590 590
591 if (rc != 0) 591 if (rc != 0)
592 return rc; 592 return rc;
593 593
594 #ifdef HAVE_DIRENT_TYPE
594 /* convert FSP dirent to OS dirent */ 595 /* convert FSP dirent to OS dirent */
595 596
596 if (fentry.type == FSP_RDTYPE_DIR ) 597 if (fentry.type == FSP_RDTYPE_DIR )
597 entry->d_type=DT_DIR; 598 entry->d_type=DT_DIR;
598 else 599 else
599 entry->d_type=DT_REG; 600 entry->d_type=DT_REG;
600 601 #endif
602
601 /* remove symlink destination */ 603 /* remove symlink destination */
602 c=strchr(fentry.name,'\n'); 604 c=strchr(fentry.name,'\n');
603 if (c) 605 if (c)
604 { 606 {
605 *c='\0'; 607 *c='\0';
606 rc=fentry.namlen-strlen(fentry.name); 608 rc=fentry.namlen-strlen(fentry.name);
607 fentry.reclen-=rc; 609 fentry.reclen-=rc;
608 fentry.namlen-=rc; 610 fentry.namlen-=rc;
609 } 611 }
610 612
613 #ifdef HAVE_DIRENT_FILENO
611 entry->d_fileno = 10; 614 entry->d_fileno = 10;
615 #endif
612 entry->d_reclen = fentry.reclen; 616 entry->d_reclen = fentry.reclen;
613 strncpy(entry->d_name,fentry.name,MAXNAMLEN); 617 strncpy(entry->d_name,fentry.name,MAXNAMLEN);
614 618
615 if (fentry.namlen > MAXNAMLEN) 619 if (fentry.namlen > MAXNAMLEN)
616 { 620 {
617 entry->d_name[MAXNAMLEN + 1 ] = '\0'; 621 entry->d_name[MAXNAMLEN + 1 ] = '\0';
618 #ifdef HAVE_NAMLEN 622 #ifdef HAVE_DIRENT_NAMLEN
619 entry->d_namlen = MAXNAMLEN; 623 entry->d_namlen = MAXNAMLEN;
620 } else 624 } else
621 { 625 {
622 entry->d_namlen = fentry.namlen; 626 entry->d_namlen = fentry.namlen;
623 #endif 627 #endif