Attachment #339458 for bug #182046

Lines 71-77 Link Here

(-)afpfs-ng-0.8.1/include/afpfs-ng/afp.h (-1 / +1 lines)
71	struct afp_file_info * largelist_next;	71	struct afp_file_info * largelist_next;
72	unsigned char isdir;	72	unsigned char isdir;
73	unsigned long long size;	73	unsigned long long size;
74	unsigned short resourcesize;	74	unsigned long long resourcesize;
75	unsigned int resource;	75	unsigned int resource;
76	unsigned short forkid;	76	unsigned short forkid;
77	struct afp_icon * icon;	77	struct afp_icon * icon;




static int ending=0;
void * just_end_it_now(void * ignore)
{
	if (ending) return NULL;
	ending=1;
	if (libafpclient->forced_ending_hook) 
		libafpclient->forced_ending_hook();
	exit_program=2;
	signal_main_thread();
	return NULL;
}

/*This is a hack to handle a problem where the first pthread_kill doesnt' work*/

Lines 478-484 Link Here

(-)afpfs-ng-0.8.1/lib/dsi.c (-2 / +2 lines)
478	}	478	}
479	server->flags=ntohs(reply1->flags);	479	server->flags=ntohs(reply1->flags);
480		480
481	p=(void )((unsigned int) server->incoming_buffer + sizeof(reply1));	481	p=(void )((unsigned long) server->incoming_buffer + sizeof(reply1));
482	p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;	482	p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;
483		483
484	/* Now work our way through the variable bits */	484	/* Now work our way through the variable bits */
Lines 762-768 Link Here
762	printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);	762	printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);
763	#endif	763	#endif
764	ret = read(server->fd, (void *)	764	ret = read(server->fd, (void *)
765	(((unsigned int) server->incoming_buffer)+server->data_read),	765	(((unsigned long) server->incoming_buffer)+server->data_read),
766	amount_to_read);	766	amount_to_read);
767	if (ret<0) return -1;	767	if (ret<0) return -1;
768	if (ret==0) {	768	if (ret==0) {

Lines 582-588 Link Here

(-)afpfs-ng-0.8.1/lib/lowlevel.c (-1 / +1 lines)
582	if (volume->server->using_version->av_number>=30 && fp.unixprivs.permissions != 0)	582	if (volume->server->using_version->av_number>=30 && fp.unixprivs.permissions != 0)
583	stbuf->st_mode \|= fp.unixprivs.permissions;	583	stbuf->st_mode \|= fp.unixprivs.permissions;
584	else	584	else
585	set_nonunix_perms(&stbuf->st_mode,&fp);	585	set_nonunix_perms((mode_t *)&stbuf->st_mode,&fp);
586		586
587	stbuf->st_uid=fp.unixprivs.uid;	587	stbuf->st_uid=fp.unixprivs.uid;
588	stbuf->st_gid=fp.unixprivs.gid;	588	stbuf->st_gid=fp.unixprivs.gid;

Lines 259-265 Link Here

(-)afpfs-ng-0.8.1/lib/proto_directory.c (-2 / +2 lines)
259	uint16_t reqcount;	259	uint16_t reqcount;
260	} __attribute__((__packed__)) * reply = (void *) buf;	260	} __attribute__((__packed__)) * reply = (void *) buf;
261		261
262	struct {	262	struct sEntry{
263	uint16_t size;	263	uint16_t size;
264	uint8_t isdir;	264	uint8_t isdir;
265	uint8_t pad;	265	uint8_t pad;
Lines 293-299 Link Here
293	filecur=new_file;	293	filecur=new_file;
294	}	294	}
295		295
296	entry = p;	296	entry = (struct sEntry *)p;
297		297
298	parse_reply_block(server,p+sizeof(*entry),	298	parse_reply_block(server,p+sizeof(*entry),
299	ntohs(entry->size),entry->isdir,	299	ntohs(entry->size),entry->isdir,

Return to bug 182046

Lines 87-98 Link Here

(-)afpfs-ng-0.8.1/lib/loop.c (-1 / +2 lines)
87	static int ending=0;	87	static int ending=0;
88	void * just_end_it_now(void * ignore)	88	void * just_end_it_now(void * ignore)
89	{	89	{
90	if (ending) return;	90	if (ending) return NULL;
91	ending=1;	91	ending=1;
92	if (libafpclient->forced_ending_hook)	92	if (libafpclient->forced_ending_hook)
93	libafpclient->forced_ending_hook();	93	libafpclient->forced_ending_hook();
94	exit_program=2;	94	exit_program=2;
95	signal_main_thread();	95	signal_main_thread();
		96	return NULL;
96	}	97	}
97		98
98	/This is a hack to handle a problem where the first pthread_kill doesnt' work/	99	/This is a hack to handle a problem where the first pthread_kill doesnt' work/