SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: The long file name be truncated

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-07-07 11:50:26 +08:00
parent 47abb1d4f2
commit fd7414ea25
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsigrok4DSL/dsdevice.c
View File

@@ -201,8 +201,8 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int mode, int status,
sdi->version = g_strdup(version);
}
if (model && *model){
strncpy(sdi->name, model, sizeof(sdi->name)-1);
if (model && *model){
sdi->name = g_strdup(model);
}
return sdi;
@@ -236,6 +236,7 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
safe_free(sdi->vendor);
safe_free(sdi->version);
safe_free(sdi->path);
safe_free(sdi->name);
g_free(sdi);
}

2
libsigrok4DSL/libsigrok-internal.h
View File

@@ -146,7 +146,7 @@ struct sr_dev_inst {
ds_device_handle handle;
/** device name. */
char name[50];
char *name;
char *path;

4
libsigrok4DSL/libsigrok.h
View File

@@ -1328,13 +1328,13 @@ typedef unsigned long long ds_device_handle;
struct ds_device_base_info
{
ds_device_handle handle;
char name[50];
char name[150];
};
struct ds_device_full_info
{
ds_device_handle handle;
char name[50];
char name[150];
char path[256]; //file path
char driver_name[20];
int dev_type; // enum sr_device_type

4
libsigrok4DSL/session_driver.c
View File

@@ -1459,7 +1459,7 @@ static int dev_acquisition_start(struct sr_dev_inst *sdi, void *cb_data)
SR_PRIV int sr_new_virtual_device(const char *filename, struct sr_dev_inst **out_di)
{
struct sr_dev_inst *sdi;
char short_name[50];
char short_name[150];
GKeyFile *kf;
char **sections, **keys, *metafile, *val;
int mode = LOGIC;
@@ -1560,7 +1560,7 @@ SR_PRIV int sr_new_virtual_device(const char *filename, struct sr_dev_inst **out
sdi->dev_type = DEV_TYPE_FILELOG;
get_file_short_name(filename, short_name, sizeof(short_name) - 1);
strncpy(sdi->name, (char*)short_name, sizeof(short_name) - 1);
sdi->name = g_strdup((const char*)short_name);
sdi->path = g_strdup(filename);
*out_di = sdi;