summary refs log tree commit diff
path: root/bin
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-02-08 16:32:51 -0500
committerJune McEnroe <june@causal.agency>2019-02-08 16:32:51 -0500
commit2ae64d8f4489345d40b38cc45a451edd04b62c61 (patch)
treeedfdefbf5c085c620493bb9993434dcd11d1215e /bin
parentElaborate hi man page (diff)
downloadsrc-2ae64d8f4489345d40b38cc45a451edd04b62c61.tar.gz
src-2ae64d8f4489345d40b38cc45a451edd04b62c61.zip
Add hi -n
Diffstat (limited to 'bin')
-rw-r--r--bin/hi.c10
-rw-r--r--bin/man1/hi.16
2 files changed, 12 insertions, 4 deletions
diff --git a/bin/hi.c b/bin/hi.c
index cd24ea07..705ea345 100644
--- a/bin/hi.c
+++ b/bin/hi.c
@@ -419,11 +419,12 @@ static const struct Format {
 };
 
 int main(int argc, char *argv[]) {
+	const char *name = NULL;
 	const struct Language *lang = NULL;
 	const struct Format *format = NULL;
 	
 	int opt;
-	while (0 < (opt = getopt(argc, argv, "cf:l:"))) {
+	while (0 < (opt = getopt(argc, argv, "cf:l:n:"))) {
 		switch (opt) {
 			break; case 'c': {
 				check();
@@ -445,6 +446,7 @@ int main(int argc, char *argv[]) {
 				}
 				if (!lang) errx(EX_USAGE, "no such language %s", optarg);
 			}
+			break; case 'n': name = optarg;
 			break; default: return EX_USAGE;
 		}
 	}
@@ -457,8 +459,10 @@ int main(int argc, char *argv[]) {
 		if (!file) err(EX_NOINPUT, "%s", path);
 	}
 
-	const char *name = strrchr(path, '/');
-	name = (name ? &name[1] : path);
+	if (!name) {
+		name = strrchr(path, '/');
+		name = (name ? &name[1] : path);
+	}
 
 	if (!lang) {
 		for (size_t i = 0; i < ARRAY_LEN(Languages); ++i) {
diff --git a/bin/man1/hi.1 b/bin/man1/hi.1
index e3223b48..a9968774 100644
--- a/bin/man1/hi.1
+++ b/bin/man1/hi.1
@@ -10,6 +10,7 @@
 .Nm
 .Op Fl f Ar format
 .Op Fl l Ar lang
+.Op Fl n Ar name
 .Op Ar file
 .Nm
 .Fl c
@@ -40,8 +41,11 @@ Set the input language.
 If a
 .Ar file
 is provided,
-.Ar lang
+the input language
 may be inferred from its name.
+.It Fl n Ar name
+Override the name used
+to infer the input language.
 .El
 .
 .Pp
t?id=b45dbe2cd833995a87cb9c1cdcd5dead3d4ad17f&follow=1'>Add "Come On Petunia"June McEnroe 2020-11-13Add x4 to LESSJune McEnroe 2020-11-04Remove modified sensitivity settingsJune McEnroe 2020-10-29Remove editJune McEnroe 2020-10-27Switch gr alias back to git rebaseJune McEnroe I always type out git reset and sometimes still expect gr to be rebase... Never got used to it I guess. 2020-10-27Allow cd host: to cd to same path over sshJune McEnroe 2020-10-27Use SendEnv for cd host:pathJune McEnroe Works properly for weird paths, etc. 2020-10-27Allow cd host:path over sshJune McEnroe Requires AcceptEnv SSH_CD in the remote sshd_config. 2020-10-07Use mandoc -T utf8 for text.June McEnroe Don't depend on LANG being set. 2020-09-20Add The Awakened KingdomJune McEnroe A cute extra novella. Finally finished this series. 2020-09-12Move /opt/local back, cheat port select to use system manJune McEnroe This is not really how you're supposed to use the select system, I don't think, since the mandoc package actually creates those files, but it does work. This lets me actually use the git installed by MacPorts. 2020-09-12Move /opt/local behind /usr againJune McEnroe The reason I did this with pkgsrc was because I actually don't want the man(1) from mandoc, since it won't follow MANSECT. Same applies to MacPorts. I wish I could disable its man(1) with a variant or whatever. 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe But keep it disabled for READMEs since they always use non-standard sections and the TOC is just distracting there, I think. Also add the style so its h1 is the same size as the ones inside sections... 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe I never use it. 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe My system is probably such a mess now... 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe Reading has really slowed down :( 2020-09-07Add SunglassesJune McEnroe An IRC find. 2020-09-06Add Between the BreathsJune McEnroe One of those good songs from a soundtrack of a film that probably isn't? The summary sounds a lot more interesting than the title implies, at least. 2020-09-04Open /dev/tty in nudgeJune McEnroe This makes it work even when it's run connected to a pipe, i.e. as the notify command of catgirl... 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe I guess this got lost somewhere, long ago... 2020-08-29Add tweets from retweetsJune McEnroe