| 1032,23 → 1032,11 |
|---|
| FILECOUNT count = (FILECOUNT)PIGETHANDLESIZE(h); |
| char* q = PILOCKHANDLE(h, false); |
| |
| char* q2, * tmp_cur_filter_str[29], *token; |
| char* tmp_cur_filter_str[29]; |
| |
| int lineNumber = 0; |
| int countFilters = 0; |
| |
| // This is required to make strtok work, because q is not zero-terminated... |
| q2 = (char*)malloc(count + 1/*NUL byte*/); |
| if (q2 == NULL) { |
| PIUNLOCKHANDLE(h); |
| PIDISPOSEHANDLE(h); |
| FSClose(refnum); |
| if (reason) *reason = TEXT("Out of memory"); // TODO: translate |
| return false; |
| } |
| memcpy(q2, q, count); |
| q2[count] = '\0'; |
| |
| token = strtok(q2, "\n"); |
| char* token = strtok(q, "\n"); |
| while (token != NULL) { |
| size_t i; |
| char* token2 = my_strdup(token); |
| 1057,11 → 1045,10 |
|---|
| } |
| if (lineNumber == 0) { |
| if (strcmp(token2,"FFL1.0") != 0) { |
| free(q2); |
| PIUNLOCKHANDLE(h); |
| PIDISPOSEHANDLE(h); |
| FSClose(refnum); |
| if (reason) *reason = TEXT("Invalid file signature"); // TODO: translate |
| //if (reason) *reason = TEXT("Invalid file signature"); // TODO: translate |
| return false; |
| } |
| } |
| 1202,8 → 1189,6 |
|---|
| token = strtok(NULL, "\n"); |
| } |
| |
| free(q2); |
| |
| PIUNLOCKHANDLE(h); |
| PIDISPOSEHANDLE(h); |
| } |