aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-01-02 08:15:52 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-01-02 08:15:52 +0000
commit99ebff5a515c4645e2faa32fd51e975e60d95ddb (patch)
tree5084aa2a518cdac3536517c8c976c1dfedd11bb4 /main.c
parentdoc: ctlseq: add missing ‘[‘ to a couple of CSI sequences (diff)
parentchangelog: fixed failing to launch when exec(3):ed with an empty argv (diff)
Merge branch 'argc-is-zero'
Diffstat (limited to 'main.c')
-rw-r--r--main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/main.c b/main.c
index 7370de29..34f72a7c 100644
--- a/main.c
+++ b/main.c
@@ -168,7 +168,7 @@ main(int argc, char *const *argv)
* don't pass this on to programs launched by us */
unsetenv("DESKTOP_STARTUP_ID");
- const char *const prog_name = argv[0];
+ const char *const prog_name = argc > 0 ? argv[0] : "<nullptr>";
static const struct option longopts[] = {
{"config", required_argument, NULL, 'c'},
@@ -401,8 +401,10 @@ main(int argc, char *const *argv)
as_server && log_syslog,
(enum fcft_log_class)log_level);
- argc -= optind;
- argv += optind;
+ if (argc > 0) {
+ argc -= optind;
+ argv += optind;
+ }
LOG_INFO("%s", version_and_features());