Macintosh-SW/afpfs-ng-mac
1
0
Fork 0
mirror of https://github.com/mabam/afpfs-ng-mac.git synced 2024-06-07 09:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from zathras777/master

Browse Source 
Stop mount_afp segfaulting & minor changes.
This commit is contained in:
Simon Vetter 2015-07-29 16:07:11 +02:00
commit f6e24eb73c
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -4,6 +4,8 @@
# Libraries # Libraries
*.lib *.lib
*.a *.a
*.la
*.lo
# Shared objects (inc. Windows DLLs) # Shared objects (inc. Windows DLLs)
*.dll *.dll
@ -15,3 +17,13 @@
*.exe *.exe
*.out *.out
*.app *.app
# Build directories & generated files
.deps
.libs
Makefile
config.h
config.log
config.status
libtool

4
fuse/commands.c
View File

@ -512,14 +512,14 @@ static int process_mount(struct fuse_client * c)
break; break;
default: default:
log_for_client((void *)c,AFPFSD,LOG_ERR, log_for_client((void *)c,AFPFSD,LOG_ERR,
"Mounting of volume %s of server %s failed.\n", "Mounting of volume %s from server %s failed.\n",
volume->volume_name_printable, volume->volume_name_printable,
volume->server->server_name_printable); volume->server->server_name_printable);
} }
goto error; goto error;
} else { } else {
log_for_client((void *)c,AFPFSD,LOG_NOTICE, log_for_client((void *)c,AFPFSD,LOG_NOTICE,
"Mounting of volume %s of server %s succeeded.\n", "Mounting of volume %s from server %s succeeded.\n",
volume->volume_name_printable, volume->volume_name_printable,
volume->server->server_name_printable); volume->server->server_name_printable);
return 0; return 0;

2
lib/proto_map.c
View File

@ -122,7 +122,7 @@ int afp_mapid_reply(struct afp_server *server, char * buf, unsigned int size, vo
if (reply->header.return_code.error_code!=kFPNoErr) return -1; if (reply->header.return_code.error_code!=kFPNoErr) return -1;
copy_from_pascal_two(name,reply->name,255); copy_from_pascal_two(name, &reply->name, 255);
return 0; return 0;
} }