blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-05-02 06:16:37 +08:00
Code Issues Projects Releases Wiki Activity

Append protocol to QR code URLs if missing.

Browse Source
This commit is contained in:
Steven Smith 2016-05-28 20:15:57 -07:00
parent 9328d2bcbd
commit b1b36b1e78
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/ui/section/qrinstall.c
View File

@ -358,21 +358,34 @@ static void qrinstall_wait_update(ui_view* view, void* data, float* progress, ch
if(err == 0) { if(err == 0) {
qrInstallData->installInfo.total = 0; qrInstallData->installInfo.total = 0;
size_t payloadLen = strlen((char*) qrData.payload);
char* currStart = (char*) qrData.payload; char* currStart = (char*) qrData.payload;
char* currEnd = NULL; while(qrInstallData->installInfo.total < URLS_MAX && currStart - (char*) qrData.payload < payloadLen) {
while((currEnd = strchr(currStart, '\n')) != NULL) { char* currEnd = strchr(currStart, '\n');
if(currEnd == NULL) {
currEnd = (char*) qrData.payload + payloadLen;
}
u32 len = currEnd - currStart; u32 len = currEnd - currStart;
if((len < 7 || strncmp(currStart, "http://", 7) != 0) && (len < 8 || strncmp(currStart, "https://", 8) != 0)) {
if(len > URL_MAX - 7) {
len = URL_MAX - 7;
}
strncpy(qrInstallData->urls[qrInstallData->installInfo.total], "http://", 7);
strncpy(&qrInstallData->urls[qrInstallData->installInfo.total][7], currStart, len);
} else {
if(len > URL_MAX) { if(len > URL_MAX) {
len = URL_MAX; len = URL_MAX;
} }
strncpy(qrInstallData->urls[qrInstallData->installInfo.total++], currStart, len); strncpy(qrInstallData->urls[qrInstallData->installInfo.total], currStart, len);
currStart = currEnd + 1;
} }
if(*currStart != '\0') { qrInstallData->installInfo.total++;
strncpy(qrInstallData->urls[qrInstallData->installInfo.total++], currStart, URL_MAX); currStart = currEnd + 1;
} }
prompt_display("Confirmation", "Install from the scanned URL(s)?", COLOR_TEXT, true, data, NULL, NULL, qrinstall_confirm_onresponse); prompt_display("Confirmation", "Install from the scanned URL(s)?", COLOR_TEXT, true, data, NULL, NULL, qrinstall_confirm_onresponse);