Apple-2-Tools
/
apple2pi
mirror of https://github.com/dschmenk/apple2pi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pulling in some changes

This commit is contained in:
dschmenk 2013-12-10 20:26:38 -08:00
parent 0a2e0730a9
commit ad28128b41
6 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
PACKAGE=a2pi PACKAGE=a2pi
VERSION=0.1.5 VERSION=0.1.7
DIST=$(PACKAGE)-$(VERSION) DIST=$(PACKAGE)-$(VERSION)
DISTDIR=./$(DIST) DISTDIR=./$(DIST)

13
debian/changelog vendored Normal file → Executable file
View File

@ -1,3 +1,16 @@
a2pi (0.1.7-2) unstable; urgency=low
* Adjust file permissions for FUSE driver to allow group access
* Add options to allow root to access FUSE mount point (for GSport)
-- David Schmenk <dschmenk@gmail.com> Fri, 06 Dec 2013 20:39:14 -0800
a2pi (0.1.6-1) unstable; urgency=low
* One more attempt at mouse acceleration. Better inital Apple client setup.
-- David Schmenk <dschmenk@gmail.com> Sun, 1 Dec 2013 18:59:17 -0800
a2pi (0.1.5-1) unstable; urgency=low a2pi (0.1.5-1) unstable; urgency=low
* One more attempt at mouse acceleration, Apple ][/][+ support * One more attempt at mouse acceleration, Apple ][/][+ support

7
debian/postinst vendored
View File

@ -51,6 +51,13 @@ case "$1" in
addgroup pi fuse addgroup pi fuse
# addgroup pi input # already there by default # addgroup pi input # already there by default
# #
# Allow other users (root) to access FUSE mount points
#
if [ "$(grep \#user_allow_other /etc/fuse.conf)" != "" ] ; then
mv /etc/fuse.conf /etc/fuse.conf.bak
sed 's/^#user_allow_other/user_allow_other/' /etc/fuse.conf.bak > /etc/fuse.conf
fi
#
# Add schmenk.is-a-geek.com to apt sources # Add schmenk.is-a-geek.com to apt sources
# #
if [ "$(grep schmenk /etc/apt/sources.list)" = "" ] ; then if [ "$(grep schmenk /etc/apt/sources.list)" = "" ] ; then

BIN
share/A2PI-1.2.PO Normal file → Executable file
View File

Binary file not shown.

2
src/a2mount
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
fusea2pi $1 -o uid=`id -u` -o gid=`id -g` $2 fusea2pi $1 -o allow_root -o uid=`id -u` -o gid=`id -g` $2

10
src/fusea2pi.c
View File

@ -115,9 +115,10 @@ pthread_mutex_t a2pi_busy = PTHREAD_MUTEX_INITIALIZER;
#define A2PI_WAIT pthread_mutex_lock(&a2pi_busy) #define A2PI_WAIT pthread_mutex_lock(&a2pi_busy)
#define A2PI_RELEASE pthread_mutex_unlock(&a2pi_busy) #define A2PI_RELEASE pthread_mutex_unlock(&a2pi_busy)
/* /*
* Raw device write flag. * Write flags.
*/ */
int raw_dev_write = FALSE; int raw_dev_write = FALSE;
int write_perms = 0;
/* /*
* Filename & date/time conversion routines. * Filename & date/time conversion routines.
*/ */
@ -216,12 +217,12 @@ struct stat *unix_stat(struct stat *stbuf, int storage, int access, int blocks,
memset(stbuf, 0, sizeof(struct stat)); memset(stbuf, 0, sizeof(struct stat));
if (storage == 0x0F || storage == 0x0D) if (storage == 0x0F || storage == 0x0D)
{ {
stbuf->st_mode = (access & 0xC3) == 0xC3 ? S_IFDIR | 0744 : S_IFDIR | 0544; stbuf->st_mode = (access & 0xC3) == 0xC3 ? S_IFDIR | (write_perms | 0555) : S_IFDIR | 0555;
stbuf->st_nlink = 2; stbuf->st_nlink = 2;
} }
else else
{ {
stbuf->st_mode = (access & 0xC3) == 0xC3 ? S_IFREG | 0644 : S_IFREG | 0444; stbuf->st_mode = (access & 0xC3) == 0xC3 ? S_IFREG | (write_perms | 0444) : S_IFREG | 0444;
stbuf->st_nlink = 1; stbuf->st_nlink = 1;
stbuf->st_blocks = blocks; stbuf->st_blocks = blocks;
stbuf->st_size = size; stbuf->st_size = size;
@ -868,7 +869,7 @@ static int a2pi_getattr(const char *path, struct stat *stbuf)
/* /*
* Root directory of volumes. * Root directory of volumes.
*/ */
unix_stat(stbuf, 0x0F, 0x01, 0, 0, 0, 0); unix_stat(stbuf, 0x0F, 0xC3, 0, 0, 0, 0);
} }
else else
{ {
@ -1378,6 +1379,7 @@ int main(int argc, char *argv[])
if (strcmp(argv[argc - 1], "+rw") == 0) if (strcmp(argv[argc - 1], "+rw") == 0)
{ {
raw_dev_write = TRUE; raw_dev_write = TRUE;
write_perms = 0220;
argc--; argc--;
} }
umask(0); umask(0);