mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

gt68xx: suppressed strncpy compiler warnings.

merge-requests/213/head
Ralph Little 2019-12-21 22:53:16 -08:00
rodzic a4360b0a75
commit 3d12424961
1 zmienionych plików z 11 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
backend/gt68xx.c
Wyświetl plik

@ -947,25 +947,30 @@ download_firmware_file (GT68xx_Device * dev)
if (strncmp (dev->model->firmware_name, PATH_SEP, 1) != 0)
{
/* probably filename only */
snprintf (filename, PATH_MAX, "%s%s%s%s%s%s%s",
snprintf (filename, sizeof(filename), "%s%s%s%s%s%s%s",
STRINGIFY (PATH_SANE_DATA_DIR),
PATH_SEP, "sane", PATH_SEP, "gt68xx", PATH_SEP,
dev->model->firmware_name);
snprintf (dirname, PATH_MAX, "%s%s%s%s%s",
snprintf (dirname, sizeof(dirname), "%s%s%s%s%s",
STRINGIFY (PATH_SANE_DATA_DIR),
PATH_SEP, "sane", PATH_SEP, "gt68xx");
strncpy (basename, dev->model->firmware_name, PATH_MAX);
strncpy (basename, dev->model->firmware_name, sizeof(basename) - 1);
basename[sizeof(basename) - 1] = '\0';
}
else
{
/* absolute path */
char *pos;
strncpy (filename, dev->model->firmware_name, PATH_MAX);
strncpy (dirname, dev->model->firmware_name, PATH_MAX);
strncpy (filename, dev->model->firmware_name, sizeof(filename) - 1);
filename[sizeof(filename) - 1] = '\0';
strncpy (dirname, dev->model->firmware_name, sizeof(dirname) - 1);
dirname[sizeof(dirname) - 1] = '\0';
pos = strrchr (dirname, PATH_SEP[0]);
if (pos)
pos[0] = '\0';
strncpy (basename, pos + 1, PATH_MAX);
strncpy (basename, pos + 1, sizeof(basename) - 1);
basename[sizeof(basename) - 1] = '\0';
}
/* first, try to open with exact case */