Overview
Comment: | Updated to use a fallback mime.types file if specified one is unavailable |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 862bf6f56be0ac799109b61cc9f89146c24b964a |
User & Date: | rkeene on 2014-08-31 18:07:10 |
Other Links: | manifest | tags |
Context
2014-10-13
| ||
08:04 | Updated to support HTTP Connection Keep-Alive check-in: b4fa45b6aa user: rkeene tags: trunk | |
2014-08-31
| ||
18:07 | Updated to use a fallback mime.types file if specified one is unavailable check-in: 862bf6f56b user: rkeene tags: trunk | |
2014-07-23
| ||
07:53 | Made wording slightly more clear check-in: f74837eecc user: rkeene tags: trunk | |
Changes
Modified Makefile from [a294b2122c] to [8247ae4962].
12 12 all: filed 13 13 14 14 filed: filed.o 15 15 $(CC) $(CFLAGS) $(LDFLAGS) -o "$@" $^ $(LIBS) 16 16 17 17 filed.o: filed.c filed-mime-types.h 18 18 19 -filed-mime-types.h: generate-mime-types 20 - ./generate-mime-types "$(MIMETYPES)" > filed-mime-types.h.new 19 +filed-mime-types.h: generate-mime-types mime.types 20 + ./generate-mime-types "$(MIMETYPES)" > filed-mime-types.h.new || \ 21 + ./generate-mime-types mime.types > filed-mime-types.h.new 21 22 mv filed-mime-types.h.new filed-mime-types.h 22 23 23 24 install: filed filed.1 24 25 test -d "$(DESTDIR)$(mandir)/man1" || mkdir -p "$(DESTDIR)$(mandir)/man1" 25 26 test -d "$(DESTDIR)$(bindir)" || mkdir -p "$(DESTDIR)$(bindir)" 26 27 cp filed.1 "$(DESTDIR)$(mandir)/man1/" 27 28 cp filed "$(DESTDIR)$(bindir)/"
Modified generate-mime-types from [64211e4a81] to [bd758d28dd].
40 40 set retval [expr {$retval % $mod}] 41 41 42 42 return $retval 43 43 44 44 } 45 45 46 46 # Read contents of mime types file 47 -set fd [open $mimeinfofile] 48 -set mimeinfo [read $fd] 49 -close $fd 47 +catch { 48 + set fd [open $mimeinfofile] 49 + set mimeinfo [read $fd] 50 + close $fd 51 +} 52 + 53 +if {![info exists mimeinfo]} { 54 + puts stderr "Not using $mimeinfofile, unreadable." 55 + 56 + exit 1 57 +} 58 + 59 +puts stderr "Using $mimeinfofile as mime.types" 50 60 51 61 # Parse into type and extensions pairs 52 62 foreach line [split $mimeinfo "\n"] { 53 63 regsub {#.*} $line {} line 54 64 set line [string trim $line] 55 65 56 66 if {$line == ""} {
Added mime.types version [099ee45806].
1 +text/html html htm 2 +test/plain txt text 3 +video/mp4 mp4 mpg4 4 +audio/mpeg mp3 mpg3 5 +application/zip zip