Apply patch: ncpfs-hg-commit-431.patch

This commit is contained in:
Mario Fetka
2026-04-28 20:56:03 +02:00
parent b417a518c5
commit 4d94ea705a
96 changed files with 3398 additions and 431 deletions

View File

@@ -50,8 +50,8 @@
struct ncp_sign_init
{
char sign_root[8];
char sign_last[16];
unsigned char sign_root[8];
unsigned char sign_last[16];
};
union ncp_sockaddr {
@@ -72,7 +72,7 @@ union ncp_sockaddr {
struct ncp_ioctl_request {
unsigned int function;
unsigned int size;
char *data;
unsigned char *data;
};
struct ncp_fs_info {
@@ -130,13 +130,13 @@ struct ncp_privatedata_ioctl
struct ncp_nls_ioctl_old
{
int codepage;
unsigned char iocharset[NCP_IOCSNAME_LEN+1];
char iocharset[NCP_IOCSNAME_LEN+1];
};
struct ncp_nls_ioctl
{
unsigned char codepage[NCP_IOCSNAME_LEN+1];
unsigned char iocharset[NCP_IOCSNAME_LEN+1];
char codepage[NCP_IOCSNAME_LEN+1];
char iocharset[NCP_IOCSNAME_LEN+1];
};
#define NCP_IOC_NCPREQUEST _IOR('n', 1, struct ncp_ioctl_request)

View File

@@ -73,7 +73,7 @@ struct ncp_bindery_object {
#ifdef SWIG
fixedCharArray object_name[NCP_BINDERY_NAME_LEN];
#else
u_int8_t object_name[NCP_BINDERY_NAME_LEN];
char object_name[NCP_BINDERY_NAME_LEN];
#endif
u_int8_t object_flags;
u_int8_t object_security;

View File

@@ -474,7 +474,7 @@ struct ncp_file_server_info
#else
struct ncp_file_server_info
{
u_int8_t ServerName[48] __attribute__((packed));
char ServerName[48] __attribute__((packed));
u_int8_t FileServiceVersion __attribute__((packed));
u_int8_t FileServiceSubVersion __attribute__((packed));
u_int16_t MaximumServiceConnections __attribute__((packed));
@@ -499,7 +499,7 @@ struct ncp_file_server_info_2 {
#ifdef SWIG
fixedArray ServerName[49];
#else
u_int8_t ServerName[49];
char ServerName[49];
#endif
u_int8_t FileServiceVersion;
u_int8_t FileServiceSubVersion;
@@ -560,7 +560,7 @@ long
long
ncp_get_encryption_key(NWCONN_HANDLE conn,
char *encryption_key);
unsigned char encryption_key[8]);
long
ncp_get_bindery_object_id(NWCONN_HANDLE conn,
NWObjectType object_type,
@@ -710,19 +710,19 @@ long
ncp_login_encrypted(NWCONN_HANDLE conn,
const struct ncp_bindery_object *object,
const unsigned char *key,
const unsigned char *passwd);
const char *passwd);
long
ncp_login_unencrypted(NWCONN_HANDLE conn,
NWObjectType object_type, const char *object_name,
const unsigned char *passwd);
const char *passwd);
long
ncp_change_login_passwd(NWCONN_HANDLE conn,
const struct ncp_bindery_object *object,
const unsigned char *key,
const unsigned char *oldpasswd,
const unsigned char *newpasswd);
const char *oldpasswd,
const char *newpasswd);
#define NCP_GRACE_PERIOD (0xdf)
@@ -782,8 +782,8 @@ const char* strnwerror(int err);
long
ncp_login_user(NWCONN_HANDLE conn,
const unsigned char *username,
const unsigned char *password);
const char *username,
const char *password);
long
ncp_get_volume_info_with_number(NWCONN_HANDLE conn, int n,
@@ -815,7 +815,7 @@ long
int attr, int accessm,
struct ncp_file_info *target);
long ncp_close_file(NWCONN_HANDLE conn, const char fileHandle[6]);
long ncp_close_file(NWCONN_HANDLE conn, const unsigned char fileHandle[6]);
long
ncp_create_newfile(NWCONN_HANDLE conn,
@@ -878,11 +878,11 @@ long
#ifdef SWIG
long
ncp_read(NWCONN_HANDLE conn, const char fileHandle[6],
ncp_read(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off_t offset, size_t count, char *RETBUFFER_LENPREV);
long
ncp_write(NWCONN_HANDLE conn, const char fileHandle[6],
ncp_write(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off_t offset, size_t IGNORE, const char *STRING_LENPREV);
long
@@ -895,23 +895,23 @@ long
u_int32_t * OUTPUT);
#else
long
ncp_read(NWCONN_HANDLE conn, const char fileHandle[6],
ncp_off_t offset, size_t count, char *target);
ncp_read(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off_t offset, size_t count, void *target);
long
ncp_write(NWCONN_HANDLE conn, const char fileHandle[6],
ncp_off_t offset, size_t count, const char *source);
ncp_write(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off_t offset, size_t count, const void *source);
NWCCODE ncp_read64(NWCONN_HANDLE conn, const char fileHandle[6],
NWCCODE ncp_read64(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off64_t offset, size_t count, void *target, size_t *bytesread);
NWCCODE ncp_write64(NWCONN_HANDLE conn, const char fileHandle[6],
NWCCODE ncp_write64(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off64_t offset, size_t count, const void *source, size_t *byteswritten);
long
ncp_copy_file(NWCONN_HANDLE conn,
const char source_file[6],
const char target_file[6],
const unsigned char source_file[6],
const unsigned char target_file[6],
u_int32_t source_offset,
u_int32_t target_offset,
u_int32_t count,
@@ -1167,8 +1167,8 @@ ncp_set_dentry_ttl(NWCONN_HANDLE conn, unsigned int ttl);
long
ncp_send_nds_frag(NWCONN_HANDLE conn,
int ndsverb,
const char *inbuf, size_t inbuflen,
char *outbuf, size_t outbufsize, size_t *outbuflen);
const void *inbuf, size_t inbuflen,
void *outbuf, size_t outbufsize, size_t *outbuflen);
long
ncp_send_nds(NWCONN_HANDLE conn, int fn,
@@ -1423,7 +1423,7 @@ ncp_ns_open_create_entry(NWCONN_HANDLE conn,
/* struct nw_info_struct2 */ void* target, size_t sizeoftarget,
u_int8_t* oc_action,
u_int8_t* oc_callback,
char fileHandle[6] /* ?? u_int32_t* or NW_FILE_HANDLE* ?? */
unsigned char fileHandle[6] /* ?? u_int32_t* or NW_FILE_HANDLE* ?? */
);
NWCCODE
@@ -1660,7 +1660,7 @@ ncp_volume_list_end(NWVOL_HANDLE handle);
NWCCODE
ncp_get_file_size(NWCONN_HANDLE conn,
/* input */
const char fileHandle[6],
const unsigned char fileHandle[6],
/* output */
ncp_off64_t* fileSize);
@@ -1684,14 +1684,14 @@ const char* ncp_namespace_to_str(char r[5], unsigned int ns);
#define NCP_PHYSREC_EX 0x01
#define NCP_PHYSREC_SH 0x03
NWCCODE ncp_log_physical_record(NWCONN_HANDLE conn, const char fileHandle[6],
NWCCODE ncp_log_physical_record(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off64_t startOffset, u_int64_t length, unsigned int flags,
unsigned int timeout);
NWCCODE ncp_clear_physical_record(NWCONN_HANDLE conn, const char fileHandle[6],
NWCCODE ncp_clear_physical_record(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off64_t startOffset, u_int64_t length);
NWCCODE ncp_release_physical_record(NWCONN_HANDLE conn, const char fileHandle[6],
NWCCODE ncp_release_physical_record(NWCONN_HANDLE conn, const unsigned char fileHandle[6],
ncp_off64_t startOffset, u_int64_t length);
#ifdef __cplusplus

View File

@@ -661,7 +661,7 @@ NWDSCCODE __NWDSCompare(NWDSContextHandle ctx, NWCONN_HANDLE conn,
NWObjectID objectID, Buf_T* buf, nbool8* matched);
NWDSCCODE __NWDSOpenStream(NWDSContextHandle ctx, const NWDSChar* objectName,
const NWDSChar* attrName, nflag32 flags, NWCONN_HANDLE* rconn,
char fileHandle[6], ncp_off64_t* fileSize);
unsigned char fileHandle[6], ncp_off64_t* fileSize);
NWDSCCODE NWDSAddObject(NWDSContextHandle ctx, const NWDSChar* name,
nuint32* iterHandle, nbool8 more, Buf_T* buf); /* D */