MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-15 16:48:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for DOS-encoded pairing files

Browse Source
This commit is contained in:
Julien BLACHE 2011-04-07 21:01:16 +02:00
parent a576033497
commit c1fae0012d
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/remote_pairing.c
View File

@ -784,16 +784,14 @@ remote_pairing_read_pin(char *path)
devname = fgets(buf, sizeof(buf), fp); devname = fgets(buf, sizeof(buf), fp);
if (!devname) if (!devname)
{ {
DPRINTF(E_LOG, L_REMOTE, "Invalid Remote pairing file %s\n", path); DPRINTF(E_LOG, L_REMOTE, "Empty Remote pairing file %s\n", path);
fclose(fp); fclose(fp);
return; return;
} }
len = strlen(devname); len = strlen(devname);
if (buf[len - 1] == '\n') if (buf[len - 1] != '\n')
buf[len - 1] = '\0';
else
{ {
DPRINTF(E_LOG, L_REMOTE, "Invalid Remote pairing file %s: device name too long or missing pin\n", path); DPRINTF(E_LOG, L_REMOTE, "Invalid Remote pairing file %s: device name too long or missing pin\n", path);
@ -801,6 +799,25 @@ remote_pairing_read_pin(char *path)
return; return;
} }
while (len)
{
if ((buf[len - 1] == '\r') || (buf[len - 1] == '\n'))
{
buf[len - 1] = '\0';
len--;
}
else
break;
}
if (!len)
{
DPRINTF(E_LOG, L_REMOTE, "Invalid Remote pairing file %s: empty line where device name expected\n", path);
fclose(fp);
return;
}
devname = strdup(buf); devname = strdup(buf);
if (!devname) if (!devname)
{ {
@ -821,11 +838,17 @@ remote_pairing_read_pin(char *path)
} }
len = strlen(pin); len = strlen(pin);
if (buf[len - 1] == '\n')
while (len)
{
if ((buf[len - 1] == '\r') || (buf[len - 1] == '\n'))
{ {
buf[len - 1] = '\0'; buf[len - 1] = '\0';
len--; len--;
} }
else
break;
}
if (len != 4) if (len != 4)
{ {