mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-23 04:46:55 +03:00
* samba/libsmb/smbdes.c: undefine uchar before redefine it
* smbfs.c (smbfs_close): honour changed semantics for return value (on error -1 is expected). * (fs): it is at least strange use char * for counter. Changed to int
This commit is contained in:
parent
8e2dd48337
commit
b7b5c71de3
@ -1,3 +1,12 @@
|
|||||||
|
2001-03-15 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
|
* samba/libsmb/smbdes.c: undefine uchar before redefine it
|
||||||
|
|
||||||
|
* smbfs.c (smbfs_close): honour changed semantics for return value
|
||||||
|
(on error -1 is expected).
|
||||||
|
|
||||||
|
* (fs): it is at least strange use char * for counter. Changed to int
|
||||||
|
|
||||||
2001-03-14 Pavel Roskin <proski@gnu.org>
|
2001-03-14 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
* Make-mc.in: Use Automake conditional USE_SAMBA_FS.
|
* Make-mc.in: Use Automake conditional USE_SAMBA_FS.
|
||||||
|
@ -46,8 +46,8 @@
|
|||||||
up with a different answer to the one above)
|
up with a different answer to the one above)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#undef uchar
|
||||||
#define uchar unsigned char
|
#define uchar const unsigned char
|
||||||
|
|
||||||
static uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9,
|
static uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9,
|
||||||
1, 58, 50, 42, 34, 26, 18,
|
1, 58, 50, 42, 34, 26, 18,
|
||||||
|
20
vfs/smbfs.c
20
vfs/smbfs.c
@ -388,10 +388,9 @@ smbfs_init(vfs *me)
|
|||||||
if(!get_myname(myhostname,NULL))
|
if(!get_myname(myhostname,NULL))
|
||||||
DEBUG(0,("Failed to get my hostname.\n"));
|
DEBUG(0,("Failed to get my hostname.\n"));
|
||||||
|
|
||||||
if (!lp_load(servicesf,True,False,False)) {
|
if (!lp_load(servicesf,True,False,False))
|
||||||
if (errno != ENOENT)
|
|
||||||
DEBUG(0, ("Can't load %s - run testparm to debug it\n", servicesf));
|
DEBUG(0, ("Can't load %s - run testparm to debug it\n", servicesf));
|
||||||
}
|
|
||||||
codepage_initialise(lp_client_code_page());
|
codepage_initialise(lp_client_code_page());
|
||||||
|
|
||||||
load_interfaces();
|
load_interfaces();
|
||||||
@ -467,7 +466,7 @@ smbfs_close (void *data)
|
|||||||
if (archive_level >= 2 && (inf->attr & aARCH)) {
|
if (archive_level >= 2 && (inf->attr & aARCH)) {
|
||||||
cli_setatr(info->cli, rname, info->attr & ~(uint16)aARCH, 0);
|
cli_setatr(info->cli, rname, info->attr & ~(uint16)aARCH, 0);
|
||||||
} */
|
} */
|
||||||
return cli_close(info->cli, info->fnum);
|
return (cli_close(info->cli, info->fnum) == True) ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
@ -513,12 +512,11 @@ browsing_helper(const char *name, uint32 type, const char *comment)
|
|||||||
|
|
||||||
if (first_direntry) {
|
if (first_direntry) {
|
||||||
current_info->entries = new_entry;
|
current_info->entries = new_entry;
|
||||||
current_info->current = new_entry;
|
|
||||||
first_direntry = FALSE;
|
first_direntry = FALSE;
|
||||||
} else {
|
} else {
|
||||||
current_info->current->next = new_entry;
|
current_info->current->next = new_entry;
|
||||||
current_info->current = new_entry;
|
|
||||||
}
|
}
|
||||||
|
current_info->current = new_entry;
|
||||||
|
|
||||||
bzero(&new_entry->my_stat, sizeof(struct stat));
|
bzero(&new_entry->my_stat, sizeof(struct stat));
|
||||||
new_entry->merrno = 0;
|
new_entry->merrno = 0;
|
||||||
@ -753,14 +751,14 @@ chkpath(struct cli_state *cli, char *path, BOOL send_only)
|
|||||||
|
|
||||||
/* #if 0 */
|
/* #if 0 */
|
||||||
static int
|
static int
|
||||||
fs (char *text)
|
fs (const char *text)
|
||||||
{
|
{
|
||||||
char *p, count = 0;
|
const char *p = text;
|
||||||
p = strchr(text, '/');
|
int count = 0;
|
||||||
while (p) {
|
|
||||||
|
while ((p = strchr(p, '/')) != NULL) {
|
||||||
count++;
|
count++;
|
||||||
p++;
|
p++;
|
||||||
p = strchr(p, '/');
|
|
||||||
}
|
}
|
||||||
if (count == 1)
|
if (count == 1)
|
||||||
return strlen(text);
|
return strlen(text);
|
||||||
|
Loading…
Reference in New Issue
Block a user