head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.28
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.26
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.24
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.22
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.20
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.18
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.16
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.14
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.12
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.10
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.8
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.6
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.4
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.2
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.2.0.6
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.4
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.2
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.1.0.10
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.8
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.6
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.4
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2007.03.20.13.32.12;	author tron;	state dead;
branches;
next	1.2;

1.2
date	2006.06.27.20.11.12;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.14.14.50.48;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove "gftp" packages. They are broken and unmaintained.

Approved by Jared D. McNeill.
@
text
@$NetBSD: patch-ae,v 1.2 2006/06/27 20:11:12 joerg Exp $

--- lib/fsplib/fsplib.c.orig	2005-01-19 02:03:45.000000000 +0000
+++ lib/fsplib/fsplib.c
@@@@ -27,6 +27,10 @@@@ use of this software.
 #include "fsplib.h"
 #include "lock.h"
 
+#ifndef ENOTSUP
+# define ENOTSUP EINVAL
+#endif
+
 /* ************ Internal functions **************** */ 
 
 /* builds filename in packet output buffer, appends password if needed */
@@@@ -575,6 +579,7 @@@@ FSP_DIR * fsp_opendir(FSP_SESSION *s,con
     return dir;
 }
 
+#if 0
 int fsp_readdir_r(FSP_DIR *dir,struct dirent *entry, struct dirent **result)
 {
     FSP_RDENTRY fentry,*fresult;
@@@@ -632,6 +637,7 @@@@ int fsp_readdir_r(FSP_DIR *dir,struct di
 
     return 0; 
 }
+#endif
 
 /* native FSP directory reader */
 int fsp_readdir_native(FSP_DIR *dir,FSP_RDENTRY *entry, FSP_RDENTRY **result)
@@@@ -681,25 +687,25 @@@@ int fsp_readdir_native(FSP_DIR *dir,FSP_
        dir->dirpos += 9;
        /* read file name */
        entry->name[255 + 1] = '\0';
-       strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN);
        namelen = strlen( (char *) dir->data+dir->dirpos);
+       if (namelen >= sizeof(entry->name) - 1) {
+	    /* skip over file name */
+            dir->dirpos += namelen +1;
+            /* pad to 4 byte boundary */
+            entry->reclen += (4 - dir->dirpos) & 3;
+            dir->dirpos += (4 - dir->dirpos) & 3;
+	    continue;
+       }
+       strncpy(entry->name,(char *)( dir->data + dir->dirpos ), sizeof(entry->name));
        /* skip over file name */
        dir->dirpos += namelen +1;
 
        /* set entry namelen field */
-       if (namelen > 255)
-           entry->namlen = 255;
-       else
-           entry->namlen = namelen;
+       entry->namlen = namelen;
        /* set record length */	   
        entry->reclen = 10+namelen;
 
-       /* pad to 4 byte boundary */
-       while( dir->dirpos & 0x3 )
-       {
-         dir->dirpos++;
-         entry->reclen++;
-       }
+       dir->dirpos += (4 - dir->dirpos) & 3;
 
        /* and return it */
        *result=entry;
@@@@ -707,6 +713,7 @@@@ int fsp_readdir_native(FSP_DIR *dir,FSP_
     }
 }
 
+#if 0
 struct dirent * fsp_readdir(FSP_DIR *dirp)
 {
     static struct dirent entry;
@@@@ -719,6 +726,7 @@@@ struct dirent * fsp_readdir(FSP_DIR *dir
     else
         return result;
 }
+#endif
 
 long fsp_telldir(FSP_DIR *dirp)
 {
@


1.2
log
@Fix a possible stack overflow on architectures with MAXNAMLEN > 255,
like Solaris. Comment out some unused functions messing with the dirent
interface to fix the build on DragonFly. Bump revision.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Added a patch to make gftp compile on NetBSD-1.6.2, which does not know
about ENOTSUP. Approved by wiz.
@
text
@d3 2
a4 4
NetBSD-1.6.2 does not know about ENOTSUP.

--- lib/fsplib/fsplib.c.orig	Wed Jan 19 03:03:45 2005
+++ lib/fsplib/fsplib.c	Sat Mar 12 11:04:49 2005
d16 69
@