commit e89422795ac851d3f62284e10c0049402f0aa525 from: Alexander Arkhipov date: Sun Mar 05 19:31:32 2023 UTC use x-*-handler for pseudo-types commit - 225dd9a359110e12b85d332e5eaa4e9c85ae2198 commit + e89422795ac851d3f62284e10c0049402f0aa525 blob - aa90b01cab85df5a6a8c2abc6d1e10b389097afc blob + ccb53132f63f154c8b5b632bdd9adfe72c44a3d7 --- rmc +++ rmc @@ -40,7 +40,7 @@ sub gettyp { while () { my ($typ, @fld) = split; for (@fld) { - if ((defined $sch && $typ =~ m=^scheme/.*= && + if ((defined $sch && $typ =~ m=^x-scheme-handler/.*= && $_ eq $sch) || (defined $ext && $_ eq $ext)) { close FILE; return $typ; @@ -53,9 +53,9 @@ sub gettyp { } # docmd($file, $ln, $typ, [$styp]) processes line $ln from the cap file. If -# $styp is empty, and $typ is not "directory", $file is assumed to be a URL, -# otherwised it's processed as a normal file. On success executes a command and -# exits. +# $styp is empty, and $typ is not "x-directory-handler", $file is assumed to be +# a URL, otherwised it's processed as a normal file. On success executes a +# command and exits. # # Differences from RFC 1524: # - Named parameters are ignored; @@ -68,7 +68,7 @@ sub docmd { my ($view, $template, $test, $compose, $edit, $print) = ''; my $qfile = shquote $file; - $isfile = 1 unless $typ eq 'scheme'; + $isfile = 1 unless $typ eq 'x-scheme-handler'; local *donefld = sub { my $s = shift(@_); @@ -234,14 +234,14 @@ unless (length($typfile)) { unless ($typ = gettyp $file, $typfile) { if (-d $file) { - $typ = 'directory'; + $typ = 'x-directory-handler'; } else { my $qfile = shquote $file; $typ = lc `file -i $qfile`; } } -unless ($typ eq 'directory') { +unless ($typ eq 'x-directory-handler') { die "bad type $typ\n" unless $typ =~ m=(.*: )?([^/]+)(/[^/]+)=; $typ = $2; $styp = $3; blob - 69927b082fc54ccfd1924745cf7224accf5be48e blob + 15140897695cfdc1e0639a15ad1fe5caef503d8a --- rmc.1 +++ rmc.1 @@ -3,7 +3,7 @@ .Os .Sh NAME .Nm rmc -.Nd view, edit, compose or print files, directories and URLs +.Nd view, edit, compose or print a file, directory or URL .Sh SYNOPSIS .Nm .Op Fl ecp