Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | It turns out that filenames in git-fast-export format can be quoted, if they contain special characters. Update the importer to dequote those names before trying to use them. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
77cbe38af027ae728980622cf7a79708 |
| User & Date: | drh 2012-10-17 17:50:53.243 |
Context
|
2012-10-18
| ||
| 05:11 | dequote_git_filename: missing return type ... (check-in: ee424936 user: jan.nijtmans tags: trunk) | |
|
2012-10-17
| ||
| 17:50 | It turns out that filenames in git-fast-export format can be quoted, if they contain special characters. Update the importer to dequote those names before trying to use them. ... (check-in: 77cbe38a user: drh tags: trunk) | |
| 14:04 |
I think I fix the previous commit, that should avoid committing a ticket
manifest if it has no changes. It was ignoring the ticket appends.
In the case of only appending, the user was not notified not properly redirected, and the ticket chagnes were not committed. Still, there should be some kind of warning to the user, if it ends up in such situation, I think. ... (check-in: f02946aa user: viriketo tags: trunk) | |
Changes
Changes to src/import.c.
| ︙ | ︙ | |||
450 451 452 453 454 455 456 457 458 459 460 461 462 463 |
return &gg.aFile[i];
}
i++;
}
return 0;
}
/*
** Read the git-fast-import format from pIn and insert the corresponding
** content into the database.
*/
static void git_fast_import(FILE *pIn){
ImportFile *pFile, *pNew;
| > > > > > > > > > > > > > > > > > | 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 |
return &gg.aFile[i];
}
i++;
}
return 0;
}
/*
** Dequote a fast-export filename. Filenames are normally unquoted. But
** if the contain some obscure special characters, quotes might be added.
*/
static dequote_git_filename(char *zName){
int n, i, j;
if( zName==0 || zName[0]!='"' ) return;
n = (int)strlen(zName);
if( zName[n-1]!='"' ) return;
for(i=0, j=1; j<n-1; j++){
char c = zName[j];
if( c=='\\' ) c = zName[++j];
zName[i++] = c;
}
zName[i] = 0;
}
/*
** Read the git-fast-import format from pIn and insert the corresponding
** content into the database.
*/
static void git_fast_import(FILE *pIn){
ImportFile *pFile, *pNew;
|
| ︙ | ︙ | |||
594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 |
}else
if( memcmp(zLine, "M ", 2)==0 ){
import_prior_files();
z = &zLine[2];
zPerm = next_token(&z);
zUuid = next_token(&z);
zName = rest_of_line(&z);
i = 0;
pFile = import_find_file(zName, &i, gg.nFile);
if( pFile==0 ){
pFile = import_add_file();
pFile->zName = fossil_strdup(zName);
}
pFile->isExe = (fossil_strcmp(zPerm, "100755")==0);
pFile->isLink = (fossil_strcmp(zPerm, "120000")==0);
fossil_free(pFile->zUuid);
pFile->zUuid = resolve_committish(zUuid);
pFile->isFrom = 0;
}else
if( memcmp(zLine, "D ", 2)==0 ){
import_prior_files();
z = &zLine[2];
zName = rest_of_line(&z);
i = 0;
while( (pFile = import_find_file(zName, &i, gg.nFile))!=0 ){
if( pFile->isFrom==0 ) continue;
fossil_free(pFile->zName);
fossil_free(pFile->zPrior);
fossil_free(pFile->zUuid);
*pFile = gg.aFile[--gg.nFile];
| > > | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 |
}else
if( memcmp(zLine, "M ", 2)==0 ){
import_prior_files();
z = &zLine[2];
zPerm = next_token(&z);
zUuid = next_token(&z);
zName = rest_of_line(&z);
dequote_git_filename(zName);
i = 0;
pFile = import_find_file(zName, &i, gg.nFile);
if( pFile==0 ){
pFile = import_add_file();
pFile->zName = fossil_strdup(zName);
}
pFile->isExe = (fossil_strcmp(zPerm, "100755")==0);
pFile->isLink = (fossil_strcmp(zPerm, "120000")==0);
fossil_free(pFile->zUuid);
pFile->zUuid = resolve_committish(zUuid);
pFile->isFrom = 0;
}else
if( memcmp(zLine, "D ", 2)==0 ){
import_prior_files();
z = &zLine[2];
zName = rest_of_line(&z);
dequote_git_filename(zName);
i = 0;
while( (pFile = import_find_file(zName, &i, gg.nFile))!=0 ){
if( pFile->isFrom==0 ) continue;
fossil_free(pFile->zName);
fossil_free(pFile->zPrior);
fossil_free(pFile->zUuid);
*pFile = gg.aFile[--gg.nFile];
|
| ︙ | ︙ |