sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

- Make ReadDirName return a const char*.

Browse Source 
- Consequential changes from that

 - mark our fstring/pstring assumptions in function prototypes

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 0001-01-01 00:00:00 +00:00
parent 4e96585b60
commit fe2bc64bc4
7 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/client.c
View File

@ -1291,7 +1291,7 @@ static int file_find(struct file_list **list, const char *directory,
int ret;
char *path;
BOOL isdir;
char *dname;
const char *dname;
dir = opendir(directory);
if (!dir) return -1;

2
source/lib/util.c
View File

@ -1435,7 +1435,7 @@ void smb_panic(const char *why)
A readdir wrapper which just returns the file name.
********************************************************************/
char *readdirname(DIR *p)
const char *readdirname(DIR *p)
{
SMB_STRUCT_DIRENT *ptr;
char *dname;

2
source/smbd/chgpasswd.c
View File

@ -64,7 +64,7 @@ static int findpty(char **slave)
int master;
static fstring line;
DIR *dirp;
char *dpname;
const char *dpname;
#if defined(HAVE_GRANTPT)
/* Try to open /dev/ptmx. If that fails, fall through to old method. */

2
source/smbd/mangle.c
View File

@ -107,7 +107,7 @@ BOOL mangle_check_cache(char *s)
map a long filename to a 8.3 name.
*/
void mangle_map(char *OutName, BOOL need83, BOOL cache83, int snum)
void mangle_map(pstring OutName, BOOL need83, BOOL cache83, int snum)
{
/* name mangling can be disabled for speed, in which case
we just truncate the string */

2
source/smbd/mangle_hash2.c
View File

@ -484,7 +484,7 @@ static BOOL is_legal_name(const char *name)
the name parameter must be able to hold 13 bytes
*/
static void name_map(char *name, BOOL need83, BOOL cache83)
static void name_map(fstring name, BOOL need83, BOOL cache83)
{
char *dot_p;
char lead_chars[7];

2
source/smbd/mangle_map.c
View File

@ -201,7 +201,7 @@ static void mangled_map(char *s, const char *MangledMap)
front end routine to the mangled map code
personally I think that the whole idea of "mangled map" is completely bogus
*/
void mangle_map_filename(char *fname, int snum)
void mangle_map_filename(fstring fname, int snum)
{
char *map;

53
source/smbd/trans2.c
View File

@ -460,7 +460,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
BOOL *out_of_space, BOOL *got_exact_match,
int *last_name_off)
{
char *dname;
const char *dname;
BOOL found = False;
SMB_STRUCT_STAT sbuf;
pstring mask;
@ -1173,7 +1173,8 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
*/
int current_pos, start_pos;
char *dname = NULL;
const char *dname = NULL;
pstring dname_pstring;
void *dirptr = conn->dirptr;
start_pos = TellDir(dirptr);
for(current_pos = start_pos; current_pos >= 0; current_pos--) {
@ -1181,21 +1182,24 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
SeekDir(dirptr, current_pos);
dname = ReadDirName(dirptr);
if (dname) {
/*
* Remember, mangle_map is called by
* get_lanman2_dir_entry(), so the resume name
* could be mangled. Ensure we do the same
* here.
*/
/* make sure we get a copy that mangle_map can modify */
/*
* Remember, mangle_map is called by
* get_lanman2_dir_entry(), so the resume name
* could be mangled. Ensure we do the same
* here.
*/
if(dname != NULL)
mangle_map( dname, False, True, SNUM(conn));
if(dname && strcsequal( resume_name, dname)) {
SeekDir(dirptr, current_pos+1);
DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
break;
pstrcpy(dname_pstring, dname);
mangle_map( dname_pstring, False, True, SNUM(conn));
if(strcsequal( resume_name, dname_pstring)) {
SeekDir(dirptr, current_pos+1);
DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
break;
}
}
}
@ -1215,13 +1219,17 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
* here.
*/
if(dname != NULL)
mangle_map( dname, False, True, SNUM(conn));
if(dname) {
/* make sure we get a copy that mangle_map can modify */
pstrcpy(dname_pstring, dname);
mangle_map(dname_pstring, False, True, SNUM(conn));
if(dname && strcsequal( resume_name, dname)) {
SeekDir(dirptr, current_pos+1);
DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
break;
if(strcsequal( resume_name, dname_pstring)) {
SeekDir(dirptr, current_pos+1);
DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
break;
}
}
} /* end for */
} /* end if current_pos */
@ -1269,7 +1277,6 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
dptr_close(&dptr_num); /* This frees up the saved mask */
}
/* Set up the return parameter block */
SSVAL(params,0,numentries);
SSVAL(params,2,finished);