Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Formatted #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Formatted #12

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f96abc
Soft tabs
Dec 11, 2017
e844706
Changes integrated but apparently not working
Dec 11, 2017
f27ae2d
Replace invalid count with an error code
Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 113 additions & 83 deletions gphotofs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,18 +347,18 @@ gphotofs_getattr(const char *path,
gchar *dir;
value = g_hash_table_lookup(p->files, path);
if (!value) {
value = g_hash_table_lookup(p->dirs, path);
value = g_hash_table_lookup(p->dirs, path);
}
if (value) {
mystbuf = (struct stat *)value;
break;
mystbuf = (struct stat *)value;
break;
}

dir = g_path_get_dirname(path);
ret = gphotofs_readdir(dir, NULL, dummyfiller, 0, NULL);
g_free(dir);
if (ret != 0) {
return ret;
return ret;
}
}

Expand Down Expand Up @@ -391,46 +391,46 @@ gphotofs_open(const char *path,
if ((fi->flags & O_ACCMODE) == O_RDONLY) {
openFile = g_hash_table_lookup(p->reads, path);
if (!openFile) {
gchar *dir = g_path_get_dirname(path);
gchar *file = g_path_get_basename(path);
gchar *dir = g_path_get_dirname(path);
gchar *file = g_path_get_basename(path);

openFile = g_new0(OpenFile, 1);
openFile->file = NULL;
openFile->count = 1;
openFile->destdir = g_strdup(dir);
openFile->destname = g_strdup(file);
g_hash_table_replace(p->reads, g_strdup(path), openFile);
openFile = g_new0(OpenFile, 1);
openFile->file = NULL;
openFile->count = 1;
openFile->destdir = g_strdup(dir);
openFile->destname = g_strdup(file);
g_hash_table_replace(p->reads, g_strdup(path), openFile);

g_free(file);
g_free(dir);
g_free(file);
g_free(dir);

} else {
openFile->count++;
openFile->count++;
}
return 0;
}
if ((fi->flags & O_ACCMODE) == O_WRONLY) {
openFile = g_hash_table_lookup(p->writes, path);
if (!openFile) {
gchar *dir = g_path_get_dirname(path);
gchar *file = g_path_get_basename(path);
gchar *dir = g_path_get_dirname(path);
gchar *file = g_path_get_basename(path);

openFile = g_new0(OpenFile, 1);
openFile->file = NULL;
openFile->count = 1;
openFile->size = 0;
openFile->writing = 1;
openFile->destdir = g_strdup(dir);
openFile->destname = g_strdup(file);
openFile = g_new0(OpenFile, 1);
openFile->file = NULL;
openFile->count = 1;
openFile->size = 0;
openFile->writing = 1;
openFile->destdir = g_strdup(dir);
openFile->destname = g_strdup(file);

openFile->buf = malloc(1);
if (!openFile->buf) return -1;
g_hash_table_replace(p->writes, g_strdup(path), openFile);
openFile->buf = malloc(1);
if (!openFile->buf) return -1;
g_hash_table_replace(p->writes, g_strdup(path), openFile);

g_free(dir);
g_free(file);
} else {
openFile->count++;
openFile->count++;
}
return 0;
}
Expand All @@ -448,7 +448,7 @@ gphotofs_read(const char *path,
OpenFile *openFile;
const char *data;
unsigned long int dataSize;
uint64_t xsize;
uint64_t xsize;
int ret;

/* gphotofs_check_events(); ... probably on doing small reads this will take too much time */
Expand All @@ -468,7 +468,7 @@ gphotofs_read(const char *path,

gp_file_new(&cFile);
ret = gp_camera_file_get(p->camera, openFile->destdir, openFile->destname, GP_FILE_TYPE_NORMAL,
cFile, p->context);
cFile, p->context);

openFile->file = cFile;
}
Expand Down Expand Up @@ -525,7 +525,7 @@ gphotofs_mkdir(const char *path, mode_t mode)
if (ret != 0) {
ret = gpresultToErrno(ret);
} else {
struct stat *stbuf;
struct stat *stbuf;

stbuf = g_new0(struct stat, 1);
stbuf->st_mode = S_IFDIR | 0555;
Expand Down Expand Up @@ -583,7 +583,7 @@ gphotofs_mknod(const char *path, mode_t mode, dev_t rdev)
return -1;
}
res = gp_camera_folder_put_file (p->camera, dir, file, GP_FILE_TYPE_NORMAL, cfile,
p->context);
p->context);
gp_file_unref (cfile);
g_free(dir);
g_free(file);
Expand All @@ -607,18 +607,18 @@ static int gphotofs_flush(const char *path, struct fuse_file_info *fi)
gp_file_new (&file);
data = malloc (openFile->size);
if (!data)
return -ENOMEM;
return -ENOMEM;
memcpy (data, openFile->buf, openFile->size);
/* The call below takes over responsbility of freeing data. */
res = gp_file_set_data_and_size (file, data, openFile->size);
if (res < 0) {
gp_file_unref (file);
return -1;
gp_file_unref (file);
return -1;
}
res = gp_camera_file_delete(p->camera, openFile->destdir, openFile->destname, p->context);
res = gp_camera_folder_put_file (p->camera, openFile->destdir, openFile->destname, GP_FILE_TYPE_NORMAL, file, p->context);
if (res < 0)
return -ENOSPC;
return -ENOSPC;
gp_file_unref (file);
}
return 0;
Expand Down Expand Up @@ -690,7 +690,7 @@ gphotofs_release(const char *path,
openFile->count--;
if (openFile->count == 0) {
if (openFile->writing) {
free (openFile->buf);
free (openFile->buf);
g_hash_table_remove(p->writes, path);
} else {
g_hash_table_remove(p->reads, path);
Expand Down Expand Up @@ -805,32 +805,6 @@ gphotofs_connect()
break;
}

if (sModel) {
CameraAbilities a;
int m;

m = gp_abilities_list_lookup_model(p->abilities, sModel);
if (m < 0) {
g_fprintf(stderr, _("Model %s was not recognised."), sModel);
g_fprintf(stderr, "\n");
ret = m;
break;
}

ret = gp_abilities_list_get_abilities(p->abilities, m, &a);
if (ret != 0)
break;

ret = gp_camera_set_abilities(p->camera, a);
if (ret != 0)
break;

/* Marcus: why save it? puzzling. */
ret = gp_setting_set("gphoto2", "model", a.model);
if (ret != 0)
break;
}

if (sPort) {
GPPortInfo info;
GPPortInfoList *il = NULL;
Expand Down Expand Up @@ -871,10 +845,66 @@ gphotofs_connect()
gp_port_info_get_path (info, &xpath);
gp_setting_set("gphoto2", "port", xpath);

// According to the gphoto2 docs, both port and abilities must be set or the camera will be
// auto-detected.
if (!sModel) {
CameraList *cameraList;
ret = gp_list_new(&cameraList);
if (ret != 0)
break;

ret = gp_abilities_list_detect(p->abilities, il, cameraList, p->context);
if (ret != 0)
break;

ret = gp_list_count(cameraList);
if (ret > 1) {

g_fprintf(stderr, "Multiple cameras detected on specified port. Model is required.\n");
return GP_ERROR;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the list is never freed. Here or below.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it necessary? I'm considering this to be the same case as ret != 0, where the whole program exits immediately without proceeding to the actual mount.

} else if (ret < 1) {
g_fprintf(stderr, "No cameras detected on specified port.\n");
return ret;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as above. cameraList is not freed.

}

const char *model;
ret = gp_list_get_name(cameraList, 0, &model);
if (ret != 0)
break;
sModel = strdup(model);
gp_list_free(cameraList);
}
gp_port_info_list_free(il);
}
}

if (sModel) {
CameraAbilities a;
int m;

m = gp_abilities_list_lookup_model(p->abilities, sModel);
if (m < 0) {
g_fprintf(stderr, _("Model %s was not recognised."), sModel);
g_fprintf(stderr, "\n");
ret = m;
break;
}

ret = gp_abilities_list_get_abilities(p->abilities, m, &a);
if (ret != 0)
break;

ret = gp_camera_set_abilities(p->camera, a);
if (ret != 0)
break;

/* Marcus: why save it? puzzling. */
ret = gp_setting_set("gphoto2", "model", a.model);
if (ret != 0)
break;
}


/* Check the connection by checking the storage info of the device.
* Abort if the device has no valid storage listed.
*/
Expand Down Expand Up @@ -969,26 +999,26 @@ gphotofs_destroy(void *context)
}

static struct fuse_operations gphotofs_oper = {
.init = gphotofs_init,
.destroy = gphotofs_destroy,
.readdir = gphotofs_readdir,
.getattr = gphotofs_getattr,
.open = gphotofs_open,
.read = gphotofs_read,
.release = gphotofs_release,
.unlink = gphotofs_unlink,

.write = gphotofs_write,
.mkdir = gphotofs_mkdir,
.rmdir = gphotofs_rmdir,
.mknod = gphotofs_mknod,
.flush = gphotofs_flush,
.fsync = gphotofs_fsync,

.chmod = gphotofs_chmod,
.chown = gphotofs_chown,

.statfs = gphotofs_statfs
.init = gphotofs_init,
.destroy = gphotofs_destroy,
.readdir = gphotofs_readdir,
.getattr = gphotofs_getattr,
.open = gphotofs_open,
.read = gphotofs_read,
.release = gphotofs_release,
.unlink = gphotofs_unlink,

.write = gphotofs_write,
.mkdir = gphotofs_mkdir,
.rmdir = gphotofs_rmdir,
.mknod = gphotofs_mknod,
.flush = gphotofs_flush,
.fsync = gphotofs_fsync,

.chmod = gphotofs_chmod,
.chown = gphotofs_chown,

.statfs = gphotofs_statfs
};

static GOptionEntry options[] =
Expand Down