Fixed renaming for the directory driver.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1694 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -140,16 +140,15 @@ int camera_file_info_set (Camera *camera, CameraFileInfo *info, char *folder, ch
|
||||
|
||||
/* We really have to rename the poor file... */
|
||||
path_old = malloc (strlen (folder) + 1 + strlen (file) + 1);
|
||||
path_new = malloc (strlen (folder) + 1 + strlen (info->file.name));
|
||||
path_new = malloc (strlen (folder) + 1 + strlen (info->file.name) + 1);
|
||||
strcpy (path_old, folder);
|
||||
strcpy (path_new, folder);
|
||||
path_old [strlen (folder)] = '/';
|
||||
path_new [strlen (folder)] = '/';
|
||||
strcpy (path_old + strlen (folder) + 1, file);
|
||||
strcpy (path_new + strlen (folder) + 1, info->file.name);
|
||||
|
||||
/* If folder = "/", we have paths like "//folder/..." */
|
||||
if (!strcmp (folder, "/"))
|
||||
|
||||
if (*(path_old + 1) == '/')
|
||||
retval = rename (path_old + 1, path_new + 1);
|
||||
else
|
||||
retval = rename (path_old, path_new);
|
||||
@@ -168,6 +167,8 @@ int camera_file_info_set (Camera *camera, CameraFileInfo *info, char *folder, ch
|
||||
return (GP_ERROR_IO);
|
||||
case ENOMEM:
|
||||
return (GP_ERROR_NO_MEMORY);
|
||||
case ENOENT:
|
||||
return (GP_ERROR_FILE_NOT_FOUND);
|
||||
default:
|
||||
return (GP_ERROR);
|
||||
}
|
||||
|
||||
@@ -94,31 +94,7 @@ int gp_camera_new (Camera **camera)
|
||||
return (GP_ERROR_NO_MEMORY);
|
||||
|
||||
/* Initialize function pointers to NULL.*/
|
||||
(*camera)->functions->id = NULL;
|
||||
(*camera)->functions->abilities = NULL;
|
||||
(*camera)->functions->init = NULL;
|
||||
(*camera)->functions->exit = NULL;
|
||||
(*camera)->functions->folder_list = NULL;
|
||||
(*camera)->functions->file_list = NULL;
|
||||
(*camera)->functions->file_info_get = NULL;
|
||||
(*camera)->functions->file_info_set = NULL;
|
||||
(*camera)->functions->file_get_preview = NULL;
|
||||
(*camera)->functions->file_config_get = NULL;
|
||||
(*camera)->functions->file_config_set = NULL;
|
||||
(*camera)->functions->folder_config_get = NULL;
|
||||
(*camera)->functions->folder_config_set = NULL;
|
||||
(*camera)->functions->config_get = NULL;
|
||||
(*camera)->functions->config_set = NULL;
|
||||
(*camera)->functions->folder_put_file = NULL;
|
||||
(*camera)->functions->file_delete = NULL;
|
||||
(*camera)->functions->folder_delete_all = NULL;
|
||||
(*camera)->functions->capture = NULL;
|
||||
(*camera)->functions->capture_preview = NULL;
|
||||
(*camera)->functions->summary = NULL;
|
||||
(*camera)->functions->manual = NULL;
|
||||
(*camera)->functions->about = NULL;
|
||||
(*camera)->functions->result_as_string = NULL;
|
||||
(*camera)->functions->config = NULL;
|
||||
memset((*camera)->functions, 0, sizeof (CameraFunctions));
|
||||
|
||||
return(GP_OK);
|
||||
}
|
||||
@@ -380,6 +356,8 @@ int gp_camera_file_info_get (Camera *camera, CameraFileInfo *info,
|
||||
int gp_camera_file_info_set (Camera *camera, CameraFileInfo *info,
|
||||
char *folder, char *file)
|
||||
{
|
||||
int result;
|
||||
|
||||
if ((camera == NULL) || (info == NULL) ||
|
||||
(folder == NULL) || (file == NULL))
|
||||
return (GP_ERROR_BAD_PARAMETERS);
|
||||
|
||||
Reference in New Issue
Block a user