@matheusbsbs / matheus-bagliano / commits / 08716b3c11

archive: refactor file extension format-guessing

Git-archive will guess a format from the output filename if no format is explicitly given. The current function just hardcodes "zip" to the zip format, and leaves everything else NULL (which will default to tar). Since we are about to add user-specified formats, we need to be more flexible. The new rule is "if a filename ends with a dot and the name of a format, it matches that format". For the existing "tar" and "zip" formats, this is identical to the current behavior. For new user-specified formats, this will do what the user expects if they name their formats appropriately. Because we will eventually start matching arbitrary user-specified extensions that may include dots, the strrchr search for the final dot is not sufficient. We need to do an actual suffix match with each extension. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 21, 2011 at 21:25 UTC 08716b3c11f4899c1be046eca735761b30ca686d

1 file changed +19 -6

archive.c

+19 -6

@@ -419,13 +419,26 @@ int write_archive(int argc, const char **argv, const char *prefix,

419 return ar->write_archive(ar, &args);

420 }

421

422 +static int match_extension(const char *filename, const char *ext)

423 +{

424 + int prefixlen = strlen(filename) - strlen(ext);

425 +

426 + /*

427 + * We need 1 character for the '.', and 1 character to ensure that the

428 + * prefix is non-empty (k.e., we don't match .tar.gz with no actual

429 + * filename).

430 + */

431 + if (prefixlen < 2 || filename[prefixlen-1] != '.')

432 + return 0;

433 + return !strcmp(filename + prefixlen, ext);

434 +}

435 +

436 const char *archive_format_from_filename(const char *filename)

437 {

424 - const char *ext = strrchr(filename, '.');

425 - if (!ext)

426 - return NULL;

427 - ext++;

428 - if (!strcasecmp(ext, "zip"))

429 - return "zip";

438 + int i;

439 +

440 + for (i = 0; i < nr_archivers; i++)

441 + if (match_extension(filename, archivers[i]->name))

442 + return archivers[i]->name;

443 return NULL;

444 }