summaryrefslogtreecommitdiffstats
path: root/source/smbd/dir.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-03-17 22:56:13 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-03-17 22:56:13 +0000
commit10b53d7c6fd77f23433dd2ef12bb14b227147a48 (patch)
tree20c5cf43d124d1fa5cb1046d3508e03f57e0c870 /source/smbd/dir.c
parent64796ed27a3842be1dde52dd4f46698e95961767 (diff)
downloadsamba-10b53d7c6fd77f23433dd2ef12bb14b227147a48.tar.gz
samba-10b53d7c6fd77f23433dd2ef12bb14b227147a48.tar.xz
samba-10b53d7c6fd77f23433dd2ef12bb14b227147a48.zip
Merge from HEAD:
- Make ReadDirName return a const char*. - Consequential changes from that - mark our fstring/pstring assumptions in function prototypes Andrew Bartlett
Diffstat (limited to 'source/smbd/dir.c')
-rw-r--r--source/smbd/dir.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/smbd/dir.c b/source/smbd/dir.c
index 95acf4a2621..3f29ac892c7 100644
--- a/source/smbd/dir.c
+++ b/source/smbd/dir.c
@@ -578,7 +578,7 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,SMB_STRUCT_STAT *st,int di
return True;
}
-static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mask)
+static BOOL mangle_mask_match(connection_struct *conn, fstring filename, char *mask)
{
mangle_map(filename,True,False,SNUM(conn));
return mask_match(filename,mask,False);
@@ -588,10 +588,10 @@ static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mas
Get an 8.3 directory entry.
****************************************************************************/
-BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
+BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname,
SMB_OFF_T *size,int *mode,time_t *date,BOOL check_descend)
{
- char *dname;
+ const char *dname;
BOOL found = False;
SMB_STRUCT_STAT sbuf;
pstring path;
@@ -907,7 +907,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto)
dirp->current = dirp->data;
}
- safe_strcpy(dirp->data+used,n, dirp->mallocsize - used - 1);
+ safe_strcpy_base(dirp->data+used,n, dirp->data, dirp->mallocsize);
used += l;
dirp->numentries++;
}
@@ -933,7 +933,7 @@ void CloseDir(void *p)
Read from a directory.
********************************************************************/
-char *ReadDirName(void *p)
+const char *ReadDirName(void *p)
{
char *ret;
Dir *dirp = (Dir *)p;
@@ -1008,7 +1008,7 @@ static ubi_dlNewList( dir_cache );
Output: None.
*****************************************************************************/
-void DirCacheAdd( const char *path, char *name, char *dname, int snum )
+void DirCacheAdd( const char *path, const char *name, const char *dname, int snum )
{
int pathlen;
int namelen;