aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-09-19 09:26:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-09-19 09:26:22 +0000
commit16ddb2e2924c369975341d0bf878790918a7d15d (patch)
tree61e71cad6c4135da135d37a85d535f925e54d366
parentmain/client: replace some uses of printf() with puts() in print_usage() (diff)
parentmain/client: add no-op "-e" command-line option (diff)
Merge branch 'eflag'
Closes #184 Closes #257 Closes #313 Closes #596 Closes #625 Closes #716
-rw-r--r--CHANGELOG.md5
-rw-r--r--client.c8
-rw-r--r--doc/foot.1.scd10
-rw-r--r--doc/footclient.1.scd4
-rw-r--r--main.c8
5 files changed, 31 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b0c2011..d229c4ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,9 @@
(https://codeberg.org/dnkl/foot/issues/701).
* Braille characters (U+2800 - U+28FF) are now rendered by foot
itself (https://codeberg.org/dnkl/foot/issues/702).
+* `-e` command-line option. This option is simply ignored, to appease
+ program launchers that blindly pass `-e` to any terminal emulator
+ (https://codeberg.org/dnkl/foot/issues/184).
### Changed
@@ -67,6 +70,8 @@
### Security
### Contributors
+* [craigbarnes](https://codeberg.org/craigbarnes)
+
## 1.9.0
diff --git a/client.c b/client.c
index 7cfcb0ef..5c767e11 100644
--- a/client.c
+++ b/client.c
@@ -71,7 +71,8 @@ print_usage(const char *prog_name)
" -o,--override=[section.]key=value override configuration option\n"
" -d,--log-level={info|warning|error|none} log level (info)\n"
" -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n"
- " -v,--version show the version number and quit\n";
+ " -v,--version show the version number and quit\n"
+ " -e ignored (for compatibility with xterm -e)\n";
printf("Usage: %s [OPTIONS...]\n", prog_name);
printf("Usage: %s [OPTIONS...] command [ARGS...]\n", prog_name);
@@ -145,7 +146,7 @@ main(int argc, char *const *argv)
struct client_string *cargv = NULL;
while (true) {
- int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:HNo:d:l::vh", longopts, NULL);
+ int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:HNo:d:l::veh", longopts, NULL);
if (c == -1)
break;
@@ -273,6 +274,9 @@ main(int argc, char *const *argv)
ret = EXIT_SUCCESS;
goto err;
+ case 'e':
+ break;
+
case '?':
goto err;
}
diff --git a/doc/foot.1.scd b/doc/foot.1.scd
index bbe784bc..91a7808a 100644
--- a/doc/foot.1.scd
+++ b/doc/foot.1.scd
@@ -141,6 +141,16 @@ the foot command line
*-v*,*--version*
Show the version number and quit.
+*-e*
+ Ignored; for compatibility with *xterm -e*.
+
+ This option was added in response to several program launchers
+ passing *-e* to arbitrary terminals, under the assumption that
+ they all implement the same semantics for it as *xterm*(1).
+ Ignoring it allows foot to be invoked as e.g. *foot -e man foot*
+ with the same results as with xterm, instead of producing an
+ "invalid option" error.
+
# EXIT STATUS
Foot will exit with code 230 if there is a failure in foot itself.
diff --git a/doc/footclient.1.scd b/doc/footclient.1.scd
index b252d5e1..9cb4ef69 100644
--- a/doc/footclient.1.scd
+++ b/doc/footclient.1.scd
@@ -79,6 +79,10 @@ terminal has terminated.
*-v*,*--version*
Show the version number and quit
+*-e*
+ Ignored; for compatibility with *xterm -e*. See *foot*(1) for more
+ details.
+
# EXIT STATUS
Footlient will exit with code 220 if there is a failure in footclient
diff --git a/main.c b/main.c
index 7d4cbbcf..fd27aebd 100644
--- a/main.c
+++ b/main.c
@@ -78,7 +78,8 @@ print_usage(const char *prog_name)
" -d,--log-level={info|warning|error|none} log level (info)\n"
" -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n"
" -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n"
- " -v,--version show the version number and quit\n";
+ " -v,--version show the version number and quit\n"
+ " -e ignored (for compatibility with xterm -e)\n";
printf("Usage: %s [OPTIONS...]\n", prog_name);
printf("Usage: %s [OPTIONS...] command [ARGS...]\n", prog_name);
@@ -216,7 +217,7 @@ main(int argc, char *const *argv)
config_override_t overrides = tll_init();
while (true) {
- int c = getopt_long(argc, argv, "+c:Co:t:T:a:LD:f:w:W:s::HmFPp:d:l::Svh", longopts, NULL);
+ int c = getopt_long(argc, argv, "+c:Co:t:T:a:LD:f:w:W:s::HmFPp:d:l::Sveh", longopts, NULL);
if (c == -1)
break;
@@ -375,6 +376,9 @@ main(int argc, char *const *argv)
print_usage(prog_name);
return EXIT_SUCCESS;
+ case 'e':
+ break;
+
case '?':
return ret;
}