Re: [PATCH] gitweb: allow space as delimiter in mime.types
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jun 14, 2011, 14:59 UTC
- Message-ID
- <m3ips8v4s2.fsf@localhost.localdomain>
- In-Reply-To
- <1308060595-28294-1-git-send-email-ludwig.nussel@suse.de>
Ludwig Nussel <ludwig.nussel@suse.de> writes:
> Subject: [PATCH] gitweb: allow space as delimiter in mime.types
A very minor nitpick: perhaps "work with" rather than "allow" would be better?
> in openSUSE /etc/mime.types has only spaces. I don't know if there's > a canonical reference that says that only tabs are allowed. Mutt at > least also accepts spaces. So make gitweb more liberal too.
Ack.
It is obviously correct, as names of MUME types cannot contain spaces, it makes gitweb work with openSUSE /etc/mime.types, and it makes code simpler.
> ---
Signoff (i.e. Signed-off-by)?
Show 26 quoted lines
> gitweb/gitweb.perl | 9 +++------
> 1 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 1b83a8d..d81d87b 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -3560,12 +3560,9 @@ sub mimetype_guess_file {
> open(my $mh, '<', $mimemap) or return undef;
> while (<$mh>) {
> next if m/^#/; # skip comments
> - my ($mimetype, $exts) = split(/\t+/);
> - if (defined $exts) {
> - my @exts = split(/\s+/, $exts);
> - foreach my $ext (@exts) {
> - $mimemap{$ext} = $mimetype;
> - }
> + my ($mimetype, @exts) = split(/\s+/);
> + foreach my $ext (@exts) {
> + $mimemap{$ext} = $mimetype;
> }
> }
> close($mh);
> --
> 1.7.3.4
> -- Jakub Narebski Poland ShadeHawk on #git